From cbce40e965acef51822b31d73da5fbc271fbcad0 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 9 Jul 2015 08:50:37 +0200
Subject: 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
---
 svx/source/svdraw/svdundo.cxx | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

(limited to 'svx/source/svdraw')

diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 069afe450f8e..e6ed8ef90413 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -785,10 +785,7 @@ void SdrUndoInsertObj::Undo()
     {
         ImplUnmarkObject( pObj );
 
-#ifdef DBG_UTIL
-        SdrObject* pChkObj=
-#endif
-        pObjList->RemoveObject(nOrdNum);
+        SdrObject* pChkObj= pObjList->RemoveObject(nOrdNum);
         DBG_ASSERT(pChkObj==pObj,"UndoInsertObj: RemoveObjNum!=pObj");
     }
 }
@@ -1327,10 +1324,7 @@ void SdrUndoNewLayer::Undo()
 {
     DBG_ASSERT(!bItsMine,"SdrUndoNewLayer::Undo(): Layer already belongs to UndoAction.");
     bItsMine=true;
-#ifdef DBG_UTIL
-    SdrLayer* pCmpLayer=
-#endif
-    pLayerAdmin->RemoveLayer(nNum);
+    SdrLayer* pCmpLayer= pLayerAdmin->RemoveLayer(nNum);
     DBG_ASSERT(pCmpLayer==pLayer,"SdrUndoNewLayer::Undo(): Removed layer is != pLayer.");
 }
 
@@ -1359,10 +1353,7 @@ void SdrUndoDelLayer::Redo()
 {
     DBG_ASSERT(!bItsMine,"SdrUndoDelLayer::Undo(): Layer already belongs to UndoAction.");
     bItsMine=true;
-#ifdef DBG_UTIL
-    SdrLayer* pCmpLayer=
-#endif
-    pLayerAdmin->RemoveLayer(nNum);
+    SdrLayer* pCmpLayer= pLayerAdmin->RemoveLayer(nNum);
     DBG_ASSERT(pCmpLayer==pLayer,"SdrUndoDelLayer::Redo(): Removed layer is != pLayer.");
 }
 
@@ -1375,20 +1366,14 @@ OUString SdrUndoDelLayer::GetComment() const
 
 void SdrUndoMoveLayer::Undo()
 {
-#ifdef DBG_UTIL
-    SdrLayer* pCmpLayer=
-#endif
-    pLayerAdmin->RemoveLayer(nNeuPos);
+    SdrLayer* pCmpLayer= pLayerAdmin->RemoveLayer(nNeuPos);
     DBG_ASSERT(pCmpLayer==pLayer,"SdrUndoMoveLayer::Undo(): Removed layer is != pLayer.");
     pLayerAdmin->InsertLayer(pLayer,nNum);
 }
 
 void SdrUndoMoveLayer::Redo()
 {
-#ifdef DBG_UTIL
-    SdrLayer* pCmpLayer=
-#endif
-    pLayerAdmin->RemoveLayer(nNum);
+    SdrLayer* pCmpLayer= pLayerAdmin->RemoveLayer(nNum);
     DBG_ASSERT(pCmpLayer==pLayer,"SdrUndoMoveLayer::Redo(): Removed layer is != pLayer.");
     pLayerAdmin->InsertLayer(pLayer,nNeuPos);
 }
-- 
cgit v1.2.3