Kaydet (Commit) c4f46a2c authored tarafından Caolán McNamara's avatar Caolán McNamara

remove unneccessary argument from CreateScHFEditDlg

Change-Id: I2e2fa80678375d49ea4b100515eecd932a79b471
üst ee47dfa4
......@@ -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
......
......@@ -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 );
}
......
......@@ -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
......
......@@ -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 )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment