diff options
| author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2012-01-27 10:32:23 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2012-01-27 13:09:02 +0100 |
| commit | e9ec6d58b58739ce43ff563fd78c2326e11d1741 (patch) | |
| tree | 21013bfa082299e99c92e2084ec7861e6acd18c3 /cui | |
| parent | 2233aa52da14ec85331aee1163b885fe9a9fb507 (diff) | |
Revert "Removed list and numbering paragraph styles and related option page"
This reverts commits 359d0fbd03a68d9131e8fb25e7dac9f19ddf6dcb,
6a15a2898b7f822ddfba23553dd127e25af15fff and
21352f88caba9dee73d5a87c8e3724d17ac6b428.
This change is not mature enought: needs more work
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/treeopt.cxx | 7 | ||||
| -rw-r--r-- | cui/source/options/treeopt.src | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index df6366104383..51a8066aa3c1 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -382,6 +382,9 @@ 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 }, @@ -1706,7 +1709,9 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) nPageId = (sal_uInt16)rTextArray.GetValue(i); if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; - if ( RID_SW_TP_MAILCONFIG != nPageId || MailMergeCfg_Impl().IsEmailSupported() ) + 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() ) ) AddTabPage( nPageId, rTextArray.GetString(i), nGroup ); } #ifdef DBG_UTIL diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src index 37bdc36d7c4f..68dbe8930766 100644 --- a/cui/source/options/treeopt.src +++ b/cui/source/options/treeopt.src @@ -145,6 +145,9 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES < "View" ; RID_SW_TP_CONTENT_OPT ;> ; < "Formatting Aids" ; RID_SW_TP_OPTSHDWCRSR ; > ; < "Grid" ; RID_SVXPAGE_GRID ; > ; + < "Basic Fonts (Western)" ;RID_SW_TP_STD_FONT ; > ; + < "Basic Fonts (Asian)" ;RID_SW_TP_STD_FONT_CJK ; > ; + < "Basic Fonts (CTL)" ; RID_SW_TP_STD_FONT_CTL ; > ; < "Print" ; RID_SW_TP_OPTPRINT_PAGE ; > ; < "Table" ; RID_SW_TP_OPTTABLE_PAGE ; > ; < "Changes" ; RID_SW_TP_REDLINE_OPT ; > ; |