convert XubString to OUString in VCL

Change-Id: I5002b4c237dd919210cb7edfef9f552688735154

6 files changed, 15 insertions, 15 deletions

diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index cd05596d1e00..a882bb762db2 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -1557,9 +1557,9 @@ void DbgDialogTest( Window* pWindow )
 
 class DbgMessageBox : public ErrorBox
 {
-    String m_aMessage;
+    OUString m_aMessage;
     public:
-    DbgMessageBox( const String& rMessage ) :
+    DbgMessageBox( const OUString& rMessage ) :
        ErrorBox( NULL, WB_YES_NO_CANCEL | WB_DEF_NO, rMessage ),
        m_aMessage( rMessage )
     {
@@ -1722,7 +1722,7 @@ void DbgPrintWindow( const char* pLine )
         return;
     bIn = true;
 
-    SolarWindowPrinter aPrinter( String( pLine, RTL_TEXTENCODING_UTF8 ) );
+    SolarWindowPrinter aPrinter( OUString( pLine, strlen(pLine), RTL_TEXTENCODING_UTF8 ) );
     TimeValue aTimeout; aTimeout.Seconds = 2; aTimeout.Nanosec = 0;
     aPrinter.execute( aTimeout );
 
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index 829cd96acc25..82f0cb3b1434 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -125,8 +125,8 @@ sal_Int32 vcl::I18nHelper::CompareString( const OUString& rStr1, const OUString&
     }
 
 
-    String aStr1( filterFormattingChars(rStr1) );
-    String aStr2( filterFormattingChars(rStr2) );
+    OUString aStr1( filterFormattingChars(rStr1) );
+    OUString aStr2( filterFormattingChars(rStr2) );
     return ImplGetTransliterationWrapper().compareString( aStr1, aStr2 );
 }
 
@@ -143,8 +143,8 @@ sal_Bool vcl::I18nHelper::MatchString( const OUString& rStr1, const OUString& rS
         ((vcl::I18nHelper*)this)->mpTransliterationWrapper = NULL;
     }
 
-    String aStr1( filterFormattingChars(rStr1) );
-    String aStr2( filterFormattingChars(rStr2) );
+    OUString aStr1( filterFormattingChars(rStr1) );
+    OUString aStr2( filterFormattingChars(rStr2) );
     return ImplGetTransliterationWrapper().isMatch( aStr1, aStr2 );
 }
 
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 14ab944a79c9..0bd41d8c68d7 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -732,7 +732,7 @@ static BitmapEx readBitmapEx( const OUString& rPath )
 
     // import the image
     Graphic aGraphic;
-    if ( GraphicFilter::LoadGraphic( aPath, String(), aGraphic ) != GRFILTER_OK )
+    if ( GraphicFilter::LoadGraphic( aPath, OUString(), aGraphic ) != GRFILTER_OK )
         return BitmapEx();
 
     return aGraphic.GetBitmapEx();
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index c3920db77901..f6e1f5c13453 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -213,7 +213,7 @@ FieldUnitStringList* ImplGetFieldUnits()
             pSVData->maCtrlData.mpFieldUnitStrings->reserve( nUnits );
             for( sal_uInt32 i = 0; i < nUnits; i++ )
             {
-                std::pair< String, FieldUnit > aElement( aUnits.GetString(i), static_cast<FieldUnit>(aUnits.GetValue(i)) );
+                std::pair< OUString, FieldUnit > aElement( aUnits.GetString(i), static_cast<FieldUnit>(aUnits.GetValue(i)) );
                 pSVData->maCtrlData.mpFieldUnitStrings->push_back( aElement );
             }
         }
@@ -237,7 +237,7 @@ FieldUnitStringList* ImplGetCleanedFieldUnits()
                 OUString aUnit( (*pUnits)[i].first );
                 aUnit = comphelper::string::remove(aUnit, ' ');
                 aUnit = aUnit.toAsciiLowerCase();
-                std::pair< String, FieldUnit > aElement( aUnit, (*pUnits)[i].second );
+                std::pair< OUString, FieldUnit > aElement( aUnit, (*pUnits)[i].second );
                 pSVData->maCtrlData.mpCleanUnitStrings->push_back( aElement );
             }
         }
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 994229a21c97..bb304b123532 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -876,9 +876,9 @@ void ComboBox::ImplUpdateFloatSelection()
     mpImplLB->SetCallSelectionChangedHdl( sal_False );
     if ( !IsMultiSelectionEnabled() )
     {
-        OUString   aSearchStr( mpSubEdit->GetText() );
-        sal_uInt16 nSelect = LISTBOX_ENTRY_NOTFOUND;
-        sal_Bool   bSelect = sal_True;
+        OUString        aSearchStr( mpSubEdit->GetText() );
+        sal_uInt16      nSelect = LISTBOX_ENTRY_NOTFOUND;
+        sal_Bool        bSelect = sal_True;
 
         if ( mpImplLB->GetCurrentPos() != LISTBOX_ENTRY_NOTFOUND )
         {
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 71fd31981ffb..4eaa1d6fc9fe 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -556,7 +556,7 @@ static Rectangle ImplCalcActionBounds( const MetaAction& rAct, const OutputDevic
             const OUString              aString( rTextAct.GetText().copy(rTextAct.GetIndex(), rTextAct.GetLen()) );
             const sal_Int32             nLen = aString.getLength();
 
-            if( nLen )
+            if( !aString.isEmpty() )
             {
                 // #105987# ImplLayout takes everything in logical coordinates
                 SalLayout* pSalLayout = rOut.ImplLayout( rTextAct.GetText(), rTextAct.GetIndex(),
@@ -587,7 +587,7 @@ static Rectangle ImplCalcActionBounds( const MetaAction& rAct, const OutputDevic
             // OutDev::DrawStretchText() code. Unfortunately, also in
             // this case, public outdev methods such as GetTextWidth()
             // don't provide enough info.
-            if( nLen )
+            if( !aString.isEmpty() )
             {
                 // #105987# ImplLayout takes everything in logical coordinates
                 SalLayout* pSalLayout = rOut.ImplLayout( rTextAct.GetText(), rTextAct.GetIndex(),