Skip to content

C
core
Kaydet (Commit) 32675bd4 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

flatten RID_LOCALIZED_NAMES by a level 

Change-Id: I5e6fe76d01b82ff6d9f7fde06f4349d54493bf1b
üst 06609e71
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 97 deletions
starmath/inc/smmod.hxx
Dosyayı görüntüle @ 32675bd4
...@@ -60,7 +60,7 @@ public: ...@@ -60,7 +60,7 @@ public:
#define SM_RESSTR(x) SmResId(x).toString() #define SM_RESSTR(x) SmResId(x).toString()
class SmLocalizedSymbolData : public Resource class SmLocalizedSymbolData
{ {
ResStringArray aUiSymbolNamesAry; ResStringArray aUiSymbolNamesAry;
ResStringArray aExportSymbolNamesAry; ResStringArray aExportSymbolNamesAry;
......
starmath/inc/starmath.hrc
Dosyayı görüntüle @ 32675bd4
...@@ -469,7 +469,6 @@ ...@@ -469,7 +469,6 @@
#define RID_MISC_MENU (RID_APP_START + 2172) #define RID_MISC_MENU (RID_APP_START + 2172)
#define RID_FUNCTIONSOTHER1_MENU (RID_APP_START + 2173) #define RID_FUNCTIONSOTHER1_MENU (RID_APP_START + 2173)
#define RID_LOCALIZED_NAMES (RID_APP_START + 3101)
#define RID_UI_SYMBOL_NAMES (RID_APP_START + 3102) #define RID_UI_SYMBOL_NAMES (RID_APP_START + 3102)
#define RID_EXPORT_SYMBOL_NAMES (RID_APP_START + 3103) #define RID_EXPORT_SYMBOL_NAMES (RID_APP_START + 3103)
#define RID_UI_SYMBOLSET_NAMES (RID_APP_START + 3105) #define RID_UI_SYMBOLSET_NAMES (RID_APP_START + 3105)
......
starmath/source/smmod.cxx
Dosyayı görüntüle @ 32675bd4
...@@ -37,29 +37,23 @@ ...@@ -37,29 +37,23 @@
#define SmModule #define SmModule
#include "smslots.hxx" #include "smslots.hxx"
SmResId::SmResId( sal_uInt16 nId ) SmResId::SmResId( sal_uInt16 nId )
: ResId(nId, *SM_MOD()->GetResMgr()) : ResId(nId, *SM_MOD()->GetResMgr())
{ {
} }
SmLocalizedSymbolData::SmLocalizedSymbolData() : SmLocalizedSymbolData::SmLocalizedSymbolData() :
Resource( SmResId(RID_LOCALIZED_NAMES) ),
aUiSymbolNamesAry ( SmResId(RID_UI_SYMBOL_NAMES) ), aUiSymbolNamesAry ( SmResId(RID_UI_SYMBOL_NAMES) ),
aExportSymbolNamesAry ( SmResId(RID_EXPORT_SYMBOL_NAMES) ), aExportSymbolNamesAry ( SmResId(RID_EXPORT_SYMBOL_NAMES) ),
aUiSymbolSetNamesAry ( SmResId(RID_UI_SYMBOLSET_NAMES) ), aUiSymbolSetNamesAry ( SmResId(RID_UI_SYMBOLSET_NAMES) ),
aExportSymbolSetNamesAry( SmResId(RID_EXPORT_SYMBOLSET_NAMES) ) aExportSymbolSetNamesAry( SmResId(RID_EXPORT_SYMBOLSET_NAMES) )
{ {
FreeResource();
} }
SmLocalizedSymbolData::~SmLocalizedSymbolData() SmLocalizedSymbolData::~SmLocalizedSymbolData()
{ {
} }
const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportName ) const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportName )
{ {
OUString aRes; OUString aRes;
...@@ -80,7 +74,6 @@ const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportNa ...@@ -80,7 +74,6 @@ const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportNa
return aRes; return aRes;
} }
const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiName ) const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiName )
{ {
OUString aRes; OUString aRes;
...@@ -101,7 +94,6 @@ const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiNa ...@@ -101,7 +94,6 @@ const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiNa
return aRes; return aRes;
} }
const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExportName ) const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExportName )
{ {
OUString aRes; OUString aRes;
...@@ -122,7 +114,6 @@ const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExpor ...@@ -122,7 +114,6 @@ const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExpor
return aRes; return aRes;
} }
const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rUiName ) const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rUiName )
{ {
OUString aRes; OUString aRes;
...@@ -269,6 +260,7 @@ SfxItemSet* SmModule::CreateItemSet( sal_uInt16 nId ) ...@@ -269,6 +260,7 @@ SfxItemSet* SmModule::CreateItemSet( sal_uInt16 nId )
} }
return pRet; return pRet;
} }
void SmModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) void SmModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
{ {
if(nId == SID_SM_EDITOPTIONS) if(nId == SID_SM_EDITOPTIONS)
...@@ -276,6 +268,7 @@ void SmModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) ...@@ -276,6 +268,7 @@ void SmModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
GetConfig()->ItemSetToConfig(rSet); GetConfig()->ItemSetToConfig(rSet);
} }
} }
VclPtr<SfxTabPage> SmModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) VclPtr<SfxTabPage> SmModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet )
{ {
VclPtr<SfxTabPage> pRet; VclPtr<SfxTabPage> pRet;
......
starmath/source/symbol.src
Dosyayı görüntüle @ 32675bd4
...@@ -23,98 +23,96 @@ ...@@ -23,98 +23,96 @@
// is the localized version of all symbols that is show in the Ui, // is the localized version of all symbols that is show in the Ui,
// for Export they have to be in English. The transition between // for Export they have to be in English. The transition between
// both lists is done with GetExportSymbolName() and GetUiSymbolName(). // both lists is done with GetExportSymbolName() and GetUiSymbolName().
Resource RID_LOCALIZED_NAMES StringArray RID_EXPORT_SYMBOLSET_NAMES
{ {
StringArray RID_EXPORT_SYMBOLSET_NAMES ItemList =
{ {
ItemList = < "Greek" ; > ;
{ < "Special" ; > ;
< "Greek" ; > ;
< "Special" ; > ;
};
}; };
StringArray RID_UI_SYMBOLSET_NAMES };
StringArray RID_UI_SYMBOLSET_NAMES
{
ItemList [ en-US ] =
{ {
ItemList [ en-US ] = < "Greek" ; > ;
{ < "Special" ; > ;
< "Greek" ; > ;
< "Special" ; > ;
};
}; };
StringArray RID_EXPORT_SYMBOL_NAMES };
StringArray RID_EXPORT_SYMBOL_NAMES
{
ItemList =
{ {
ItemList = < "alpha" ; > ;
{ < "ALPHA" ; > ;
< "alpha" ; > ; < "beta" ; > ;
< "ALPHA" ; > ; < "BETA" ; > ;
< "beta" ; > ; < "gamma" ; > ;
< "BETA" ; > ; < "GAMMA" ; > ;
< "gamma" ; > ; < "delta" ; > ;
< "GAMMA" ; > ; < "DELTA" ; > ;
< "delta" ; > ; < "epsilon" ; > ;
< "DELTA" ; > ; < "EPSILON" ; > ;
< "epsilon" ; > ; < "zeta" ; > ;
< "EPSILON" ; > ; < "ZETA" ; > ;
< "zeta" ; > ; < "eta" ; > ;
< "ZETA" ; > ; < "ETA" ; > ;
< "eta" ; > ; < "theta" ; > ;
< "ETA" ; > ; < "THETA" ; > ;
< "theta" ; > ; < "iota" ; > ;
< "THETA" ; > ; < "IOTA" ; > ;
< "iota" ; > ; < "kappa" ; > ;
< "IOTA" ; > ; < "KAPPA" ; > ;
< "kappa" ; > ; < "lambda" ; > ;
< "KAPPA" ; > ; < "LAMBDA" ; > ;
< "lambda" ; > ; < "mu" ; > ;
< "LAMBDA" ; > ; < "MU" ; > ;
< "mu" ; > ; < "nu" ; > ;
< "MU" ; > ; < "NU" ; > ;
< "nu" ; > ; < "xi" ; > ;
< "NU" ; > ; < "XI" ; > ;
< "xi" ; > ; < "omicron" ; > ;
< "XI" ; > ; < "OMICRON" ; > ;
< "omicron" ; > ; < "pi" ; > ;
< "OMICRON" ; > ; < "PI" ; > ;
< "pi" ; > ; < "rho" ; > ;
< "PI" ; > ; < "RHO" ; > ;
< "rho" ; > ; < "sigma" ; > ;
< "RHO" ; > ; < "SIGMA" ; > ;
< "sigma" ; > ; < "tau" ; > ;
< "SIGMA" ; > ; < "TAU" ; > ;
< "tau" ; > ; < "upsilon" ; > ;
< "TAU" ; > ; < "UPSILON" ; > ;
< "upsilon" ; > ; < "phi" ; > ;
< "UPSILON" ; > ; < "PHI" ; > ;
< "phi" ; > ; < "chi" ; > ;
< "PHI" ; > ; < "CHI" ; > ;
< "chi" ; > ; < "psi" ; > ;
< "CHI" ; > ; < "PSI" ; > ;
< "psi" ; > ; < "omega" ; > ;
< "PSI" ; > ; < "OMEGA" ; > ;
< "omega" ; > ; < "varepsilon" ; > ;
< "OMEGA" ; > ; < "vartheta" ; > ;
< "varepsilon" ; > ; < "varpi" ; > ;
< "vartheta" ; > ; < "varrho" ; > ;
< "varpi" ; > ; < "varsigma" ; > ;
< "varrho" ; > ; < "varphi" ; > ;
< "varsigma" ; > ; < "element" ; > ;
< "varphi" ; > ; < "noelement" ; > ;
< "element" ; > ; < "strictlylessthan" ; > ;
< "noelement" ; > ; < "strictlygreaterthan" ; > ;
< "strictlylessthan" ; > ; < "notequal" ; > ;
< "strictlygreaterthan" ; > ; < "identical" ; > ;
< "notequal" ; > ; < "tendto" ; > ;
< "identical" ; > ; < "infinite" ; > ;
< "tendto" ; > ; < "angle" ; > ;
< "infinite" ; > ; < "perthousand" ; > ;
< "angle" ; > ; < "and" ; > ;
< "perthousand" ; > ; < "or" ; > ;
< "and" ; > ;
< "or" ; > ;
};
}; };
StringArray RID_UI_SYMBOL_NAMES };
{ StringArray RID_UI_SYMBOL_NAMES
{
ItemList [ en-US ] = ItemList [ en-US ] =
{ {
< "alpha" ; > ; < "alpha" ; > ;
...@@ -184,7 +182,6 @@ Resource RID_LOCALIZED_NAMES ...@@ -184,7 +182,6 @@ Resource RID_LOCALIZED_NAMES
< "and" ; > ; < "and" ; > ;
< "or" ; > ; < "or" ; > ;
}; };
};
}; };
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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