helpcompiler/source/HelpCompiler.cxx | 9 ++------- sfx2/source/dialog/backingwindow.cxx | 2 -- 2 files changed, 2 insertions(+), 9 deletions(-)
New commits: commit d1a28461aeafe3aa7a3ce44c69ba621c62c266f5 Author: Stephan Bergmann <[email protected]> AuthorDate: Thu Mar 27 09:47:54 2025 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Mar 28 08:05:09 2025 +0100 -Werror,-Wunused-const-variable ...after ad8d4ad6a60d596f865f158ad53dee617a0a1b48 "Remove external link from start center" Change-Id: Id9153945d3ec0bd2ccd1c8ae362f540463f21eef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183386 Tested-by: allotropia jenkins <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 41998fbfa8bd..901197d3124c 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -67,8 +67,6 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::document; -const char SERVICENAME_CFGREADACCESS[] = "com.sun.star.configuration.ConfigurationAccess"; - // increase size of the text in the buttons on the left fMultiplier-times float const fMultiplier = 1.4f; commit bb7d3aae696f7c85d418e03f799df013e799e69b Author: Stephan Bergmann <[email protected]> AuthorDate: Thu Mar 27 09:42:43 2025 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Mar 28 08:04:58 2025 +0100 Use SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP ...following up on 2838a9168bb1a321ce0d2297284e6c8cf529604c "helpcompiler: suppress deprecation warning", to make that also cover Clang 12 warning > helpcompiler/source/HelpCompiler.cxx:144:13: error: 'xmlSubstituteEntitiesDefault' is deprecated [-Werror,-Wdeprecated-declarations] > xmlSubstituteEntitiesDefault(1); > ^ Change-Id: I5ce415add113b14563e1e9d552b8c0299aac39a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183385 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: allotropia jenkins <[email protected]> diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx index 9cd0425c2e05..98a16f6769d1 100644 --- a/helpcompiler/source/HelpCompiler.cxx +++ b/helpcompiler/source/HelpCompiler.cxx @@ -137,15 +137,10 @@ xmlDocPtr HelpCompiler::getSourceDocument(const fs::path &filePath) if (!cur) { static std::string fsroot('\'' + src.toUTF8() + '\''); -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4996) -#endif +SAL_WNODEPRECATED_DECLARATIONS_PUSH xmlSubstituteEntitiesDefault(1); xmlLoadExtDtdDefaultValue = 1; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif +SAL_WNODEPRECATED_DECLARATIONS_POP cur = xsltParseStylesheetFile(reinterpret_cast<const xmlChar *>(resEmbStylesheet.native_file_string().c_str())); int nbparams = 0;
