summaryrefslogtreecommitdiff
path: root/cui/source/options/treeopt.cxx
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2013-09-29 10:49:07 +0200
committerJan Holesovsky <kendy@collabora.com>2013-09-29 14:49:43 +0200
commitffe69acb222f1b4773a6fad20429ee1bc44fd985 (patch)
tree9163083a342c29c52d8b4f46e60f380d99855b77 /cui/source/options/treeopt.cxx
parented25f39a72e02a5f30652f9ad55fcfe5551c3026 (diff)
Kill internationaloptions page, it has been unused for years.
Change-Id: Ia528bf60a8af81b17ca18ad5eb305bed59818d05
Diffstat (limited to 'cui/source/options/treeopt.cxx')
-rw-r--r--cui/source/options/treeopt.cxx17
1 files changed, 6 insertions, 11 deletions
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 36029955f1ac..3239304719b9 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -398,7 +398,6 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
{ "Calc", NULL, SID_SC_EDITOPTIONS },
{ "Calc", "General", SID_SC_TP_LAYOUT },
{ "Calc", "View", SID_SC_TP_CONTENT },
- { "Calc", "International", RID_OFA_TP_INTERNATIONAL },
{ "Calc", "Calculate", SID_SC_TP_CALC },
{ "Calc", "Formula", SID_SC_TP_FORMULA },
{ "Calc", "SortLists", SID_SC_TP_USERLISTS },
@@ -1679,10 +1678,8 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
nPageId = (sal_uInt16)rCalcArray.GetValue(i);
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
continue;
-// if( bCTL || nId != RID_OFA_TP_INTERNATIONAL )
-// #103755# if an international tabpage is need one day, this should be used again... ;-)
- if ( nPageId != RID_OFA_TP_INTERNATIONAL )
- AddTabPage( nPageId, rCalcArray.GetString( i ), nGroup );
+
+ AddTabPage( nPageId, rCalcArray.GetString( i ), nGroup );
}
}
}
@@ -1699,15 +1696,14 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
ResStringArray& rImpressArray = aDlgResource.GetImpressArray();
setGroupName( "Impress", rImpressArray.GetString(0) );
nGroup = AddGroup( rImpressArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_EDITOPTIONS );
- const sal_Bool bCTL = aLanguageOptions.IsCTLFontEnabled();
const sal_uInt16 nCount = static_cast< const sal_uInt16 >( rImpressArray.Count() );
for ( i = 1; i < nCount; ++i )
{
nPageId = (sal_uInt16)rImpressArray.GetValue(i);
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
continue;
- if ( bCTL || nPageId != RID_OFA_TP_INTERNATIONAL_IMPR )
- AddTabPage( nPageId, rImpressArray.GetString(i), nGroup );
+
+ AddTabPage( nPageId, rImpressArray.GetString(i), nGroup );
}
}
}
@@ -1723,15 +1719,14 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
ResStringArray& rDrawArray = aDlgResource.GetDrawArray();
setGroupName( "Draw", rDrawArray.GetString(0) );
nGroup = AddGroup( rDrawArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_GRAPHIC_OPTIONS );
- const sal_Bool bCTL = aLanguageOptions.IsCTLFontEnabled();
const sal_uInt16 nCount = static_cast< const sal_uInt16 >( rDrawArray.Count() );
for ( i = 1; i < nCount; ++i )
{
nPageId = (sal_uInt16)rDrawArray.GetValue(i);
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
continue;
- if ( bCTL || nPageId != RID_OFA_TP_INTERNATIONAL_SD )
- AddTabPage( nPageId, rDrawArray.GetString(i), nGroup );
+
+ AddTabPage( nPageId, rDrawArray.GetString(i), nGroup );
}
}
}