mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unneccessary argument from CreateScHFEditDlg

Browse Source 
Change-Id: I2e2fa80678375d49ea4b100515eecd932a79b471
This commit is contained in:
Caolán McNamara
2013-05-14 09:57:56 +01:00
parent ee47dfa474
commit c4f46a2c9a
4 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sc/inc/scabstdlg.hxx
View File

@@ -492,7 +492,6 @@ public:
Window* pParent, Window* pParent,
const SfxItemSet& rCoreSet, const SfxItemSet& rCoreSet,
const String& rPageStyle, const String& rPageStyle,
int nId,
sal_uInt16 nResId = RID_SCDLG_HFEDIT ) = 0; sal_uInt16 nResId = RID_SCDLG_HFEDIT ) = 0;
virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg

16
sc/source/ui/attrdlg/scdlgfact.cxx
View File

@@ -1238,22 +1238,10 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF
Window* pParent, Window* pParent,
const SfxItemSet& rCoreSet, const SfxItemSet& rCoreSet,
const String& rPageStyle, const String& rPageStyle,
int nId,
sal_uInt16 nResId ) sal_uInt16 nResId )
{ {
SfxTabDialog* pDlg=NULL; SfxTabDialog* pDlg = new ScHFEditDlg( pFrame, pParent, rCoreSet,rPageStyle, nResId );
switch ( nId ) return new ScAbstractTabDialog_Impl( pDlg );
{
case RID_SCDLG_HFEDIT :
pDlg = new ScHFEditDlg( pFrame, pParent, rCoreSet,rPageStyle, nResId );
break;
default:
break;
}
if ( pDlg )
return new ScAbstractTabDialog_Impl( pDlg );
return 0;
} }

1
sc/source/ui/attrdlg/scdlgfact.hxx
View File

@@ -559,7 +559,6 @@ public:
Window* pParent, Window* pParent,
const SfxItemSet& rCoreSet, const SfxItemSet& rCoreSet,
const String& rPageStyle, const String& rPageStyle,
int nId,
sal_uInt16 nResId = RID_SCDLG_HFEDIT ); sal_uInt16 nResId = RID_SCDLG_HFEDIT );
virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg

2
sc/source/ui/docshell/docsh4.cxx
View File

@@ -1706,7 +1706,7 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller,
GetActiveDialogParent(), GetActiveDialogParent(),
rStyleSet, rStyleSet,
aStr, aStr,
RID_SCDLG_HFEDIT, nResId); nResId);
OSL_ENSURE(pDlg, "Dialog create fail!"); OSL_ENSURE(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK ) if ( pDlg->Execute() == RET_OK )
{ {