flaten array of stringarrays by a level

Change-Id: I44dfe258f2220c5063b1177b67dbef71608ecef8

4 files changed, 127 insertions, 133 deletions

diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index efe0d202c0dc..0f57cf68ef32 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -106,7 +106,6 @@
 // treeopt
 #define RID_SVXPAGE_COLOR                   (RID_SVX_START +  60)
 #define OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE      ( RID_OFA_START + 256 )
-#define RID_OFADLG_OPTIONS_TREE_PAGES   (RID_OFA_START + 116)
 
 // options
 #define RID_SVXPAGE_ONLINEUPDATE            (RID_SVX_START + 298)
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index c497b8367163..7cbbe3a6783c 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -194,7 +194,7 @@ public:
 
 // class OfaPageResource -------------------------------------------------
 
-class OfaPageResource : public Resource
+class OfaPageResource
 {
     ResStringArray      aGeneralDlgAry;
     ResStringArray      aInetDlgAry;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 3ecfdf624a84..7d968e38ab93 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1105,7 +1105,6 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
 }
 
 OfaPageResource::OfaPageResource() :
-    Resource(CUI_RES(RID_OFADLG_OPTIONS_TREE_PAGES)),
     aGeneralDlgAry(CUI_RES(SID_GENERAL_OPTIONS)),
     aInetDlgAry(CUI_RES(SID_INET_DLG)),
     aLangDlgAry(CUI_RES(SID_LANGUAGE_OPTIONS)),
@@ -1119,7 +1118,6 @@ OfaPageResource::OfaPageResource() :
     aFilterDlgAry(CUI_RES(SID_FILTER_DLG)),
     aDatasourcesDlgAry(CUI_RES(SID_SB_STARBASEOPTIONS))
 {
-    FreeResource();
 }
 
 SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index 7209e503f6a2..4301f793f543 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -21,159 +21,156 @@
 #include "helpid.hrc"
 #include <svx/dialogs.hrc>
 
-Resource RID_OFADLG_OPTIONS_TREE_PAGES
+StringArray SID_GENERAL_OPTIONS
 {
-    StringArray SID_GENERAL_OPTIONS
+    ItemList [ en-US ] =
     {
-        ItemList [ en-US ] =
-        {
-            < "%PRODUCTNAME" ; 0; > ;
-            < "User Data" ;  RID_SFXPAGE_GENERAL; > ;
-            < "General" ;  OFA_TP_MISC; > ;
-            < "Memory" ; OFA_TP_MEMORY; > ;
-            < "View" ; OFA_TP_VIEW ; > ;
-            < "Print" ; RID_SFXPAGE_PRINTOPTIONS; > ;
-            < "Paths" ;  RID_SFXPAGE_PATH; > ;
-            < "Fonts" ; RID_SVX_FONT_SUBSTITUTION ; > ;
-            < "Security" ; RID_SVXPAGE_INET_SECURITY ; > ;
-            < "Personalization" ; RID_SVXPAGE_PERSONALIZATION ; > ;
-            < "Application Colors" ; RID_SVXPAGE_COLORCONFIG ; > ;
-            < "Accessibility" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ;
-            < "Advanced" ; RID_SVXPAGE_OPTIONS_JAVA ; > ;
-            < "Basic IDE Options" ; RID_SVXPAGE_BASICIDE_OPTIONS ; > ;
-            < "Online Update" ; RID_SVXPAGE_ONLINEUPDATE ; > ;
-            < "OpenCL" ; RID_SVXPAGE_OPENCL ; > ;
-        };
+        < "%PRODUCTNAME" ; 0; > ;
+        < "User Data" ;  RID_SFXPAGE_GENERAL; > ;
+        < "General" ;  OFA_TP_MISC; > ;
+        < "Memory" ; OFA_TP_MEMORY; > ;
+        < "View" ; OFA_TP_VIEW ; > ;
+        < "Print" ; RID_SFXPAGE_PRINTOPTIONS; > ;
+        < "Paths" ;  RID_SFXPAGE_PATH; > ;
+        < "Fonts" ; RID_SVX_FONT_SUBSTITUTION ; > ;
+        < "Security" ; RID_SVXPAGE_INET_SECURITY ; > ;
+        < "Personalization" ; RID_SVXPAGE_PERSONALIZATION ; > ;
+        < "Application Colors" ; RID_SVXPAGE_COLORCONFIG ; > ;
+        < "Accessibility" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ;
+        < "Advanced" ; RID_SVXPAGE_OPTIONS_JAVA ; > ;
+        < "Basic IDE Options" ; RID_SVXPAGE_BASICIDE_OPTIONS ; > ;
+        < "Online Update" ; RID_SVXPAGE_ONLINEUPDATE ; > ;
+        < "OpenCL" ; RID_SVXPAGE_OPENCL ; > ;
     };
-    StringArray SID_LANGUAGE_OPTIONS
+};
+StringArray SID_LANGUAGE_OPTIONS
+{
+    ItemList [ en-US ] =
     {
-        ItemList [ en-US ] =
-        {
-            < "Language Settings" ; 0; > ;
-            < "Languages"; OFA_TP_LANGUAGES; > ;
-            < "Writing Aids" ; RID_SFXPAGE_LINGU; > ;
-            < "Searching in Japanese" ;  RID_SVXPAGE_JSEARCH_OPTIONS; > ;
-            < "Asian Layout" ;  RID_SVXPAGE_ASIAN_LAYOUT; > ;
-            < "Complex Text Layout" ;  RID_SVXPAGE_OPTIONS_CTL; >;
-        };
+        < "Language Settings" ; 0; > ;
+        < "Languages"; OFA_TP_LANGUAGES; > ;
+        < "Writing Aids" ; RID_SFXPAGE_LINGU; > ;
+        < "Searching in Japanese" ;  RID_SVXPAGE_JSEARCH_OPTIONS; > ;
+        < "Asian Layout" ;  RID_SVXPAGE_ASIAN_LAYOUT; > ;
+        < "Complex Text Layout" ;  RID_SVXPAGE_OPTIONS_CTL; >;
     };
-    StringArray SID_INET_DLG
+};
+StringArray SID_INET_DLG
+{
+    ItemList [ en-US ] =
     {
-        ItemList [ en-US ] =
-        {
-            < "Internet" ; 0; > ;
-            < "Proxy" ;  RID_SVXPAGE_INET_PROXY; > ;
-            < "E-mail" ;  RID_SVXPAGE_INET_MAIL; > ;
-        };
+        < "Internet" ; 0; > ;
+        < "Proxy" ;  RID_SVXPAGE_INET_PROXY; > ;
+        < "E-mail" ;  RID_SVXPAGE_INET_MAIL; > ;
     };
-    StringArray SID_SW_EDITOPTIONS
+};
+StringArray SID_SW_EDITOPTIONS
+{
+    ItemList [ en-US ] =
     {
-        ItemList [ en-US ] =
-        {
-            < "%PRODUCTNAME Writer" ; 0; > ;
-            < "General" ;     RID_SW_TP_OPTLOAD_PAGE   ; > ;
-            < "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    ; > ;
-            < "Comparison" ; RID_SW_TP_COMPARISON_OPT ; > ;
-            < "Compatibility" ; RID_SW_TP_OPTCOMPATIBILITY_PAGE    ; > ;
-            < "AutoCaption" ; RID_SW_TP_OPTCAPTION_PAGE ; > ;
-            < "Mail Merge E-mail" ; RID_SW_TP_MAILCONFIG ; >;
-        };
+        < "%PRODUCTNAME Writer" ; 0; > ;
+        < "General" ;     RID_SW_TP_OPTLOAD_PAGE   ; > ;
+        < "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    ; > ;
+        < "Comparison" ; RID_SW_TP_COMPARISON_OPT ; > ;
+        < "Compatibility" ; RID_SW_TP_OPTCOMPATIBILITY_PAGE    ; > ;
+        < "AutoCaption" ; RID_SW_TP_OPTCAPTION_PAGE ; > ;
+        < "Mail Merge E-mail" ; RID_SW_TP_MAILCONFIG ; >;
     };
-    StringArray SID_SW_ONLINEOPTIONS
+};
+StringArray SID_SW_ONLINEOPTIONS
+{
+    ItemList [ en-US ] =
     {
-        ItemList [ en-US ] =
-        {
-            < "%PRODUCTNAME Writer/Web" ; 0; > ;
-            < "View" ;       RID_SW_TP_HTML_CONTENT_OPT      ;> ;
-            < "Formatting Aids" ;        RID_SW_TP_HTML_OPTSHDWCRSR    ; > ;
-            < "Grid" ;        RID_SW_TP_HTML_OPTGRID_PAGE ; > ;
-            < "Print" ;         RID_SW_TP_HTML_OPTPRINT_PAGE  ; > ;
-            < "Table" ;         RID_SW_TP_HTML_OPTTABLE_PAGE  ; > ;
-            < "Background" ;    RID_SW_TP_BACKGROUND  ; > ;
-        };
+        < "%PRODUCTNAME Writer/Web" ; 0; > ;
+        < "View" ;       RID_SW_TP_HTML_CONTENT_OPT      ;> ;
+        < "Formatting Aids" ;        RID_SW_TP_HTML_OPTSHDWCRSR    ; > ;
+        < "Grid" ;        RID_SW_TP_HTML_OPTGRID_PAGE ; > ;
+        < "Print" ;         RID_SW_TP_HTML_OPTPRINT_PAGE  ; > ;
+        < "Table" ;         RID_SW_TP_HTML_OPTTABLE_PAGE  ; > ;
+        < "Background" ;    RID_SW_TP_BACKGROUND  ; > ;
     };
-    StringArray SID_SM_EDITOPTIONS
+};
+StringArray SID_SM_EDITOPTIONS
+{
+    ItemList [ en-US ] =
     {
-        ItemList [ en-US ] =
-        {
-            < "%PRODUCTNAME Math" ; 0; > ;
-            < "Settings" ; SID_SM_TP_PRINTOPTIONS;> ;
-        };
+        < "%PRODUCTNAME Math" ; 0; > ;
+        < "Settings" ; SID_SM_TP_PRINTOPTIONS;> ;
     };
-    StringArray SID_SC_EDITOPTIONS
+};
+StringArray SID_SC_EDITOPTIONS
+{
+    ItemList [ en-US ] =
     {
-        ItemList [ en-US ] =
-        {
-            < "%PRODUCTNAME Calc" ; 0; > ;
-            < "General" ;           SID_SC_TP_LAYOUT            ;> ;
-            < "Defaults" ;          RID_SC_TP_DEFAULTS          ;> ;
-            < "View" ;          SID_SC_TP_CONTENT           ;> ;
-            < "Calculate" ;         SID_SC_TP_CALC              ;> ;
-            < "Formula" ;       SID_SC_TP_FORMULA ;> ;
-            < "Sort Lists" ;        SID_SC_TP_USERLISTS         ;> ;
-            < "Changes" ;       SID_SC_TP_CHANGES           ;> ;
-            < "Compatibility" ; SID_SC_TP_COMPATIBILITY ;> ;
-            < "Grid" ;          SID_SC_TP_GRID              ;> ;
-            < "Print" ;         RID_SC_TP_PRINT             ;> ;
-        };
+        < "%PRODUCTNAME Calc" ; 0; > ;
+        < "General" ;           SID_SC_TP_LAYOUT            ;> ;
+        < "Defaults" ;          RID_SC_TP_DEFAULTS          ;> ;
+        < "View" ;          SID_SC_TP_CONTENT           ;> ;
+        < "Calculate" ;         SID_SC_TP_CALC              ;> ;
+        < "Formula" ;       SID_SC_TP_FORMULA ;> ;
+        < "Sort Lists" ;        SID_SC_TP_USERLISTS         ;> ;
+        < "Changes" ;       SID_SC_TP_CHANGES           ;> ;
+        < "Compatibility" ; SID_SC_TP_COMPATIBILITY ;> ;
+        < "Grid" ;          SID_SC_TP_GRID              ;> ;
+        < "Print" ;         RID_SC_TP_PRINT             ;> ;
     };
-    StringArray SID_SD_EDITOPTIONS
+};
+StringArray SID_SD_EDITOPTIONS
+{
+    ItemList [ en-US ] =
     {
-        ItemList [ en-US ] =
-        {
-            < "%PRODUCTNAME Impress" ; 0; > ;
-            < "General";            SID_SI_TP_MISC                  ; > ;
-            < "View" ;          SID_SI_TP_CONTENTS              ; > ;
-            < "Grid" ;          SID_SI_TP_SNAP                  ; > ;
-            < "Print" ;         SID_SI_TP_PRINT                 ; > ;
-        };
+        < "%PRODUCTNAME Impress" ; 0; > ;
+        < "General";            SID_SI_TP_MISC                  ; > ;
+        < "View" ;          SID_SI_TP_CONTENTS              ; > ;
+        < "Grid" ;          SID_SI_TP_SNAP                  ; > ;
+        < "Print" ;         SID_SI_TP_PRINT                 ; > ;
     };
-    StringArray SID_SD_GRAPHIC_OPTIONS
+};
+StringArray SID_SD_GRAPHIC_OPTIONS
+{
+    ItemList [ en-US ] =
     {
-        ItemList [ en-US ] =
-        {
-            < "%PRODUCTNAME Draw" ; 0; > ;
-            < "General" ;           SID_SD_TP_MISC              ; > ;
-            < "View" ;          SID_SD_TP_CONTENTS          ; > ;
-            < "Grid" ;          SID_SD_TP_SNAP              ; > ;
-            < "Print" ;             SID_SD_TP_PRINT             ; > ;
-        };
+        < "%PRODUCTNAME Draw" ; 0; > ;
+        < "General" ;           SID_SD_TP_MISC              ; > ;
+        < "View" ;          SID_SD_TP_CONTENTS          ; > ;
+        < "Grid" ;          SID_SD_TP_SNAP              ; > ;
+        < "Print" ;             SID_SD_TP_PRINT             ; > ;
     };
-    StringArray SID_SCH_EDITOPTIONS
+};
+StringArray SID_SCH_EDITOPTIONS
+{
+    ItemList [ en-US ] =
     {
-        ItemList [ en-US ] =
-        {
-            < "Charts" ; 0; > ;
-            < "Default Colors" ;        RID_OPTPAGE_CHART_DEFCOLORS ; > ;
-        };
+        < "Charts" ; 0; > ;
+        < "Default Colors" ;        RID_OPTPAGE_CHART_DEFCOLORS ; > ;
     };
-    StringArray SID_FILTER_DLG
+};
+StringArray SID_FILTER_DLG
+{
+    ItemList [ en-US ] =
     {
-        ItemList [ en-US ] =
-        {
-                < "Load/Save" ; 0; > ;
-            < "General" ;  RID_SFXPAGE_SAVE; > ;
-            < "VBA Properties" ;  SID_OPTFILTER_MSOFFICE; > ;
-            < "Microsoft Office" ;  RID_OFAPAGE_MSFILTEROPT2; > ;
-            < "HTML Compatibility" ; RID_OFAPAGE_HTMLOPT ; > ;
-        };
+            < "Load/Save" ; 0; > ;
+        < "General" ;  RID_SFXPAGE_SAVE; > ;
+        < "VBA Properties" ;  SID_OPTFILTER_MSOFFICE; > ;
+        < "Microsoft Office" ;  RID_OFAPAGE_MSFILTEROPT2; > ;
+        < "HTML Compatibility" ; RID_OFAPAGE_HTMLOPT ; > ;
     };
-    StringArray SID_SB_STARBASEOPTIONS
+};
+StringArray SID_SB_STARBASEOPTIONS
+{
+    ItemList [ en-US ] =
     {
-        ItemList [ en-US ] =
-        {
-            < "%PRODUCTNAME Base" ; 0; > ;
-            < "Connections" ; SID_SB_CONNECTIONPOOLING; > ;
-            < "Databases" ; SID_SB_DBREGISTEROPTIONS; > ;
-        };
+        < "%PRODUCTNAME Base" ; 0; > ;
+        < "Connections" ; SID_SB_CONNECTIONPOOLING; > ;
+        < "Databases" ; SID_SB_DBREGISTEROPTIONS; > ;
     };
 };