diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/CppunitTest_sw_filters_test.mk | 1 | ||||
| -rw-r--r-- | sw/prj/build.lst | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/WW8Sttbf.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 3b31eb9bd813..d12ff2d94497 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -97,6 +97,7 @@ $(eval $(call gb_CppunitTest_add_old_components,sw_filters_test,\ configmgr \ ucb1 \ ucpfile1 \ + ucpchelp1 \ )) $(eval $(call gb_CppunitTest_set_args,sw_filters_test,\ diff --git a/sw/prj/build.lst b/sw/prj/build.lst index e2d759dceb36..37b464dfbb1a 100644 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -1,2 +1,2 @@ -sw sw : filter TRANSLATIONS:translations configmgr connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit dbaccess comphelper LIBXSLT:libxslt test NULL +sw sw : filter TRANSLATIONS:translations configmgr connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit dbaccess comphelper LIBXSLT:libxslt test xmlhelp NULL sw sw\prj nmake - all sw_prj NULL diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx index 5ef82118e5a4..e3311605c636 100644 --- a/sw/source/filter/ww8/WW8Sttbf.cxx +++ b/sw/source/filter/ww8/WW8Sttbf.cxx @@ -98,7 +98,7 @@ namespace ww8 #endif } -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 char sBuffer[256]; snprintf(sBuffer, sizeof(sBuffer), "offset=\"%" SAL_PRIuUINT32 "\" count=\"%" SAL_PRIuUINT32 "\"", nOffset, nCount); diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 9ef2ff9cef70..56631b9bb225 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -923,7 +923,7 @@ void WW8SprmIter::UpdateMyMembers() nAktSize = mrSprmParser.GetSprmSize(nAktId, pSprms); pAktParams = pSprms + mrSprmParser.DistanceToData(nAktId); bValid = nAktSize <= nRemLen; - OSL_ENSURE(bValid, "sprm longer than remaining bytes"); + SAL_WARN_IF(!bValid, ".doc", "sprm longer than remaining bytes, doc or parser is wrong"); } if (!bValid) @@ -7410,7 +7410,7 @@ sal_uInt8* wwSprmParser::findSprmData(sal_uInt16 nId, sal_uInt8* pSprms, bool bValid = nSize <= nLen; - OSL_ENSURE(bValid, "sprm longer than remaining bytes"); + SAL_WARN_IF(!bValid, ".doc", "sprm longer than remaining bytes, doc or parser is wrong"); if (nAktId == nId && bValid) // Sprm found return pSprms + DistanceToData(nId); |