some pesky XubStrings

Change-Id: Ib4095dee416cab6d954e1612d2e3f6e2d4464f48

5 files changed, 8 insertions, 8 deletions

diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 6da63862e6b4..9c41a8b486af 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -351,7 +351,7 @@ void Calendar::ImplFormat()
         if ( (aOutSize.Width() <= 1) || (aOutSize.Height() <= 1) )
             return;
 
-        XubString a99Text( XubString( RTL_CONSTASCII_USTRINGPARAM( "99" ) ) );
+        rtl::OUString a99Text("99");
 
         Font aOldFont = GetFont();
 
@@ -2168,7 +2168,7 @@ void Calendar::EndSelection()
 Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine,
                                     long nCalcLines ) const
 {
-    XubString   a99Text( XubString( RTL_CONSTASCII_USTRINGPARAM( "99" ) ) );
+    rtl::OUString a99Text("99");
     Font        aOldFont = GetFont();
 
     // Wochenanzeige beruecksichtigen
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index c2e26b900493..be53f12867c4 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -91,7 +91,7 @@ public:
 void ColorListBox::ImplInit()
 {
     pColorList = new ImpColorList();
-    aImageSize.Width()  = GetTextWidth( XubString( RTL_CONSTASCII_USTRINGPARAM( "xxx" ) ) );
+    aImageSize.Width()  = GetTextWidth( rtl::OUString("xxx") );
     aImageSize.Height() = GetTextHeight();
     aImageSize.Height() -= 2;
 
@@ -688,7 +688,7 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
 
 void LineListBox::ImplInit()
 {
-    aTxtSize.Width()  = GetTextWidth( XubString( RTL_CONSTASCII_USTRINGPARAM( " " )  ) );
+    aTxtSize.Width()  = GetTextWidth( rtl::OUString( " " ) );
     aTxtSize.Height() = GetTextHeight();
     pLineList   = new ImpLineList();
     eUnit       = FUNIT_POINT;
@@ -904,7 +904,7 @@ void LineListBox::UpdateEntries( long nOldWidth )
                     GetColorLine2( GetEntryCount( ) ),
                     GetColorDist( GetEntryCount( ) ),
                     pData->GetStyle(), aBmp );
-            ListBox::InsertEntry( XubString( RTL_CONSTASCII_USTRINGPARAM( " " )  ), aBmp, LISTBOX_APPEND );
+            ListBox::InsertEntry( rtl::OUString( " " ), aBmp, LISTBOX_APPEND );
             if ( n == nTypePos )
                 SelectEntryPos( GetEntryCount() - 1 );
         }
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index ddf8fdd54d7d..7f702b5b4f01 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -168,7 +168,7 @@ void FileControl::Resize()
     }
     else
     {
-        XubString aSmallText( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
+        rtl::OUString aSmallText( "..." );
         maButton.SetText( aSmallText );
         nButtonTextWidth = maButton.GetTextWidth( aSmallText );
     }
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 98545612b09b..8dcffcea938b 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -1266,7 +1266,7 @@ void DoubleCurrencyField::UpdateCurrencyFormat()
         sSymbol = comphelper::string::stripStart(sSymbol, ' ');
         sSymbol = comphelper::string::stripEnd(sSymbol, ' ');
 
-        XubString sTemp = String::CreateFromAscii("[$");
+        XubString sTemp = rtl::OUString("[$");
         sTemp += sSymbol;
         sTemp.AppendAscii("] ");
         sTemp += sNewFormat;
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index beb2153e4ffc..4fff9e02d1e4 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -1409,7 +1409,7 @@ void MultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSi
         }
     }
 
-    XubString aText = GetText();
+    rtl::OUString aText = GetText();
     Size aTextSz( pDev->GetTextWidth( aText ), pDev->GetTextHeight() );
     sal_uLong nLines = (sal_uLong) (aSize.Height() / aTextSz.Height());
     if ( !nLines )