some UniString->rtl::OUString

Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3

4 files changed, 6 insertions, 6 deletions

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index adeaf5ca6ddf..8c47e2c51555 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2880,7 +2880,7 @@ Size Edit::CalcSize( xub_StrLen nChars ) const
 {
     // width for N characters, independent from content.
     // works only correct for fixed fonts, average otherwise
-    Size aSz( GetTextWidth( XubString( 'x' ) ), GetTextHeight() );
+    Size aSz( GetTextWidth( rtl::OUString('x') ), GetTextHeight() );
     aSz.Width() *= nChars;
     aSz = CalcWindowSize( aSz );
     return aSz;
@@ -2892,7 +2892,7 @@ xub_StrLen Edit::GetMaxVisChars() const
 {
     const Window* pW = mpSubEdit ? mpSubEdit : this;
     long nOutWidth = pW->GetOutputSizePixel().Width();
-    long nCharWidth = GetTextWidth( XubString( 'x' ) );
+    long nCharWidth = GetTextWidth( rtl::OUString('x') );
     return nCharWidth ? (xub_StrLen)(nOutWidth/nCharWidth) : 0;
 }
 
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index d0bb734309a3..bf12e2d1c0b6 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -1400,7 +1400,7 @@ Size ListBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
 
     // Breite
     if ( nColumns )
-        aSz.Width() = nColumns * GetTextWidth( XubString( 'X' ) );
+        aSz.Width() = nColumns * GetTextWidth( rtl::OUString('X') );
     else
         aSz.Width() = aMinSz.Width();
 
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index acc466a323fe..f6d96be1f417 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -421,7 +421,7 @@ static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, xub_Uni
         xCharClass = vcl::unohelper::CreateCharacterClassification();
 
     const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILocale();
-    cCharCode = xCharClass->toUpper( String(cCharCode), 0, 1, rLocale )[0];
+    cCharCode = xCharClass->toUpper( rtl::OUString(cCharCode), 0, 1, rLocale )[0];
 
     if ( i < nFormEnd )
         pWindow = ImplGetNextWindow( pParent, i, i, sal_True );
@@ -434,7 +434,7 @@ static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, xub_Uni
         while ( nPos != STRING_NOTFOUND )
         {
             cCompareChar = aStr.GetChar( nPos+1 );
-            cCompareChar = xCharClass->toUpper( String(cCompareChar), 0, 1, rLocale )[0];
+            cCompareChar = xCharClass->toUpper( rtl::OUString(cCompareChar), 0, 1, rLocale )[0];
             if ( cCompareChar == cCharCode )
             {
                 // Bei Static-Controls auf das naechste Controlm weiterschalten
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 8f3e296fa567..ad1d867b3fd8 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -265,7 +265,7 @@ void MessBox::ImplPosControls()
     rtl::OUString   aTabStr("    ");
     sal_uInt16      nIndex = 0;
     while ( nIndex != STRING_NOTFOUND )
-        nIndex = aMessText.SearchAndReplace( '\t', aTabStr, nIndex );
+        nIndex = aMessText.SearchAndReplace( rtl::OUString('\t'), aTabStr, nIndex );
 
     // Wenn Fenster zu schmall, machen wir Dialog auch breiter
     if ( mpWindowImpl->mbFrame )