diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-07-09 08:50:37 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-07-13 18:14:11 +0200 |
| commit | cbce40e965acef51822b31d73da5fbc271fbcad0 (patch) | |
| tree | bad77c67c68055f7597b8ecf1df1b74e778873cf /sd | |
| parent | 429280541ff1fbbbf3f0482211a659c96c3347d2 (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 'sd')
| -rw-r--r-- | sd/source/core/drawdoc3.cxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview2.cxx | 5 |
4 files changed, 3 insertions, 14 deletions
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index e274f0370a49..a186e7a47fb1 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1565,10 +1565,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, if (pMySheet) { // A stylesheet of the same name already exists -> overwrite contents -#ifdef DBG_UTIL - bool bTest = -#endif - pMySheet->SetName(pHisSheet->GetName()); + bool bTest = pMySheet->SetName(pHisSheet->GetName()); DBG_ASSERT(bTest, "Renaming StyleSheet failed."); pMySheet->GetItemSet().ClearItem(0); // Delete all diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index c2be4751a2f8..4e97ce2ca5f4 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -917,9 +917,7 @@ void SlotManager::RenameSlide() aNameDlg->GetName( aNewName ); if (aNewName != aPageName) { -#ifdef DBG_UTIL bool bResult = -#endif RenameSlideFromDrawViewShell( pSelectedPage->GetPageNum()/2, aNewName ); DBG_ASSERT( bResult, "Couldn't rename slide" ); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 83262d4999c7..00d4a19780ed 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -442,10 +442,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) aNameDlg->GetName( aNewName ); if (aNewName != aPageName) { -#ifdef DBG_UTIL - bool bResult = -#endif - RenameSlide( nPageId, aNewName ); + bool bResult = RenameSlide( nPageId, aNewName ); DBG_ASSERT( bResult, "Couldn't rename slide" ); } } diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 29e388d34ea0..79a022b9be14 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -425,10 +425,7 @@ void View::DragFinished( sal_Int8 nDropAction ) if( pObj && pObj->GetPage() ) { const size_t nOrdNum = pObj->GetOrdNumDirect(); -#ifdef DBG_UTIL - SdrObject* pChkObj = -#endif - pObj->GetPage()->RemoveObject(nOrdNum); + SdrObject* pChkObj = pObj->GetPage()->RemoveObject(nOrdNum); DBG_ASSERT(pChkObj==pObj,"pChkObj!=pObj in RemoveObject()"); } } |