diff options
| author | August Sodora <augsod@gmail.com> | 2011-12-16 18:37:03 -0500 |
|---|---|---|
| committer | August Sodora <augsod@gmail.com> | 2011-12-19 14:36:10 -0500 |
| commit | d330111ec383542ad8955d78a64f4ed4b095b683 (patch) | |
| tree | 45a2274ff5825d2a4b478636bedb5c1cdace10b2 /sw | |
| parent | Simplify treeopt select handler (diff) | |
| download | core-d330111ec383542ad8955d78a64f4ed4b095b683.tar.gz core-d330111ec383542ad8955d78a64f4ed4b095b683.zip | |
Clean up treeopt select handler locking hack
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/app/appopt.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index 22212668d8c4..d9afcb37c408 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -526,7 +526,6 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI } } break; -#if OSL_DEBUG_LEVEL > 1 case RID_SW_TP_OPTTEST_PAGE: { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); @@ -538,7 +537,6 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI } break; } -#endif case RID_SW_TP_BACKGROUND: { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); @@ -564,7 +562,8 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI break; } - OSL_ENSURE( pRet, "SwModule::CreateTabPage(): Unknown tabpage id" ); + if(!pRet) + SAL_WARN( "sw", "SwModule::CreateTabPage(): Unknown tabpage id " << nId ); return pRet; } diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index a31db0d97390..7a636618d9ac 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -1645,9 +1645,7 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI break; case RID_SW_TP_OPTTEST_PAGE : case TP_OPTTEST_PAGE : -#ifdef DBG_UTIL pRet = SwTestTabPage::Create; -#endif break; case TP_OPTPRINT_PAGE : case RID_SW_TP_HTML_OPTPRINT_PAGE: |