summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-07-09 08:50:37 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-07-13 18:14:11 +0200
commitcbce40e965acef51822b31d73da5fbc271fbcad0 (patch)
treebad77c67c68055f7597b8ecf1df1b74e778873cf /fpicker
parent429280541ff1fbbbf3f0482211a659c96c3347d2 (diff)
Make content of OSL_ASSERT, DBG_ASSERT, etc. visiblie in non-debug builds
...to avoid lots of loplugin:staticmethods warnings. Also enables DBG_ASSERT etc. also for --enable-debug builds in addition to --enable-dbgutil builds. Change-Id: Ib89ecd9ab8ce7abb2c64790ace248b31f9d2b64d
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/office/commonpicker.cxx4
-rw-r--r--fpicker/source/office/iodlgimp.cxx5
-rw-r--r--fpicker/source/win32/filepicker/dibpreview.cxx6
3 files changed, 2 insertions, 13 deletions
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 170f12785ab2..804850696577 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -459,10 +459,8 @@ namespace svt
continue;
}
-#ifdef DBG_UTIL
bool bKnownSetting =
-#endif
- implHandleInitializationArgument( sSettingName, aSettingValue );
+ implHandleInitializationArgument( sSettingName, aSettingValue );
DBG_ASSERT( bKnownSetting,
( OString( "OCommonPicker::initialize: unknown argument \"" )
+= OString( sSettingName.getStr(), sSettingName.getLength(), osl_getThreadTextEncoding() )
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 642028867d69..55c7f2789f72 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -266,9 +266,6 @@ void SvtExpFileDlg_Impl::SetStandardDir( const OUString& _rDir )
_aStdDir = "file:///";
}
-
-#if defined DBG_UTIL
-
namespace {
OUString lcl_DecoratedFilter( const OUString& _rOriginalFilter )
{
@@ -279,8 +276,6 @@ namespace {
return aDecoratedFilter.makeStringAndClear();
}
}
-#endif
-
void SvtExpFileDlg_Impl::ClearFilterList( )
{
diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx
index 6f0ed999beac..0d2ebf4ee9a7 100644
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -236,11 +236,7 @@ void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC)
int nX = abs(nWidth - cxDib) / 2;
int nY = abs(nHeight - cyDib) / 2;
-#if OSL_DEBUG_LEVEL > 0
- int GDIError = GDI_ERROR;
- GDIError =
-#endif
- StretchDIBits(
+ int GDIError = StretchDIBits(
hDC, nX, nY, cxDib, cyDib,
0, 0, cxDib, cyDib, pBits, pbmi,
DIB_RGB_COLORS, SRCCOPY);