diff options
| -rw-r--r-- | sc/inc/scabstdlg.hxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 16 | ||||
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.hxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 2 |
4 files changed, 3 insertions, 17 deletions
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 5190c9addd2f..93bae5a05508 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -492,7 +492,6 @@ public: Window* pParent, const SfxItemSet& rCoreSet, const String& rPageStyle, - int nId, sal_uInt16 nResId = RID_SCDLG_HFEDIT ) = 0; virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index e9945b83f0d0..2c9bbc37e650 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -1238,22 +1238,10 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF Window* pParent, const SfxItemSet& rCoreSet, const String& rPageStyle, - int nId, sal_uInt16 nResId ) { - SfxTabDialog* pDlg=NULL; - switch ( nId ) - { - case RID_SCDLG_HFEDIT : - pDlg = new ScHFEditDlg( pFrame, pParent, rCoreSet,rPageStyle, nResId ); - break; - default: - break; - } - - if ( pDlg ) - return new ScAbstractTabDialog_Impl( pDlg ); - return 0; + SfxTabDialog* pDlg = new ScHFEditDlg( pFrame, pParent, rCoreSet,rPageStyle, nResId ); + return new ScAbstractTabDialog_Impl( pDlg ); } diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index a18767c5acc2..356776d16e3f 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -559,7 +559,6 @@ public: Window* pParent, const SfxItemSet& rCoreSet, const String& rPageStyle, - int nId, sal_uInt16 nResId = RID_SCDLG_HFEDIT ); virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 9bc4a40bb639..5511b61cfdee 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1706,7 +1706,7 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller, GetActiveDialogParent(), rStyleSet, aStr, - RID_SCDLG_HFEDIT, nResId); + nResId); OSL_ENSURE(pDlg, "Dialog create fail!"); if ( pDlg->Execute() == RET_OK ) { |