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

[Libreoffice Gerrit user]

 xmloff/source/text/txtimppr.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 08db2bb4f380fcf0e389f8035fe0251923109b16
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Nov 5 09:15:35 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Nov 5 17:07:54 2018 +0100

    -Werror=unused-parameter
    
    follow-up to b5d5032ce9b40cdca233f6f8951fa056262ec041 "Fix for --enable-debug --disable-assert-always-abort", found by
    <https://ci.libreoffice.org//job/lo_tb_random_config_linux/1579/>
    
    Change-Id: Ie0ef4c0cb0f69d951bec24a2a40218cdfdf61edf
    Reviewed-on: https://gerrit.libreoffice.org/62874
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 519fdf3099d4..7fa6d4bd00ef 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -282,7 +282,7 @@ void lcl_SeparateBorder(
     XMLPropertyState const * pAllBorder, XMLPropertyState* pBorders[4],
     XMLPropertyState* pNewBorders[4], XMLPropertyState* pAllBorderWidth,
     XMLPropertyState* pBorderWidths[4]
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
     , const rtl::Reference< XMLPropertySetMapper >& rMapper
 #endif
 )
@@ -569,7 +569,7 @@ void XMLTextImportPropertyMapper::finished(
             i, pAllBorderDistance, pBorderDistances, pNewBorderDistances,
             pAllBorder, pBorders, pNewBorders,
             pAllBorderWidth, pBorderWidths
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
             , getPropertySetMapper()
 #endif
             );
@@ -578,7 +578,7 @@ void XMLTextImportPropertyMapper::finished(
             i, pCharAllBorderDistance, pCharBorderDistances,
             pCharNewBorderDistances, pCharAllBorder, pCharBorders,
             pCharNewBorders, pCharAllBorderWidth, pCharBorderWidths
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
             , getPropertySetMapper()
 #endif
             );