[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 2 commits - compilerplugins/clang pyuno/source

[Caolán McNamara (via logerrit)]

 compilerplugins/clang/badstatics.cxx |    2 ++
 pyuno/source/loader/pyuno_loader.cxx |    4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c53da679fd420b47eed59827862df8d75eddd361
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Jun 2 15:00:49 2023 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Jun 2 16:06:39 2023 +0200

    temp silence loplugin for testing purposes
    
    Change-Id: I9fa9fac4ffab471ef5afee515753fbcc7aeb964f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152560
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/compilerplugins/clang/badstatics.cxx 
b/compilerplugins/clang/badstatics.cxx
index 3b80278a2f4f..7c604bc5ee66 100644
--- a/compilerplugins/clang/badstatics.cxx
+++ b/compilerplugins/clang/badstatics.cxx
@@ -199,6 +199,8 @@ public:
                 || name == "g_aWindowList"
                     //vcl/unx/gtk3/a11y/atkutil.cxx, asserted empty at exit
                 || name == "gFontPreviewVirDevs"
+                || (loplugin::DeclCheck(pVarDecl).Var("aPreviewCache")
+                    .Class("StylesPreviewWindow_Base").GlobalNamespace()) // 
TODO: temp disable
                     //svtools/source/control/ctrlbox.cxx, empty at exit
                 || name == "aLogger" // FormulaLogger& FormulaLogger::get() in 
sc/source/core/tool/formulalogger.cxx
                 || name == "s_aUncommittedRegistrations" // 
sw/source/uibase/dbui/dbmgr.cxx
commit 5c79145a53eba0ebeb7ba616eda89fb175ae8de0
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: Fri Jun 2 16:06:26 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>
    (cherry picked from commit c7b4d15c5c33e8ac05b054aa1d19751fb1b1275a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152449
    Tested-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 da0467f450c6..b5261e49033d 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -130,7 +130,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 )