remove StringListResource in favour of ResStringArray...

and turn local resources used as lists of strings into
string array resources

Change-Id: I9d67a790659963bca87aacba1c052d7b244b4e21

2 files changed, 139 insertions, 142 deletions

diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 8264cb4de45d..589e9dc59370 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -38,7 +38,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <unotools/syslocale.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/StringListResource.hxx>
+#include <tools/resary.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp>
 #include <com/sun/star/inspection/StringRepresentation.hpp>
@@ -676,10 +676,12 @@ void GeometryHandler::implCreateListLikeControl(
         ,bool _bTrueIfListBoxFalseIfComboBox
     )
 {
-    ::std::vector< OUString > aList;
-    tools::StringListResource aRes(ModuleRes(_nResId),aList);
-
-    implCreateListLikeControl(_rxControlFactory,out_Descriptor,aList,_bReadOnlyControl,_bTrueIfListBoxFalseIfComboBox);
+    ModuleRes aRes(_nResId);
+    ResStringArray aResList(aRes);
+    std::vector<OUString> aList;
+    for (sal_uInt32 i = 0; i < aResList.Count(); ++i)
+        aList.push_back(aResList.GetString(i));
+    implCreateListLikeControl(_rxControlFactory, out_Descriptor, aList, _bReadOnlyControl, _bTrueIfListBoxFalseIfComboBox);
 }
 
 void GeometryHandler::implCreateListLikeControl(
@@ -931,9 +933,12 @@ beans::Property GeometryHandler::getProperty(const OUString & PropertyName)
 }
 uno::Any GeometryHandler::getConstantValue(bool _bToControlValue,sal_uInt16 _nResId,const uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName )
 {
-    ::std::vector< OUString > aList;
-    tools::StringListResource aRes(ModuleRes(_nResId),aList);
-    uno::Sequence< OUString > aSeq(comphelper::containerToSequence(aList));
+    ModuleRes aRes(_nResId);
+    ResStringArray aResList(aRes);
+    std::vector<OUString> aList;
+    uno::Sequence< OUString > aSeq(aResList.Count());
+    for (sal_uInt32 i = 0; i < aResList.Count(); ++i)
+        aSeq[i] = aResList.GetString(i);
 
     uno::Reference< inspection::XStringRepresentation > xConversionHelper = inspection::StringRepresentation::createConstant( m_xContext,m_xTypeConverter,_sConstantName,aSeq);
     if ( _bToControlValue )
@@ -1068,11 +1073,19 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
             {
                 OUString sValue;
                 _rControlValue >>= sValue;
-                ::std::vector< OUString > aList;
-                tools::StringListResource aRes(ModuleRes(RID_STR_TYPE_CONST),aList);
-                ::std::vector< OUString >::const_iterator aFind = ::std::find(aList.begin(),aList.end(),sValue);
-                if ( aFind != aList.end() )
-                    aPropertyValue <<= static_cast<sal_uInt32>(aFind - aList.begin());
+                ModuleRes aRes(RID_STR_TYPE_CONST);
+                ResStringArray aResList(aRes);
+                sal_uInt32 nFound(RESARRAY_INDEX_NOTFOUND);
+                for (sal_uInt32 i = 0; i < aResList.Count(); ++i)
+                {
+                    if (aResList.GetString(i) == sValue)
+                    {
+                        nFound = i;
+                        break;
+                    }
+                }
+                if (nFound != RESARRAY_INDEX_NOTFOUND)
+                    aPropertyValue <<= nFound;
             }
             break;
         case PROPERTY_ID_MIMETYPE:
@@ -1082,22 +1095,38 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
             {
                 OUString sValue;
                 _rControlValue >>= sValue;
-                ::std::vector< OUString > aList;
-                tools::StringListResource aRes(ModuleRes(RID_STR_VERTICAL_ALIGN_CONST),aList);
-                ::std::vector< OUString >::const_iterator aFind = ::std::find(aList.begin(),aList.end(),sValue);
-                if ( aFind != aList.end() )
-                    aPropertyValue <<= static_cast<style::VerticalAlignment>(aFind - aList.begin());
+                ModuleRes aRes(RID_STR_VERTICAL_ALIGN_CONST);
+                ResStringArray aResList(aRes);
+                sal_uInt32 nFound(RESARRAY_INDEX_NOTFOUND);
+                for (sal_uInt32 i = 0; i < aResList.Count(); ++i)
+                {
+                    if (aResList.GetString(i) == sValue)
+                    {
+                        nFound = i;
+                        break;
+                    }
+                }
+                if (nFound != RESARRAY_INDEX_NOTFOUND)
+                    aPropertyValue <<= static_cast<style::VerticalAlignment>(nFound);
             }
             break;
         case PROPERTY_ID_PARAADJUST:
             {
                 OUString sValue;
                 _rControlValue >>= sValue;
-                ::std::vector< OUString > aList;
-                tools::StringListResource aRes(ModuleRes(RID_STR_PARAADJUST_CONST),aList);
-                ::std::vector< OUString >::const_iterator aFind = ::std::find(aList.begin(),aList.end(),sValue);
-                if ( aFind != aList.end() )
-                    aPropertyValue <<= static_cast<sal_Int16>(aFind - aList.begin());
+                ModuleRes aRes(RID_STR_PARAADJUST_CONST);
+                ResStringArray aResList(aRes);
+                sal_uInt32 nFound(RESARRAY_INDEX_NOTFOUND);
+                for (sal_uInt32 i = 0; i < aResList.Count(); ++i)
+                {
+                    if (aResList.GetString(i) == sValue)
+                    {
+                        nFound = i;
+                        break;
+                    }
+                }
+                if (nFound != RESARRAY_INDEX_NOTFOUND)
+                    aPropertyValue <<= static_cast<sal_Int16>(nFound);
             }
             break;
         default:
@@ -1211,30 +1240,30 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper
             break;
         case PROPERTY_ID_TYPE:
             {
-                ::std::vector< OUString > aList;
-                tools::StringListResource aRes(ModuleRes(RID_STR_TYPE_CONST),aList);
-                if ( m_nDataFieldType < aList.size() )
-                    aControlValue <<= aList[m_nDataFieldType];
+                ModuleRes aRes(RID_STR_TYPE_CONST);
+                ResStringArray aResList(aRes);
+                if (m_nDataFieldType < aResList.Count())
+                    aControlValue <<= aResList.GetString(m_nDataFieldType);
             }
             break;
         case PROPERTY_ID_VERTICALALIGN:
             {
                 style::VerticalAlignment nParagraphVertAlign = style::VerticalAlignment_TOP;
                 aPropertyValue >>= nParagraphVertAlign;
-                ::std::vector< OUString > aList;
-                tools::StringListResource aRes(ModuleRes(RID_STR_VERTICAL_ALIGN_CONST),aList);
-                if ( static_cast<sal_Int16>(nParagraphVertAlign) < static_cast<sal_Int16>(aList.size()) )
-                    aControlValue <<= aList[nParagraphVertAlign];
+                ModuleRes aRes(RID_STR_VERTICAL_ALIGN_CONST);
+                ResStringArray aResList(aRes);
+                if (nParagraphVertAlign < aResList.Count())
+                    aControlValue <<= aResList.GetString(nParagraphVertAlign);
             }
             break;
         case PROPERTY_ID_PARAADJUST:
             {
                 sal_Int16 nParagraphAdjust = style::ParagraphAdjust_LEFT;
                 aPropertyValue >>= nParagraphAdjust;
-                ::std::vector< OUString > aList;
-                tools::StringListResource aRes(ModuleRes(RID_STR_PARAADJUST_CONST),aList);
-                if ( nParagraphAdjust < static_cast<sal_Int16>(aList.size()) )
-                    aControlValue <<= aList[nParagraphAdjust];
+                ModuleRes aRes(RID_STR_PARAADJUST_CONST);
+                ResStringArray aResList(aRes);
+                if (static_cast<sal_uInt32>(nParagraphAdjust) < aResList.Count())
+                    aControlValue <<= aResList.GetString(nParagraphAdjust);
             }
             break;
         case PROPERTY_ID_BACKCOLOR:
diff --git a/reportdesign/source/ui/inspection/inspection.src b/reportdesign/source/ui/inspection/inspection.src
index 1876009ae230..7720b82aa816 100644
--- a/reportdesign/source/ui/inspection/inspection.src
+++ b/reportdesign/source/ui/inspection/inspection.src
@@ -24,65 +24,54 @@ String RID_STR_PROPPAGE_DEFAULT
 {
     Text [ en-US ] = "General" ;
 };
+
 String RID_STR_PROPPAGE_DATA
 {
     Text [ en-US ] = "Data" ;
 };
-Resource RID_STR_BOOL
+
+StringArray RID_STR_BOOL
 {
-    String 1
+    ItemList [ en-US ] =
     {
-        Text [ en-US ] = "No" ;
-    };
-    String 2
-    {
-        Text [ en-US ] = "Yes" ;
+        < "No" ; >;
+        < "Yes" ; >;
     };
 };
+
 String RID_STR_FORCENEWPAGE
 {
     Text [ en-US ] = "Force New Page" ;
 };
-Resource RID_STR_FORCENEWPAGE_CONST
+
+StringArray RID_STR_FORCENEWPAGE_CONST
 {
-    String 1
-    {
-        Text [ en-US ] = "None" ;
-    };
-    String 2
+    ItemList [ en-US ] =
     {
-        Text [ en-US ] = "Before Section" ;
-    };
-    String 3
-    {
-        Text [ en-US ] = "After Section" ;
-    };
-    String 4
-    {
-        Text [ en-US ] = "Before & After Section" ;
+        < "None" ; >;
+        < "Before Section" ; >;
+        < "After Section" ; >;
+        < "Before & After Section" ; >;
     };
 };
+
 String RID_STR_NEWROWORCOL
 {
     Text [ en-US ] = "New Row Or Column" ;
 };
+
 String RID_STR_KEEPTOGETHER
 {
     Text [ en-US ] = "Keep Together" ;
 };
-Resource RID_STR_KEEPTOGETHER_CONST
+
+StringArray RID_STR_KEEPTOGETHER_CONST
 {
-    String 1
-    {
-        Text [ en-US ] = "No" ;
-    };
-    String 2
+    ItemList [ en-US ] =
     {
-        Text [ en-US ] = "Whole Group" ;
-    };
-    String 3
-    {
-        Text [ en-US ] = "With First Detail" ;
+        < "No" ; >;
+        < "Whole Group" ; >;
+        < "With First Detail" ; >;
     };
 };
 String RID_STR_CANGROW
@@ -133,57 +122,44 @@ String RID_STR_GROUPKEEPTOGETHER
 {
     Text [ en-US ] = "Group keep together" ;
 };
-Resource RID_STR_GROUPKEEPTOGETHER_CONST
+
+StringArray RID_STR_GROUPKEEPTOGETHER_CONST
 {
-    String 1
-    {
-        Text [ en-US ] = "Per Page" ;
-    };
-    String 2
+    ItemList [ en-US ] =
     {
-        Text [ en-US ] = "Per Column" ;
+        < "Per Page" ; >;
+        < "Per Column" ; >;
     };
 };
-Resource RID_STR_SECTIONPAGEBREAK_CONST
+
+StringArray RID_STR_SECTIONPAGEBREAK_CONST
 {
-    String 1
-    {
-        Text [ en-US ] = "None" ;
-    };
-    String 2
+    ItemList [ en-US ] =
     {
-        Text [ en-US ] = "Section" ;
-    };
-    String 3
-    {
-        Text [ en-US ] = "Automatic" ;
+        < "None" ; >;
+        < "Section" ; >;
+        < "Automatic" ; >;
     };
 };
+
 String RID_STR_PAGEHEADEROPTION
 {
     Text [ en-US ] = "Page header" ;
 };
+
 String RID_STR_PAGEFOOTEROPTION
 {
     Text [ en-US ] = "Page footer" ;
 };
-Resource RID_STR_REPORTPRINTOPTION_CONST
+
+StringArray RID_STR_REPORTPRINTOPTION_CONST
 {
-    String 1
-    {
-        Text [ en-US ] = "All Pages" ;
-    };
-    String 2
-    {
-        Text [ en-US ] = "Not With Report Header" ;
-    };
-    String 3
+    ItemList [ en-US ] =
     {
-        Text [ en-US ] = "Not With Report Footer" ;
-    };
-    String 4
-    {
-        Text [ en-US ] = "Not With Report Header/Footer" ;
+        < "All Pages" ; >;
+        < "Not With Report Header" ; >;
+        < "Not With Report Footer" ; >;
+        < "Not With Report Header/Footer" ; >;
     };
 };
 String RID_STR_DEEPTRAVERSING
@@ -266,41 +242,38 @@ String RID_STR_TYPE
 {
     Text [ en-US ] = "Data Field Type";
 };
-Resource RID_STR_TYPE_CONST
+
+StringArray RID_STR_TYPE_CONST
 {
-    String 1
-    {
-        Text [ en-US ] = "Field or Formula";
-    };
-    String 2
-    {
-        Text [ en-US ] = "Function";
-    };
-    String 3
-    {
-        Text [ en-US ] = "Counter";
-    };
-    String 4
+    ItemList [ en-US ] =
     {
-        Text [ en-US ] = "User defined Function";
+        < "Field or Formula"; >;
+        < "Function"; >;
+        < "Counter"; >;
+        < "User defined Function"; >;
     };
 };
+
 String RID_STR_MASTERFIELDS
 {
     Text [ en-US ] = "Link master fields" ;
 };
+
 String RID_STR_DETAILFIELDS
 {
     Text [ en-US ] = "Link slave fields" ;
 };
+
 String RID_STR_EXPLANATION
 {
     Text [ en-US ] = "Charts can be used to display detailed data about the current record of the report. To do this, you can specify which columns in the chart match which columns in the report.";
 };
+
 String RID_STR_DETAILLABEL
 {
     Text [ en-US ] = "Chart" ;
 };
+
 String RID_STR_MASTERLABEL
 {
     Text [ en-US ] = "Report" ;
@@ -310,68 +283,63 @@ String RID_STR_PREVIEW_COUNT
 {
     Text [ en-US ] = "Preview Row(s)" ;
 };
+
 String RID_STR_AREA
 {
     Text [ en-US ] = "Area" ;
 };
+
 String RID_STR_MIMETYPE
 {
     Text [ en-US ] = "Report Output Format" ;
 };
+
 String RID_STR_VERTICALALIGN
 {
     Text [ en-US ] = "Vert. Alignment" ;
 };
-Resource RID_STR_VERTICAL_ALIGN_CONST
+
+StringArray RID_STR_VERTICAL_ALIGN_CONST
 {
-    String 1
-    {
-        Text [ en-US ] = "Top";
-    };
-    String 2
-    {
-        Text [ en-US ] = "Middle";
-    };
-    String 3
+    ItemList [ en-US ] =
     {
-        Text [ en-US ] = "Bottom";
+        < "Top"; >;
+        < "Middle"; >;
+        < "Bottom"; >;
     };
 };
+
 String RID_STR_PARAADJUST
 {
     Text [ en-US ] = "Horz. Alignment" ;
 };
-Resource RID_STR_PARAADJUST_CONST
+
+StringArray RID_STR_PARAADJUST_CONST
 {
-    String 1
-    {
-        Text [ en-US ] = "Left";
-    };
-    String 2
+    ItemList [ en-US ] =
     {
-        Text [ en-US ] = "Right";
-    };
-    String 3
-    {
-        Text [ en-US ] = "Block";
-    };
-    String 4
-    {
-        Text [ en-US ] = "Center";
+        < "Left"; >;
+        < "Right"; >;
+        < "Block"; >;
+        < "Center"; >;
     };
 };
+
 String RID_STR_F_COUNTER
 {
     Text [ en-US ] = "Counter" ;
 };
+
 String RID_STR_F_ACCUMULATION
 {
     Text [ en-US ] = "Accumulation" ;
 };
+
 String RID_STR_F_MINIMUM
 {
     Text [ en-US ] = "Minimum" ;
 };
+
 String RID_STR_F_MAXIMUM
 {
     Text [ en-US ] = "Maximum" ;