convert LocaleDataWrapper to OUString

Change-Id: Icb5f5adf9139d1c0f0e86d8128ea6742ce20b138

3 files changed, 20 insertions, 16 deletions

diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 03fdc09e7112..0bc5425b1fc2 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -48,6 +48,7 @@
 #include <unotools/localedatawrapper.hxx>
 
 using namespace ::com::sun::star;
+using namespace ::comphelper;
 
 // -----------------------------------------------------------------------
 
@@ -84,8 +85,8 @@ static sal_Bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt,
         if ( (nGroup == KEYGROUP_FKEYS) || (nGroup == KEYGROUP_CURSOR) ||
              (nGroup == KEYGROUP_MISC) ||
              ((cChar >= '0') && (cChar <= '9')) ||
-             (cChar == rLocaleDataWrappper.getNumDecimalSep() ) ||
-             (bThousandSep && (cChar == rLocaleDataWrappper.getNumThousandSep())) ||
+             string::equals(rLocaleDataWrappper.getNumDecimalSep(), cChar) ||
+             (bThousandSep && string::equals(rLocaleDataWrappper.getNumThousandSep(), cChar)) ||
              (cChar == '-') )
             return sal_False;
         else
@@ -111,7 +112,7 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, double& rValue,
         return sal_False;
 
     // Fuehrende und nachfolgende Leerzeichen entfernen
-    aStr = comphelper::string::strip(aStr, ' ');
+    aStr = string::strip(aStr, ' ');
 
     // Position des Dezimalpunktes suchen
     nDecPos = aStr.Search( rLocaleDataWrappper.getNumDecimalSep() );
@@ -1080,7 +1081,7 @@ static FieldUnit ImplStringToMetric(const rtl::OUString &rMetricString)
     {
         // return FieldUnit
         rtl::OUString aStr(rMetricString.toAsciiLowerCase());
-        aStr = comphelper::string::remove(aStr, ' ');
+        aStr = string::remove(aStr, ' ');
         for( FieldUnitStringList::const_iterator it = pList->begin(); it != pList->end(); ++it )
         {
             if ( it->first.Equals( aStr ) )
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 67b82700dcc2..4ed66e5f1325 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -26,6 +26,7 @@
  *
  ************************************************************************/
 
+#include <comphelper/string.hxx>
 #include <tools/rc.h>
 #include <vcl/svapp.hxx>
 #include <vcl/sound.hxx>
@@ -48,6 +49,7 @@
 #include <unotools/misccfg.hxx>
 
 using namespace ::com::sun::star;
+using namespace ::comphelper;
 
 // =======================================================================
 
@@ -2194,13 +2196,13 @@ static sal_Bool ImplTimeProcessKeyInput( Edit*, const KeyEvent& rKEvt,
         if ( (nGroup == KEYGROUP_FKEYS) || (nGroup == KEYGROUP_CURSOR) ||
              (nGroup == KEYGROUP_MISC)   ||
              ((cChar >= '0') && (cChar <= '9')) ||
-             (cChar == rLocaleDataWrapper.getTimeSep()) ||
-             ( ( rLocaleDataWrapper.getTimeAM().Search( cChar ) != STRING_NOTFOUND ) ) ||
-             ( ( rLocaleDataWrapper.getTimePM().Search( cChar ) != STRING_NOTFOUND ) ) ||
+             string::equals(rLocaleDataWrapper.getTimeSep(), cChar) ||
+             (rLocaleDataWrapper.getTimeAM().indexOf(cChar) != -1) ||
+             (rLocaleDataWrapper.getTimePM().indexOf(cChar) != -1) ||
              // Accept AM/PM:
              (cChar == 'a') || (cChar == 'A') || (cChar == 'm') || (cChar == 'M') || (cChar == 'p') || (cChar == 'P') ||
-             ((eFormat == TIMEF_100TH_SEC) && (cChar == rLocaleDataWrapper.getTime100SecSep())) ||
-             ((eFormat == TIMEF_SEC_CS) && (cChar == rLocaleDataWrapper.getTime100SecSep())) ||
+             ((eFormat == TIMEF_100TH_SEC) && string::equals(rLocaleDataWrapper.getTime100SecSep(), cChar)) ||
+             ((eFormat == TIMEF_SEC_CS) && string::equals(rLocaleDataWrapper.getTime100SecSep(), cChar)) ||
              (bDuration && (cChar == '-')) )
             return sal_False;
         else
@@ -2263,7 +2265,7 @@ static sal_Bool ImplTimeGetValue( const XubString& rStr, Time& rTime,
         return sal_False;
 
     // Nach Separatoren suchen
-    if ( rLocaleDataWrapper.getTimeSep().Len() )
+    if (!rLocaleDataWrapper.getTimeSep().isEmpty())
     {
         XubString aSepStr( RTL_CONSTASCII_USTRINGPARAM( ",.;:/" ) );
         if ( !bDuration )
@@ -2272,12 +2274,12 @@ static sal_Bool ImplTimeGetValue( const XubString& rStr, Time& rTime,
         // Die obigen Zeichen durch das Separatorzeichen ersetzen
         for ( xub_StrLen i = 0; i < aSepStr.Len(); i++ )
         {
-            if ( aSepStr.GetChar( i ) == rLocaleDataWrapper.getTimeSep() )
+            if (string::equals(rLocaleDataWrapper.getTimeSep(), aSepStr.GetChar(i)))
                 continue;
             for ( xub_StrLen j = 0; j < aStr.Len(); j++ )
             {
                 if ( aStr.GetChar( j ) == aSepStr.GetChar( i ) )
-                    aStr.SetChar( j, rLocaleDataWrapper.getTimeSep().GetChar(0) );
+                    aStr.SetChar( j, rLocaleDataWrapper.getTimeSep()[0] );
             }
         }
     }
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index 8f4eb0166298..0ae610fa2e06 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -44,6 +44,7 @@
 
 #include <unotools/localedatawrapper.hxx>
 
+using namespace ::comphelper;
 
 // =======================================================================
 
@@ -126,8 +127,8 @@ static sal_Bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt,
         if ( (nGroup == KEYGROUP_FKEYS) || (nGroup == KEYGROUP_CURSOR) ||
              (nGroup == KEYGROUP_MISC) ||
              ((cChar >= '0') && (cChar <= '9')) ||
-             (bThousandSep && (cChar == rLocaleDataWrapper.getNumThousandSep())) ||
-             (cChar == rLocaleDataWrapper.getNumDecimalSep() ) ||
+             (bThousandSep && string::equals(rLocaleDataWrapper.getNumThousandSep(), cChar)) ||
+             (string::equals(rLocaleDataWrapper.getNumDecimalSep(), cChar) ) ||
              (cChar == '-') )
             return sal_False;
         else
@@ -153,7 +154,7 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, BigInt& rValue,
         return sal_False;
 
     // Fuehrende und nachfolgende Leerzeichen entfernen
-    aStr = comphelper::string::strip(aStr, ' ');
+    aStr = string::strip(aStr, ' ');
 
     // Position des Dezimalpunktes suchen
     nDecPos = aStr.Search( rLocaleDataWrapper.getNumDecimalSep() );
@@ -360,7 +361,7 @@ void LongCurrencyFormatter::SetCurrencySymbol( const String& rStr )
 
 String LongCurrencyFormatter::GetCurrencySymbol() const
 {
-    return maCurrencySymbol.Len() ? maCurrencySymbol : GetLocaleDataWrapper().getCurrSymbol();
+    return !maCurrencySymbol.isEmpty() ? maCurrencySymbol : GetLocaleDataWrapper().getCurrSymbol();
 }
 
 // -----------------------------------------------------------------------