Some removal/replacement of the String/UniString with OUString

5 files changed, 27 insertions, 27 deletions

diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index ab827f0c9f77..6a8b4661a393 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -109,9 +109,9 @@ void CompressGraphicsDialog::Update()
     aBitmapSizeString += String( " x " ) ;
     aBitmapSizeString += GetUnitString( aOriginalSize100mm.Height(), eFieldUnit, cSeparator );
     aBitmapSizeString += String( " ( " ) ;
-    aBitmapSizeString += UniString::CreateFromInt32(aPixelSize.Width());
+    aBitmapSizeString += OUString::valueOf(aPixelSize.Width());
     aBitmapSizeString += String( " x " ) ;
-    aBitmapSizeString += UniString::CreateFromInt32(aPixelSize.Height());
+    aBitmapSizeString += OUString::valueOf(aPixelSize.Height());
     aBitmapSizeString += String( " px )" ) ;
     m_pFixedText2->SetText(aBitmapSizeString);
 
@@ -123,7 +123,7 @@ void CompressGraphicsDialog::Update()
     aViewSizeString += String( " x " ) ;
     aViewSizeString += GetUnitString( m_aViewSize100mm.Height(), eFieldUnit, cSeparator );
     aViewSizeString += ( " at " ) ;
-    aViewSizeString += UniString::CreateFromInt32(aValX);
+    aViewSizeString += OUString::valueOf(aValX);
     aViewSizeString += ( " DPI" ) ;
     m_pFixedText3->SetText(aViewSizeString);
 
@@ -134,7 +134,7 @@ void CompressGraphicsDialog::Update()
     sal_Int32 aNativeSize = aMemStream.Tell();
 
     String aNativeSizeString;
-    aNativeSizeString += UniString::CreateFromInt32(aNativeSize / 1024);
+    aNativeSizeString += OUString::valueOf(aNativeSize / 1024);
     aNativeSizeString += String( " kiB" ) ;
 
     m_pFixedText5->SetText(aNativeSizeString);
@@ -144,18 +144,18 @@ void CompressGraphicsDialog::Update()
 void CompressGraphicsDialog::UpdateNewWidthMF()
 {
     int nPixelX = (sal_Int32)( GetViewWidthInch() * m_dResolution );
-    m_pMFNewWidth->SetText( UniString::CreateFromInt32( nPixelX ) );
+    m_pMFNewWidth->SetText( OUString::valueOf( nPixelX ) );
 }
 
 void CompressGraphicsDialog::UpdateNewHeightMF()
 {
     int nPixelY = (sal_Int32)( GetViewHeightInch() * m_dResolution );
-    m_pMFNewHeight->SetText( UniString::CreateFromInt32( nPixelY ) );
+    m_pMFNewHeight->SetText( OUString::valueOf( nPixelY ) );
 }
 
 void CompressGraphicsDialog::UpdateResolutionLB()
 {
-    m_pResolutionLB->SetText( UniString::CreateFromInt32( (sal_Int32) m_dResolution ) );
+    m_pResolutionLB->SetText( OUString::valueOf( (sal_Int32) m_dResolution ) );
 }
 
 double CompressGraphicsDialog::GetViewWidthInch()
@@ -280,7 +280,7 @@ IMPL_LINK_NOARG( CompressGraphicsDialog, CalculateClickHdl )
     if ( aSize > 0 )
     {
         String aNewSizeString;
-        aNewSizeString += UniString::CreateFromInt32(aSize / 1024);
+        aNewSizeString += OUString::valueOf(aSize / 1024);
         aNewSizeString += String( " kiB" ) ;
         m_pFixedText6->SetText(aNewSizeString);
     }
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 8d61882eb17d..3df20db880ac 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -81,7 +81,7 @@ SfxItemPresentation SvxRotateModeItem::GetPresentation(
 //          break; // DURCHFALLEN!!!
 
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += UniString::CreateFromInt32( GetValue() );
+            rText += OUString::valueOf( GetValue() );
             break;
         default: ;//prevent warning
     }
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 63e553a5ee1e..614651552e52 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -638,12 +638,12 @@ SfxItemPresentation SdrFractionItem::GetPresentation(
     if(nValue.IsValid())
     {
         sal_Int32 nDiv = nValue.GetDenominator();
-        rText = UniString::CreateFromInt32(nValue.GetNumerator());
+        rText = OUString::valueOf(nValue.GetNumerator());
 
         if(nDiv != 1)
         {
             rText += sal_Unicode('/');
-            rText += UniString::CreateFromInt32(nDiv);
+            rText += OUString::valueOf(nDiv);
         }
     }
     else
@@ -695,9 +695,9 @@ SfxItemPresentation SdrScaleItem::GetPresentation(
     {
         sal_Int32 nDiv = GetValue().GetDenominator();
 
-        rText = UniString::CreateFromInt32(GetValue().GetNumerator());
+        rText = OUString::valueOf(GetValue().GetNumerator());
         rText += sal_Unicode(':');
-        rText += UniString::CreateFromInt32(nDiv);
+        rText += OUString::valueOf(nDiv);
     }
     else
     {
@@ -817,7 +817,7 @@ SfxItemPresentation SdrPercentItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/,
     SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText = UniString::CreateFromInt32(GetValue());
+    rText = OUString::valueOf(GetValue());
     rText += sal_Unicode('%');
 
     if(ePres == SFX_ITEM_PRESENTATION_COMPLETE)
@@ -858,7 +858,7 @@ SfxItemPresentation SdrAngleItem::GetPresentation(
     if(bNeg)
         nValue = -nValue;
 
-    rText = UniString::CreateFromInt32(nValue);
+    rText = OUString::valueOf(nValue);
 
     if(nValue)
     {
@@ -1301,7 +1301,7 @@ SfxItemPresentation SdrTextAniDelayItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
     XubString& rText, const IntlWrapper *) const
 {
-    rText = UniString::CreateFromInt32(GetValue());
+    rText = OUString::valueOf(GetValue());
     rText += sal_Unicode('m');
     rText += sal_Unicode('s');
 
@@ -1351,7 +1351,7 @@ SfxItemPresentation SdrTextAniAmountItem::GetPresentation(
 
     if(nValue < 0)
     {
-        rText = UniString::CreateFromInt32(-nValue);
+        rText = OUString::valueOf(-nValue);
         rText += UniString(RTL_CONSTASCII_USTRINGPARAM("pixel"));
     }
     else
@@ -1489,11 +1489,11 @@ SfxItemPresentation SdrCustomShapeAdjustmentItem::GetPresentation(
     SfxMapUnit /*ePresentationMetric*/, XubString &rText, const IntlWrapper *) const
 {
     sal_uInt32 i, nCount = GetCount();
-    rText.Append( UniString::CreateFromInt32( nCount ) );
+    rText.Append( OUString::valueOf( static_cast<sal_Int32>( nCount ) ) );
     for ( i = 0; i < nCount; i++ )
     {
         rText += sal_Unicode( ' ' );
-        rText.Append( UniString::CreateFromInt32( GetValue( i ).nValue ) );
+        rText.Append( OUString::valueOf( static_cast<sal_Int32>( GetValue( i ).nValue ) ) );
     }
     if ( ePresentation == SFX_ITEM_PRESENTATION_COMPLETE )
     {
@@ -2058,7 +2058,7 @@ SfxItemPresentation SdrSignedPercentItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
     XubString& rText, const IntlWrapper *) const
 {
-    rText = UniString::CreateFromInt32(GetValue());
+    rText = OUString::valueOf(GetValue());
     rText += sal_Unicode('%');
 
     if(ePres == SFX_ITEM_PRESENTATION_COMPLETE)
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 7333a36331b6..b78f71c37926 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1249,13 +1249,13 @@ XubString SdrView::GetStatusText()
             if (nLen==0) bBrk=sal_True; // to be sure
         }
 
-        aStr.SearchAndReplaceAscii("%1", UniString::CreateFromInt32(nPar + 1));
-        aStr.SearchAndReplaceAscii("%2", UniString::CreateFromInt32(nLin + 1));
-        aStr.SearchAndReplaceAscii("%3", UniString::CreateFromInt32(nCol + 1));
+        aStr.SearchAndReplaceAscii("%1", OUString::valueOf(nPar + 1));
+        aStr.SearchAndReplaceAscii("%2", OUString::valueOf(nLin + 1));
+        aStr.SearchAndReplaceAscii("%3", OUString::valueOf(nCol + 1));
 
 #ifdef DBG_UTIL
         aStr += UniString( RTL_CONSTASCII_USTRINGPARAM( ", Level " ) );
-        aStr += UniString::CreateFromInt32( pTextEditOutliner->GetDepth( aSel.nEndPara ) );
+        aStr += OUString::valueOf( pTextEditOutliner->GetDepth( aSel.nEndPara ) );
 #endif
     }
 
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 581bcd0104cd..d7b04d513b45 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -99,7 +99,7 @@ SfxItemPresentation XLineTransparenceItem::GetPresentation
             rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) );
             rText.AppendAscii(": ");
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue()) );
+            rText += OUString::valueOf((sal_uInt16) GetValue());
             rText += sal_Unicode('%');
             return ePres;
         default:
@@ -495,7 +495,7 @@ SfxItemPresentation XFillTransparenceItem::GetPresentation
             rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) );
             rText.AppendAscii(": ");
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue() ));
+            rText += OUString::valueOf((sal_uInt16) GetValue() );
             rText += sal_Unicode('%');
             return ePres;
         default:
@@ -622,7 +622,7 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation
 //          rText = XubString( ResId( RID_SVXSTR_GRADIENTSTEPCOUNT, DIALOG_MGR() ) );
 //          rText += ": ";
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue() ));
+            rText += OUString::valueOf((sal_uInt16) GetValue() );
             return ePres;
         default:
             return SFX_ITEM_PRESENTATION_NONE;