diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-01-10 20:52:16 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-10 20:53:04 +0000 |
commit | 5ac26a7f0054ca3d1af41f3483dc0e32a343bb96 (patch) | |
tree | a7e21f1b3c00be7fb45a38f687c5682f0c6a41a6 /cui/source/factory | |
parent | 957676441635d236743b61ccb74128821d07d0d0 (diff) |
Resolves: fdo#73260 fix Registered Database single tab dialog
Change-Id: I71bfe44b3d1f88a44a2c53b10c6880c2a3a4ede0
Diffstat (limited to 'cui/source/factory')
-rw-r--r-- | cui/source/factory/dlgfact.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 3a7bca7fbb5e..3ab8e8665585 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1615,16 +1615,14 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, ) { -// TODO will fix this ugly hack when all cases are in SfxSingleTabDialog - SfxNoLayoutSingleTabDialog* pDlg=NULL; - SfxSingleTabDialog* pDlg1=NULL; + SfxSingleTabDialog* pDlg=NULL; switch ( nResId ) { case RID_SVXPAGE_MEASURE : - pDlg1 = new SvxMeasureDialog( pParent, rAttr, pView ); + pDlg = new SvxMeasureDialog( pParent, rAttr, pView ); break; case RID_SVXPAGE_CONNECTION : - pDlg1 = new SvxConnectionDialog( pParent, rAttr, pView ); + pDlg = new SvxConnectionDialog( pParent, rAttr, pView ); break; case RID_SFXPAGE_DBREGISTER : pDlg = new DatabaseRegistrationDialog( pParent, rAttr ); @@ -1636,9 +1634,6 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, if ( pDlg ) return new CuiAbstractSfxDialog_Impl( pDlg ); - if ( pDlg1 ) - return new CuiAbstractSfxDialog_Impl( pDlg1 ); - return 0; } |