no need to inherit SwOLENames from resource

Change-Id: Ie7a51c8af7834b4d59a5a94e808ccac7e63e3aa4

3 files changed, 49 insertions, 58 deletions

diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index e7f43ca52b1b..7205296e9216 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -132,31 +132,29 @@ String STR_TOKEN_HELP_AUTHORITY
 {
     Text [ en-US ] = "Bibliography entry: ";
 };
+
 String STR_CHARSTYLE
 {
     Text [ en-US ] = "Character Style: ";
 };
 
-Resource RES_SRCTYPES
-{
-    StringArray 1
+StringArray RES_SRCTYPES
+{
+    /* ids from tox.hxx
+    TOO_MATH        = 0x01,
+    TOO_CHART       = 0x02,
+    TOO_IMAGE       = 0x04,
+    TOO_CALC        = 0x08,
+    TOO_DRAW_IMPRESS= 0x10,
+    TOO_OTHER       = 0x80
+    */
+    ItemList [ en-US ] =
     {
-        /* ids from tox.hxx
-        TOO_MATH        = 0x01,
-        TOO_CHART       = 0x02,
-        TOO_IMAGE       = 0x04,
-        TOO_CALC        = 0x08,
-        TOO_DRAW_IMPRESS= 0x10,
-        TOO_OTHER       = 0x80
-        */
-        ItemList [ en-US ] =
-        {
-            < "%PRODUCTNAME Math" ;                 1;> ;
-            < "%PRODUCTNAME Chart" ;            2;> ;
-            < "%PRODUCTNAME Calc" ;                 8;> ;
-            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
-            < "Other OLE Objects";  128;> ;
-        };
+        < "%PRODUCTNAME Math" ;  1;> ;
+        < "%PRODUCTNAME Chart" ; 2;> ;
+        < "%PRODUCTNAME Calc" ;  8;> ;
+        < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
+        < "Other OLE Objects";   128;> ;
     };
 };
 
diff --git a/sw/source/ui/misc/numberingtypelistbox.src b/sw/source/ui/misc/numberingtypelistbox.src
index f7b23ccc1ce9..cbd9873a2ff5 100644
--- a/sw/source/ui/misc/numberingtypelistbox.src
+++ b/sw/source/ui/misc/numberingtypelistbox.src
@@ -19,39 +19,35 @@
 
 #include "misc.hrc"
 
-Resource STRRES_NUMTYPES
+StringArray STRRES_NUMTYPES
 {
-    StringArray 1
+    ItemList [ en-US ] =
     {
-
-        ItemList [ en-US ] =
-        {
-            < "None" ;                      5/*SVX_NUM_NUMBER_NONE         */; > ;
-            < "Bullet" ;                    6/*SVX_NUM_CHAR_SPECIAL        */; > ;
-            < "Graphics" ;                  8/*SVX_NUM_BITMAP              */; > ;
-            < "1, 2, 3, ..." ;              4/*SVX_NUM_ARABIC              */; > ;
-            < "A, B, C, ..." ;              0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            < "a, b, c, ..." ;              1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            < "I, II, III, ..." ;           2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            < "i, ii, iii, ..." ;           3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            < "A, .., AA, .., AAA, ..." ;   9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-            < "a, .., aa, .., aaa, ..." ;  10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            < "Native Numbering" ;                      12 /*NATIVE_NUMBERING                   */; > ;
-            < "А, Б, .., Аа, Аб, ... (Bulgarian)" ;     38 /*CHARS_CYRILLIC_UPPER_LETTER_BG     */; > ;
-            < "а, б, .., аа, аб, ... (Bulgarian)" ;     39 /*CHARS_CYRILLIC_LOWER_LETTER_BG     */; > ;
-            < "А, Б, .., Аа, Бб, ... (Bulgarian)" ;     40 /*CHARS_CYRILLIC_UPPER_LETTER_N_BG   */; > ;
-            < "а, б, .., аа, бб, ... (Bulgarian)" ;     41 /*CHARS_CYRILLIC_LOWER_LETTER_N_BG   */; > ;
-            < "А, Б, .., Аа, Аб, ... (Russian)" ;       42 /*CHARS_CYRILLIC_UPPER_LETTER_RU     */; > ;
-            < "а, б, .., аа, аб, ... (Russian)" ;       43 /*CHARS_CYRILLIC_LOWER_LETTER_RU     */; > ;
-            < "А, Б, .., Аа, Бб, ... (Russian)" ;       44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU   */; > ;
-            < "а, б, .., аа, бб, ... (Russian)" ;       45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU   */; > ;
-            < "А, Б, .., Аа, Аб, ... (Serbian)" ;       48 /*CHARS_CYRILLIC_UPPER_LETTER_SR     */; > ;
-            < "а, б, .., аа, аб, ... (Serbian)" ;       49 /*CHARS_CYRILLIC_LOWER_LETTER_SR     */; > ;
-            < "А, Б, .., Аа, Бб, ... (Serbian)" ;       50 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR   */; > ;
-            < "а, б, .., аа, бб, ... (Serbian)" ;       51 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR   */; > ;
-            < "Α, Β, Γ, ... (Greek Upper Letter)";       52 /*CHARS_GREEK_UPPER_LETTER           */; > ;
-            < "α, β, γ, ... (Greek Lower Letter)";       53 /*CHARS_GREEK_LOWER_LETTER           */; > ;
-        };
+        < "None" ;                      5/*SVX_NUM_NUMBER_NONE         */; > ;
+        < "Bullet" ;                    6/*SVX_NUM_CHAR_SPECIAL        */; > ;
+        < "Graphics" ;                  8/*SVX_NUM_BITMAP              */; > ;
+        < "1, 2, 3, ..." ;              4/*SVX_NUM_ARABIC              */; > ;
+        < "A, B, C, ..." ;              0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
+        < "a, b, c, ..." ;              1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
+        < "I, II, III, ..." ;           2/*SVX_NUM_ROMAN_UPPER         */; > ;
+        < "i, ii, iii, ..." ;           3/*SVX_NUM_ROMAN_LOWER         */; > ;
+        < "A, .., AA, .., AAA, ..." ;   9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
+        < "a, .., aa, .., aaa, ..." ;  10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
+        < "Native Numbering" ;                      12 /*NATIVE_NUMBERING                   */; > ;
+        < "А, Б, .., Аа, Аб, ... (Bulgarian)" ;     38 /*CHARS_CYRILLIC_UPPER_LETTER_BG     */; > ;
+        < "а, б, .., аа, аб, ... (Bulgarian)" ;     39 /*CHARS_CYRILLIC_LOWER_LETTER_BG     */; > ;
+        < "А, Б, .., Аа, Бб, ... (Bulgarian)" ;     40 /*CHARS_CYRILLIC_UPPER_LETTER_N_BG   */; > ;
+        < "а, б, .., аа, бб, ... (Bulgarian)" ;     41 /*CHARS_CYRILLIC_LOWER_LETTER_N_BG   */; > ;
+        < "А, Б, .., Аа, Аб, ... (Russian)" ;       42 /*CHARS_CYRILLIC_UPPER_LETTER_RU     */; > ;
+        < "а, б, .., аа, аб, ... (Russian)" ;       43 /*CHARS_CYRILLIC_LOWER_LETTER_RU     */; > ;
+        < "А, Б, .., Аа, Бб, ... (Russian)" ;       44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU   */; > ;
+        < "а, б, .., аа, бб, ... (Russian)" ;       45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU   */; > ;
+        < "А, Б, .., Аа, Аб, ... (Serbian)" ;       48 /*CHARS_CYRILLIC_UPPER_LETTER_SR     */; > ;
+        < "а, б, .., аа, аб, ... (Serbian)" ;       49 /*CHARS_CYRILLIC_LOWER_LETTER_SR     */; > ;
+        < "А, Б, .., Аа, Бб, ... (Serbian)" ;       50 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR   */; > ;
+        < "а, б, .., аа, бб, ... (Serbian)" ;       51 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR   */; > ;
+        < "Α, Β, Γ, ... (Greek Upper Letter)";       52 /*CHARS_GREEK_UPPER_LETTER           */; > ;
+        < "α, β, γ, ... (Greek Lower Letter)";       53 /*CHARS_GREEK_LOWER_LETTER           */; > ;
     };
 };
 
diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx
index e81d0f276b33..d9c63a78ba03 100644
--- a/sw/source/uibase/inc/cnttab.hxx
+++ b/sw/source/uibase/inc/cnttab.hxx
@@ -64,19 +64,16 @@ struct CurTOXType
     CurTOXType (TOXTypes t) : eType (t), nIndex (0) {};
 };
 
-class SwOLENames : public Resource
+class SwOLENames
 {
-    ResStringArray      aNamesAry;
+    ResStringArray aNamesAry;
 public:
-    SwOLENames(const ResId& rResId) :
-        Resource(rResId),
-        aNamesAry(ResId(1,*rResId.GetResMgr()))
+    SwOLENames(const ResId& rResId)
+        : aNamesAry(rResId)
     {
-        FreeResource();
     }
 
-    ResStringArray&     GetNames() { return aNamesAry;}
-
+    ResStringArray& GetNames() { return aNamesAry;}
 };
 
 #endif