turn this into a more natural StringArray

Change-Id: Iaf3773608c30dc291cf65a4bc8c282b9f15ee04b

3 files changed, 38 insertions, 128 deletions

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 23d7a92a3f0e..07f496adfed3 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -22,7 +22,6 @@
 #include <tools/datetime.hxx>
 #include <tools/resary.hxx>
 #include <tools/urlobj.hxx>
-#include <tools/StringListResource.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/svapp.hxx>
@@ -1410,13 +1409,11 @@ namespace
     {
         VclPtr<ComboBox> aNameBox(VclPtr<ComboBox>::Create(pParent, WB_TABSTOP|WB_DROPDOWN|
                                                                     WB_AUTOSIZE|WB_AUTOHSCROLL));
-        Point aPos(aNameBox->LogicToPixel(Point(0, 2), MapUnit::MapAppFont));
-        Size aSize(aNameBox->LogicToPixel(Size(60, 72), MapUnit::MapAppFont));
-        aNameBox->SetPosSizePixel(aPos, aSize);
-        std::vector<OUString> aList;
-        tools::StringListResource aRes(SfxResId(RID_STR_TYPE_CONST), aList);
-        for (const auto& rName : aList)
-            aNameBox->InsertEntry(rName);
+        aNameBox->SetPosSizePixel(aNameBox->LogicToPixel(Point(0, 2), MapUnit::MapAppFont),
+                                  aNameBox->LogicToPixel(Size(60, 72), MapUnit::MapAppFont));
+        ResStringArray aStrArr(SfxResId(SFX_CB_PROPERTY_STRINGARRAY));
+        for (sal_uInt32 i = 0; i < aStrArr.Count(); ++i)
+            aNameBox->InsertEntry(aStrArr.GetString(i));
         return aNameBox;
     }
 }
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index 996096a73e57..b0504193d838 100644
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -28,127 +28,40 @@ String STR_SFX_NEWOFFICEDOC
     Text [ en-US ] = "%PRODUCTNAME document" ;
 };
 
-Resource RID_STR_TYPE_CONST
+StringArray SFX_CB_PROPERTY_STRINGARRAY
 {
-    String 1
-    {
-        Text [ en-US ] = "Checked by";
-    };
-    String 2
-    {
-        Text [ en-US ] = "Client";
-    };
-    String 3
-    {
-        Text [ en-US ] = "Date completed";
-    };
-    String 4
-    {
-        Text [ en-US ] = "Department";
-    };
-    String 5
-    {
-        Text [ en-US ] = "Destinations";
-    };
-    String 6
-    {
-        Text [ en-US ] = "Disposition";
-    };
-    String 7
-    {
-        Text [ en-US ] = "Division";
-    };
-    String 8
-    {
-        Text [ en-US ] = "Document number";
-    };
-    String 9
-    {
-        Text [ en-US ] = "Editor";
-    };
-    String 10
-    {
-        Text [ en-US ] = "E-Mail";
-    };
-    String 11
-    {
-        Text [ en-US ] = "Forward to";
-    };
-    String 12
-    {
-        Text [ en-US ] = "Group";
-    };
-    String 13
-    {
-        Text [ en-US ] = "Info";
-    };
-    String 14
-    {
-        Text [ en-US ] = "Language";
-    };
-    String 15
-    {
-        Text [ en-US ] = "Mailstop";
-    };
-    String 16
-    {
-        Text [ en-US ] = "Matter";
-    };
-    String 17
-    {
-        Text [ en-US ] = "Office";
-    };
-    String 18
-    {
-        Text [ en-US ] = "Owner";
-    };
-    String 19
-    {
-        Text [ en-US ] = "Project";
-    };
-    String 20
-    {
-        Text [ en-US ] = "Publisher";
-    };
-    String 21
-    {
-        Text [ en-US ] = "Purpose";
-    };
-    String 22
-    {
-        Text [ en-US ] = "Received from";
-    };
-    String 23
-    {
-        Text [ en-US ] = "Recorded by";
-    };
-    String 24
-    {
-        Text [ en-US ] = "Recorded date";
-    };
-    String 25
-    {
-        Text [ en-US ] = "Reference";
-    };
-    String 26
-    {
-        Text [ en-US ] = "Source";
-    };
-    String 27
-    {
-        Text [ en-US ] = "Status";
-    };
-    String 28
-    {
-        Text [ en-US ] = "Telephone number";
-    };
-    String 29
-    {
-        Text [ en-US ] = "Typist";
-    };
-    String 30
+    ItemList [ en-US ] =
     {
-        Text [ en-US ] = "URL";
+        < "Checked by"; >;
+        < "Client"; >;
+        < "Date completed"; >;
+        < "Department"; >;
+        < "Destinations"; >;
+        < "Disposition"; >;
+        < "Division"; >;
+        < "Document number"; >;
+        < "Editor"; >;
+        < "E-Mail"; >;
+        < "Forward to"; >;
+        < "Group"; >;
+        < "Info"; >;
+        < "Language"; >;
+        < "Mailstop"; >;
+        < "Matter"; >;
+        < "Office"; >;
+        < "Owner"; >;
+        < "Project"; >;
+        < "Publisher"; >;
+        < "Purpose"; >;
+        < "Received from"; >;
+        < "Recorded by"; >;
+        < "Recorded date"; >;
+        < "Reference"; >;
+        < "Source"; >;
+        < "Status"; >;
+        < "Telephone number"; >;
+        < "Typist"; >;
+        < "URL"; >;
     };
 };
 
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index 41fc033c81bc..e8d2d5d432ee 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -36,6 +36,7 @@
 #define STR_SFX_UNDOCK                      (RID_SFX_SFXLOCAL_START +  8)
 #define STR_SFX_QUERY_WRONG_TYPE            (RID_SFX_SFXLOCAL_START + 11)
 #define SFX_LB_PROPERTY_STRINGARRAY         (RID_SFX_SFXLOCAL_START + 12)
+#define SFX_CB_PROPERTY_STRINGARRAY         (RID_SFX_SFXLOCAL_START + 13)
 
 // Controls --------------------------------------------------------------
 #define SFX_WIN_PROPERTY_YESNO              (RID_SFX_SFXLOCAL_START +  6)
@@ -46,7 +47,6 @@
 #define SFX_IMG_PROPERTY_REMOVE             (RID_SFX_SFXLOCAL_START +  0)
 #define SFX_IMG_CLOSE_DOC                   (RID_SFX_SFXLOCAL_START +  2)
 
-#define RID_STR_TYPE_CONST                  (RID_SFX_SFXLOCAL_START + 9)
 #define RID_MENU_NOTEBOOKBAR                (RID_SFX_SFXLOCAL_START + 10)
 
 #endif