some UniString->rtl::OUString

Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3

5 files changed, 10 insertions, 9 deletions

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 2643aa44be48..21721156b606 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/i18n/CollatorOptions.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/string.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/request.hxx>
@@ -597,11 +598,11 @@ sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet&  )
     pOpt->bChgEnumNum = bCheck;
     bModified |= aBulletFont != pOpt->aBulletFont;
     pOpt->aBulletFont = aBulletFont;
-    bModified |= String(pOpt->cBullet) != sBulletChar;
+    bModified |= !comphelper::string::equals(sBulletChar, pOpt->cBullet);
     pOpt->cBullet = sBulletChar.GetChar(0);
 
     bModified |= aByInputBulletFont != pOpt->aByInputBulletFont;
-    bModified |= String(pOpt->cByInputBullet) != sByInputBulletChar;
+    bModified |= !comphelper::string::equals(sByInputBulletChar, pOpt->cByInputBullet);
     pOpt->aByInputBulletFont = aByInputBulletFont;
     pOpt->cByInputBullet = sByInputBulletChar.GetChar(0);
 
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 7e82b1cfdd1d..87044935b294 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -701,7 +701,7 @@ void SvxBackgroundTabPage::FillUserData()
 */
 
 {
-    SetUserData( String( aBtnPreview.IsChecked() ? sal_Unicode('1') : sal_Unicode('0') ) );
+    SetUserData( aBtnPreview.IsChecked() ? rtl::OUString('1') : rtl::OUString('0') );
 }
 
 //------------------------------------------------------------------------
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 98b00b6a95c9..55b1180fcae7 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -3576,7 +3576,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart )
 
         if ( !bFound )
         {
-            nEntryPos = pBox->InsertEntry( String( cBracket ) );
+            nEntryPos = pBox->InsertEntry( rtl::OUString(cBracket) );
             pBox->SelectEntryPos( nEntryPos );
         }
     }
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index e909c1706886..6008b63d72f3 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2311,7 +2311,7 @@ sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
         aBulletColor.Invert();
     aFont.SetColor(aBulletColor);
     pVDev->SetFont( aFont );
-    String aText(sal_Unicode(rFmt.GetBulletChar()));
+    rtl::OUString aText(rFmt.GetBulletChar());
     long nY = nYStart;
     nY -= ((aTmpSize.Height() - rSize.Height())/ 2);
     pVDev->DrawText( Point(nXStart, nY), aText );
@@ -2463,7 +2463,7 @@ void    SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
                      rFmt.GetLabelFollowedBy() == SvxNumberFormat::SPACE )
                 {
                     pVDev->SetFont(aStdFont);
-                    String aText(' ');
+                    rtl::OUString aText(' ');
                     pVDev->DrawText( Point(nNumberXPos, nYStart), aText );
                     nBulletWidth = nBulletWidth + (sal_uInt16)pVDev->GetTextWidth(aText);
                 }
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index ecb0461cdf7c..58784d8afceb 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -463,7 +463,7 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl()
         pTypeBtn = &aDezTab;
         aDezChar.Enable();
         aDezCharLabel.Enable();
-        aDezChar.SetText( String( (sal_Unicode)aAktTab.GetDecimal() ) );
+        aDezChar.SetText( rtl::OUString( (sal_Unicode)aAktTab.GetDecimal() ) );
     }
     else if ( aAktTab.GetAdjustment() == SVX_TAB_ADJUST_CENTER )
         pTypeBtn = &aCenterTab;
@@ -486,7 +486,7 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl()
     {
         pFillBtn = &aFillSpecial;
         aFillChar.Enable();
-        aFillChar.SetText( String( (sal_Unicode)aAktTab.GetFill() ) );
+        aFillChar.SetText( rtl::OUString( (sal_Unicode)aAktTab.GetFill() ) );
     }
     pFillBtn->Check();
 }
@@ -628,7 +628,7 @@ IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox )
         eAdj = SVX_TAB_ADJUST_DECIMAL;
         aDezChar.Enable();
         aDezCharLabel.Enable();
-        aDezChar.SetText( String( (sal_Unicode)aAktTab.GetDecimal() ) );
+        aDezChar.SetText( rtl::OUString( (sal_Unicode)aAktTab.GetDecimal() ) );
     }
 
     aAktTab.GetAdjustment() = eAdj;