flatten RID_LOCALIZED_NAMES by a level

Change-Id: I5e6fe76d01b82ff6d9f7fde06f4349d54493bf1b

4 files changed, 86 insertions, 97 deletions

diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 62f244bed554..f88b5f13a18d 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -60,7 +60,7 @@ public:
 
 #define SM_RESSTR(x) SmResId(x).toString()
 
-class SmLocalizedSymbolData : public Resource
+class SmLocalizedSymbolData
 {
     ResStringArray      aUiSymbolNamesAry;
     ResStringArray      aExportSymbolNamesAry;
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index ef15e8c6ab6d..6fc8fb16fae7 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -469,7 +469,6 @@
 #define RID_MISC_MENU               (RID_APP_START + 2172)
 #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_EXPORT_SYMBOL_NAMES         (RID_APP_START + 3103)
 #define RID_UI_SYMBOLSET_NAMES          (RID_APP_START + 3105)
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 014620ac4700..149288099666 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -37,29 +37,23 @@
 #define SmModule
 #include "smslots.hxx"
 
-
 SmResId::SmResId( sal_uInt16 nId )
     : ResId(nId, *SM_MOD()->GetResMgr())
 {
 }
 
-
 SmLocalizedSymbolData::SmLocalizedSymbolData() :
-    Resource( SmResId(RID_LOCALIZED_NAMES) ),
     aUiSymbolNamesAry       ( SmResId(RID_UI_SYMBOL_NAMES) ),
     aExportSymbolNamesAry   ( SmResId(RID_EXPORT_SYMBOL_NAMES) ),
     aUiSymbolSetNamesAry    ( SmResId(RID_UI_SYMBOLSET_NAMES) ),
     aExportSymbolSetNamesAry( SmResId(RID_EXPORT_SYMBOLSET_NAMES) )
 {
-    FreeResource();
 }
 
-
 SmLocalizedSymbolData::~SmLocalizedSymbolData()
 {
 }
 
-
 const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportName )
 {
     OUString aRes;
@@ -80,7 +74,6 @@ const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportNa
     return aRes;
 }
 
-
 const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiName )
 {
     OUString aRes;
@@ -101,7 +94,6 @@ const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiNa
     return aRes;
 }
 
-
 const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExportName )
 {
     OUString aRes;
@@ -122,7 +114,6 @@ const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExpor
     return aRes;
 }
 
-
 const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rUiName )
 {
     OUString aRes;
@@ -269,6 +260,7 @@ SfxItemSet*  SmModule::CreateItemSet( sal_uInt16 nId )
     }
     return pRet;
 }
+
 void SmModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
 {
     if(nId == SID_SM_EDITOPTIONS)
@@ -276,6 +268,7 @@ void SmModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
         GetConfig()->ItemSetToConfig(rSet);
     }
 }
+
 VclPtr<SfxTabPage> SmModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet )
 {
     VclPtr<SfxTabPage> pRet;
diff --git a/starmath/source/symbol.src b/starmath/source/symbol.src
index dfcc6e83ce5c..6f41a45ab616 100644
--- a/starmath/source/symbol.src
+++ b/starmath/source/symbol.src
@@ -23,98 +23,96 @@
 // is the localized version of all symbols that is show in the Ui,
 // for Export they have to be in English. The transition between
 // 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" ; > ;
-            < "beta" ; > ;
-            < "BETA" ; > ;
-            < "gamma" ; > ;
-            < "GAMMA" ; > ;
-            < "delta" ; > ;
-            < "DELTA" ; > ;
-            < "epsilon" ; > ;
-            < "EPSILON" ; > ;
-            < "zeta" ; > ;
-            < "ZETA" ; > ;
-            < "eta" ; > ;
-            < "ETA" ; > ;
-            < "theta" ; > ;
-            < "THETA" ; > ;
-            < "iota" ; > ;
-            < "IOTA" ; > ;
-            < "kappa" ; > ;
-            < "KAPPA" ; > ;
-            < "lambda" ; > ;
-            < "LAMBDA" ; > ;
-            < "mu" ; > ;
-            < "MU" ; > ;
-            < "nu" ; > ;
-            < "NU" ; > ;
-            < "xi" ; > ;
-            < "XI" ; > ;
-            < "omicron" ; > ;
-            < "OMICRON" ; > ;
-            < "pi" ; > ;
-            < "PI" ; > ;
-            < "rho" ; > ;
-            < "RHO" ; > ;
-            < "sigma" ; > ;
-            < "SIGMA" ; > ;
-            < "tau" ; > ;
-            < "TAU" ; > ;
-            < "upsilon" ; > ;
-            < "UPSILON" ; > ;
-            < "phi" ; > ;
-            < "PHI" ; > ;
-            < "chi" ; > ;
-            < "CHI" ; > ;
-            < "psi" ; > ;
-            < "PSI" ; > ;
-            < "omega" ; > ;
-            < "OMEGA" ; > ;
-            < "varepsilon" ; > ;
-            < "vartheta" ; > ;
-            < "varpi" ; > ;
-            < "varrho" ; > ;
-            < "varsigma" ; > ;
-            < "varphi" ; > ;
-            < "element" ; > ;
-            < "noelement" ; > ;
-            < "strictlylessthan" ; > ;
-            < "strictlygreaterthan" ; > ;
-            < "notequal" ; > ;
-            < "identical" ; > ;
-            < "tendto" ; > ;
-            < "infinite" ; > ;
-            < "angle" ; > ;
-            < "perthousand" ; > ;
-            < "and" ; > ;
-            < "or" ; > ;
-        };
+        < "alpha" ; > ;
+        < "ALPHA" ; > ;
+        < "beta" ; > ;
+        < "BETA" ; > ;
+        < "gamma" ; > ;
+        < "GAMMA" ; > ;
+        < "delta" ; > ;
+        < "DELTA" ; > ;
+        < "epsilon" ; > ;
+        < "EPSILON" ; > ;
+        < "zeta" ; > ;
+        < "ZETA" ; > ;
+        < "eta" ; > ;
+        < "ETA" ; > ;
+        < "theta" ; > ;
+        < "THETA" ; > ;
+        < "iota" ; > ;
+        < "IOTA" ; > ;
+        < "kappa" ; > ;
+        < "KAPPA" ; > ;
+        < "lambda" ; > ;
+        < "LAMBDA" ; > ;
+        < "mu" ; > ;
+        < "MU" ; > ;
+        < "nu" ; > ;
+        < "NU" ; > ;
+        < "xi" ; > ;
+        < "XI" ; > ;
+        < "omicron" ; > ;
+        < "OMICRON" ; > ;
+        < "pi" ; > ;
+        < "PI" ; > ;
+        < "rho" ; > ;
+        < "RHO" ; > ;
+        < "sigma" ; > ;
+        < "SIGMA" ; > ;
+        < "tau" ; > ;
+        < "TAU" ; > ;
+        < "upsilon" ; > ;
+        < "UPSILON" ; > ;
+        < "phi" ; > ;
+        < "PHI" ; > ;
+        < "chi" ; > ;
+        < "CHI" ; > ;
+        < "psi" ; > ;
+        < "PSI" ; > ;
+        < "omega" ; > ;
+        < "OMEGA" ; > ;
+        < "varepsilon" ; > ;
+        < "vartheta" ; > ;
+        < "varpi" ; > ;
+        < "varrho" ; > ;
+        < "varsigma" ; > ;
+        < "varphi" ; > ;
+        < "element" ; > ;
+        < "noelement" ; > ;
+        < "strictlylessthan" ; > ;
+        < "strictlygreaterthan" ; > ;
+        < "notequal" ; > ;
+        < "identical" ; > ;
+        < "tendto" ; > ;
+        < "infinite" ; > ;
+        < "angle" ; > ;
+        < "perthousand" ; > ;
+        < "and" ; > ;
+        < "or" ; > ;
     };
-    StringArray RID_UI_SYMBOL_NAMES
-    {
+};
+StringArray RID_UI_SYMBOL_NAMES
+{
     ItemList [ en-US ] =
     {
         < "alpha" ; > ;
@@ -184,7 +182,6 @@ Resource RID_LOCALIZED_NAMES
         < "and" ; > ;
         < "or" ; > ;
     };
-    };
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */