convert TOOLKIT module from String to OUString

Change-Id: Ibc5ffbffa0ddc6a80c3a95406b324cda09f7c9e1

4 files changed, 15 insertions, 15 deletions

diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx
index 01ef619fdd11..929af4513486 100644
--- a/toolkit/source/awt/vclxfont.cxx
+++ b/toolkit/source/awt/vclxfont.cxx
@@ -197,8 +197,8 @@ sal_Bool VCLXFont::hasGlyphs( const OUString& aText )
     OutputDevice* pOutDev = VCLUnoHelper::GetOutputDevice( mxDevice );
     if ( pOutDev )
     {
-        String aStr( aText );
-        if ( pOutDev->HasGlyphs( maFont, aStr, 0, aStr.Len() ) == STRING_LEN )
+        OUString aStr( aText );
+        if ( pOutDev->HasGlyphs( maFont, aStr, 0, aStr.getLength() ) == STRING_LEN )
         {
             return sal_True;
         }
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index ef105df5f21e..4e3f6cdecb03 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -335,7 +335,7 @@ static int SAL_CALL ComponentInfoCompare( const void* pFirst, const void* pSecon
 }
 }
 
-sal_uInt16 ImplGetComponentType( const String& rServiceName )
+sal_uInt16 ImplGetComponentType( const OUString& rServiceName )
 {
     static bool bSorted = false;
     if( !bSorted )
@@ -628,7 +628,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
     if ( aServiceName == "tabcontrolnotabs" )
     {
         nWinBits |= WB_NOBORDER;
-        nType = ImplGetComponentType( String( "tabcontrol" ) );
+        nType = ImplGetComponentType( OUString( "tabcontrol" ) );
     }
     if ( !pParent )
     {
@@ -705,7 +705,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                 *ppNewComp = new VCLXEdit;
             break;
             case WINDOW_ERRORBOX:
-                pNewWindow = new ErrorBox( pParent, nWinBits, String() );
+                pNewWindow = new ErrorBox( pParent, nWinBits, OUString() );
                 *ppNewComp = new VCLXMessageBox;
             break;
             case WINDOW_FIXEDBITMAP:
@@ -754,7 +754,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                 *ppNewComp = new VCLXButton;
             break;
             case WINDOW_INFOBOX:
-                pNewWindow = new InfoBox( pParent, String() );
+                pNewWindow = new InfoBox( pParent, OUString() );
                 *ppNewComp = new VCLXMessageBox;
             break;
             case WINDOW_LISTBOX:
@@ -775,7 +775,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                 *ppNewComp = new VCLXButton;
             break;
             case WINDOW_MESSBOX:
-                pNewWindow = new MessBox( pParent, nWinBits, String(), String() );
+                pNewWindow = new MessBox( pParent, nWinBits, OUString(), OUString() );
                 *ppNewComp = new VCLXMessageBox;
             break;
             case WINDOW_METRICBOX:
@@ -838,7 +838,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                 *ppNewComp = new VCLXButton;
             break;
             case WINDOW_QUERYBOX:
-                pNewWindow = new QueryBox( pParent, nWinBits, String() );
+                pNewWindow = new QueryBox( pParent, nWinBits, OUString() );
                 *ppNewComp = new VCLXMessageBox;
             break;
             case WINDOW_RADIOBUTTON:
@@ -914,7 +914,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                 pNewWindow = new TriStateBox( pParent, nWinBits );
             break;
             case WINDOW_WARNINGBOX:
-                pNewWindow = new WarningBox( pParent, nWinBits, String() );
+                pNewWindow = new WarningBox( pParent, nWinBits, OUString() );
                 *ppNewComp = new VCLXMessageBox;
             break;
             case WINDOW_WORKWINDOW:
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 3f72467606a3..84e0f66dbb70 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -1595,7 +1595,7 @@ OUString VCLXListBox::getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::Run
 {
     SolarMutexGuard aGuard;
 
-    String aItem;
+    OUString aItem;
     ListBox* pBox = (ListBox*) GetWindow();
     if ( pBox )
         aItem = pBox->GetEntry( nPos );
@@ -1649,7 +1649,7 @@ OUString VCLXListBox::getSelectedItem() throw(::com::sun::star::uno::RuntimeExce
 {
     SolarMutexGuard aGuard;
 
-    String aItem;
+    OUString aItem;
     ListBox* pBox = (ListBox*) GetWindow();
     if ( pBox )
         aItem = pBox->GetSelectEntry();
@@ -1729,7 +1729,7 @@ void VCLXListBox::selectItem( const OUString& rItemText, sal_Bool bSelect ) thro
     ListBox* pBox = (ListBox*) GetWindow();
     if ( pBox )
     {
-        String aItemText( rItemText );
+        OUString aItemText( rItemText );
         selectItemPos( pBox->GetEntryPos( aItemText ), bSelect );
     }
 }
@@ -2215,7 +2215,7 @@ OUString VCLXMessageBox::getCaptionText() throw(::com::sun::star::uno::RuntimeEx
 {
     SolarMutexGuard aGuard;
 
-    String aText;
+    OUString aText;
     Window* pWindow = GetWindow();
     if ( pWindow )
         aText = pWindow->GetText();
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 5767b27fe185..5c03a72c331c 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -340,8 +340,8 @@ Font VCLUnoHelper::CreateFont( const ::com::sun::star::awt::FontDescriptor& rDes
         aFont.SetSize( Size( rDescr.Width, rDescr.Height ) );
     if ( (FontFamily)rDescr.Family != FAMILY_DONTKNOW )
         aFont.SetFamily( (FontFamily)rDescr.Family );
-    if ( (CharSet)rDescr.CharSet != RTL_TEXTENCODING_DONTKNOW )
-        aFont.SetCharSet( (CharSet)rDescr.CharSet );
+    if ( (rtl_TextEncoding)rDescr.CharSet != RTL_TEXTENCODING_DONTKNOW )
+        aFont.SetCharSet( (rtl_TextEncoding)rDescr.CharSet );
     if ( (FontPitch)rDescr.Pitch != PITCH_DONTKNOW )
         aFont.SetPitch( (FontPitch)rDescr.Pitch );
     if ( rDescr.CharacterWidth )