[Libreoffice-commits] core.git: xmloff/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Wed Mar 18 13:51:40 UTC 2020


 xmloff/source/core/xmltoken.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d77ab56c8befc15816c7f70644dd72f4058642d1
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Mar 18 14:10:33 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Mar 18 14:51:17 2020 +0100

    Avoid -Werror=unused-but-set-variable
    
    ...in --enable-debug --enable-werror --disable-assert-always-abort builds like
    <https://ci.libreoffice.org//job/lo_tb_random_config_linux/2279/>:
    
    > /lo/home/tdf/lode/jenkins/workspace/lo_tb_random_config_linux/xmloff/source/core/xmltoken.cxx:3368:18: error: variable ‘foundDuplicate’ set but not used [-Werror=unused-but-set-variable]
    >  3368 |             bool foundDuplicate = false;
    >       |                  ^~~~~~~~~~~~~~
    
    Change-Id: If9d433082de84c433132276e171ba5c42c24b61c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90699
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 48fc80a37b0b..92abc4cef73e 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3357,7 +3357,7 @@ namespace xmloff::token {
     // get OUString representation of token
     const OUString& GetXMLToken( enum XMLTokenEnum eToken )
     {
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
         static bool s_bChecked = false;
         if (!s_bChecked)
         {


More information about the Libreoffice-commits mailing list