summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-05-24 07:37:00 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-05-24 07:37:00 +0100
commit55dbc98f225d5b2c695b3d724a1fff0e9c5e9873 (patch)
tree7c3f6d7762a78262194aafad23e209854a8fcd7b
parentWaE: fVal may be used uninitialized (diff)
downloadbinfilter-55dbc98f225d5b2c695b3d724a1fff0e9c5e9873.tar.gz
binfilter-55dbc98f225d5b2c695b3d724a1fff0e9c5e9873.zip
convert ResStringArray to rtl::OUString
Change-Id: I32d51ad09e1a190d92d6e6f6c14d9f9debf7bf41
-rw-r--r--binfilter/bf_starmath/source/starmath_parse.cxx2
-rw-r--r--binfilter/bf_starmath/source/starmath_smmod.cxx34
2 files changed, 18 insertions, 18 deletions
diff --git a/binfilter/bf_starmath/source/starmath_parse.cxx b/binfilter/bf_starmath/source/starmath_parse.cxx
index 30f763c8e..2146f11ff 100644
--- a/binfilter/bf_starmath/source/starmath_parse.cxx
+++ b/binfilter/bf_starmath/source/starmath_parse.cxx
@@ -2216,7 +2216,7 @@ const sal_Int32 coNumContFlags =
/*M*/ USHORT nCount = pFrom->Count();
/*M*/ for (USHORT i = 0; i < nCount; ++i)
/*M*/ {
-/*M*/ if (pFrom->GetString(i) == rName)
+/*M*/ if (pFrom->GetString(i).equals(rName))
/*M*/ {
/*M*/ aNewName = pTo->GetString(i);
/*M*/ bReplace = TRUE;
diff --git a/binfilter/bf_starmath/source/starmath_smmod.cxx b/binfilter/bf_starmath/source/starmath_smmod.cxx
index 3c1dd5ed1..0b6656c4a 100644
--- a/binfilter/bf_starmath/source/starmath_smmod.cxx
+++ b/binfilter/bf_starmath/source/starmath_smmod.cxx
@@ -76,10 +76,10 @@ namespace binfilter {
/*N*/ const ResStringArray &rExportNames = rData.GetExportSymbolNamesArray();
/*N*/ USHORT nCount = rExportNames.Count();
/*N*/ for (USHORT i = 0; i < nCount && !aRes.Len(); ++i)
-/*N*/ {
-/*N*/ if (rExportName == rExportNames.GetString(i))
+/*N*/ {
+/*N*/ if (rExportNames.GetString(i).equals(rExportName))
/*N*/ {
-/*N*/ aRes = rUiNames.GetString(i);
+/*N*/ aRes = rUiNames.GetString(i);
/*N*/ break;
/*N*/ }
/*N*/ }
@@ -90,43 +90,43 @@ namespace binfilter {
/*N*/ const String SmLocalizedSymbolData::GetExportSymbolName( const String &rUiName ) const
/*N*/ {
-/*N*/ String aRes;
+/*N*/ String aRes;
/*N*/
/*N*/ const SmLocalizedSymbolData &rData = SM_MOD1()->GetLocSymbolData();
/*N*/ const ResStringArray &rUiNames = rData.GetUiSymbolNamesArray();
/*N*/ const ResStringArray &rExportNames = rData.GetExportSymbolNamesArray();
-/*N*/ USHORT nCount = rUiNames.Count();
+/*N*/ USHORT nCount = rUiNames.Count();
/*N*/ for (USHORT i = 0; i < nCount && !aRes.Len(); ++i)
-/*N*/ {
-/*N*/ if (rUiName == rUiNames.GetString(i))
-/*N*/ {
+/*N*/ {
+/*N*/ if (rUiNames.GetString(i).equals(rUiName))
+/*N*/ {
/*N*/ aRes = rExportNames.GetString(i);
/*N*/ break;
-/*N*/ }
-/*N*/ }
+/*N*/ }
+/*N*/ }
/*N*/
-/*N*/ return aRes;
+/*N*/ return aRes;
/*N*/ }
/*N*/ const String SmLocalizedSymbolData::GetUiSymbolSetName( const String &rExportName ) const
/*N*/ {
-/*N*/ String aRes;
+/*N*/ String aRes;
/*N*/
/*N*/ const SmLocalizedSymbolData &rData = SM_MOD1()->GetLocSymbolData();
/*N*/ const ResStringArray &rUiNames = rData.GetUiSymbolSetNamesArray();
/*N*/ const ResStringArray &rExportNames = rData.GetExportSymbolSetNamesArray();
/*N*/ USHORT nCount = rExportNames.Count();
/*N*/ for (USHORT i = 0; i < nCount && !aRes.Len(); ++i)
-/*N*/ {
-/*N*/ if (rExportName == rExportNames.GetString(i))
+/*N*/ {
+/*N*/ if (rExportNames.GetString(i).equals(rExportName))
/*N*/ {
-/*N*/ aRes = rUiNames.GetString(i);
+/*N*/ aRes = rUiNames.GetString(i);
/*N*/ break;
/*N*/ }
-/*N*/ }
+/*N*/ }
/*N*/
-/*N*/ return aRes;
+/*N*/ return aRes;
/*N*/ }