[Libreoffice-commits] core.git: 2 commits - pyuno/source sw/source

[Caolán McNamara (via logerrit)]

 pyuno/source/loader/pyuno_loader.cxx |    4 +++-
 sw/source/core/layout/flowfrm.cxx    |    8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit c7b4d15c5c33e8ac05b054aa1d19751fb1b1275a
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Jun 1 16:20:48 2023 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Jun 1 18:23:28 2023 +0200

    WaE: Py_SetPythonHome is deprecated since python 3.11
    
    not obvious how to replace it, so just accept for now
    
    Change-Id: Id3fc4c95a5cc60e078f06faaa024faa9c770de20
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152504
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/pyuno/source/loader/pyuno_loader.cxx 
b/pyuno/source/loader/pyuno_loader.cxx
index 27ef6abbc198..05a03fe72c4d 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -129,7 +129,9 @@ static void setPythonHome ( const OUString & pythonHome )
         PyErr_SetString(PyExc_SystemError, "python home path is too long");
         return;
     }
-    Py_SetPythonHome(wide);
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
+    Py_SetPythonHome(wide); // deprecated since python 3.11
+SAL_WNODEPRECATED_DECLARATIONS_POP
 }
 
 static void prependPythonPath( std::u16string_view pythonPathBootstrap )
commit 9ff2b61876843584d6c4fb3cadda48089b8a84b7
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Jun 1 15:48:30 2023 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Jun 1 18:23:19 2023 +0200

    WaE: -Wmaybe-uninitialized with GCC 13
    
    Change-Id: I69e0f28ab6f6a8a2c7181876735b128d39394b52
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152503
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index 402f47f8004e..cb47267f1195 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2020,7 +2020,15 @@ bool SwFlowFrame::MoveFwd( bool bMakePage, bool 
bPageBreak, bool bMoveAlways )
         }
     }
 
+// prevent -Werror=maybe-uninitialized under gcc 11.2.0
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 13
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
     std::optional<SwFrameDeleteGuard> oDeleteGuard;
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 13
+#pragma GCC diagnostic pop
+#endif
     if (bMakePage)
         oDeleteGuard.emplace(pOldBoss);