Kaydet (Commit) 6a15a289 authored tarafından Cédric Bosdonnat's avatar Cédric Bosdonnat

Styles cleanup: forgot to remove some bits

üst 74b648ed
...@@ -415,9 +415,6 @@ static OptionsMapping_Impl const OptionsMap_Impl[] = ...@@ -415,9 +415,6 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
{ "Writer", "View", RID_SW_TP_CONTENT_OPT }, { "Writer", "View", RID_SW_TP_CONTENT_OPT },
{ "Writer", "FormattingAids", RID_SW_TP_OPTSHDWCRSR }, { "Writer", "FormattingAids", RID_SW_TP_OPTSHDWCRSR },
{ "Writer", "Grid", RID_SVXPAGE_GRID }, { "Writer", "Grid", RID_SVXPAGE_GRID },
{ "Writer", "BasicFontsWestern", RID_SW_TP_STD_FONT },
{ "Writer", "BasicFontsAsian", RID_SW_TP_STD_FONT_CJK },
{ "Writer", "BasicFontsCTL", RID_SW_TP_STD_FONT_CTL },
{ "Writer", "Print", RID_SW_TP_OPTPRINT_PAGE }, { "Writer", "Print", RID_SW_TP_OPTPRINT_PAGE },
{ "Writer", "Table", RID_SW_TP_OPTTABLE_PAGE }, { "Writer", "Table", RID_SW_TP_OPTTABLE_PAGE },
{ "Writer", "Changes", RID_SW_TP_REDLINE_OPT }, { "Writer", "Changes", RID_SW_TP_REDLINE_OPT },
...@@ -1933,9 +1930,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) ...@@ -1933,9 +1930,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
nPageId = (sal_uInt16)rTextArray.GetValue(i); nPageId = (sal_uInt16)rTextArray.GetValue(i);
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
continue; continue;
if ( ( RID_SW_TP_STD_FONT_CJK != nPageId || aLanguageOptions.IsCJKFontEnabled() ) && if ( RID_SW_TP_MAILCONFIG != nPageId || MailMergeCfg_Impl().IsEmailSupported() )
( RID_SW_TP_STD_FONT_CTL != nPageId || aLanguageOptions.IsCTLFontEnabled() ) &&
( RID_SW_TP_MAILCONFIG != nPageId || MailMergeCfg_Impl().IsEmailSupported() ) )
AddTabPage( nPageId, rTextArray.GetString(i), nGroup ); AddTabPage( nPageId, rTextArray.GetString(i), nGroup );
} }
#ifdef DBG_UTIL #ifdef DBG_UTIL
......
...@@ -465,24 +465,6 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI ...@@ -465,24 +465,6 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI
pRet = SvxGridTabPage::Create(pParent, rSet); pRet = SvxGridTabPage::Create(pParent, rSet);
break; break;
case RID_SW_TP_STD_FONT:
case RID_SW_TP_STD_FONT_CJK:
case RID_SW_TP_STD_FONT_CTL:
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
if ( pFact )
{
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId );
if ( fnCreatePage )
pRet = (*fnCreatePage)( pParent, rSet );
}
if(RID_SW_TP_STD_FONT != nId)
{
aSet.Put (SfxUInt16Item(SID_FONTMODE_TYPE, RID_SW_TP_STD_FONT_CJK == nId ? FONT_GROUP_CJK : FONT_GROUP_CTL));
pRet->PageCreated(aSet);
}
}
break;
case RID_SW_TP_HTML_OPTPRINT_PAGE: case RID_SW_TP_HTML_OPTPRINT_PAGE:
case RID_SW_TP_OPTPRINT_PAGE: case RID_SW_TP_OPTPRINT_PAGE:
{ {
......
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