diff options
| -rw-r--r-- | cui/source/options/treeopt.cxx | 7 | ||||
| -rw-r--r-- | sw/source/ui/app/appopt.cxx | 18 |
2 files changed, 1 insertions, 24 deletions
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 57b8976c3f62..89855ac28fa4 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -415,9 +415,6 @@ static OptionsMapping_Impl const OptionsMap_Impl[] = { "Writer", "View", RID_SW_TP_CONTENT_OPT }, { "Writer", "FormattingAids", RID_SW_TP_OPTSHDWCRSR }, { "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", "Table", RID_SW_TP_OPTTABLE_PAGE }, { "Writer", "Changes", RID_SW_TP_REDLINE_OPT }, @@ -1933,9 +1930,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) nPageId = (sal_uInt16)rTextArray.GetValue(i); if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; - if ( ( RID_SW_TP_STD_FONT_CJK != nPageId || aLanguageOptions.IsCJKFontEnabled() ) && - ( RID_SW_TP_STD_FONT_CTL != nPageId || aLanguageOptions.IsCTLFontEnabled() ) && - ( RID_SW_TP_MAILCONFIG != nPageId || MailMergeCfg_Impl().IsEmailSupported() ) ) + if ( RID_SW_TP_MAILCONFIG != nPageId || MailMergeCfg_Impl().IsEmailSupported() ) AddTabPage( nPageId, rTextArray.GetString(i), nGroup ); } #ifdef DBG_UTIL diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index 689e8759498e..9f1b7224551e 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -465,24 +465,6 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI pRet = SvxGridTabPage::Create(pParent, rSet); 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_OPTPRINT_PAGE: { |