finish deprecation of O(U)String::valueOf()

Compiler plugin to replace with matching number(), boolean() or OUString ctor, ran it, few manual tweaks, mark as really deprecated. Change-Id: I4a79bdbcf4c460d21e73b635d2bd3725c22876b2
author: Luboš Luňák <l.lunak@suse.cz> 2013-08-21 15:07:31 +0200
committer: Luboš Luňák <l.lunak@suse.cz> 2013-08-21 15:10:35 +0200
commit: 64b993e046f23baaacaff1572b7d2a816588b5ef (patch)
tree: 237dce36a1d4787d168a0520839f6aab22500487
parent: 75f41baab6ce75786a91fe461835ee16a23ec18e (diff)
490 files changed, 1733 insertions, 1572 deletions
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 244bb553f673..8f6b0670b1ea 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -406,7 +406,7 @@ lcl_CreateStream(uno::Reference<embed::XStorage> const& xStorage,
         do
         {
             ++count;
-            filename = basename + OUString::valueOf(count) + suffix;
+            filename = basename + OUString::number(count) + suffix;
         }
         while (xStorage->hasByName(filename));
     }
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 0593c12c867e..386a3ab72875 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -135,7 +135,7 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage,
 
         if( bOutput )
         {
-            OUString aPageStr = " [" + IDE_RESSTR(RID_STR_PAGE) + " " + OUString::valueOf( nCurPage ) + "]";
+            OUString aPageStr = " [" + IDE_RESSTR(RID_STR_PAGE) + " " + OUString::number( nCurPage ) + "]";
             pPrinter->DrawText( aPos, aPageStr );
         }
     }
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 1ccc4ada2ea7..578940f2ce96 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -113,7 +113,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq )
                     nFound = pCurWin->StartSearchAndReplace(rSearchItem);
 
                 OUString aReplStr(IDE_RESSTR(RID_STR_SEARCHREPLACES));
-                aReplStr = aReplStr.replaceAll("XX", OUString::valueOf(nFound));
+                aReplStr = aReplStr.replaceAll("XX", OUString::number(nFound));
                 InfoBox( pCurWin, aReplStr ).Execute();
             }
             else
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index f0aa0bac3b6b..89f9f450eaf9 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -96,7 +96,7 @@ SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName )
             while ( !bValid )
             {
                 aMacroName = aStdMacroText;
-                aMacroName += OUString::valueOf( nMacro );
+                aMacroName += OUString::number( nMacro );
                 // test whether existing...
                 bValid = pModule->GetMethods()->Find( aMacroName, SbxCLASS_METHOD ) ? false : true;
                 nMacro++;
diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx
index 8baa2fe31bd0..3ee023b6149c 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -73,7 +73,7 @@ void LineNumberWindow::Paint( const Rectangle& )
 
     sal_Int64 y = (nStartLine - 1) * (sal_Int64)nLineHeight;
     for(sal_Int32 n = nStartLine; n <= nEndLine; ++n, y += nLineHeight)
-        DrawText(Point(0, y - m_nCurYOffset), OUString::valueOf(n));
+        DrawText(Point(0, y - m_nCurYOffset), OUString::number(n));
 }
 
 void LineNumberWindow::DataChanged(DataChangedEvent const & rDCEvt)
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index 996767f34e2b..fe87f4c04883 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -171,7 +171,7 @@ OUString implCreatePureResourceId
       Reference< XStringResourceManager > xStringResourceManager )
 {
     sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId();
-    OUString aPureIdStr = OUString::valueOf( nUniqueId );
+    OUString aPureIdStr = OUString::number( nUniqueId );
     aPureIdStr += aDot;
     aPureIdStr += aDialogName;
     aPureIdStr += aDot;
@@ -433,7 +433,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties
                             }
 
                             sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId();
-                            OUString aPureIdStr = OUString::valueOf( nUniqueId );
+                            OUString aPureIdStr = OUString::number( nUniqueId );
                             aPureIdStr += aIdStrBase;
 
                             // Set Id for all locales
@@ -527,7 +527,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties
                             OUString aPureSourceIdStr = aSourceIdStr.copy( 1 );
 
                             sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId();
-                            OUString aPureIdStr = OUString::valueOf( nUniqueId );
+                            OUString aPureIdStr = OUString::number( nUniqueId );
                             aPureIdStr += aIdStrBase;
 
                             // Set Id for all locales
@@ -576,7 +576,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties
                             OUString aPureSourceIdStr = aSourceIdStr.copy( 1 );
 
                             sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId();
-                            OUString aPureIdStr = OUString::valueOf( nUniqueId );
+                            OUString aPureIdStr = OUString::number( nUniqueId );
                             aPureIdStr += aIdStrBase;
 
                             // Set Id for all locales
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 3224c7129a80..17cc60798a33 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -1296,7 +1296,7 @@ namespace basctl
         while ( !bValid )
         {
             aObjectName = aBaseName;
-            aObjectName += OUString::valueOf( i );
+            aObjectName += OUString::number( i );
 
             if ( aUsedNamesCheck.find( aObjectName ) == aUsedNamesCheck.end() )
                 bValid = true;
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index 1396e22bbc99..2b331ce72e32 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -108,7 +108,7 @@ void TbxControls::StateChanged( sal_uInt16 nSID, SfxItemState eState,
             if( nTemp )
             {
                 OUString aSlotURL( "slot:" );
-                aSlotURL += OUString::valueOf( sal_Int32( nTemp ));
+                aSlotURL += OUString::number( nTemp);
                 Image aImage = GetImage( m_xFrame,
                                          aSlotURL,
                                          hasBigImages()
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index ba07117a26d2..d166e928331f 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -804,7 +804,7 @@ OUString DlgEdObj::GetUniqueName() const
 
         do
         {
-            aUniqueName = aDefaultName + OUString::valueOf(++n);
+            aUniqueName = aDefaultName + OUString::number(++n);
         }   while (xNameAcc->hasByName(aUniqueName));
     }
 
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 3ef3255a3030..298712372ccd 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1734,7 +1734,7 @@ sal_Bool StarBASIC::RTError( SbError code, const OUString& rMsg, sal_Int32 l, sa
         // like vba ( adds an error number etc )
         if ( SbiRuntime::isVBAEnabled() && ( code == SbERR_BASIC_COMPAT ) )
         {
-            OUString aTmp = "\'" + OUString::valueOf(SbxErrObject::getUnoErrObject()->getNumber()) +
+            OUString aTmp = "\'" + OUString::number(SbxErrObject::getUnoErrObject()->getNumber()) +
                             "\'\n" + OUString(!GetSbData()->aErrMsg.isEmpty() ? GetSbData()->aErrMsg : rMsg);
             code = (sal_uIntPtr)*new StringErrorInfo( code, aTmp );
         }
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index f3d27eddbcd1..57614271c857 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -280,7 +280,7 @@ const OUString& SbiTokenizer::Symbol( SbiToken t )
     // character token?
     if( t < FIRSTKWD )
     {
-        aSym = OUString::valueOf(sal::static_int_cast<sal_Unicode>(t));
+        aSym = OUString(sal::static_int_cast<sal_Unicode>(t));
         return aSym;
     }
     switch( t )
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 3ae89cb80f7c..fb01bdbfb989 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -886,7 +886,7 @@ RTLFUNC(Hex)
         sal_uInt32 nVal = pArg->IsInteger() ?
             static_cast<sal_uInt16>(pArg->GetInteger()) :
             static_cast<sal_uInt32>(pArg->GetLong());
-        OUString aStr(OUString::valueOf( sal_Int64(nVal), 16 ));
+        OUString aStr(OUString::number( nVal, 16 ));
         aStr = aStr.toAsciiUpperCase();
         rPar.Get(0)->PutString( aStr );
     }
@@ -4649,8 +4649,8 @@ RTLFUNC(Partition)
     // will be handled properly during any subsequent sort operation.
 
     // calculate the  maximun number of characters before lowervalue and uppervalue
-    OUString aBeforeStart = OUString::valueOf( nStart - 1 );
-    OUString aAfterStop = OUString::valueOf( nStop + 1 );
+    OUString aBeforeStart = OUString::number( nStart - 1 );
+    OUString aAfterStop = OUString::number( nStop + 1 );
     sal_Int32 nLen1 = aBeforeStart.getLength();
     sal_Int32 nLen2 = aAfterStop.getLength();
     sal_Int32 nLen = nLen1 >= nLen2 ? nLen1:nLen2;
@@ -4675,8 +4675,8 @@ RTLFUNC(Partition)
             nLowerValue = ((( nNumber - nStart ) / nInterval ) * nInterval ) + nStart;
             nUpperValue = nLowerValue + nInterval - 1;
         }
-        aLowerValue = OUString::valueOf( nLowerValue );
-        aUpperValue = OUString::valueOf( nUpperValue );
+        aLowerValue = OUString::number( nLowerValue );
+        aUpperValue = OUString::number( nUpperValue );
     }
 
     nLen1 = aLowerValue.getLength();
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index 422c0dde799c..851c6a8caa93 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -37,7 +37,7 @@ static OUString ImpCurrencyToString( const sal_Int64 &rVal )
     ImpGetIntntlSep( cDecimalSep, cThousandSep );
 #endif
 
-    OUString aAbsStr = OUString::valueOf( absVal );
+    OUString aAbsStr = OUString::number( absVal );
     OUStringBuffer aBuf;
 
     sal_Int32 initialLen = aAbsStr.getLength();
diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx
index 6642789c58b1..649bb46f11c6 100644
--- a/basic/source/sbx/sbxint.cxx
+++ b/basic/source/sbx/sbxint.cxx
@@ -543,7 +543,7 @@ start:
             if( !p->pOUString )
                 p->pOUString = new OUString;
 
-            ::OString  aOStr  = ::OString::valueOf( n );
+            ::OString  aOStr  = OString::number( n );
                (*p->pOUString) = ::OStringToOUString
                 ( aOStr, RTL_TEXTENCODING_ASCII_US );
             break;
@@ -821,7 +821,7 @@ start:
                 SbxBase::SetError( SbxERR_CONVERSION );
             else
             {
-                ::OString  aOStr  = ::OString::valueOf( (sal_Int64)n );
+                ::OString  aOStr  = OString::number( n );
                    (*p->pOUString) = ::OStringToOUString
                     ( aOStr, RTL_TEXTENCODING_ASCII_US );
             }
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index ac609287bf74..ea82ec7a0c7c 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -827,7 +827,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
     OString aNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US));
     OString aClassNameStr(OUStringToOString(aClassName, RTL_TEXTENCODING_ASCII_US));
     rStrm << "Object( "
-          << OString::valueOf(reinterpret_cast<sal_Int64>(this)).getStr()<< "=='"
+          << OString::number(reinterpret_cast<sal_Int64>(this)).getStr()<< "=='"
           << ( aNameStr.isEmpty() ?  "<unnamed>" : aNameStr.getStr() ) << "', "
           << "of class '" << aClassNameStr.getStr() << "', "
           << "counts "
@@ -837,7 +837,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
     {
         OString aParentNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US));
         rStrm << "in parent "
-              << OString::valueOf(reinterpret_cast<sal_Int64>(GetParent())).getStr()
+              << OString::number(reinterpret_cast<sal_Int64>(GetParent())).getStr()
               << "=='" << ( aParentNameStr.isEmpty() ? "<unnamed>" : aParentNameStr.getStr()  ) << "'";
     }
     else
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 180de7ed0ac6..e3545ef1a130 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -471,12 +471,12 @@ bool ImpConvStringExt( OUString& rSrc, SbxDataType eTargetType )
         {
             if( rSrc.equalsIgnoreAsciiCase("true") )
             {
-                aNewString = OUString::valueOf( (sal_Int32)SbxTRUE );
+                aNewString = OUString::number( SbxTRUE );
                 bChanged = true;
             }
             else if( rSrc.equalsIgnoreAsciiCase("false") )
             {
-                aNewString = OUString::valueOf( (sal_Int32)SbxFALSE );
+                aNewString = OUString::number( SbxFALSE );
                 bChanged = true;
             }
             break;
@@ -825,13 +825,13 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const
                 }
                 else
                 {
-                    rRes = OUString::valueOf(nMin);
+                    rRes = OUString::number(nMin);
                 }
             }
             else if( aFmtStr.equalsIgnoreAsciiCase( VBAFORMAT_W ))
             {
                 sal_Int32 nWeekDay = implGetWeekDay( nNumber );
-                rRes = OUString::valueOf(nWeekDay);
+                rRes = OUString::number(nWeekDay);
             }
             else if( aFmtStr.equalsIgnoreAsciiCase( VBAFORMAT_Y ))
             {
@@ -839,7 +839,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const
                 double dBaseDate;
                 implDateSerial( nYear, 1, 1, dBaseDate );
                 sal_Int32 nYear32 = 1 + sal_Int32( nNumber - dBaseDate );
-                rRes = OUString::valueOf(nYear32);
+                rRes = OUString::number(nYear32);
             }
             else
             {
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 6c4c09b72e6d..8fb9e0897da2 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -737,7 +737,7 @@ void SbxVariable::Dump( SvStream& rStrm, sal_Bool bFill )
 {
     OString aBNameStr(OUStringToOString(GetName( SbxNAME_SHORT_TYPES ), RTL_TEXTENCODING_ASCII_US));
     rStrm << "Variable( "
-          << OString::valueOf(reinterpret_cast<sal_Int64>(this)).getStr() << "=="
+          << OString::number(reinterpret_cast<sal_Int64>(this)).getStr() << "=="
           << aBNameStr.getStr();
     OString aBParentNameStr(OUStringToOString(GetParent()->GetName(), RTL_TEXTENCODING_ASCII_US));
     if ( GetParent() )
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index ce14003f9f84..3973836e797c 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -254,7 +254,7 @@ namespace cairocanvas
         if( mpRefDevice )
         {
             OUString aFilename("dbg_frontbuffer");
-            aFilename += OUString::valueOf(nFilePostfixCount);
+            aFilename += OUString::number(nFilePostfixCount);
             aFilename += ".bmp";
 
             SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx
index b682caf20929..48fdad5f6456 100644
--- a/canvas/source/tools/verifyinput.cxx
+++ b/canvas/source/tools/verifyinput.cxx
@@ -227,7 +227,7 @@ namespace canvas
                 throw lang::IllegalArgumentException(
                     OUString::createFromAscii(pStr) +
                     ": verifyInput(): AffineMatrix2D contains infinite or NAN value(s) at the following positions (m00-m12): " +
-                    OUString::valueOf(nBinaryState),
+                    OUString::number(nBinaryState),
                     xIf, nArgPos );
             }
 #else
@@ -262,7 +262,7 @@ namespace canvas
                 throw lang::IllegalArgumentException(
                     OUString::createFromAscii(pStr) +
                     ": verifyInput(): Matrix2D contains infinite or NAN value(s) at the following positions (m00-m11): " +
-                    OUString::valueOf(nBinaryState),
+                    OUString::number(nBinaryState),
                     xIf, nArgPos );
             }
 #else
@@ -300,9 +300,9 @@ namespace canvas
                 throw lang::IllegalArgumentException(
                     OUString::createFromAscii(pStr) +
                     ": verifyInput(): render state's device color has too few components (" +
-                    OUString::valueOf(nMinColorComponents) +
+                    OUString::number(nMinColorComponents) +
                     " expected, " +
-                    OUString::valueOf(renderState.DeviceColor.getLength()) +
+                    OUString::number(renderState.DeviceColor.getLength()) +
                     " provided)",
                     xIf, nArgPos );
 #else
@@ -317,7 +317,7 @@ namespace canvas
                 throw lang::IllegalArgumentException(
                     OUString::createFromAscii(pStr) +
                     ": verifyInput(): render state's CompositeOperation value out of range (" +
-                    OUString::valueOf(sal::static_int_cast<sal_Int32>(renderState.CompositeOperation)) +
+                    OUString::number(sal::static_int_cast<sal_Int32>(renderState.CompositeOperation)) +
                     " not known)",
                     xIf, nArgPos );
 #else
@@ -342,7 +342,7 @@ namespace canvas
                 throw lang::IllegalArgumentException(
                     OUString::createFromAscii(pStr) +
                     ": verifyInput(): textures' alpha value out of range (is " +
-                    OUString::valueOf(texture.Alpha) + ")",
+                    OUString::number(texture.Alpha) + ")",
                     xIf, nArgPos );
 #else
                 throw lang::IllegalArgumentException();
@@ -368,7 +368,7 @@ namespace canvas
                 throw lang::IllegalArgumentException(
                     OUString::createFromAscii(pStr) +
                     ": verifyInput(): textures' RepeatModeX value is out of range (" +
-                    OUString::valueOf(sal::static_int_cast<sal_Int32>(texture.RepeatModeX)) +
+                    OUString::number(sal::static_int_cast<sal_Int32>(texture.RepeatModeX)) +
                     " not known)",
                     xIf, nArgPos );
 #else
@@ -383,7 +383,7 @@ namespace canvas
                 throw lang::IllegalArgumentException(
                     OUString::createFromAscii(pStr) +
                     ": verifyInput(): textures' RepeatModeY value is out of range (" +
-                    OUString::valueOf(sal::static_int_cast<sal_Int32>(texture.RepeatModeY)) +
+                    OUString::number(sal::static_int_cast<sal_Int32>(texture.RepeatModeY)) +
                     " not known)",
                     xIf, nArgPos );
 #else
@@ -413,7 +413,7 @@ namespace canvas
                         throw lang::IllegalArgumentException(
                             OUString::createFromAscii(mpStr) +
                             ": verifyInput(): one of stroke attributes' DashArray value out of range (is " +
-                            OUString::valueOf(rVal) + ")",
+                            OUString::number(rVal) + ")",
                             mrIf, mnArgPos );
 #else
                         throw lang::IllegalArgumentException();
@@ -439,7 +439,7 @@ namespace canvas
                 throw lang::IllegalArgumentException(
                     OUString::createFromAscii(pStr) +
                     ": verifyInput(): stroke attributes' StrokeWidth value out of range (is " +
-                    OUString::valueOf(strokeAttributes.StrokeWidth) +
+                    OUString::number(strokeAttributes.StrokeWidth) +
                     ")",
                     xIf, nArgPos );
 #else
@@ -454,7 +454,7 @@ namespace canvas
                 throw lang::IllegalArgumentException(
                     OUString::createFromAscii(pStr) +
                     ": verifyInput(): stroke attributes' MiterLimit value out of range (is " +
-                    OUString::valueOf(strokeAttributes.MiterLimit) + ")",
+                    OUString::number(strokeAttributes.MiterLimit) + ")",
                     xIf, nArgPos );
 #else
                 throw lang::IllegalArgumentException();
@@ -476,7 +476,7 @@ namespace canvas
                 throw lang::IllegalArgumentException(
                     OUString::createFromAscii(pStr) +
                     ": verifyInput(): stroke attributes' StartCapType value is out of range (" +
-                    OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.StartCapType)) +
+                    OUString::number(sal::static_int_cast<sal_Int32>(strokeAttributes.StartCapType)) +
                     " not known)",
                     xIf, nArgPos );
 #else
@@ -491,7 +491,7 @@ namespace canvas
                 throw lang::IllegalArgumentException(
                     OUString::createFromAscii(pStr) +
                     ": verifyInput(): stroke attributes' StartCapType value is out of range (" +
-                    OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.EndCapType)) +
+                    OUString::number(sal::static_int_cast<sal_Int32>(strokeAttributes.EndCapType)) +
                     " not known)",
                     xIf, nArgPos );
 #else
@@ -506,7 +506,7 @@ namespace canvas
                 throw lang::IllegalArgumentException(
                     OUString::createFromAscii(pStr) +
                     ": verifyInput(): stroke attributes' JoinType value is out of range (" +
-                    OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.JoinType)) +
+                    OUString::number(sal::static_int_cast<sal_Int32>(strokeAttributes.JoinType)) +
                     " not known)",
                     xIf, nArgPos );
 #else
@@ -578,7 +578,7 @@ namespace canvas
                     throw lang::IllegalArgumentException(
                         OUString::createFromAscii(pStr) +
                         ": verifyInput(): bitmap layout's ColorSpace getEndianness() value is out of range (" +
-                        OUString::valueOf(sal::static_int_cast<sal_Int32>(bitmapLayout.ColorSpace->getEndianness())) +
+                        OUString::number(sal::static_int_cast<sal_Int32>(bitmapLayout.ColorSpace->getEndianness())) +
                         " not known)",
                         xIf, nArgPos );
 #else
@@ -683,7 +683,7 @@ namespace canvas
                 throw lang::IllegalArgumentException(
                     OUString::createFromAscii(pStr) +
                     ": verifyBitmapSize(): size has 0 or negative width (value: " +
-                    OUString::valueOf(size.Width) + ")",
+                    OUString::number(size.Width) + ")",
                     xIf, 0 );
 #else
                 throw lang::IllegalArgumentException();
@@ -696,7 +696,7 @@ namespace canvas
                 throw lang::IllegalArgumentException(
                     OUString::createFromAscii(pStr) +
                     ": verifyBitmapSize(): size has 0 or negative height (value: " +
-                    OUString::valueOf(size.Height) +
+                    OUString::number(size.Height) +
                     ")",
                     xIf, 0 );
 #else
@@ -717,7 +717,7 @@ namespace canvas
                 throw lang::IllegalArgumentException(
                     OUString::createFromAscii(pStr) +
                     ": verifySpriteSize(): size has 0 or negative width (value: " +
-                    OUString::valueOf(size.Width) + ")",
+                    OUString::number(size.Width) + ")",
                     xIf, 0 );
 #else
                 throw lang::IllegalArgumentException();
@@ -730,7 +730,7 @@ namespace canvas
                 throw lang::IllegalArgumentException(
                     OUString::createFromAscii(pStr) +
                     ": verifySpriteSize(): size has 0 or negative height (value: " +
-                    OUString::valueOf(size.Height) + ")",
+                    OUString::number(size.Height) + ")",
                     xIf, 0 );
 #else
                 throw lang::IllegalArgumentException();
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx
index dc568749ee75..b874bd1a5ff3 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.cxx
@@ -212,7 +212,7 @@ namespace vclcanvas
         if( mpOutDev )
         {
             OUString aFilename("dbg_frontbuffer");
-            aFilename += OUString::valueOf(nFilePostfixCount);
+            aFilename += OUString::number(nFilePostfixCount);
             aFilename += OUString(".bmp");
 
             SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 185d440d76a5..88a297025158 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -645,9 +645,9 @@ namespace vclcanvas
 
             mpRedrawManager->forEachSprite( makeAdder(nCount,sal_Int32(1)) );
             OUString text(
-                OUString::valueOf(
+                OUString::number(
                     // disambiguate overload...
-                    static_cast<sal_Int64>(nCount) ) );
+                    nCount ) );
 
             // pad with leading space
             while( text.getLength() < 3 )
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index 0a0e4b578f0f..2e1063c5f8b6 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -129,7 +129,7 @@ namespace vclcanvas
         if( mpBackBuffer )
         {
             OUString aFilename("dbg_backbuffer");
-            aFilename += OUString::valueOf(nFilePostfixCount);
+            aFilename += OUString::number(nFilePostfixCount);
             aFilename += OUString(".bmp");
 
             SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 21474063a36b..74cf3cc32045 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -566,8 +566,8 @@ Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i
         i < 0 ||
         static_cast< ChildListVectorType::size_type >( i ) >= m_aChildList.size() )
     {
-        OUString aBuf = "Index " + OUString::valueOf( i ) + " is invalid for range [ 0, " +
-                        OUString::valueOf( static_cast< sal_Int32 >( m_aChildList.size() - 1 ) ) +
+        OUString aBuf = "Index " + OUString::number( i ) + " is invalid for range [ 0, " +
+                        OUString::number( m_aChildList.size() - 1 ) +
                         " ]";
         lang::IndexOutOfBoundsException aEx( aBuf,
                                              const_cast< ::cppu::OWeakObject * >(
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 2ea1cf0babae..c86b10eec542 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -574,7 +574,7 @@ void DataBrowser::RenewTable()
                             GetDataWindow().LogicToPixel( Size( 42, 0 )).getWidth() ));
 
     OUString aDefaultSeriesName(SCH_RESSTR(STR_COLUMN_LABEL));
-    replaceParamterInString( aDefaultSeriesName, "%COLUMNNUMBER", OUString::valueOf( sal_Int32(24) ) );
+    replaceParamterInString( aDefaultSeriesName, "%COLUMNNUMBER", OUString::number( 24 ) );
     sal_Int32 nColumnWidth = GetDataWindow().GetTextWidth( aDefaultSeriesName )
         + GetDataWindow().LogicToPixel( Point( 4 + impl::SeriesHeader::GetRelativeAppFontXPosForNameField(), 0 ), MAP_APPFONT ).X();
     sal_Int32 nColumnCount = m_apDataBrowserModel->getColumnCount();
@@ -640,7 +640,7 @@ OUString DataBrowser::GetColString( sal_Int32 nColumnId ) const
 
 OUString DataBrowser::GetRowString( sal_Int32 nRow ) const
 {
-    return OUString::valueOf(nRow + 1);
+    return OUString::number(nRow + 1);
 }
 
 OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 5a63bad5c77d..6e2c6576b269 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -382,7 +382,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
                                 // values
                                 Reference< chart2::data::XDataSequence > xNewSeq(
                                     xDataProvider->createDataSequenceByRangeRepresentation(
-                                        OUString::valueOf( nIndex )));
+                                        OUString::number( nIndex )));
                                 lcl_copyDataSequenceProperties(
                                     aLSequences[nSeqIdx]->getValues(), xNewSeq );
                                 aLSequences[nSeqIdx]->setValues( xNewSeq );
@@ -391,7 +391,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
                                 Reference< chart2::data::XDataSequence > xNewLabelSeq(
                                     xDataProvider->createDataSequenceByRangeRepresentation(
                                         "label " +
-                                        OUString::valueOf( nIndex )));
+                                        OUString::number( nIndex )));
                                 lcl_copyDataSequenceProperties(
                                     aLSequences[nSeqIdx]->getLabel(), xNewLabelSeq );
                                 aLSequences[nSeqIdx]->setLabel( xNewLabelSeq );
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index ef63d909ad2c..943081c9d5d1 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -507,7 +507,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
             sal_Int32 nIndex = aRet.indexOf( aWildcard );
             if( nIndex != -1 )
             {
-                aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), OUString::valueOf(nPointIndex+1) );
+                aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), OUString::number(nPointIndex+1) );
             }
 
             //replace data series index
@@ -526,7 +526,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
                     }
                 }
 
-                OUString aReplacement( OUString::valueOf(nSeriesIndex+1) );
+                OUString aReplacement( OUString::number(nSeriesIndex+1) );
                 aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), aReplacement );
             }
 
@@ -673,7 +673,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID,
             sal_Int32 nPointIndex( ObjectIdentifier::getParticleID(rObjectCID).toInt32() );
 
             // replace data point index
-            replaceParamterInString( aRet, "%POINTNUMBER", OUString::valueOf( nPointIndex + 1 ));
+            replaceParamterInString( aRet, "%POINTNUMBER", OUString::number( nPointIndex + 1 ));
 
             // replace data series index
             {
@@ -685,7 +685,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID,
                     if( aSeriesVector[nSeriesIndex] == xSeries )
                         break;
                 }
-                replaceParamterInString( aRet, "%SERIESNUMBER", OUString::valueOf( nSeriesIndex + 1 ) );
+                replaceParamterInString( aRet, "%SERIESNUMBER", OUString::number( nSeriesIndex + 1 ) );
             }
 
             // replace point value
@@ -743,7 +743,7 @@ OUString ObjectNameProvider::getNameForCID(
                     aRet += getName( OBJECTTYPE_DATA_POINT  );
                     sal_Int32 nPointIndex = ObjectIdentifier::getIndexFromParticleOrCID( rObjectCID );
                     aRet += " ";
-                    aRet += OUString::valueOf(nPointIndex+1);
+                    aRet += OUString::number(nPointIndex+1);
 
                     if( eType == OBJECTTYPE_DATA_LABEL )
                     {
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index fb8b8fd59a04..6cfa45dc978d 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -58,7 +58,7 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight
     if( nIndex != -1 )
     {
         aTipHelp = aTipHelp.replaceAt(nIndex, aReplacementStr.getLength(),
-            OUString::valueOf( nLightNumber ) );
+            OUString::number( nLightNumber ) );
     }
     this->SetQuickHelpText( String( aTipHelp ) );
 }
@@ -143,13 +143,13 @@ namespace
     OUString lcl_makeColorName( Color rColor )
     {
         OUString aStr = SVX_RESSTR(RID_SVXFLOAT3D_FIX_R) +
-                        OUString::valueOf((sal_Int32)rColor.GetRed()) +
+                        OUString::number(rColor.GetRed()) +
                         " " +
                         SVX_RESSTR(RID_SVXFLOAT3D_FIX_G) +
-                        OUString::valueOf((sal_Int32)rColor.GetGreen()) +
+                        OUString::number(rColor.GetGreen()) +
                         " " +
                         SVX_RESSTR(RID_SVXFLOAT3D_FIX_B) +
-                        OUString::valueOf((sal_Int32)rColor.GetBlue());
+                        OUString::number(rColor.GetBlue());
         return aStr;
     }
     void lcl_selectColor( ColorListBox& rListBox, const Color& rColor )
@@ -173,7 +173,7 @@ namespace
             OUString aColorPropertyPrefix("D3DSceneLightColor");
             OUString aDirectionPropertyPrefix("D3DSceneLightDirection");
             OUString aEnabledPropertyPrefix("D3DSceneLightOn");
-            OUString aIndex( OUString::valueOf( nIndex + 1 ));
+            OUString aIndex( OUString::number( nIndex + 1 ));
 
             try
             {
@@ -201,7 +201,7 @@ namespace
             OUString aColorPropertyPrefix("D3DSceneLightColor");
             OUString aDirectionPropertyPrefix("D3DSceneLightDirection");
             OUString aEnabledPropertyPrefix("D3DSceneLightOn");
-            OUString aIndex( OUString::valueOf( nIndex + 1 ));
+            OUString aIndex( OUString::number( nIndex + 1 ));
 
             try
             {
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index ffbd7bcb69b1..91d6ca4e65a2 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -475,7 +475,7 @@ void DataSourceTabPage::fillSeriesListBox()
                 if( nIndex != -1 )
                     aLabel = OUString( aResString.replaceAt(
                                          nIndex, aReplacementStr.getLength(),
-                                         OUString::valueOf(nUnnamedSeriesIndex)));
+                                         OUString::number(nUnnamedSeriesIndex)));
             }
             if( aLabel.isEmpty() )
                 aLabel = ::chart::SchResId( STR_DATA_UNNAMED_SERIES ).toString();
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index 3aa1f2a84df5..99923f212779 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -72,7 +72,7 @@ DragMethod_PieSegment::~DragMethod_PieSegment()
 void DragMethod_PieSegment::TakeSdrDragComment(String& rStr) const
 {
     rStr = SCH_RESSTR(STR_STATUS_PIE_SEGMENT_EXPLODED);
-    rStr.SearchAndReplaceAscii( "%PERCENTVALUE", OUString::valueOf( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) ));
+    rStr.SearchAndReplaceAscii( "%PERCENTVALUE", OUString::number( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) ));
 }
 bool DragMethod_PieSegment::BeginSdrDrag()
 {
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 4e118ee37360..cb264ea022dc 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -262,7 +262,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
                 }
 
                 //check whether the diagram was hit but not selected (e.g. because it has no filling):
-                OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) );
+                OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::number( 0 ) );
                 OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
                 bool bBackGroundHit = m_aSelectedOID.getObjectCID().equals( aPageCID ) || m_aSelectedOID.getObjectCID().equals( aWallCID ) || !m_aSelectedOID.isAutoGeneratedObject();
                 if( bBackGroundHit )
@@ -431,7 +431,7 @@ OUString SelectionHelper::getHitObjectCID(
     {
         if( aRet.equals( aPageCID ) )
         {
-            OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) );
+            OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::number( 0 ) );
             //todo: if more than one diagram is available in future do chack the list of all diagrams here
             SdrObject* pDiagram = rDrawViewWrapper.getNamedSdrObject( aDiagramCID );
             if( pDiagram )
@@ -448,7 +448,7 @@ OUString SelectionHelper::getHitObjectCID(
 
             if( aRet.equals( aWallCID ) )
             {
-                OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) );
+                OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::number( 0 ) );
                 aRet = aDiagramCID;
             }
         }
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index 66424a9a0f7a..0cc7038fcb88 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -47,7 +47,7 @@ struct lcl_NumberedStringGenerator
     vector< uno::Any > operator()()
     {
         vector< uno::Any > aRet(1);
-        aRet[0] = uno::makeAny( m_aStub.replaceAt( m_nStubStartIndex, m_nWildcardLength, OUString::valueOf( ++m_nCounter )) );
+        aRet[0] = uno::makeAny( m_aStub.replaceAt( m_nStubStartIndex, m_nWildcardLength, OUString::number( ++m_nCounter )) );
         return aRet;
     }
 private:
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 8168c266db91..597e2be1e706 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -125,7 +125,7 @@ struct lcl_internalizeSeries : public ::std::unary_function< Reference< chart2::
             for( sal_Int32 i=0; i<aOldSeriesData.getLength(); ++i )
             {
                 sal_Int32 nNewIndex( m_bDataInColumns ? m_rInternalData.appendColumn() : m_rInternalData.appendRow() );
-                OUString aIdentifier( OUString::valueOf( nNewIndex ));
+                OUString aIdentifier( OUString::number( nNewIndex ));
                 //@todo: deal also with genericXDataSequence
                 Reference< chart2::data::XNumericalDataSequence > xValues( aOldSeriesData[i]->getValues(), uno::UNO_QUERY );
                 Reference< chart2::data::XTextualDataSequence > xLabel( aOldSeriesData[i]->getLabel(), uno::UNO_QUERY );
@@ -468,10 +468,10 @@ void InternalDataProvider::lcl_increaseMapReferences(
 {
     for( sal_Int32 nIndex = nEnd - 1; nIndex >= nBegin; --nIndex )
     {
-        lcl_adaptMapReferences( OUString::valueOf( nIndex ),
-                            OUString::valueOf( nIndex + 1 ));
-        lcl_adaptMapReferences( lcl_aLabelRangePrefix + OUString::valueOf( nIndex ),
-                            lcl_aLabelRangePrefix + OUString::valueOf( nIndex + 1 ));
+        lcl_adaptMapReferences( OUString::number( nIndex ),
+                            OUString::number( nIndex + 1 ));
+        lcl_adaptMapReferences( lcl_aLabelRangePrefix + OUString::number( nIndex ),
+                            lcl_aLabelRangePrefix + OUString::number( nIndex + 1 ));
     }
 }
 
@@ -480,10 +480,10 @@ void InternalDataProvider::lcl_decreaseMapReferences(
 {
     for( sal_Int32 nIndex = nBegin; nIndex < nEnd; ++nIndex )
     {
-        lcl_adaptMapReferences( OUString::valueOf( nIndex ),
-                            OUString::valueOf( nIndex - 1 ));
-        lcl_adaptMapReferences( lcl_aLabelRangePrefix + OUString::valueOf( nIndex ),
-                            lcl_aLabelRangePrefix + OUString::valueOf( nIndex - 1 ));
+        lcl_adaptMapReferences( OUString::number( nIndex ),
+                            OUString::number( nIndex - 1 ));
+        lcl_adaptMapReferences( lcl_aLabelRangePrefix + OUString::number( nIndex ),
+                            lcl_aLabelRangePrefix + OUString::number( nIndex - 1 ));
     }
 }
 
@@ -548,7 +548,7 @@ Reference< chart2::data::XDataSequence > InternalDataProvider::lcl_createDataSeq
         {
             m_aInternalData.insertColumn( n );
             m_aInternalData.setColumnValues( n, aNewData );
-            aRangeRepresentation = OUString::valueOf( n );
+            aRangeRepresentation = OUString::number( n );
         }
         else if( nCategories > 1 )
         {
@@ -556,7 +556,7 @@ Reference< chart2::data::XDataSequence > InternalDataProvider::lcl_createDataSeq
         }
         else
         {
-            aRangeRepresentation = lcl_aLabelRangePrefix+OUString::valueOf( n );
+            aRangeRepresentation = lcl_aLabelRangePrefix+OUString::number( n );
         }
     }
 
@@ -629,7 +629,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
             for( sal_Int32 nL=0; nL<nLevelCount; nL++ )
                 aComplexCategories.push_back( new LabeledDataSequence(
                     new UncachedDataSequence( this
-                        , lcl_aCategoriesLevelRangeNamePrefix + OUString::valueOf( nL )
+                        , lcl_aCategoriesLevelRangeNamePrefix + OUString::number( nL )
                         , lcl_aCategoriesRoleName ) ) );
         }
         else
@@ -638,7 +638,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
             for( sal_Int32 nP=0; nP<nPointCount; nP++ )
                 aComplexCategories.push_back( new LabeledDataSequence(
                     new UncachedDataSequence( this
-                        , lcl_aCategoriesPointRangeNamePrefix + OUString::valueOf( nP )
+                        , lcl_aCategoriesPointRangeNamePrefix + OUString::number( nP )
                         , lcl_aCategoriesRoleName ) ) );
         }
         //don't add the created sequences to the map as they are used temporarily only ...
@@ -661,8 +661,8 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
     {
         aDataVec.push_back(
             new LabeledDataSequence(
-                lcl_createDataSequenceAndAddToMap( OUString::valueOf( nIdx )),
-                lcl_createDataSequenceAndAddToMap( lcl_aLabelRangePrefix + OUString::valueOf( nIdx ))));
+                lcl_createDataSequenceAndAddToMap( OUString::number( nIdx )),
+                lcl_createDataSequenceAndAddToMap( lcl_aLabelRangePrefix + OUString::number( nIdx ))));
     }
 
     // attention: this data provider has the limitation that it stores
@@ -745,14 +745,14 @@ Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDa
     {
         // label
         sal_Int32 nIndex = aRangeRepresentation.copy( lcl_aLabelRangePrefix.getLength()).toInt32();
-        return lcl_createDataSequenceAndAddToMap( lcl_aLabelRangePrefix + OUString::valueOf( nIndex ));
+        return lcl_createDataSequenceAndAddToMap( lcl_aLabelRangePrefix + OUString::number( nIndex ));
     }
     else if ( aRangeRepresentation == "last" )
     {
         sal_Int32 nIndex = (m_bDataInColumns
                             ? m_aInternalData.getColumnCount()
                             : m_aInternalData.getRowCount()) - 1;
-        return lcl_createDataSequenceAndAddToMap( OUString::valueOf( nIndex ));
+        return lcl_createDataSequenceAndAddToMap( OUString::number( nIndex ));
     }
     else if( !aRangeRepresentation.isEmpty())
     {
@@ -836,7 +836,7 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation
         if( nLevelCount == 1 )
         {
             sal_Int32 nL=0;
-            aResult = this->getDataByRangeRepresentation( lcl_aCategoriesLevelRangeNamePrefix + OUString::valueOf( nL ) );
+            aResult = this->getDataByRangeRepresentation( lcl_aCategoriesLevelRangeNamePrefix + OUString::number( nL ) );
         }
         else
         {
@@ -953,8 +953,8 @@ void SAL_CALL InternalDataProvider::insertSequence( ::sal_Int32 nAfterIndex )
 void SAL_CALL InternalDataProvider::deleteSequence( ::sal_Int32 nAtIndex )
     throw (uno::RuntimeException)
 {
-    lcl_deleteMapReferences( OUString::valueOf( nAtIndex ));
-    lcl_deleteMapReferences( lcl_aLabelRangePrefix + OUString::valueOf( nAtIndex ));
+    lcl_deleteMapReferences( OUString::number( nAtIndex ));
+    lcl_deleteMapReferences( lcl_aLabelRangePrefix + OUString::number( nAtIndex ));
     if( m_bDataInColumns )
     {
         lcl_decreaseMapReferences( nAtIndex + 1, m_aInternalData.getColumnCount());
@@ -1028,7 +1028,7 @@ void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32
 
     // notify change to all affected ranges
     tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0"));
-    tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::valueOf( nMaxRep )));
+    tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep )));
     ::std::for_each( aBegin, aEnd, lcl_setModified());
 
     tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName ));
@@ -1052,7 +1052,7 @@ void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32
 
     // notify change to all affected ranges
     tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0"));
-    tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::valueOf( nMaxRep )));
+    tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep )));
     ::std::for_each( aBegin, aEnd, lcl_setModified());
 
     tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName ));
@@ -1072,7 +1072,7 @@ void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::s
 
     // notify change to all affected ranges
     tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0"));
-    tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::valueOf( nMaxRep )));
+    tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep )));
     ::std::for_each( aBegin, aEnd, lcl_setModified());
 
     tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName ));
@@ -1193,18 +1193,18 @@ OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXM
         if( aRange.aUpperLeft.nColumn == 0 )
             return lcl_aCategoriesRangeName;
         if( aRange.aUpperLeft.nRow == 0 )
-            return lcl_aLabelRangePrefix + OUString::valueOf( aRange.aUpperLeft.nColumn - 1 );
+            return lcl_aLabelRangePrefix + OUString::number( aRange.aUpperLeft.nColumn - 1 );
 
-        return OUString::valueOf( aRange.aUpperLeft.nColumn - 1 );
+        return OUString::number( aRange.aUpperLeft.nColumn - 1 );
     }
 
     // data in rows
     if( aRange.aUpperLeft.nRow == 0 )
         return lcl_aCategoriesRangeName;
     if( aRange.aUpperLeft.nColumn == 0 )
-        return lcl_aLabelRangePrefix + OUString::valueOf( aRange.aUpperLeft.nRow - 1 );
+        return lcl_aLabelRangePrefix + OUString::number( aRange.aUpperLeft.nRow - 1 );
 
-    return OUString::valueOf( aRange.aUpperLeft.nRow - 1 );
+    return OUString::number( aRange.aUpperLeft.nRow - 1 );
 }
 
 namespace
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 9c09aab49727..b6da8e8e8720 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -467,7 +467,7 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem(
             {
                 aRet = ObjectIdentifier::createParticleForDiagram( xDiagram, xChartModel );
                 aRet.appendAscii(":CS=");
-                aRet.append( OUString::valueOf( nCooSysIndex ) );
+                aRet.append( OUString::number( nCooSysIndex ) );
                 break;
             }
         }
@@ -482,9 +482,9 @@ OUString ObjectIdentifier::createParticleForAxis(
 {
     OUStringBuffer aRet("Axis=");
 
-    aRet.append( OUString::valueOf( nDimensionIndex ) );
+    aRet.append( OUString::number( nDimensionIndex ) );
     aRet.appendAscii(",");
-    aRet.append( OUString::valueOf( nAxisIndex ) );
+    aRet.append( OUString::number( nAxisIndex ) );
 
     return aRet.makeStringAndClear();
 }
@@ -494,9 +494,9 @@ OUString ObjectIdentifier::createParticleForGrid(
           , sal_Int32 nAxisIndex )
 {
     OUStringBuffer aRet("Axis=");
-    aRet.append( OUString::valueOf( nDimensionIndex ) );
+    aRet.append( OUString::number( nDimensionIndex ) );
     aRet.appendAscii(",");
-    aRet.append( OUString::valueOf( nAxisIndex ) );
+    aRet.append( OUString::number( nAxisIndex ) );
     aRet.append( ":Grid=0" );
 
     return aRet.makeStringAndClear();
@@ -527,15 +527,15 @@ OUString ObjectIdentifier::createParticleForSeries(
     OUStringBuffer aRet;
 
     aRet.appendAscii("D=");
-    aRet.append( OUString::valueOf( nDiagramIndex ) );
+    aRet.append( OUString::number( nDiagramIndex ) );
     aRet.appendAscii(":CS=");
-    aRet.append( OUString::valueOf( nCooSysIndex ) );
+    aRet.append( OUString::number( nCooSysIndex ) );
     aRet.appendAscii(":CT=");
-    aRet.append( OUString::valueOf( nChartTypeIndex ) );
+    aRet.append( OUString::number( nChartTypeIndex ) );
     aRet.appendAscii(":");
     aRet.append(getStringForType( OBJECTTYPE_DATA_SERIES ));
     aRet.appendAscii("=");
-    aRet.append( OUString::valueOf( nSeriesIndex ) );
+    aRet.append( OUString::number( nSeriesIndex ) );
 
     return aRet.makeStringAndClear();
 }
@@ -601,15 +601,15 @@ OUString ObjectIdentifier::createPieSegmentDragParameterString(
         , const awt::Point& rMinimumPosition
         , const awt::Point& rMaximumPosition )
 {
-    OUStringBuffer aRet( OUString::valueOf( nOffsetPercent ) );
+    OUStringBuffer aRet( OUString::number( nOffsetPercent ) );
     aRet.append( sal_Unicode( ',' ));
-    aRet.append( OUString::valueOf( rMinimumPosition.X ) );
+    aRet.append( OUString::number( rMinimumPosition.X ) );
     aRet.append( sal_Unicode( ',' ));
-    aRet.append( OUString::valueOf( rMinimumPosition.Y ) );
+    aRet.append( OUString::number( rMinimumPosition.Y ) );
     aRet.append( sal_Unicode( ',' ));
-    aRet.append( OUString::valueOf( rMaximumPosition.X ) );
+    aRet.append( OUString::number( rMaximumPosition.X ) );
     aRet.append( sal_Unicode( ',' ));
-    aRet.append( OUString::valueOf( rMaximumPosition.Y ) );
+    aRet.append( OUString::number( rMaximumPosition.Y ) );
     return aRet.makeStringAndClear();
 }
 
@@ -984,7 +984,7 @@ OUString ObjectIdentifier::createDataCurveCID(
                                 , sal_Int32 nCurveIndex
                                 , bool bAverageLine )
 {
-    OUString aParticleID( OUString::valueOf( nCurveIndex ) );
+    OUString aParticleID( OUString::number( nCurveIndex ) );
     ObjectType eType = bAverageLine ? OBJECTTYPE_DATA_AVERAGE_LINE : OBJECTTYPE_DATA_CURVE;
     return createClassifiedIdentifierWithParent( eType, aParticleID, rSeriesParticle );
 }
@@ -993,7 +993,7 @@ OUString ObjectIdentifier::createDataCurveEquationCID(
                                 const OUString& rSeriesParticle
                                 , sal_Int32 nCurveIndex )
 {
-    OUString aParticleID( OUString::valueOf( nCurveIndex ) );
+    OUString aParticleID( OUString::number( nCurveIndex ) );
     return createClassifiedIdentifierWithParent( OBJECTTYPE_DATA_CURVE_EQUATION, aParticleID, rSeriesParticle );
 }
 
@@ -1015,7 +1015,7 @@ OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObjectType,
     if( !aRet.isEmpty() )
     {
         aRet.appendAscii("=");
-        aRet.append(OUString::valueOf(nIndex));
+        aRet.append(OUString::number(nIndex));
     }
     return aRet.makeStringAndClear();
 }
@@ -1045,7 +1045,7 @@ OUString ObjectIdentifier::createSeriesSubObjectStub( ObjectType eSubObjectType
 OUString ObjectIdentifier::createPointCID( const OUString& rPointCID_Stub, sal_Int32 nIndex  )
 {
     OUString aRet(rPointCID_Stub);
-    return aRet+=OUString::valueOf( nIndex );
+    return aRet+=OUString::number( nIndex );
 }
 
 OUString ObjectIdentifier::getParticleID( const OUString& rCID )
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx
index 96990b881bac..2ca570a2da7f 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -152,7 +152,7 @@ OUString lcl_addNamedPropertyUniqueNameToTable(
                 if( aMaxIt != aNumbers.end())
                     nIndex = (*aMaxIt) + 1;
 
-                aUniqueName = rPrefix + OUString::valueOf( nIndex );
+                aUniqueName = rPrefix + OUString::number( nIndex );
             }
 
             OSL_ASSERT( !aUniqueName.isEmpty());
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index f783e2444473..5dda2a20b0f4 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2451,7 +2451,7 @@ void ChartView::createShapes()
 
         //create the group shape for diagram and axes first to have title and legends on top of it
         uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartModel ) );
-        OUString aDiagramCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) ) );//todo: other index if more than one diagram is possible
+        OUString aDiagramCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::number( 0 ) ) );//todo: other index if more than one diagram is possible
         uno::Reference< drawing::XShapes > xDiagramPlusAxesPlusMarkHandlesGroup_Shapes( ShapeFactory(m_xShapeFactory).createGroup2D(xPageShapes,aDiagramCID) );
 
         uno::Reference< drawing::XShape > xDiagram_MarkHandles( ShapeFactory(m_xShapeFactory).createInvisibleRectangle(
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index 645fd06b8398..6516b175da8e 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -355,7 +355,7 @@ bool FileStream::write(void const * buffer, sal_uInt64 size) {
 
 FileStream &operator<<(FileStream& o, sal_uInt32 i) {
     sal_uInt64 writtenBytes;
-    OString s = OString::valueOf((sal_Int32)i);
+    OString s = OString::number(i);
     osl_writeFile(o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes);
     return o;
 }
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 94c9348da5b1..2d7df99a0e25 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -237,7 +237,7 @@ OUString EmbeddedObjectContainer::CreateUniqueObjectName()
     do
     {
         aStr = aPersistName;
-        aStr += OUString::valueOf( i++ );
+        aStr += OUString::number( i++ );
     }
     while( HasEmbeddedObject( aStr ) );
     // TODO/LATER: should we consider deleted objects?
diff --git a/comphelper/source/misc/anytostring.cxx b/comphelper/source/misc/anytostring.cxx
index c9ddbeea5487..9cf551a965f3 100644
--- a/comphelper/source/misc/anytostring.cxx
+++ b/comphelper/source/misc/anytostring.cxx
@@ -42,7 +42,7 @@ inline void appendChar( OUStringBuffer & buf, sal_Unicode c )
     if (c < ' ' || c > '~') {
         buf.append( "\\X" );
         OUString const s(
-            OUString::valueOf( static_cast< sal_Int32 >(c), 16 ) );
+            OUString::number( static_cast< sal_Int32 >(c), 16 ) );
         for ( sal_Int32 f = 4 - s.getLength(); f > 0; --f )
             buf.append( static_cast< sal_Unicode >('0') );
         buf.append( s );
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index 68ef68ceda5f..4fd527462083 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -55,8 +55,8 @@ OUString MimeConfigurationHelper::GetStringClassIDRepresentation( const uno::Seq
 
             sal_Int32 nDigit1 = (sal_Int32)( (sal_uInt8)aClassID[nInd] / 16 );
             sal_Int32 nDigit2 = (sal_uInt8)aClassID[nInd] % 16;
-            aResult += OUString::valueOf( nDigit1, 16 );
-            aResult += OUString::valueOf( nDigit2, 16 );
+            aResult += OUString::number( nDigit1, 16 );
+            aResult += OUString::number( nDigit2, 16 );
         }
     }
 
diff --git a/compilerplugins/clang/valueof.cxx b/compilerplugins/clang/valueof.cxx
new file mode 100644
index 000000000000..7f00ff676cb8
--- /dev/null
+++ b/compilerplugins/clang/valueof.cxx
@@ -0,0 +1,148 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * Based on LLVM/Clang.
+ *
+ * This file is distributed under the University of Illinois Open Source
+ * License. See LICENSE.TXT for details.
+ *
+ */
+
+/*
+This is a rewriter.
+
+Replaces all calls to the deprecated O(U)String::valueOf() .
+
+*/
+
+#include "plugin.hxx"
+
+namespace loplugin
+{
+
+class ConvertValueOf
+    : public RecursiveASTVisitor< ConvertValueOf >
+    , public RewritePlugin
+    {
+    public:
+        explicit ConvertValueOf( CompilerInstance& compiler, Rewriter& rewriter );
+        virtual void run() override;
+        bool VisitCallExpr( const CallExpr* call );
+    private:
+        void removeCast( const Expr* arg );
+    };
+
+ConvertValueOf::ConvertValueOf( CompilerInstance& compiler, Rewriter& rewriter )
+    : RewritePlugin( compiler, rewriter )
+    {
+    }
+
+void ConvertValueOf::run()
+    {
+    TraverseDecl( compiler.getASTContext().getTranslationUnitDecl());
+    }
+
+bool ConvertValueOf::VisitCallExpr( const CallExpr* call )
+    {
+    if( ignoreLocation( call ))
+        return true;
+    // Using getDirectCallee() here means that we find only calls
+    // that call the function directly (i.e. not using a pointer, for example).
+    // Use getCallee() to include also those :
+    //    if( const FunctionDecl* func = dyn_cast_or_null< FunctionDecl >( call->getCalleeDecl()))
+    if( const FunctionDecl* func = call->getDirectCallee())
+        {
+        // Optimize, getQualifiedNameAsString() is reportedly expensive,
+        // so first check fast details like number of arguments or the (unqualified)
+        // name before checking the fully qualified name.
+        // See FunctionDecl for all the API about the function.
+        if( func->getIdentifier() != NULL
+            && ( func->getName() == "valueOf" ))
+            {
+            string qualifiedName = func->getQualifiedNameAsString();
+            if( qualifiedName == "rtl::OString::valueOf" )
+                {
+                // Further checks about arguments. Check mainly ParmVarDecl, VarDecl,
+                // ValueDecl and QualType for Clang API details.
+                string arg0 = func->getParamDecl( 0 )->getType().getAsString();
+                if( arg0 == "sal_Bool" )
+                    replaceText( call->getCallee()->getSourceRange(), "OString::boolean" );
+                else if( arg0 == "sal_Char" )
+                    replaceText( call->getCallee()->getSourceRange(), "OString" );
+                else
+                    {
+                    replaceText( call->getCallee()->getSourceRange(), "OString::number" );
+                    removeCast( call->getArg( 0 ));
+                    }
+                }
+            if( qualifiedName == "rtl::OUString::valueOf" )
+                {
+                // Further checks about arguments. Check mainly ParmVarDecl, VarDecl,
+                // ValueDecl and QualType for Clang API details.
+                string arg0 = func->getParamDecl( 0 )->getType().getAsString();
+                if( arg0 == "sal_Bool" )
+                    replaceText( call->getCallee()->getSourceRange(), "OUString::boolean" );
+                else if( arg0 == "sal_Unicode" )
+                    replaceText( call->getCallee()->getSourceRange(), "OUString" );
+                else
+                    {
+                    replaceText( call->getCallee()->getSourceRange(), "OUString::number" );
+                    removeCast( call->getArg( 0 ));
+                    }
+                }
+            }
+        }
+    return true;
+    }
+
+void ConvertValueOf::removeCast( const Expr* arg )
+    {
+    arg = arg->IgnoreImpCasts();
+    if( const ExplicitCastExpr* cast = dyn_cast< ExplicitCastExpr >( arg ))
+        {
+// Explicit casts don't seem to actually always change the type (integer promotion
+// takes place first?), so remove also preceding implicit casts:
+//     void f( int );
+//     char a;
+//     f( int( a ));
+//    |-CallExpr 0x1a84f20 <line:6:5, col:16> 'void'
+//    | |-ImplicitCastExpr 0x1a84f08 <col:5> 'void (*)(int)' <FunctionToPointerDecay>
+//    | | `-DeclRefExpr 0x1a84eb8 <col:5> 'void (int)' lvalue Function 0x1a58900 'f' 'void (int)'
+//    | `-CXXFunctionalCastExpr 0x1a84e90 <col:8, col:15> 'int' functional cast to int <NoOp>
+//    |   `-ImplicitCastExpr 0x1a84e78 <col:13> 'int' <IntegralCast>
+//    |     `-ImplicitCastExpr 0x1a84e60 <col:13> 'char' <LValueToRValue>
+//    |       `-DeclRefExpr 0x1a58b88 <col:13> 'char' lvalue Var 0x1a58ab0 'a' 'char'
+        const Expr* castFrom = cast->getSubExpr()->IgnoreImpCasts();
+        if( cast->getType()->isIntegerType() && castFrom->getType()->isIntegerType())
+            {
+            string fromType = castFrom->getType().getAsString();
+            if( fromType != "sal_Bool" && fromType != "bool" && fromType != "sal_Char" && fromType != "sal_Unicode" )
+                {
+                if( const CXXFunctionalCastExpr* funcCast = dyn_cast< CXXFunctionalCastExpr >( cast ))
+                    {
+                    removeText( CharSourceRange::getCharRange( funcCast->getLocStart(),
+                        compiler.getSourceManager().getExpansionLoc( funcCast->getSubExpr()->getLocStart())));
+                    removeText( CharSourceRange::getCharRange( locationAfterToken(
+                        compiler.getSourceManager().getExpansionLoc( funcCast->getSubExpr()->getLocEnd())),
+                        locationAfterToken( funcCast->getLocEnd())));
+                    }
+                else if( const CXXNamedCastExpr* namedCast = dyn_cast< CXXNamedCastExpr >( cast ))
+                    {
+                    removeText( CharSourceRange::getCharRange( namedCast->getLocStart(),
+                        compiler.getSourceManager().getExpansionLoc( namedCast->getSubExpr()->getLocStart())));
+                    removeText( CharSourceRange::getCharRange( locationAfterToken(
+                        compiler.getSourceManager().getExpansionLoc( namedCast->getSubExpr()->getLocEnd())),
+                    locationAfterToken( namedCast->getLocEnd())));
+                    }
+                else if( const CStyleCastExpr* cCast = dyn_cast< CStyleCastExpr >( cast ))
+                    removeText( SourceRange( cCast->getLocStart(), cCast->getRParenLoc()));
+                else
+                    abort();
+                }
+            }
+        }
+    }
+
+static Plugin::Registration< ConvertValueOf > X( "convertvalueof" );
+
+} // namespace
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 1ab181cb08c9..f099acfc7fd9 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -176,15 +176,15 @@ void writeValueContent(oslFileHandle handle, sal_Int16 value) {
 }
 
 void writeValueContent(oslFileHandle handle, sal_Int32 value) {
-    writeData(handle, OString::valueOf(value));
+    writeData(handle, OString::number(value));
 }
 
 void writeValueContent(oslFileHandle handle, sal_Int64 value) {
-    writeData(handle, OString::valueOf(value));
+    writeData(handle, OString::number(value));
 }
 
 void writeValueContent(oslFileHandle handle, double value) {
-    writeData(handle, OString::valueOf(value));
+    writeData(handle, OString::number(value));
 }
 
 void writeValueContent(oslFileHandle handle, OUString const & value) {
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index 8506fef0b7dd..4b9f62019c51 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -225,7 +225,7 @@ void OConnectionWrapper::createUniqueId( const OUString& _rURL
         {
             sal_Int32 nValue = 0;
             if ( pBegin->Value >>= nValue )
-                sValue = OUString::valueOf(nValue);
+                sValue = OUString::number(nValue);
             else
             {
                 Sequence< OUString> aSeq;
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index fd51bfde1f06..a4880d4416f2 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1454,12 +1454,12 @@ OUString createUniqueName( const Sequence< OUString >& _rNames, const OUString&
     OUString sName( _rBaseName );
     sal_Int32 nPos = 1;
     if ( _bStartWithNumber )
-        sName += OUString::valueOf( nPos );
+        sName += OUString::number( nPos );
 
     while ( aUsedNames.find( sName ) != aUsedNames.end() )
     {
         sName = _rBaseName;
-        sName += OUString::valueOf( ++nPos );
+        sName += OUString::number( ++nPos );
     }
     return sName;
 }
@@ -1976,7 +1976,7 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams,
                     ::connectivity::SharedResources aResources;
                     const OUString sError( aResources.getResourceStringWithSubstitution(
                             STR_UNKNOWN_PARA_TYPE,
-                            "$position$", OUString::valueOf(parameterIndex)
+                            "$position$", OUString::number(parameterIndex)
                          ) );
                     ::dbtools::throwGenericSQLException(sError,NULL);
                 }
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index bfa07500824c..233d249e111f 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -955,7 +955,7 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const OUString& _rSour
         SharedResources aResources;
         OUString sMessage = aResources.getResourceStringWithSubstitution( STR_STRING_LENGTH_EXCEEDED,
             "$string$", _rSource,
-            "$maxlen$", OUString::valueOf( _nMaxLen ),
+            "$maxlen$", OUString::number( _nMaxLen ),
             "$charset$", lcl_getEncodingName( _eEncoding )
         );
 
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index b21a4765da23..9f05e883dff7 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -434,7 +434,7 @@ static OUString lcl_GetColumnStr( sal_Int32 nColumn )
 {
     //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::lcl_GetColumnStr" );
     if ( nColumn < 26 )
-        return OUString::valueOf( (sal_Unicode) ( 'A' + nColumn ) );
+        return OUString( (sal_Unicode) ( 'A' + nColumn ) );
     else
     {
         OUStringBuffer aBuffer(2);
@@ -504,7 +504,7 @@ void OCalcTable::fillColumns()
         sal_Int32 nExprCnt = 0;
         while(aFind != m_aColumns->get().end())
         {
-            (aAlias = aColumnName) += OUString::valueOf((sal_Int32)++nExprCnt);
+            (aAlias = aColumnName) += OUString::number(++nExprCnt);
             aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
         }
 
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index b4f445f7189e..7f0c00c46a15 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -976,13 +976,13 @@ OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, Runti
 OUString SAL_CALL ODatabaseMetaData::getDriverVersion(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDriverVersion" );
-    return OUString::valueOf((sal_Int32)1);
+    return OUString::number(1);
 }
 // -------------------------------------------------------------------------
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDatabaseProductVersion" );
-    return OUString::valueOf((sal_Int32)0);
+    return OUString::number(0);
 }
 // -------------------------------------------------------------------------
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 175fd48a3dca..d34c5266c99f 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -350,7 +350,7 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any
     {
         const OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution(
                 STR_UNKNOWN_PARA_TYPE,
-                "$position$", OUString::valueOf(parameterIndex)
+                "$position$", OUString::number(parameterIndex)
              ) );
         ::dbtools::throwGenericSQLException(sError,*this);
     }
diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx
index 15e49ff4323b..acac9ac82a93 100644
--- a/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/connectivity/source/drivers/file/FStringFunctions.cxx
@@ -114,7 +114,7 @@ ORowSetValue OOp_Locate::operate(const ::std::vector<ORowSetValue>& lhs) const
             return ORowSetValue();
     }
     if ( lhs.size() == 2 )
-        return OUString::valueOf(lhs[0].getString().indexOf(lhs[1].getString())+1);
+        return OUString::number(lhs[0].getString().indexOf(lhs[1].getString())+1);
 
     else if ( lhs.size() != 3 )
         return ORowSetValue();
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 75f804e93df6..899ad14cec74 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -110,7 +110,7 @@ namespace connectivity
         OUString lcl_getNextCount()
         {
             static sal_Int32 s_nCount = 0;
-            return OUString::valueOf(s_nCount++);
+            return OUString::number(s_nCount++);
         }
         // -----------------------------------------------------------------------------
         OUString StorageContainer::removeURLPrefix(const OUString& _sURL,const OUString& _sFileURL)
@@ -295,7 +295,7 @@ namespace connectivity
                             sMessage += "\nMode: 0x";
                             if ( _nMode < 16 )
                                 sMessage += "0";
-                            sMessage += OString::valueOf( _nMode, 16 ).toAsciiUpperCase();
+                            sMessage += OString::number( _nMode, 16 ).toAsciiUpperCase();
                             OSL_FAIL( sMessage.getStr() );
 #endif
                             StorageContainer::throwJavaException(e,env);
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 0458ad7d5af4..59a4b29b46f3 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -389,7 +389,7 @@ void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, c
     {
         const OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution(
                 STR_UNKNOWN_PARA_TYPE,
-                "$position$", OUString::valueOf(parameterIndex)
+                "$position$", OUString::number(parameterIndex)
              ) );
         ::dbtools::throwGenericSQLException(sError,*this);
     }
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 6664ee0e21d8..34526cacdbde 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -842,7 +842,7 @@ void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const ::c
         ::connectivity::SharedResources aResources;
         const OUString sError( aResources.getResourceStringWithSubstitution(
                 STR_UNKNOWN_COLUMN_TYPE,
-                "$position$", OUString::valueOf(columnIndex)
+                "$position$", OUString::number(columnIndex)
              ) );
         ::dbtools::throwGenericSQLException(sError,*this);
     }
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 1f7e8798e40f..a850bdec26dd 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -654,13 +654,13 @@ OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, Runti
 // -------------------------------------------------------------------------
 OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
 {
-    OUString aValue = OUString::valueOf((sal_Int32)1);
+    OUString aValue = OUString::number(1);
     return aValue;
 }
 // -------------------------------------------------------------------------
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
-    OUString aValue = OUString::valueOf((sal_Int32)0);
+    OUString aValue = OUString::number(0);
     return aValue;
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 7486f3f3c54a..c439d05d5c9d 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -936,7 +936,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
 
         // Determine where '%' character is...
 
-        if ( matchString.equals( OUString::valueOf( WILDCARD ) ) )
+        if ( matchString.equals( OUString( WILDCARD ) ) )
         {
             // String containing only a '%' and nothing else
             op = MQueryOp::Exists;
@@ -1787,7 +1787,7 @@ void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) th
     {
         const OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution(
                 STR_COLUMN_NOT_UPDATEABLE,
-                "$position$", OUString::valueOf(columnIndex)
+                "$position$", OUString::number(columnIndex)
              ) );
         ::dbtools::throwGenericSQLException(sError,*this);
     } // if (!::dbtools::implUpdateObject(this, columnIndex, x))
@@ -1800,7 +1800,7 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any&
     {
         const OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution(
                 STR_COLUMN_NOT_UPDATEABLE,
-                "$position$", OUString::valueOf(columnIndex)
+                "$position$", OUString::number(columnIndex)
              ) );
         ::dbtools::throwGenericSQLException(sError,*this);
     }
diff --git a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
index 5d234c445ea4..c0e4f0dfc9cb 100644
--- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
@@ -932,8 +932,8 @@ void OPreparedStatement::checkParameterIndex(sal_Int32 _parameterIndex)
     {
         ::connectivity::SharedResources aResources;
         const OUString sError( aResources.getResourceStringWithSubstitution(STR_WRONG_PARAM_INDEX,
-            "$pos$", OUString::valueOf(_parameterIndex),
-            "$count$", OUString::valueOf((sal_Int32)numParams)
+            "$pos$", OUString::number(_parameterIndex),
+            "$count$", OUString::number(numParams)
             ));
         SQLException aNext(sError,*this, OUString(),0,Any());
 
diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx b/connectivity/source/drivers/odbcbase/OTools.cxx
index 365f9205bbcb..8e442f2e4c42 100644
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
@@ -209,7 +209,7 @@ void OTools::bindValue( OConnection* _pConnection,
                 case SQL_DECIMAL:
                 case SQL_NUMERIC:
                 {
-                    OString aString = OString::valueOf(*(double*)_pValue);
+                    OString aString = OString::number(*(double*)_pValue);
                     _nMaxLen = (SQLSMALLINT)aString.getLength();
                     *pLen = _nMaxLen;
                     *((OString*)_pData) = aString;
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 2442bbaab290..8ec5b6beec61 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1635,12 +1635,12 @@ static void columnMetaData2DatabaseTypeDescription(
             // row[9] RADIX TODO
             if( xRow->getBoolean( 6 ) && ! isSystemColumn(xRow->getInt( 12 )) )
             {
-                row[10] <<= OUString::valueOf(com::sun::star::sdbc::ColumnValue::NO_NULLS);
+                row[10] <<= OUString::number(com::sun::star::sdbc::ColumnValue::NO_NULLS);
                 row[17] <<= statics.NO;
             }
             else
             {
-                row[10] <<= OUString::valueOf(com::sun::star::sdbc::ColumnValue::NULLABLE);
+                row[10] <<= OUString::number(com::sun::star::sdbc::ColumnValue::NULLABLE);
                 row[17] <<= statics.YES;
             }
 
@@ -1865,7 +1865,7 @@ static void columnMetaData2DatabaseTypeDescription(
             if( tableOid != lastTableOid )
                 index = 1;
             lastTableOid = tableOid;
-            row[4] <<= OUString::valueOf( index );
+            row[4] <<= OUString::number( index );
             index ++;
         }
         {
@@ -2305,14 +2305,14 @@ static void pgTypeInfo2ResultSet(
         }
 
         row[TYPE_NAME] <<= xRow->getString(1);
-        row[DATA_TYPE] <<= OUString::valueOf(dataType);
-        row[PRECISION] <<= OUString::valueOf( precision );
+        row[DATA_TYPE] <<= OUString::number(dataType);
+        row[PRECISION] <<= OUString::number( precision );
         sal_Int32 nullable = xRow->getBoolean(4) ?
             com::sun::star::sdbc::ColumnValue::NO_NULLS :
             com::sun::star::sdbc::ColumnValue::NULLABLE;
-        row[NULLABLE] <<= OUString::valueOf(nullable);
-        row[CASE_SENSITIVE] <<= OUString::valueOf((sal_Int32)1);
-        row[SEARCHABLE] <<= OUString::valueOf( calcSearchable( dataType ) );
+        row[NULLABLE] <<= OUString::number(nullable);
+        row[CASE_SENSITIVE] <<= OUString::number(1);
+        row[SEARCHABLE] <<= OUString::number( calcSearchable( dataType ) );
         row[UNSIGNED_ATTRIBUTE] <<= OUString("0"); //
         if( com::sun::star::sdbc::DataType::INTEGER == dataType ||
             com::sun::star::sdbc::DataType::BIGINT == dataType )
@@ -2320,7 +2320,7 @@ static void pgTypeInfo2ResultSet(
         else
             row[AUTO_INCREMENT] <<= OUString("0");     // TODO
         row[MINIMUM_SCALE] <<= OUString("0");      // TODO: what is this ?
-        row[MAXIMUM_SCALE] <<= OUString::valueOf( getMaxScale( dataType ) );
+        row[MAXIMUM_SCALE] <<= OUString::number( getMaxScale( dataType ) );
         row[NUM_PREC_RADIX] <<= OUString("10");    // TODO: what is this ?
         (void)FIXED_PREC_SCALE;
         vec.push_back( row );
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index fb82b9907089..23ef836b16ac 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -668,7 +668,7 @@ void PreparedStatement::setObjectWithInfo(
         OUString myString;
         if( x >>= myDouble )
         {
-            myString = OUString::valueOf( myDouble );
+            myString = OUString::number( myDouble );
         }
         else
         {
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index ec000a54e354..b0d1c74a5629 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -462,7 +462,7 @@ void UpdateableResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw
 //     buf.append( "'" );
 //     buf.append( (sal_Int64) x );
 //     buf.append( "'" );
-    m_updateableField[columnIndex-1].value <<= OUString::valueOf( x );
+    m_updateableField[columnIndex-1].value <<= OUString::number( x );
 }
 
 void UpdateableResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw (SQLException, RuntimeException)
@@ -472,7 +472,7 @@ void UpdateableResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw (S
     checkClosed();
     checkUpdate( columnIndex );
 
-    m_updateableField[columnIndex-1].value <<= OUString::valueOf( x );
+    m_updateableField[columnIndex-1].value <<= OUString::number( x );
 }
 
 void UpdateableResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw (SQLException, RuntimeException)
@@ -481,7 +481,7 @@ void UpdateableResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw
     checkClosed();
     checkUpdate( columnIndex );
 
-    m_updateableField[columnIndex-1].value <<= OUString::valueOf( x );
+    m_updateableField[columnIndex-1].value <<= OUString::number( x );
 }
 
 void UpdateableResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw (SQLException, RuntimeException)
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index 60ed5b0658ae..d687b6913bbb 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -138,7 +138,7 @@ OParseColumn* OParseColumn::createColumnForResultSet( const Reference< XResultSe
         sal_Int32 searchIndex=1;
         while(_rColumns.find(sAlias) != _rColumns.end())
         {
-            (sAlias = sLabel) += OUString::valueOf(searchIndex++);
+            (sAlias = sLabel) += OUString::number(searchIndex++);
         }
         sLabel = sAlias;
     }
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 12b44805f22e..1237120d07ed 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1141,7 +1141,7 @@ namespace
         {
             if ( _rParentNode.getChild(i) == &_rParamNode )
             {
-                sColumnName += OUString::valueOf( i+1 );
+                sColumnName += OUString::number( i+1 );
                 break;
             }
         }
@@ -1854,7 +1854,7 @@ OUString OSQLParseTreeIterator::getUniqueColumnName(const OUString & rColumnName
     sal_Int32 i=1;
     while(aIter != m_aSelectColumns->get().end())
     {
-        (aAlias = rColumnName) += OUString::valueOf(i++);
+        (aAlias = rColumnName) += OUString::number(i++);
         aIter = find(
             m_aSelectColumns->get().begin(),
             m_aSelectColumns->get().end(),
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 1c748abae7b2..db004873a733 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1150,7 +1150,7 @@ OUString OSQLParser::stringToDouble(const OUString& _rValue,sal_Int16 _nScale)
             ParseResult aResult = m_xCharClass->parsePredefinedToken(KParseType::ANY_NUMBER,_rValue,0,m_pData->aLocale,0,OUString(),KParseType::ANY_NUMBER,OUString());
             if((aResult.TokenType & KParseType::IDENTNAME) && aResult.EndPos == _rValue.getLength())
             {
-                aValue = OUString::valueOf(aResult.Value);
+                aValue = OUString::number(aResult.Value);
                 sal_Int32 nPos = aValue.lastIndexOf('.');
                 if((nPos+_nScale) < aValue.getLength())
                     aValue = aValue.replaceAt(nPos+_nScale,aValue.getLength()-nPos-_nScale,OUString());
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index 2bf53267d2b7..bbed1713d2ca 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -310,7 +310,7 @@ Any SAL_CALL OCollection::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsEx
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     if (Index < 0 || Index >= m_pElements->size() )
-        throw IndexOutOfBoundsException(OUString::valueOf(Index),static_cast<XTypeProvider*>(this));
+        throw IndexOutOfBoundsException(OUString::number(Index),static_cast<XTypeProvider*>(this));
 
     return makeAny(getObject(Index));
 }
@@ -413,7 +413,7 @@ void SAL_CALL OCollection::dropByIndex( sal_Int32 index ) throw(SQLException, In
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     if(index <0 || index >= getCount())
-        throw IndexOutOfBoundsException(OUString::valueOf(index),static_cast<XTypeProvider*>(this));
+        throw IndexOutOfBoundsException(OUString::number(index),static_cast<XTypeProvider*>(this));
 
     dropImpl(index);
 }
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 79cec37a3637..1390e56536eb 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -951,7 +951,7 @@ inline void EnvironmentsData::getEnvironment(
     }
 
     OUString aKey(
-        OUString::valueOf( reinterpret_cast< sal_IntPtr >(pContext) ) );
+        OUString::number( reinterpret_cast< sal_IntPtr >(pContext) ) );
     aKey += rEnvDcp;
 
     // try to find registered mapping
@@ -971,7 +971,7 @@ inline void EnvironmentsData::registerEnvironment( uno_Environment ** ppEnv )
     uno_Environment * pEnv =  *ppEnv;
 
     OUString aKey(
-        OUString::valueOf( reinterpret_cast< sal_IntPtr >(pEnv->pContext) ) );
+        OUString::number( reinterpret_cast< sal_IntPtr >(pEnv->pContext) ) );
     aKey += pEnv->pTypeName;
 
     // try to find registered environment
diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx
index f1d7c5261046..65ddfa75f0c4 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -513,7 +513,7 @@ rtl::OUString PropertySetMixinImpl::Impl::translateHandle(
     if (handle < 0 || handle >= handleMap.getLength()) {
         throw css::beans::UnknownPropertyException(
             (rtl::OUString("bad handle ")
-             + rtl::OUString::valueOf(handle)),
+             + rtl::OUString::number(handle)),
             object);
     }
     return handleMap[handle];
@@ -1362,7 +1362,7 @@ void PropertySetMixinImpl::setPropertyValues(
                     (rtl::OUString("name ")
                      + props[i].Name
                      + rtl::OUString(" does not match handle ")
-                     + rtl::OUString::valueOf(props[i].Handle)),
+                     + rtl::OUString::number(props[i].Handle)),
                     static_cast< css::beans::XPropertySet * >(this));
             }
             m_impl->setProperty(
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 7e1d9a36defb..6277eaf82fba 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -231,8 +231,8 @@ OUString
 replaceSixteen( const OUString& str, sal_Int32 nReplacement )
 {
     OUString result( str );
-    OUString sixteen = OUString::valueOf( (sal_Int32)16 );
-    OUString expected = OUString::valueOf( nReplacement );
+    OUString sixteen = OUString::number( 16 );
+    OUString expected = OUString::number( nReplacement );
 
     sal_Int32 len = sixteen.getLength();
     sal_Int32 index = result.indexOf( sixteen );
@@ -261,12 +261,12 @@ generateCustomName(
     if ( pos != -1 )
     {
         name = prefix.replaceAt(
-            pos, placeholder.getLength(), OUString::valueOf( suffix ) );
+            pos, placeholder.getLength(), OUString::number( suffix ) );
     }
     else
     {
         // no placeholder found so just append the suffix
-        name = prefix + OUString::valueOf( suffix );
+        name = prefix + OUString::number( suffix );
     }
 
     // now check is there is an already existing entry with this name
@@ -307,7 +307,7 @@ generateCustomURL(
     url += OUString(CUSTOM_TOOLBAR_STR );
 
     // use a random number to minimize possible clash with existing custom toolbars
-    url += OUString::valueOf( sal_Int64( generateRandomValue() ), 16 );
+    url += OUString::number( generateRandomValue(), 16 );
 
     // now check is there is an already existing entry with this url
     SvxEntries::const_iterator iter = entries->begin();
@@ -339,7 +339,7 @@ generateCustomMenuURL(
     sal_Int32 suffix = 1 )
 {
     OUString url(CUSTOM_MENU_STR );
-    url += OUString::valueOf( suffix );
+    url += OUString::number( suffix );
 
     // now check is there is an already existing entry with this url
     SvxEntries::const_iterator iter = entries->begin();
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index d5249ddb2e88..28b3ee4ae9a9 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -451,7 +451,7 @@ void SfxConfigGroupListBox_Impl::InitModule()
         for (i1=0; i1<c1; ++i1)
         {
             sal_Int16&      rGroupID   = lGroups[i1];
-            OUString sGroupID   = OUString::valueOf((sal_Int32)rGroupID);
+            OUString sGroupID   = OUString::number(rGroupID);
             OUString sGroupName ;
 
             try
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 98e8a38e8582..0d9a5327253b 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -459,7 +459,7 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame
                 }
 
                 sal_Int32 gid = gids[i];
-                OUString idx = OUString::valueOf( gid );
+                OUString idx = OUString::number( gid );
                 OUString group = idx;
                 try
                 {
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index b0a73ef88736..f6b26ff5bc3f 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -1329,7 +1329,7 @@ OUString GetErrorMessage(
         }
         if ( eScriptError.lineNum != -1 )
         {
-            line = OUString::valueOf( eScriptError.lineNum );
+            line = OUString::number( eScriptError.lineNum );
             unformatted = CUI_RES( RID_SVXSTR_ERROR_AT_LINE );
         }
         else
@@ -1369,7 +1369,7 @@ OUString GetErrorMessage(
 
     if ( eScriptException.lineNum != -1 )
     {
-        line = OUString::valueOf( eScriptException.lineNum );
+        line = OUString::number( eScriptException.lineNum );
         unformatted = CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE );
     }
     else
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 2e9c67069e82..9084b8dc03bb 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -202,7 +202,7 @@ void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess, OUSt
                         sal_Int32 nVal = 0;
                         if(aProp >>= nVal)
                         {
-                            OUString aNumber( OUString::valueOf( nVal ) );
+                            OUString aNumber( OUString::number( nVal ) );
                             sValue = aNumber;
                         }
                     }
@@ -213,7 +213,7 @@ void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess, OUSt
                         sal_Bool bVal = sal_False;
                         if(aProp >>= bVal  )
                         {
-                            OUString sBoolean( OUString::valueOf( bVal ) );
+                            OUString sBoolean( OUString::boolean( bVal ) );
                             sValue = sBoolean;
                         }
                     }
@@ -242,7 +242,7 @@ void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess, OUSt
                             {
                                 for(sal_Int16 nInd=0;  nInd < seqLong.getLength(); ++nInd)
                                 {
-                                    OUString sNumber( OUString::valueOf(seqLong[nInd]) );
+                                    OUString sNumber( OUString::number(seqLong[nInd]) );
                                     sValue += sNumber;
                                     sValue += OUString(",");
                                 }
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 7ba03b9d3f14..189ead276ab0 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -173,7 +173,7 @@ void WebConnectionInfoDialog::FillPasswordList()
                 for ( sal_Int32 nUserInd = 0; nUserInd < aURLEntries[nURLInd].UserList.getLength(); nUserInd++ )
                 {
                     OUString aUIEntry( aURLEntries[nURLInd].Url );
-                    aUIEntry += OUString::valueOf( (sal_Unicode)'\t' );
+                    aUIEntry += OUString( (sal_Unicode)'\t' );
                     aUIEntry += aURLEntries[nURLInd].UserList[nUserInd].UserName;
                     SvTreeListEntry* pEntry = m_pPasswordsLB->InsertEntry( aUIEntry );
                     pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) );
@@ -189,7 +189,7 @@ void WebConnectionInfoDialog::FillPasswordList()
             for ( sal_Int32 nURLIdx = 0; nURLIdx < aUrls.getLength(); nURLIdx++ )
             {
                 OUString aUIEntry( aUrls[ nURLIdx ] );
-                aUIEntry += OUString::valueOf( (sal_Unicode)'\t' );
+                aUIEntry += OUString( (sal_Unicode)'\t' );
                 aUIEntry += OUString( "*" );
                 SvTreeListEntry* pEntry = m_pPasswordsLB->InsertEntry( aUIEntry );
                 pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) );
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index fdf5e77393c2..0f635d64b02c 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -677,10 +677,10 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound )
                         ((float)aOrigSize.Height()/TWIP_TO_INCH)+0.5));
              sTemp += " ";
              sTemp += CUI_RESSTR( STR_PPI );
-             OUString sPPI = OUString::valueOf(ax);
+             OUString sPPI = OUString::number(ax);
              if (abs(ax - ay) > 1) {
                 sPPI += OUString( sal_Unicode (0x00D7) );
-                sPPI += OUString::valueOf(ay);
+                sPPI += OUString::number(ay);
              }
              sTemp = sTemp.replaceAll("%1", sPPI);
         }
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index a952c896474c..f0893481d80b 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -144,7 +144,7 @@ void SvxNumberPreview::Paint( const Rectangle& )
 
     if ( mnPos != STRING_NOTFOUND )
     {
-        long nCharWidth = GetTextWidth( OUString::valueOf( mnChar ) );
+        long nCharWidth = GetTextWidth( OUString( mnChar ) );
 
         int nNumCharsToInsert = 0;
         if (nCharWidth > 0) nNumCharsToInsert = nLeadSpace / nCharWidth;
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 24dfe30cd7dd..54126259163a 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1244,7 +1244,7 @@ void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
         if(pSaveNum->GetLevelCount() > 1)
         {
             OUString sEntry( "1 - " );
-            sEntry += OUString::valueOf( static_cast<sal_Int32>(pSaveNum->GetLevelCount()) );
+            sEntry += OUString::number( pSaveNum->GetLevelCount() );
             m_pLevelLB->InsertEntry(sEntry);
             m_pLevelLB->SelectEntry(sEntry);
         }
@@ -2996,7 +2996,7 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet )
         if(pSaveNum->GetLevelCount() > 1)
         {
             OUString sEntry( "1 - " );
-            sEntry += OUString::valueOf( static_cast<sal_Int32>(pSaveNum->GetLevelCount()) );
+            sEntry += OUString::number( pSaveNum->GetLevelCount() );
             m_pLevelLB->InsertEntry(sEntry);
             m_pLevelLB->SelectEntry(sEntry);
         }
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 2ca7a95ea493..e1a387dcbe66 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -935,7 +935,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl)
         {
             aName = aPaperBin;
             aName.Append( sal_Unicode(' ') );
-            aName.Append( OUString::valueOf( static_cast<sal_Int32>(i+1) ) );
+            aName.Append( OUString::number( i+1 ) );
         }
         nEntryPos = m_pPaperTrayBox->InsertEntry( aName );
         m_pPaperTrayBox->SetEntryData( nEntryPos, (void*)(sal_uLong)i );
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 6ef538afff9a..b0d300d10e0c 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1845,7 +1845,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                             sal_Int32 searchIndex=1;
                             while(aColumnMap.find(sAlias) != aColumnMap.end())
                             {
-                                (sAlias = sName) += OUString::valueOf(searchIndex++);
+                                (sAlias = sName) += OUString::number(searchIndex++);
                             }
                             sName = sAlias;
                         }
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 9143aff769be..0863f0ff57e5 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -953,7 +953,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  ) thr
                 sal_Int32 j = 0;
                 while ( aFindName != aNames.end() )
                 {
-                    sColumnName += OUString::valueOf(++j);
+                    sColumnName += OUString::number(++j);
                     aFindName = ::std::find_if(aNames.begin(),aNames.end(),::std::bind2nd(aCaseCompareFunctor,sColumnName));
                 }
 
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 956c58cdcb65..c28643c4bf02 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -222,7 +222,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
             const static OUString sBaseName("Obj");
 
             sPersistentName = sBaseName;
-            sPersistentName += OUString::valueOf(sal_Int32(rDefinitions.size() + 1));
+            sPersistentName += OUString::number(rDefinitions.size() + 1);
             Reference<XNameAccess> xElements(getContainerStorage(),UNO_QUERY);
             if ( xElements.is() )
                 sPersistentName = ::dbtools::createUniqueName(xElements,sPersistentName);
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 55b7c4ec5b10..5ed81181b33e 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -2113,7 +2113,7 @@ void ODocumentDefinition::updateDocumentTitle()
                 sName = DBACORE_RESSTRING( RID_STR_REPORT );
             Reference< XUntitledNumbers > xUntitledProvider(m_pImpl->m_pDataSource->getModel_noCreate(), UNO_QUERY      );
             if ( xUntitledProvider.is() )
-                sName += OUString::valueOf( xUntitledProvider->leaseNumber(getComponent()) );
+                sName += OUString::number( xUntitledProvider->leaseNumber(getComponent()) );
         }
 
         Reference< XTitle > xDatabaseDocumentModel(m_pImpl->m_pDataSource->getModel_noCreate(),uno::UNO_QUERY);
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index 6c2b992f5a5b..9168e10575d0 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -201,7 +201,7 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat
             uno::Reference< chart::XChartDataArray> xChartData( m_xInternal, uno::UNO_QUERY_THROW );
             xChartData->setData( uno::Sequence< uno::Sequence< double > >() );
             xChartData->setColumnDescriptions( uno::Sequence< OUString >() );
-            if ( m_xInternal->hasDataByRangeRepresentation( OUString::valueOf( sal_Int32(0) ) ) )
+            if ( m_xInternal->hasDataByRangeRepresentation( OUString::number( 0 ) ) )
                 m_xInternal->deleteSequence(0);
         }
         catch( const uno::Exception& )
@@ -754,7 +754,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat
         OSL_VERIFY( xColumn->getPropertyValue( PROPERTY_TYPE ) >>= col->nDataType );
 
         const sal_Int32 columnIndex = col - aColumns.begin();
-        const OUString sRangeName = OUString::valueOf( columnIndex );
+        const OUString sRangeName = OUString::number( columnIndex );
         m_aNumberFormats.insert( ::std::map< OUString, uno::Any >::value_type( sRangeName, aNumberFormat ) );
     }
 
@@ -803,7 +803,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat
               4.30, 9.02, 6.20 };
         for(sal_Int32 h = 0,k = 0; h < nRowCount; ++h,++k )
         {
-            aRowLabels.push_back(OUString::valueOf(h+1));
+            aRowLabels.push_back(OUString::number(h+1));
             ::std::vector< double > aRow;
             const sal_Int32 nSize = sizeof(fDefaultData)/sizeof(fDefaultData[0]);
             for (size_t j = 0; j < (aColumns.size()-1); ++j,++k)
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index 8d0b5f1ce63d..b9a12d11362d 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -1018,7 +1018,7 @@ namespace dbmm
         sal_Int32 nOverallRange( m_aSubDocs.size() );
         OUString sProgressSkeleton(
             MacroMigrationResId( STR_OVERALL_PROGRESS).toString().
-            replaceFirst("$overall$", OUString::valueOf(nOverallRange)));
+            replaceFirst("$overall$", OUString::number(nOverallRange)));
 
         m_rProgress.start( nOverallRange );
 
@@ -1031,7 +1031,7 @@ namespace dbmm
             // update overall progress text
             OUString sOverallProgress(
                 sProgressSkeleton.replaceFirst("$current$",
-                    OUString::valueOf(nOverallProgressValue)));
+                    OUString::number(nOverallProgressValue)));
             m_rProgress.setOverallProgressText( sOverallProgress );
 
             // migrate document
@@ -1262,7 +1262,7 @@ namespace dbmm
             // (The latter is valid, since there can be multiple sub documents with the same base name,
             // in different levels in the hierarchy.)
             // In this case, just use the umambiguous sub document number.
-            return sPrefix + OUString::valueOf( sal_Int64( _rDocument.nNumber ) ) + "_" + _rSourceLibName;
+            return sPrefix + OUString::number( _rDocument.nNumber ) + "_" + _rSourceLibName;
         }
     }
 
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 0ca0dfa61770..10cad9b7b4b0 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -312,7 +312,7 @@ void ODBExport::exportDataSource()
                 break;
                 case TypeClass_DOUBLE:
                     // let the unit converter format is as string
-                    sValue = OUString::valueOf( getDouble( aValue ) );
+                    sValue = OUString::number( getDouble( aValue ) );
                     break;
                 case TypeClass_BOOLEAN:
                     sValue = ::xmloff::token::GetXMLToken( getBOOL( aValue ) ? XML_TRUE : XML_FALSE );
@@ -321,7 +321,7 @@ void ODBExport::exportDataSource()
                 case TypeClass_SHORT:
                 case TypeClass_LONG:
                     // let the unit converter format is as string
-                    sValue = OUString::valueOf( getINT32( aValue ) );
+                    sValue = OUString::number( getINT32( aValue ) );
                     break;
                 default:
                     break;
@@ -607,7 +607,7 @@ void ODBExport::exportConnectionData()
                     AddAttribute(XML_NAMESPACE_DB,XML_TYPE,sType);
                     AddAttribute(XML_NAMESPACE_DB,XML_HOSTNAME,sHostName);
                     if ( nPort != -1 )
-                        AddAttribute(XML_NAMESPACE_DB,XML_PORT,OUString::valueOf(nPort));
+                        AddAttribute(XML_NAMESPACE_DB,XML_PORT,OUString::number(nPort));
                     if ( sDatabaseName.getLength() )
                         AddAttribute(XML_NAMESPACE_DB,XML_DATABASE_NAME,sDatabaseName);
 
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index a8d32fa66f05..15d80947b54d 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -2942,7 +2942,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
                 OUString sMessage(
                     OUString(
                         OUString(ModuleRes(RID_STR_UNSUPPORTED_OBJECT_TYPE))).
-                    replaceFirst("$type$", OUString::valueOf(sal_Int32(pObject->Type))));
+                    replaceFirst("$type$", OUString::number(pObject->Type)));
                 throw IllegalArgumentException(sMessage, *this, sal_Int16( pObject - aSelectedObjects.getConstArray() ));
             }
         }
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 67bd3736b2e7..2b2a9f77dbb0 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -602,7 +602,7 @@ void OGenericUnoController::InvalidateFeature_Impl()
             if ( m_aSupportedFeatures.end() == aFeaturePos )
             {
                 OString sMessage( "OGenericUnoController::InvalidateFeature_Impl: feature id " );
-                sMessage += OString::valueOf( aNextFeature.nId );
+                sMessage += OString::number( aNextFeature.nId );
                 sMessage += OString( " has been invalidated, but is not supported!" );
                 SAL_WARN("dbaccess.ui", sMessage.getStr() );
             }
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index aee6df61a43b..b318b97b7d8e 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -526,7 +526,7 @@ String OFieldDescControl::GetControlText( sal_uInt16 nControlId )
             break;
         case FIELD_PROPERTY_TEXTLEN:
             if (pTextLen)
-                return OUString::valueOf(static_cast<sal_Int64>(pTextLen->GetValue()));
+                return OUString::number(pTextLen->GetValue());
         case FIELD_PROPERTY_NUMTYPE:
             if (pNumType)
                 return pNumType->GetSelectEntry();
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 3b52da5bd7ab..ed8c3e29fdaf 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -894,7 +894,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             if (bFolderExists == sal_True)
             {
                 i++;
-                pURL->setName(sLastSegmentName.concat(OUString::valueOf(i)));
+                pURL->setName(sLastSegmentName.concat(OUString::number(i)));
             }
         }
     }
@@ -913,7 +913,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             bElementExists = xSimpleFileAccess->exists( aExistenceCheck.GetMainURL( INetURLObject::NO_DECODE ) );
             if ( bElementExists )
             {
-                aExistenceCheck.setBase( BaseName.concat( OUString::valueOf( i ) ) );
+                aExistenceCheck.setBase( BaseName.concat( OUString::number( i ) ) );
                 ++i;
             }
         }
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 8d2cd7defcc6..58799dee088a 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -656,12 +656,12 @@ void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName)
         while(m_aDestColumns.find(sName) != m_aDestColumns.end())
         {
             sName = aAlias;
-            sName += OUString::valueOf(++nPos);
+            sName += OUString::number(++nPos);
             if(nMaxNameLen && sName.getLength() > nMaxNameLen)
             {
                 aAlias = aAlias.copy(0,::std::min<sal_Int32>( nMaxNameLen-nCount, aAlias.getLength() ));
                 sName = aAlias;
-                sName += OUString::valueOf(nPos);
+                sName += OUString::number(nPos);
                 ++nCount;
             }
         }
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index b3d88ae23915..53d45f81adcc 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -810,11 +810,11 @@ void OHTMLImportExport::WriteTables()
     aStrOut = aStrOut + " ";
     aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cellspacing;
     aStrOut = aStrOut + "=";
-    aStrOut = aStrOut + OString::valueOf((sal_Int32)nCellSpacing);
+    aStrOut = aStrOut + OString::number(nCellSpacing);
     aStrOut = aStrOut + " ";
     aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cols;
     aStrOut = aStrOut + "=";
-    aStrOut = aStrOut + OString::valueOf(aNames.getLength());
+    aStrOut = aStrOut + OString::number(aNames.getLength());
     aStrOut = aStrOut + " ";
     aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_border;
     aStrOut = aStrOut + "=1";
@@ -964,12 +964,12 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I
     aStrTD = aStrTD + " ";
     aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_width;
     aStrTD = aStrTD + "=";
-    aStrTD = aStrTD + OString::valueOf((sal_Int32)nWidthPixel);
+    aStrTD = aStrTD + OString::number(nWidthPixel);
     // line height
     aStrTD = aStrTD + " ";
     aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_height;
     aStrTD = aStrTD + "=";
-    aStrTD = aStrTD + OString::valueOf((sal_Int32)nHeightPixel);
+    aStrTD = aStrTD + OString::number(nHeightPixel);
 
     aStrTD = aStrTD + " ";
     aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_align;
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index f27844576089..81e3fb2a13ec 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -1485,12 +1485,12 @@ OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor&   _rCmpFu
 
             OUString sName(sAlias);
             sal_Int32 nPos = 1;
-            sName += OUString::valueOf(nPos);
+            sName += OUString::number(nPos);
 
             while(_rCmpFunctor(sName))
             {
                 sName = sAlias;
-                sName += OUString::valueOf(++nPos);
+                sName += OUString::number(++nPos);
             }
             sAlias = sName;
             // we have to check again, it could happen that the name is already to long
@@ -1634,7 +1634,7 @@ OUString OCopyTableWizard::createUniqueName(const OUString& _sName)
             while(m_vSourceColumns.find(sName) != m_vSourceColumns.end())
             {
                 sName = _sName;
-                sName += OUString::valueOf(++nPos);
+                sName += OUString::number(++nPos);
             }
         }
     }
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 31c939058c26..20e976d70197 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -440,7 +440,7 @@ void OJoinController::saveTableWindows( ::comphelper::NamedValueCollection& o_rV
             aWindowData.put( "WindowHeight", static_cast<sal_Int32>((*aIter)->GetSize().Height()) );
             aWindowData.put( "ShowAll", (*aIter)->IsShowAll() );
 
-            const OUString sTableName( OUString( "Table" ) + OUString::valueOf( i ) );
+            const OUString sTableName( OUString( "Table" ) + OUString::number( i ) );
             aAllTablesData.put( sTableName, aWindowData.getPropertyValues() );
         }
 
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 3e890c8550cf..928245ab9c73 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -103,7 +103,7 @@ sal_Bool OQueryTableWindow::Init()
     if (pContainer->CountTableAlias(sAliasName, m_nAliasNum))
     {
         sAliasName += OUString('_');
-        sAliasName += OUString::valueOf(m_nAliasNum);
+        sAliasName += OUString::number(m_nAliasNum);
     }
 
 
diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
index 020e5d07eb0f..a36b9f777731 100644
--- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
+++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
@@ -216,7 +216,7 @@ void OTableFieldDesc::Save( ::comphelper::NamedValueCollection& o_rSettings, con
                     ++crit, ++c
                 )
             {
-                aCriteria[c].Name = OUString( "Criterion_" ) + OUString::valueOf( c );
+                aCriteria[c].Name = OUString( "Criterion_" ) + OUString::number( c );
                 aCriteria[c].Value <<= *crit;
             }
 
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 82c1422c12ae..fdeac5a1f35a 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -1106,7 +1106,7 @@ OUString OQueryController::getPrivateTitle( ) const
             ::osl::MutexGuard aGuard( getMutex() );
             String aDefaultName = String( ModuleRes( editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE ) );
             sName = aDefaultName.GetToken(0,' ');
-            sName += OUString::valueOf(getCurrentStartNumber());
+            sName += OUString::number(getCurrentStartNumber());
         }
     }
     return sName;
@@ -1243,7 +1243,7 @@ void OQueryController::saveViewSettings( ::comphelper::NamedValueCollection& o_r
             aFieldData.clear();
             (*field)->Save( aFieldData, i_includingCriteria );
 
-            const OUString sFieldSettingName = "Field" + OUString::valueOf( i );
+            const OUString sFieldSettingName = "Field" + OUString::number( i );
             aAllFieldsData.put( sFieldSettingName, aFieldData.getPropertyValues() );
         }
     }
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index f75b3e8b8ffe..2b53bef2d5d7 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -1511,7 +1511,7 @@ OUString OTableController::createUniqueName(const OUString& _rName)
         OFieldDescription* pFieldDesc = (*aIter)->GetActFieldDescr();
         if (pFieldDesc && !pFieldDesc->GetName().isEmpty() && bCase(sName,pFieldDesc->GetName()))
         { // found a second name of _rName so we need another
-            sName = _rName + OUString::valueOf(++i);
+            sName = _rName + OUString::number(++i);
             aIter = m_vRowList.begin(); // and retry
         }
     }
@@ -1535,7 +1535,7 @@ OUString OTableController::getPrivateTitle() const
         {
             String aName = String(ModuleRes(STR_TBL_TITLE));
             sTitle = aName.GetToken(0,' ');
-            sTitle += OUString::valueOf(getCurrentStartNumber());
+            sTitle += OUString::number(getCurrentStartNumber());
         }
     }
     catch( const Exception& )
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index cf71cbd28647..4aaf66d14709 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1342,8 +1342,8 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou
                     {
                         OUString aMessage( String( ModuleRes( STR_CTW_UNSUPPORTED_COLUMN_TYPE ) ) );
 
-                        aMessage = aMessage.replaceAt( aMessage.indexOfAsciiL( "$type$", 6 ), 6, OUString::valueOf( aSourceColTypes[ nSourceColumn ] ) );
-                        aMessage = aMessage.replaceAt( aMessage.indexOfAsciiL( "$pos$", 5 ), 5, OUString::valueOf( nSourceColumn ) );
+                        aMessage = aMessage.replaceAt( aMessage.indexOfAsciiL( "$type$", 6 ), 6, OUString::number( aSourceColTypes[ nSourceColumn ] ) );
+                        aMessage = aMessage.replaceAt( aMessage.indexOfAsciiL( "$pos$", 5 ), 5, OUString::number( nSourceColumn ) );
 
                         ::dbtools::throwSQLException(
                             aMessage,
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index d75b35238b49..47024cb8b91c 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1566,7 +1566,7 @@ int Desktop::Main()
                 osl::File::remove( pidfileURL );
                 if ( (rc = pidfile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ) ) == osl::File::E_None )
                 {
-                    OString pid( OString::valueOf( static_cast<sal_Int32>( GETPID() ) ) );
+                    OString pid( OString::number( GETPID() ) );
                     sal_uInt64 written = 0;
                     if ( pidfile.write(pid.getStr(), pid.getLength(), written) != osl::File::E_None )
                     {
diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx
index 81466aba63f9..d64a54116fbd 100644
--- a/desktop/source/deployment/manager/dp_activepackages.hxx
+++ b/desktop/source/deployment/manager/dp_activepackages.hxx
@@ -37,7 +37,7 @@ namespace dp_manager {
 class ActivePackages {
 public:
     struct Data {
-        Data(): failedPrerequisites(OUString::valueOf((sal_Int32)0))
+        Data(): failedPrerequisites("0")
             {}
         /* name of the temporary file (shared, user extension) or the name of
            the folder of the bundled extension.
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 51fd817b2aac..05ff8df3033e 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -1399,7 +1399,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
                     //could have declined the license. Then the next time the
                     //extension folder is investigated we do not want to
                     //try to install the extension again.
-                    dbData.failedPrerequisites = OUString::valueOf(failedPrereq);
+                    dbData.failedPrerequisites = OUString::number(failedPrereq);
                     insertToActivationLayerDB(id, dbData);
                     bModified |= true;
                 }
@@ -1524,7 +1524,7 @@ sal_Int32 PackageManagerImpl::checkPrerequisites(
 
             sal_Int32 failedPrereq = extension->checkPrerequisites(
                 xAbortChannel, _xCmdEnv, false);
-            dbData.failedPrerequisites = OUString::valueOf(failedPrereq);
+            dbData.failedPrerequisites = OUString::number(failedPrereq);
             insertToActivationLayerDB(id, dbData);
         }
         else
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
index d6fdfc4a4251..a12e8fa6b719 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
@@ -74,7 +74,7 @@ void ComponentBackendDb::addEntry(OUString const & url, Data const & data)
         {
             Reference<css::xml::dom::XNode> componentNode = writeKeyElement(url);
             writeSimpleElement("java-type-library",
-                               OUString::valueOf((sal_Bool) data.javaTypeLibrary),
+                               OUString::boolean((sal_Bool) data.javaTypeLibrary),
                                componentNode);
 
             writeSimpleList(
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 00e3ebaced42..8908e6521f5d 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -542,7 +542,7 @@ void BackendImpl::implProcessHelp(
                                     if( aErrorInfo.m_nXMLParsingLine != -1 )
                                     {
                                         aErrStr += OUString(", line " );
-                                        aErrStr += OUString::valueOf( aErrorInfo.m_nXMLParsingLine );
+                                        aErrStr += OUString::number( aErrorInfo.m_nXMLParsingLine );
                                     }
                                 }
                             }
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 3f63fbe6a3b9..ad06ead76938 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -475,9 +475,9 @@ void SplashScreen::SetScreenBitmap(BitmapEx &rBitmap)
         aStrBuf.append( OUStringToOString(_sAppName, RTL_TEXTENCODING_UTF8) );
         aStrBuf.append( "_" );
     }
-    aResBuf.append( OString::valueOf( nWidth ));
+    aResBuf.append( OString::number( nWidth ));
     aResBuf.append( "x" );
-    aResBuf.append( OString::valueOf( nHeight ));
+    aResBuf.append( OString::number( nHeight ));
 
     aStrBuf.append( aResBuf.getStr() );
     if (Application::LoadBrandBitmap (aStrBuf.makeStringAndClear().getStr(), rBitmap))
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 72b4c83a3e19..50e18065f74d 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -985,12 +985,12 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
             // SWG:
             if ( nEsc )
             {
-                rOutput << "{\\*\\updnprop" << OString::valueOf(
-                    static_cast<sal_Int32>(nProp100)).getStr() << '}';
+                rOutput << "{\\*\\updnprop" << OString::number(
+                    nProp100).getStr() << '}';
             }
             long nUpDown = nFontHeight * std::abs( nEsc ) / 100;
-            OString aUpDown = OString::valueOf(
-                static_cast<sal_Int32>(nUpDown));
+            OString aUpDown = OString::number(
+                nUpDown);
             if ( nEsc < 0 )
                 rOutput << OOO_STRING_SVTOOLS_RTF_DN << aUpDown.getStr();
             else if ( nEsc > 0 )
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 306ba5a0151a..d2da4840fca5 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -207,7 +207,7 @@ uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage(
 
     for ( sal_Int32 nInd = 0; nInd < 32000 && !xResult.is(); nInd++ )
     {
-        OUString aName = OUString::valueOf( nInd );
+        OUString aName = OUString::number( nInd );
         aName += OUString( "TMPSTOR" );
         aName += m_aEntryName;
         if ( !m_xParentStorage->hasByName( aName ) )
@@ -232,7 +232,7 @@ OUString OleEmbeddedObject::MoveToTemporarySubstream()
     OUString aResult;
     for ( sal_Int32 nInd = 0; nInd < 32000 && aResult.isEmpty(); nInd++ )
     {
-        OUString aName = OUString::valueOf( nInd );
+        OUString aName = OUString::number( nInd );
         aName += OUString( "TMPSTREAM" );
         aName += m_aEntryName;
         if ( !m_xParentStorage->hasByName( aName ) )
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 7ccfe37021a3..d231480eea0e 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -536,7 +536,7 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea
     for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ )
     {
         OUString aStreamName( "\002OlePres00" );
-        aStreamName += OUString::valueOf( (sal_Int32)nInd );
+        aStreamName += OUString::number( nInd );
         if ( xNameContainer->hasByName( aStreamName ) )
             xNameContainer->removeByName( aStreamName );
     }
@@ -604,7 +604,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream()
                     for ( sal_uInt8 nInd = 0; nInd < 10 && !bExists; nInd++ )
                     {
                         OUString aStreamName( "\002OlePres00" );
-                        aStreamName += OUString::valueOf( (sal_Int32)nInd );
+                        aStreamName += OUString::number( nInd );
                         try
                         {
                             bExists = xNameContainer->hasByName( aStreamName );
@@ -654,7 +654,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres
             for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ )
             {
                 OUString aStreamName( "\002OlePres00" );
-                aStreamName += OUString::valueOf( (sal_Int32)nInd );
+                aStreamName += OUString::number( nInd );
                 uno::Reference< io::XStream > xCachedCopyStream;
                 try
                 {
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 1df837c44a0f..5478d054b063 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -308,7 +308,7 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io
                 aReadSeq[0] == '.'
                )
             {
-                aFileSuffix += OUString::valueOf( (sal_Unicode) aReadSeq[0] );
+                aFileSuffix += OUString( (sal_Unicode) aReadSeq[0] );
             }
 
         } while( aReadSeq[0] );
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 68ba6fe5e5f0..f9b0415b7d79 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -219,7 +219,7 @@ namespace abp
         while ( ( m_pImpl->aDataSourceNames.end() != aPos ) && ( nPostFix < 65535 ) )
         {   // there already is a data source with this name
             sCheck = _rDataSourceName;
-            sCheck += OUString::valueOf( nPostFix++ );
+            sCheck += OUString::number( nPostFix++ );
 
             aPos = m_pImpl->aDataSourceNames.find( sCheck );
         }
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index ada5cc721c89..efb197269824 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -253,7 +253,7 @@ void    BibConfig::Commit()
         const Mapping* pMapping = &(*pMappingsArr)[i];
         OUString sPrefix(cDataSourceHistory);
         sPrefix += "/_";
-        sPrefix += OUString::valueOf(i);
+        sPrefix += OUString::number(i);
         sPrefix += "/";
         pNodeValues[nIndex].Name    = sPrefix;
         pNodeValues[nIndex].Name    += sName;
@@ -277,7 +277,7 @@ void    BibConfig::Commit()
         {
             OUString sSubPrefix(sPrefix);
             sSubPrefix += "/_";
-            sSubPrefix += OUString::valueOf(nFieldAssignment);
+            sSubPrefix += OUString::number(nFieldAssignment);
             Sequence< PropertyValue > aAssignmentValues(2);
             PropertyValue* pAssignmentValues = aAssignmentValues.getArray();
             pAssignmentValues[0].Name   = sSubPrefix;
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 4b226f5604df..44bcb19b52a6 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -497,7 +497,7 @@ uno::Reference< awt::XControlModel >  BibGeneralPage::AddXControl(
                     OUString* pListSourceArr = aListSource.getArray();
                     //pListSourceArr[0] = "select TypeName, TypeIndex from TypeNms";
                     for(sal_Int32 i = 0; i < TYPE_COUNT; ++i)
-                        pListSourceArr[i] = OUString::valueOf(i);
+                        pListSourceArr[i] = OUString::number(i);
                     aAny.setValue(&aListSource, ::getCppuType((uno::Sequence<OUString>*)0));
 
                     xPropSet->setPropertyValue("ListSource", aAny);
diff --git a/extensions/source/dbpilots/dbptools.cxx b/extensions/source/dbpilots/dbptools.cxx
index 947b50865846..c6dafd944dd1 100644
--- a/extensions/source/dbpilots/dbptools.cxx
+++ b/extensions/source/dbpilots/dbptools.cxx
@@ -41,7 +41,7 @@ namespace dbp
             for (sal_Int32 i=1; i<0x7FFFFFFF; ++i)
             {
                 _rElementsName = sBase;
-                _rElementsName += OUString::valueOf((sal_Int32)i);
+                _rElementsName += OUString::number(i);
                 if (!_rxContainer->hasByName(_rElementsName))
                     return;
             }
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 3097b8eba621..0754ffe4eb9a 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -263,7 +263,7 @@ namespace dbp
         for (::svt::WizardTypes::WizardState i=0; i<m_aExistingRadios.GetEntryCount(); ++i)
         {
             rSettings.aLabels.push_back(m_aExistingRadios.GetEntry(i));
-            rSettings.aValues.push_back(OUString::valueOf((sal_Int32)(i + 1)));
+            rSettings.aValues.push_back(OUString::number((i + 1)));
         }
 
         return sal_True;
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index 91c6fa92ca33..e00a38668c60 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -130,7 +130,7 @@ namespace logging
             info.Size = sizeof (oslProcessInfo);
             if ( osl_getProcessInfo ( 0, osl_Process_IDENTIFIER, &info ) == osl_Process_E_None)
                 aProcessId = info.Ident;
-            rtl::OUString aPID = rtl::OUString::valueOf( sal_Int64( aProcessId ) );
+            rtl::OUString aPID = OUString::number( aProcessId );
 
             Variable aVariables[] =
             {
diff --git a/extensions/source/logging/logrecord.cxx b/extensions/source/logging/logrecord.cxx
index eba865bf6d23..a4a95ced4d08 100644
--- a/extensions/source/logging/logrecord.cxx
+++ b/extensions/source/logging/logrecord.cxx
@@ -47,7 +47,7 @@ namespace logging
         OUString getCurrentThreadID()
         {
             oslThreadIdentifier nThreadID( osl::Thread::getCurrentIdentifier() );
-            return OUString::valueOf( (sal_Int64)nThreadID );
+            return OUString::number( (sal_Int64)nThreadID );
         }
     }
 
diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx
index 35af67f3e30d..8678f625878b 100644
--- a/extensions/source/nsplugin/source/so_main.cxx
+++ b/extensions/source/nsplugin/source/so_main.cxx
@@ -309,7 +309,7 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f
             return Reference< lang::XMultiServiceFactory >(NULL);
         }
 
-        aPluginPipeName = OUString::valueOf( aPath.hashCode() );
+        aPluginPipeName = OUString::number( aPath.hashCode() );
 
         // accept string
         OSL_ASSERT( buf.isEmpty() );
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index bdd203cbc8a4..50dbebb419d4 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -554,7 +554,7 @@ namespace pcr
                         sal_Int32 nNumber = 1;
                         do
                         {
-                            sNewName = sBaseName + OUString::valueOf( nNumber++ );
+                            sNewName = sBaseName + OUString::number( nNumber++ );
                         }
                         while ( xBindingNames->hasByName( sNewName ) );
                         Reference< XNamed > xName( xBinding, UNO_QUERY_THROW );
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index fd3f6ce99e5e..672ab9b3e285 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -397,7 +397,7 @@ namespace pcr
                         for ( i = 0; i < nNewCount; ++i )
                         {
                             sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId();
-                            OUString aPureIdStr = OUString::valueOf( nUniqueId );
+                            OUString aPureIdStr = OUString::number( nUniqueId );
                             aPureIdStr += aIdStrBase;
                             pNewPureIds[i] = aPureIdStr;
                             // Force usage of next Unique Id
diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx
index 0da7a156f6fc..a61dba03d233 100644
--- a/extensions/source/propctrlr/newdatatype.cxx
+++ b/extensions/source/propctrlr/newdatatype.cxx
@@ -64,7 +64,7 @@ namespace pcr
         sal_Int32 nPostfixNumber = 1;
         do
         {
-            ( sInitialName = sNameBase ) += OUString::valueOf(nPostfixNumber++);
+            ( sInitialName = sNameBase ) += OUString::number(nPostfixNumber++);
         }
         while ( m_aProhibitedNames.find( sInitialName ) != m_aProhibitedNames.end() );
 
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index e39fb9c616cc..998aade8f033 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -315,7 +315,7 @@ namespace
     {
         OUString operator()( sal_Int32 _rIntValue ) const
         {
-            return OUString::valueOf( (sal_Int32)_rIntValue );
+            return OUString::number( _rIntValue );
         }
         sal_Int32 operator()( const OUString& _rStringValue ) const
         {
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 961893055ec3..555edb6093a6 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -244,7 +244,7 @@ public:
         OSL_ASSERT( m_xUpdateInformationProvider.is() );
 
         if( !(m_nCount < m_nNodes ) )
-            throw container::NoSuchElementException(OUString::valueOf(m_nCount), *this);
+            throw container::NoSuchElementException(OUString::number(m_nCount), *this);
 
         try
         {
@@ -301,7 +301,7 @@ public:
     uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
     {
         if( m_nCount > 0 )
-            throw container::NoSuchElementException(OUString::valueOf(m_nCount), *this);
+            throw container::NoSuchElementException(OUString::boolean(m_nCount), *this);
 
         ++m_nCount;
         return uno::makeAny(m_aEntry);
diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx
index 8e95687fb22c..5ded6ea8ca47 100644
--- a/filter/source/flash/swfexporter.hxx
+++ b/filter/source/flash/swfexporter.hxx
@@ -46,7 +46,7 @@ inline OUString STR(const sal_Char * in)
 
 inline OUString VAL(sal_Int32 in)
 {
-    return OUString::valueOf(in);
+    return OUString::number(in);
 }
 
 namespace swf {
diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx
index a32fd8ab94c4..d59c1ad5784e 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -179,7 +179,7 @@ void PBMWriter::ImplWriteBody()
 
 void PBMWriter::ImplWriteNumber(sal_Int32 nNumber)
 {
-    const OString aNum(OString::valueOf(nNumber));
+    const OString aNum(OString::number(nNumber));
     m_rOStm << aNum.getStr();
 }
 
diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx
index ee91eb827da6..912fdd341c4d 100644
--- a/filter/source/graphicfilter/epgm/epgm.cxx
+++ b/filter/source/graphicfilter/epgm/epgm.cxx
@@ -203,7 +203,7 @@ void PGMWriter::ImplWriteBody()
 // write a decimal number in ascii format into the stream
 void PGMWriter::ImplWriteNumber(sal_Int32 nNumber)
 {
-    const OString aNum(OString::valueOf(nNumber));
+    const OString aNum(OString::number(nNumber));
     m_rOStm << aNum.getStr();
 }
 
diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx
index 666135ae74b8..3c0106940ca4 100644
--- a/filter/source/graphicfilter/eppm/eppm.cxx
+++ b/filter/source/graphicfilter/eppm/eppm.cxx
@@ -212,7 +212,7 @@ void PPMWriter::ImplWriteBody()
 
 void PPMWriter::ImplWriteNumber(sal_Int32 nNumber)
 {
-    const OString aNum(OString::valueOf(nNumber));
+    const OString aNum(OString::number(nNumber));
     m_rOStm << aNum.getStr();
 }
 
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index eb93e47e7df8..b4a5f1b7a374 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -2483,7 +2483,7 @@ void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo )
 
 void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode)
 {
-    const OString aNumber(OString::valueOf(nNumber));
+    const OString aNumber(OString::number(nNumber));
     mnCursorPos += aNumber.getLength();
     *mpPS << aNumber.getStr();
     ImplExecMode(nMode);
@@ -2499,7 +2499,7 @@ void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode )
     if ( !nPTemp && nATemp && ( fNumber < 0.0 ) )
         *mpPS << (sal_Char)'-';
 
-    const OString aNumber1(OString::valueOf(nPTemp));
+    const OString aNumber1(OString::number(nPTemp));
     *mpPS << aNumber1.getStr();
     mnCursorPos += aNumber1.getLength();
 
@@ -2508,7 +2508,7 @@ void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode )
         int zCount = 0;
         *mpPS << (sal_uInt8)'.';
         mnCursorPos++;
-        const OString aNumber2(OString::valueOf(nATemp));
+        const OString aNumber2(OString::number(nATemp));
 
         sal_Int16 n, nLen = aNumber2.getLength();
         if ( nLen < 8 )
@@ -2545,7 +2545,7 @@ void PSWriter::ImplWriteF( sal_Int32 nNumber, sal_uLong nCount, sal_uLong nMode
         nNumber = -nNumber;
         mnCursorPos++;
     }
-    const OString aScaleFactor(OString::valueOf(nNumber));
+    const OString aScaleFactor(OString::number(nNumber));
     sal_uLong nLen = aScaleFactor.getLength();
     long nStSize =  ( nCount + 1 ) - nLen;
     if ( nStSize >= 1 )
diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx
index 451ad2e63ee5..2c64123b6a82 100644
--- a/filter/source/graphicfilter/expm/expm.cxx
+++ b/filter/source/graphicfilter/expm/expm.cxx
@@ -207,7 +207,7 @@ void XPMWriter::ImplWriteBody()
 
 void XPMWriter::ImplWriteNumber(sal_Int32 nNumber)
 {
-    const OString aNum(OString::valueOf(nNumber));
+    const OString aNum(OString::number(nNumber));
     m_rOStm << aNum.getStr();
 }
 
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 61f13ce85870..de06d5dc8920 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -458,7 +458,7 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead,
         long nNumber = ImplGetNumber( &pDest, nCount );
         if ( nCount && ( (sal_uInt32)nNumber < 10 ) )
         {
-            aString += " LanguageLevel:" + OUString::valueOf( nNumber );
+            aString += " LanguageLevel:" + OUString::number( nNumber );
         }
     }
     aVDev.DrawText( aRect, aString, TEXT_DRAW_CLIP | TEXT_DRAW_MULTILINE );
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index 9c93c16491fa..ddf0c6399e48 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -344,7 +344,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
             aPageEntries.push_back( pEntry );
 
             OUString aName("i");
-            aName += OUString::valueOf( nPage );
+            aName += OUString::number( nPage );
             aName += ".gif";
             pEntry->setURL( aName );
 
diff --git a/filter/source/placeware/tempfile.cxx b/filter/source/placeware/tempfile.cxx
index 7df4cf622b68..faa8b5658e06 100644
--- a/filter/source/placeware/tempfile.cxx
+++ b/filter/source/placeware/tempfile.cxx
@@ -143,7 +143,7 @@ OUString PlaceWareTempFile::createTempFileURL()
         OUString aTmp( aTempDirURL );
         if( aTmp.getStr()[ aTmp.getLength() - 1 ] != sal_Unicode( '/' ) )
             aTmp += "/";
-        aTmp += OUString::valueOf( (sal_Int32) (unsigned) u, nRadix );
+        aTmp += OUString::number(  (unsigned) u, nRadix );
         aTmp += ".tmp";
 
         osl::File aFile( aTmp );
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 200d8fdcf5b5..8e6d2933da48 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -712,16 +712,16 @@ sal_Bool SVGFilter::implExportDocument()
     #ifdef _SVG_WRITE_EXTENTS
     if( mbSinglePage )
     {
-        aAttr = OUString::valueOf( nDocWidth * 0.01 ) + "mm";
+        aAttr = OUString::number( nDocWidth * 0.01 ) + "mm";
         mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "width", aAttr );
 
-        aAttr = OUString::valueOf( nDocHeight * 0.01 ) + "mm";
+        aAttr = OUString::number( nDocHeight * 0.01 ) + "mm";
         mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "height", aAttr );
     }
     #endif
 
 
-    aAttr = "0 0 " + OUString::valueOf( nDocWidth ) + " " + OUString::valueOf( nDocHeight );
+    aAttr = "0 0 " + OUString::number( nDocWidth ) + " " + OUString::number( nDocHeight );
 
     msClipPathId = "presentation_clip_path";
     OUString sClipPathAttrValue = "url(#" + msClipPathId + ")";
@@ -732,7 +732,7 @@ sal_Bool SVGFilter::implExportDocument()
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "clip-path", sClipPathAttrValue );
 
     // standard line width is based on 1 pixel on a 90 DPI device (0.28222mmm)
-    mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-width", OUString::valueOf( 28.222 ) );
+    mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-width", OUString::number( 28.222 ) );
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-linejoin", "round" );
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns", "http://www.w3.org/2000/svg" );
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:ooo", "http://xml.openoffice.org/svg/export" );
@@ -750,10 +750,10 @@ sal_Bool SVGFilter::implExportDocument()
             mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "clipPathUnits", "userSpaceOnUse" );
             SvXMLElementExport aClipPathElem( *mpSVGExport, XML_NAMESPACE_NONE, "clipPath", sal_True, sal_True );
             {
-                mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "x", OUString::valueOf( sal_Int32(0) ) );
-                mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "y", OUString::valueOf( sal_Int32(0) ) );
-                mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "width", OUString::valueOf( nDocWidth ) );
-                mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "height", OUString::valueOf( nDocHeight ) );
+                mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "x", OUString::number( 0 ) );
+                mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "y", OUString::number( 0 ) );
+                mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "width", OUString::number( nDocWidth ) );
+                mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "height", OUString::number( nDocHeight ) );
                 SvXMLElementExport aRectElem( *mpSVGExport, XML_NAMESPACE_NONE, "rect", sal_True, sal_True );
             }
         }
@@ -838,13 +838,13 @@ OUString implGenerateFieldId( std::vector< TextField* > & aFieldSet,
         }
     }
     OUString sFieldId( sOOOElemField );
-    sFieldId += OUString::valueOf( sal_Unicode('_') );
+    sFieldId += OUString( sal_Unicode('_') );
     if( !bFound )
     {
         aFieldSet.push_back( new TextFieldType( aField ) );
     }
     aFieldSet[i]->insertMasterPage( xMasterPage );
-    sFieldId += OUString::valueOf( i );
+    sFieldId += OUString::number( i );
     return sFieldId;
 }
 
@@ -860,8 +860,8 @@ sal_Bool SVGFilter::implGenerateMetaData()
         SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True );
 
         mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", aOOOElemMetaSlides );
-        mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrNumberOfSlides, OUString::valueOf( nCount ) );
-        mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrStartSlideNumber, OUString::valueOf( mnVisiblePage ) );
+        mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrNumberOfSlides, OUString::number( nCount ) );
+        mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrStartSlideNumber, OUString::number( mnVisiblePage ) );
 
         /*
          *  Add a (global) Page Numbering Type attribute for the document
@@ -920,8 +920,8 @@ sal_Bool SVGFilter::implGenerateMetaData()
                 Reference< XMasterPageTarget >    xMasterPageTarget( xDrawPage, UNO_QUERY );
                 Reference< XDrawPage >            xMasterPage( xMasterPageTarget->getMasterPage(), UNO_QUERY );
                 OUString                          aSlideId( aId );
-                aSlideId += OUString::valueOf( sal_Unicode('_') );
-                aSlideId += OUString::valueOf( i );
+                aSlideId += OUString( sal_Unicode('_') );
+                aSlideId += OUString::number( i );
 
                 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", aSlideId );
                 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrSlide, implGetValidIDFromInterface( xDrawPage ) );
@@ -1194,7 +1194,7 @@ void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPat
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sId );
 
     double fFactor = 1.0 / 2048;
-    OUString sFactor = OUString::valueOf( fFactor );
+    OUString sFactor = OUString::number( fFactor );
     OUString sTransform = "scale(" + sFactor + ",-" + sFactor + ")";
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "transform", sTransform );
 
@@ -1230,7 +1230,7 @@ sal_Bool SVGFilter::implExportTextEmbeddedBitmaps()
             if( pAction )
             {
                 sal_uLong nId = GetBitmapChecksum( pAction );
-                sId = "bitmap(" + OUString::valueOf( (sal_Int64)nId ) + ")";
+                sId = "bitmap(" + OUString::number( nId ) + ")";
                 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sId );
 
                 const Reference< XShape >& rxShape = (const Reference< XShape >&)( it->GetObject() );
@@ -2200,7 +2200,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
                         UCharSet::const_iterator aChar = pCharSet->begin();
                         for( ; aChar != pCharSet->end(); ++aChar )
                         {
-                            aRepresentation += OUString::valueOf( *aChar );
+                            aRepresentation += OUString( *aChar );
                         }
                     }
                     pInfo->SetRepresentation( aRepresentation );
@@ -2235,10 +2235,10 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
                     switch( mVisiblePagePropSet.nPageNumberingType )
                     {
                         case SVX_CHARS_UPPER_LETTER:
-                            aRepresentation += OUString::valueOf( (sal_Unicode)(char)( ( nPageNumber - 1 ) % 26 + 'A' ) );
+                            aRepresentation += OUString( (sal_Unicode)(char)( ( nPageNumber - 1 ) % 26 + 'A' ) );
                             break;
                         case SVX_CHARS_LOWER_LETTER:
-                            aRepresentation += OUString::valueOf( (sal_Unicode)(char)( ( nPageNumber - 1 ) % 26 + 'a' ) );
+                            aRepresentation += OUString( (sal_Unicode)(char)( ( nPageNumber - 1 ) % 26 + 'a' ) );
                             break;
                         case SVX_ROMAN_UPPER:
                             aRepresentation += SvxNumberFormat::CreateRomanString( nPageNumber, true /* upper */ );
@@ -2250,7 +2250,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
                         case SVX_ARABIC: ;
                         // in case the numbering type is not handled we fall back on arabic numbering
                         default:
-                            aRepresentation += OUString::valueOf( sal_Int32(nPageNumber) );
+                            aRepresentation += OUString::number( nPageNumber );
                             break;
                     }
                 }
@@ -2280,18 +2280,18 @@ void SVGExport::writeMtf( const GDIMetaFile& rMtf )
     if( xExtDocHandler.is() )
         xExtDocHandler->unknown( SVG_DTD_STRING );
 
-    aAttr = rtl::OUString::valueOf( aSize.Width() );
+    aAttr = OUString::number( aSize.Width() );
     aAttr += "mm";
     AddAttribute( XML_NAMESPACE_NONE, "width", aAttr );
 
-    aAttr = rtl::OUString::valueOf( aSize.Height() );
+    aAttr = OUString::number( aSize.Height() );
     aAttr += "mm";
     AddAttribute( XML_NAMESPACE_NONE, "height", aAttr );
 
     aAttr = "0 0 ";
-    aAttr += rtl::OUString::valueOf( aSize.Width() * 100L );
+    aAttr += OUString::number( aSize.Width() * 100L );
     aAttr += " ";
-    aAttr += rtl::OUString::valueOf( aSize.Height() * 100L );
+    aAttr += OUString::number( aSize.Height() * 100L );
     AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr );
 
     {
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index d7cb1c2ebc3c..c061bfb3c475 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -187,7 +187,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont )
             {
                 SvXMLElementExport  aExp( mrExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True );
                 OUString     aCurIdStr( aEmbeddedFontStr );
-                OUString     aUnitsPerEM( OUString::valueOf( nFontEM ) );
+                OUString     aUnitsPerEM( OUString::number( nFontEM ) );
                 VirtualDevice       aVDev;
                 Font                aFont( rFont );
 
@@ -197,7 +197,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont )
                 aVDev.SetMapMode( MAP_100TH_MM );
                 aVDev.SetFont( aFont );
 
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", aCurIdStr += OUString::valueOf( ++mnCurFontId ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", aCurIdStr += OUString::number( ++mnCurFontId ) );
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", aUnitsPerEM );
 
                 {
@@ -222,14 +222,14 @@ void SVGFontExport::implEmbedFont( const Font& rFont )
                     mrExport.AddAttribute( XML_NAMESPACE_NONE, "units-per-em", aUnitsPerEM );
                     mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-weight", aFontWeight );
                     mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-style", aFontStyle );
-                    mrExport.AddAttribute( XML_NAMESPACE_NONE, "ascent", OUString::valueOf( aVDev.GetFontMetric().GetAscent() ) );
-                    mrExport.AddAttribute( XML_NAMESPACE_NONE, "descent", OUString::valueOf( aVDev.GetFontMetric().GetDescent() ) );
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, "ascent", OUString::number( aVDev.GetFontMetric().GetAscent() ) );
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, "descent", OUString::number( aVDev.GetFontMetric().GetDescent() ) );
 
                     {
                         SvXMLElementExport aExp3( mrExport, XML_NAMESPACE_NONE, "font-face", sal_True, sal_True );
                     }
 
-                    mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", OUString::valueOf( aSize.Width() ) );
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", OUString::number( aSize.Width() ) );
 
                     {
                         const Point         aPos;
@@ -274,7 +274,7 @@ void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const OUString& rCellStr
         if( rCellStr[ 0 ] == nSpace && rCellStr.getLength() == 1 )
             aBoundRect = Rectangle( Point( 0, 0 ), Size( rOut.GetTextWidth( OUString(' ') ), 0 ) );
 
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", OUString::valueOf( aBoundRect.GetWidth() ) );
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", OUString::number( aBoundRect.GetWidth() ) );
 
         const OUString aPathString( SVGActionWriter::GetPathString( aPolyPoly, sal_False ) );
         if( !aPathString.isEmpty() )
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 0ba49cd91a3b..f1f9eedc249c 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -299,7 +299,7 @@ struct AnnotatingVisitor
 
     OUString getStyleName( const char* sPrefix, sal_Int32 nId )
     {
-        return OUString::createFromAscii(sPrefix)+OUString::valueOf(nId);
+        return OUString::createFromAscii(sPrefix)+OUString::number(nId);
     }
 
     bool hasGradientOpacity( const Gradient& rGradient )
@@ -500,7 +500,7 @@ struct AnnotatingVisitor
             double rRotate, rShearX;
             if( rState.maFillGradient.maTransform.decompose(rScale, rTranslate, rRotate, rShearX) )
                 xAttrs->AddAttribute( "draw:angle",
-                                      OUString::valueOf(rRotate*1800.0/M_PI ) );
+                                      OUString::number(rRotate*1800.0/M_PI ) );
             xAttrs->AddAttribute( "draw:start-color",
                                   getOdfColor(
                                       maGradientStopVector[
@@ -531,12 +531,12 @@ struct AnnotatingVisitor
 
                 // modulate gradient opacity with overall fill opacity
                 xAttrs->AddAttribute( "draw:end",
-                                      OUString::valueOf(
+                                      OUString::number(
                                           maGradientStopVector[
                                               rState.maFillGradient.maStops[0]].maStopColor.a*
                                           maCurrState.mnFillOpacity*maCurrState.mnOpacity*100.0)+"%" );
                 xAttrs->AddAttribute( "draw:start",
-                                      OUString::valueOf(
+                                      OUString::number(
                                           maGradientStopVector[
                                               rState.maFillGradient.maStops[1]].maStopColor.a*
                                           maCurrState.mnFillOpacity*maCurrState.mnOpacity*100.0)+"%" );
@@ -572,11 +572,11 @@ struct AnnotatingVisitor
             xAttrs->Clear();
             xAttrs->AddAttribute( "fo:font-family", rState.maFontFamily);
             xAttrs->AddAttribute( "fo:font-size",
-                                  OUString::valueOf(pt2mm(rState.mnFontSize))+"mm");
+                                  OUString::number(pt2mm(rState.mnFontSize))+"mm");
             xAttrs->AddAttribute( "fo:font-style", rState.maFontStyle);
             xAttrs->AddAttribute( "fo:font-variant", rState.maFontVariant);
             xAttrs->AddAttribute( "fo:font-weight",
-                                  OUString::valueOf(rState.mnFontWeight));
+                                  OUString::number(rState.mnFontWeight));
             xAttrs->AddAttribute( "fo:color", getOdfColor(rState.maFillColor));
 
             mxDocumentHandler->startElement( "style:text-properties", xUnoAttrs );
@@ -627,7 +627,7 @@ struct AnnotatingVisitor
                     }
                     else if( maCurrState.mnFillOpacity*maCurrState.mnOpacity != 1.0 )
                         xAttrs->AddAttribute( "draw:opacity",
-                                              OUString::valueOf(100.0*maCurrState.mnFillOpacity*maCurrState.mnOpacity)+"%" );
+                                              OUString::number(100.0*maCurrState.mnFillOpacity*maCurrState.mnOpacity)+"%" );
                 }
                 else
                 {
@@ -635,7 +635,7 @@ struct AnnotatingVisitor
                     xAttrs->AddAttribute( "draw:fill-color", getOdfColor(rState.maFillColor));
                     if( maCurrState.mnFillOpacity*maCurrState.mnOpacity != 1.0 )
                         xAttrs->AddAttribute( "draw:opacity",
-                                              OUString::valueOf(100.0*maCurrState.mnFillOpacity*maCurrState.mnOpacity)+"%" );
+                                              OUString::number(100.0*maCurrState.mnFillOpacity*maCurrState.mnOpacity)+"%" );
                 }
             }
             else
@@ -649,7 +649,7 @@ struct AnnotatingVisitor
             else if( rState.meStrokeType == DASH )
             {
                 xAttrs->AddAttribute( "draw:stroke", "dash");
-                xAttrs->AddAttribute( "draw:stroke-dash", "dash"+OUString::valueOf(mnCurrStateId));
+                xAttrs->AddAttribute( "draw:stroke-dash", "dash"+OUString::number(mnCurrStateId));
                 xAttrs->AddAttribute( "svg:stroke-color", getOdfColor(rState.maStrokeColor));
             }
             else
@@ -659,7 +659,7 @@ struct AnnotatingVisitor
             {
                 ::basegfx::B2DVector aVec(maCurrState.mnStrokeWidth,0);
                 aVec *= maCurrState.maCTM;
-                xAttrs->AddAttribute( "svg:stroke-width", OUString::valueOf( pt2mm(aVec.getLength()) )+"mm");
+                xAttrs->AddAttribute( "svg:stroke-width", OUString::number( pt2mm(aVec.getLength()) )+"mm");
             }
             if( maCurrState.meLineJoin == basegfx::B2DLINEJOIN_MITER )
                 xAttrs->AddAttribute( "draw:stroke-linejoin", "miter");
@@ -669,7 +669,7 @@ struct AnnotatingVisitor
                 xAttrs->AddAttribute( "draw:stroke-linejoin", "bevel");
             if( maCurrState.mnStrokeOpacity*maCurrState.mnOpacity != 1.0 )
                 xAttrs->AddAttribute( "svg:stroke-opacity",
-                                      OUString::valueOf(100.0*maCurrState.mnStrokeOpacity*maCurrState.mnOpacity)+"%");
+                                      OUString::number(100.0*maCurrState.mnStrokeOpacity*maCurrState.mnOpacity)+"%");
         }
 
         mxDocumentHandler->startElement( "style:graphic-properties", xUnoAttrs );
@@ -690,7 +690,7 @@ struct AnnotatingVisitor
             nStyleId = mrStates.find(maCurrState)->mnStyleId;
 
         xElem->setAttribute("internal-style-ref",
-                            OUString::valueOf(
+                            OUString::number(
                                 nStyleId)
                             +"$0");
     }
@@ -1240,9 +1240,9 @@ struct ShapeWritingVisitor
                 }
 
                 if ( x1 != x2 || y1 != y2 ) {
-                    OUString sLinePath = "M"+OUString::valueOf(x1)+","
-                        +OUString::valueOf(y1)+"L"+OUString::valueOf(x2)+","
-                        +OUString::valueOf(y2);
+                    OUString sLinePath = "M"+OUString::number(x1)+","
+                        +OUString::number(y1)+"L"+OUString::number(x2)+","
+                        +OUString::number(y2);
                     basegfx::B2DPolyPolygon aPoly;
                     basegfx::tools::importFromSvgD(aPoly, sLinePath);
 
@@ -1515,8 +1515,8 @@ struct ShapeWritingVisitor
                     y -= 2.0*maCurrState.mnFontSize/3.0;
                 }
 
-                xAttrs->AddAttribute( "svg:x", OUString::valueOf(pt2mm(x))+"mm");
-                xAttrs->AddAttribute( "svg:y", OUString::valueOf(pt2mm(y))+"mm");
+                xAttrs->AddAttribute( "svg:x", OUString::number(pt2mm(x))+"mm");
+                xAttrs->AddAttribute( "svg:y", OUString::number(pt2mm(y))+"mm");
                 xAttrs->AddAttribute( "draw:style-name", "svggraphicstyle"+sStyleId );
 
                 mxDocumentHandler->startElement("draw:frame", xUnoAttrs);
@@ -1554,10 +1554,10 @@ struct ShapeWritingVisitor
                         const std::string&                              data)
     {
         xAttrs->Clear();
-        xAttrs->AddAttribute( "svg:x", OUString::valueOf(pt2mm(rShapeBounds.getMinX()))+"mm");
-        xAttrs->AddAttribute( "svg:y", OUString::valueOf(pt2mm(rShapeBounds.getMinY()))+"mm");
-        xAttrs->AddAttribute( "svg:width", OUString::valueOf(pt2mm(rShapeBounds.getWidth()))+"mm");
-        xAttrs->AddAttribute( "svg:height", OUString::valueOf(pt2mm(rShapeBounds.getHeight()))+"mm");
+        xAttrs->AddAttribute( "svg:x", OUString::number(pt2mm(rShapeBounds.getMinX()))+"mm");
+        xAttrs->AddAttribute( "svg:y", OUString::number(pt2mm(rShapeBounds.getMinY()))+"mm");
+        xAttrs->AddAttribute( "svg:width", OUString::number(pt2mm(rShapeBounds.getWidth()))+"mm");
+        xAttrs->AddAttribute( "svg:height", OUString::number(pt2mm(rShapeBounds.getHeight()))+"mm");
 
         mxDocumentHandler->startElement("draw:frame", xUnoAttrs);
 
@@ -1584,16 +1584,16 @@ struct ShapeWritingVisitor
         if (!rMatrix.decompose(rScale, rTranslate, rRotate, rShearX))
             return;
         if (rScale.getX() != 1.0 || rScale.getY() != 1.0)
-            sTransformValue += "scale("+OUString::valueOf(rScale.getX())+" "
-                 +OUString::valueOf(rScale.getY())+") ";
+            sTransformValue += "scale("+OUString::number(rScale.getX())+" "
+                 +OUString::number(rScale.getY())+") ";
         if (rTranslate.getX() != 0.0f || rTranslate.getY() != 0.0f)
-            sTransformValue += "translate("+OUString::valueOf(rTranslate.getX()/100.0f)+"mm "
-                 +OUString::valueOf(rTranslate.getY()/100.0f)+"mm) ";
+            sTransformValue += "translate("+OUString::number(rTranslate.getX()/100.0f)+"mm "
+                 +OUString::number(rTranslate.getY()/100.0f)+"mm) ";
         if (rRotate != 0.0f)
-            sTransformValue += "rotate("+OUString::valueOf(rRotate)+") ";
+            sTransformValue += "rotate("+OUString::number(rRotate)+") ";
 
         if (rShearX != 0.0f)
-            sTransformValue += "skewX("+OUString::valueOf(rShearX)+") ";
+            sTransformValue += "skewX("+OUString::number(rShearX)+") ";
         if (sTransformValue.isEmpty())
             return;
         xAttrs->AddAttribute( "draw:transform", sTransformValue);
@@ -1679,25 +1679,25 @@ struct ShapeWritingVisitor
                               const basegfx::B2DRange&                  rShapeBounds,
                               const OUString&                      rStyleName )
     {
-        xAttrs->AddAttribute( "draw:z-index", OUString::valueOf( mnShapeNum++ ));
+        xAttrs->AddAttribute( "draw:z-index", OUString::number( mnShapeNum++ ));
         xAttrs->AddAttribute( "draw:style-name", rStyleName);
-        xAttrs->AddAttribute( "svg:width", OUString::valueOf(pt2mm(rShapeBounds.getWidth()))+"mm");
-        xAttrs->AddAttribute( "svg:height", OUString::valueOf(pt2mm(rShapeBounds.getHeight()))+"mm");
+        xAttrs->AddAttribute( "svg:width", OUString::number(pt2mm(rShapeBounds.getWidth()))+"mm");
+        xAttrs->AddAttribute( "svg:height", OUString::number(pt2mm(rShapeBounds.getHeight()))+"mm");
 
         // OOo expects the viewbox to be in 100th of mm
         xAttrs->AddAttribute( "svg:viewBox",
             "0 0 "
-            + OUString::valueOf(
+            + OUString::number(
                 basegfx::fround(pt100thmm(rShapeBounds.getWidth())) )
             + " "
-            + OUString::valueOf(
+            + OUString::number(
                 basegfx::fround(pt100thmm(rShapeBounds.getHeight())) ));
 
         // TODO(F1): decompose transformation in calling code, and use
         // transform attribute here
         // writeTranslate(maCurrState.maCTM, xAttrs);
-        xAttrs->AddAttribute( "svg:x", OUString::valueOf(pt2mm(rShapeBounds.getMinX()))+"mm");
-        xAttrs->AddAttribute( "svg:y", OUString::valueOf(pt2mm(rShapeBounds.getMinY()))+"mm");
+        xAttrs->AddAttribute( "svg:x", OUString::number(pt2mm(rShapeBounds.getMinX()))+"mm");
+        xAttrs->AddAttribute( "svg:y", OUString::number(pt2mm(rShapeBounds.getMinY()))+"mm");
     }
 
     State                                      maCurrState;
@@ -1757,13 +1757,13 @@ struct OfficeStylesWritingVisitor
             xAttrs->AddAttribute( "draw:display-name", "dash"+sStyleId );
             xAttrs->AddAttribute( "draw:style", "rect" );
             if ( dots1>0 ) {
-                xAttrs->AddAttribute( "draw:dots1", OUString::valueOf(dots1) );
-                xAttrs->AddAttribute( "draw:dots1-length", OUString::valueOf(pt2mm(convLength( OUString::valueOf(dots1_length), maCurrState, 'h' )))+"mm" );
+                xAttrs->AddAttribute( "draw:dots1", OUString::number(dots1) );
+                xAttrs->AddAttribute( "draw:dots1-length", OUString::number(pt2mm(convLength( OUString::number(dots1_length), maCurrState, 'h' )))+"mm" );
             }
-            xAttrs->AddAttribute( "draw:distance", OUString::valueOf(pt2mm(convLength( OUString::valueOf(dash_distance), maCurrState, 'h' )))+"mm" );
+            xAttrs->AddAttribute( "draw:distance", OUString::number(pt2mm(convLength( OUString::number(dash_distance), maCurrState, 'h' )))+"mm" );
             if ( dots2>0 ) {
-                xAttrs->AddAttribute( "draw:dots2", OUString::valueOf(dots2) );
-                xAttrs->AddAttribute( "draw:dots2-length", OUString::valueOf(pt2mm(convLength( OUString::valueOf(dots2_length), maCurrState, 'h' )))+"mm" );
+                xAttrs->AddAttribute( "draw:dots2", OUString::number(dots2) );
+                xAttrs->AddAttribute( "draw:dots2-length", OUString::number(pt2mm(convLength( OUString::number(dots2_length), maCurrState, 'h' )))+"mm" );
             }
 
             mxDocumentHandler->startElement( "draw:stroke-dash", xUnoAttrs);
@@ -1977,7 +1977,7 @@ sal_Bool SVGReader::parseAndConvert()
     m_xDocumentHandler->startElement( "config:config-item" , xUnoAttrs);
 
     sal_Int64 iWidth = sal_Int64(fViewPortWidth);
-    m_xDocumentHandler->characters( OUString::valueOf(iWidth) );
+    m_xDocumentHandler->characters( OUString::number(iWidth) );
 
     m_xDocumentHandler->endElement( "config:config-item" );
 
@@ -1988,7 +1988,7 @@ sal_Bool SVGReader::parseAndConvert()
     m_xDocumentHandler->startElement( "config:config-item", xUnoAttrs);
 
     sal_Int64 iHeight = sal_Int64(fViewPortHeight);
-    m_xDocumentHandler->characters( OUString::valueOf(iHeight) );
+    m_xDocumentHandler->characters( OUString::number(iHeight) );
 
     m_xDocumentHandler->endElement( "config:config-item" );
 
@@ -2012,8 +2012,8 @@ sal_Bool SVGReader::parseAndConvert()
     xAttrs->AddAttribute( "fo:margin-bottom", "0mm");
     xAttrs->AddAttribute( "fo:margin-left", "0mm");
     xAttrs->AddAttribute( "fo:margin-right", "0mm");
-    xAttrs->AddAttribute( "fo:page-width", OUString::valueOf(fViewPortWidth)+"mm");
-    xAttrs->AddAttribute( "fo:page-height", OUString::valueOf(fViewPortHeight)+"mm");
+    xAttrs->AddAttribute( "fo:page-width", OUString::number(fViewPortWidth)+"mm");
+    xAttrs->AddAttribute( "fo:page-height", OUString::number(fViewPortHeight)+"mm");
     xAttrs->AddAttribute( "style:print-orientation",
         fViewPortWidth > fViewPortHeight ? OUString("landscape") : OUString("portrait") );
     m_xDocumentHandler->startElement( "style:page-layout-properties", xUnoAttrs );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 4a31742aea99..4693d0f07201 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -134,7 +134,7 @@ void SVGAttributeWriter::AddColorAttr( const char* pColorAttrName,
     ImplGetColorStr( rColor, aColor );
 
     if( rColor.GetTransparency() > 0 && rColor.GetTransparency() < 255 )
-        aColorOpacity = OUString::valueOf( ImplRound( ( 255.0 - rColor.GetTransparency() ) / 255.0 ) );
+        aColorOpacity = OUString::number( ImplRound( ( 255.0 - rColor.GetTransparency() ) / 255.0 ) );
 
     mrExport.AddAttribute( XML_NAMESPACE_NONE, pColorAttrName, aColor );
 
@@ -191,7 +191,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie
         aEndColor.SetBlue( (sal_uInt8)( (long) aEndColor.GetBlue() * rGradient.GetEndIntensity() ) / 100 );
 
         mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId,
-                            ( rGradientId = "Gradient_" ) += OUString::valueOf( nCurGradientId++ ) );
+                            ( rGradientId = "Gradient_" ) += OUString::number( nCurGradientId++ ) );
 
         {
             ::std::auto_ptr< SvXMLElementExport >   apGradient;
@@ -207,10 +207,10 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie
                 aLinePoly.Rotate( aObjRectCenter, nAngle );
 
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits, "userSpaceOnUse" );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, OUString::valueOf( aLinePoly[ 0 ].X() ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, OUString::valueOf( aLinePoly[ 0 ].Y() ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, OUString::valueOf( aLinePoly[ 1 ].X() ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::valueOf( aLinePoly[ 1 ].Y() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, OUString::number( aLinePoly[ 0 ].X() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, OUString::number( aLinePoly[ 0 ].Y() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, OUString::number( aLinePoly[ 1 ].X() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::number( aLinePoly[ 1 ].Y() ) );
 
                 apGradient.reset( new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemLinearGradient, sal_True, sal_True ) );
 
@@ -219,7 +219,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie
                                 ( ( rGradient.GetStyle() == GradientStyle_AXIAL ) ? 0.005 : 0.01 );
 
                 ImplGetColorStr( ( rGradient.GetStyle() == GradientStyle_AXIAL ) ? aEndColor : aStartColor, aColorStr );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::valueOf( fBorder ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::number( fBorder ) );
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr );
 
                 {
@@ -229,7 +229,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie
                 if( rGradient.GetStyle() == GradientStyle_AXIAL )
                 {
                     ImplGetColorStr( aStartColor, aColorStr );
-                    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::valueOf( 0.5 ) );
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::number( 0.5 ) );
                     mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr );
 
                     {
@@ -241,7 +241,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie
                     fBorder = 0.0;
 
                 ImplGetColorStr( aEndColor, aColorStr );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::valueOf( ImplRound( 1.0 - fBorder ) ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::number( ImplRound( 1.0 - fBorder ) ) );
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr );
 
                 {
@@ -256,15 +256,15 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie
                                                 rObjRect.GetHeight() * rObjRect.GetHeight() ) * 0.5;
 
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits, "userSpaceOnUse" );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, OUString::valueOf( ImplRound( fCenterX ) ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, OUString::valueOf( ImplRound( fCenterY ) ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrR, OUString::valueOf( ImplRound( fRadius ) ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, OUString::number( ImplRound( fCenterX ) ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, OUString::number( ImplRound( fCenterY ) ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrR, OUString::number( ImplRound( fRadius ) ) );
 
                 apGradient.reset( new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemRadialGradient, sal_True, sal_True ) );
 
                 // write stop values
                 ImplGetColorStr( aEndColor, aColorStr );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::valueOf( 0.0 ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::number( 0.0 ) );
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr );
 
                 {
@@ -273,7 +273,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie
 
                 ImplGetColorStr( aStartColor, aColorStr );
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset,
-                                       OUString::valueOf( ImplRound( 1.0 - rGradient.GetBorder() * 0.01 ) ) );
+                                       OUString::number( ImplRound( 1.0 - rGradient.GetBorder() * 0.01 ) ) );
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr );
 
                 {
@@ -300,7 +300,7 @@ void SVGAttributeWriter::SetFontAttr( const Font& rFont )
 
         // Font Size
         mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontSize,
-                               OUString::valueOf( rFont.GetHeight() ) + "px" );
+                               OUString::number( rFont.GetHeight() ) + "px" );
 
         // Font Style
         if( rFont.GetItalic() != ITALIC_NONE )
@@ -331,7 +331,7 @@ void SVGAttributeWriter::SetFontAttr( const Font& rFont )
             default:                    nFontWeight = 400; break;
         }
 
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontWeight, OUString::valueOf( nFontWeight ) );
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontWeight, OUString::number( nFontWeight ) );
 
         if( mrExport.IsUseNativeTextDecoration() )
         {
@@ -748,7 +748,7 @@ void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer )
         if( nCurFontSize != nParFontSize )
         {
             mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontSize,
-                                   OUString::valueOf( nCurFontSize ) +  "px" );
+                                   OUString::number( nCurFontSize ) +  "px" );
         }
 
         // Font Style
@@ -787,7 +787,7 @@ void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer )
                 case WEIGHT_BLACK:          nFontWeight = 900; break;
                 default:                    nFontWeight = 400; break;
             }
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontWeight, OUString::valueOf( nFontWeight ) );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontWeight, OUString::number( nFontWeight ) );
         }
 
         if( bIsTextContainer )
@@ -895,7 +895,7 @@ sal_Bool SVGTextWriter::nextParagraph()
                         {
                             mbIsNewListItem = sal_True;
 #if OSL_DEBUG_LEVEL > 0
-                            sInfo = "NumberingLevel: " + OUString::valueOf( (sal_Int32)nListLevel );
+                            sInfo = "NumberingLevel: " + OUString::number( nListLevel );
                             mrExport.AddAttribute( XML_NAMESPACE_NONE, "style", sInfo );
 #endif
                             Reference< XIndexReplace > xNumRules;
@@ -962,7 +962,7 @@ sal_Bool SVGTextWriter::nextParagraph()
                                                 }
                                                 mcBulletChar = cBullet;
 #if OSL_DEBUG_LEVEL > 0
-                                                sInfo = OUString::valueOf( (sal_Int32) cBullet );
+                                                sInfo = OUString::number( (sal_Int32) cBullet );
                                                 mrExport.AddAttribute( XML_NAMESPACE_NONE, "bullet-char", sInfo );
 #endif
                                             }
@@ -1237,9 +1237,9 @@ void SVGTextWriter::startTextPosition( sal_Bool bExportX, sal_Bool bExportY )
     mnTextWidth = 0;
     mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "TextPosition" );
     if( bExportX )
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( maTextPos.X() ) );
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::number( maTextPos.X() ) );
     if( bExportY )
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( maTextPos.Y() ) );
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::number( maTextPos.Y() ) );
 
     // if text is rotated, set transform matrix at new tspan element
     const Font& rFont = mpVDev->GetFont();
@@ -1247,11 +1247,11 @@ void SVGTextWriter::startTextPosition( sal_Bool bExportX, sal_Bool bExportY )
     {
         Point   aRot( maTextPos );
         OUString aTransform =
-                OUString("translate(") + OUString::valueOf( aRot.X() ) +
-                "," + OUString::valueOf( aRot.Y() ) + ")" +
-                " rotate(" + OUString::valueOf( rFont.GetOrientation() * -0.1 ) +
-                ")" + " translate(" + OUString::valueOf( -aRot.X() ) +
-                "," + OUString::valueOf( -aRot.Y() ) + ")";
+                OUString("translate(") + OUString::number( aRot.X() ) +
+                "," + OUString::number( aRot.Y() ) + ")" +
+                " rotate(" + OUString::number( rFont.GetOrientation() * -0.1 ) +
+                ")" + " translate(" + OUString::number( -aRot.X() ) +
+                "," + OUString::number( -aRot.Y() ) + ")";
 
         mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform );
     }
@@ -1307,8 +1307,8 @@ void SVGTextWriter::implWriteBulletChars()
 
                 // Add positioning attribute through a translation
                 sPosition = OUString("translate(") +
-                            OUString::valueOf( rInfo.aPos.X() ) +
-                            "," + OUString::valueOf( rInfo.aPos.Y() ) + ")";
+                            OUString::number( rInfo.aPos.X() ) +
+                            "," + OUString::number( rInfo.aPos.Y() ) + ")";
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, "transform", sPosition );
 
                 mpContext->AddPaintAttr( COL_TRANSPARENT, rInfo.aColor );
@@ -1318,13 +1318,13 @@ void SVGTextWriter::implWriteBulletChars()
                 // <use transform="scale(font-size)" xlink:ref="/" >
                 {
                     // Add size attribute through a scaling
-                    sScaling = "scale(" + OUString::valueOf( rInfo.nFontSize ) +
-                               "," + OUString::valueOf( rInfo.nFontSize )+ ")";
+                    sScaling = "scale(" + OUString::number( rInfo.nFontSize ) +
+                               "," + OUString::number( rInfo.nFontSize )+ ")";
                     mrExport.AddAttribute( XML_NAMESPACE_NONE, "transform", sScaling );
 
                     // Add ref attribute
                     sRefId = "#bullet-char-template(" +
-                             OUString::valueOf( (sal_Int32)( rInfo.cBulletChar ) ) +
+                             OUString::number( ( rInfo.cBulletChar ) ) +
                              ")";
                     mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, sRefId );
 
@@ -1356,7 +1356,7 @@ void SVGTextWriter::writeBitmapPlaceholder( const MetaBitmapActionType* pAction
     // bitmap placeholder element
     sal_uLong nId = SVGActionWriter::GetChecksum( pAction );
     OUString sId = "bitmap-placeholder("  + msShapeId + "." +
-                   OUString::valueOf( (sal_Int64)nId ) + ")";
+                   OUString::number( nId ) + ")";
 
     {
         mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", sId );
@@ -1413,7 +1413,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps()
                 sId = "embedded-bitmap(";
                 sId += msShapeId;
                 sId += ".";
-                sId += OUString::valueOf( (sal_Int64)nId );
+                sId += OUString::number( nId );
                 sId += ")";
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", sId );
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "EmbeddedBitmap" );
@@ -1424,7 +1424,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps()
                 {
                     // referenced bitmap template
                     sRefId = "#bitmap(";
-                    sRefId += OUString::valueOf( (sal_Int64)nChecksum );
+                    sRefId += OUString::number( nChecksum );
                     sRefId += ")";
 
                     Point aPoint;
@@ -1432,8 +1432,8 @@ void SVGTextWriter::implWriteEmbeddedBitmaps()
                     implMap( aPt, aPoint );
                     implMap( aSz, aSize );
 
-                    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( aPoint.X() ) );
-                    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aPoint.Y() ) );
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::number( aPoint.X() ) );
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::number( aPoint.Y() ) );
                     mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, sRefId );
 
                     SvXMLElementExport aRefElem( mrExport, XML_NAMESPACE_NONE, "use", sal_True, sal_True );
@@ -1720,9 +1720,9 @@ OUString SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly, sal_Bool
         if( nSize > 1 )
         {
             aPathData += "M ";
-            aPathData += OUString::valueOf( ( aPolyPoint = rPoly[ 0 ] ).X() );
+            aPathData += OUString::number( ( aPolyPoint = rPoly[ 0 ] ).X() );
             aPathData += aComma;
-            aPathData += OUString::valueOf( aPolyPoint.Y() );
+            aPathData += OUString::number( aPolyPoint.Y() );
 
             sal_Char nCurrentMode = 0;
             const bool bClose(!bLine || rPoly[0] == rPoly[nSize - 1]);
@@ -1741,9 +1741,9 @@ OUString SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly, sal_Bool
                     {
                         if ( j )
                             aPathData += aBlank;
-                        aPathData += OUString::valueOf( ( aPolyPoint = rPoly[ n++ ] ).X() );
+                        aPathData += OUString::number( ( aPolyPoint = rPoly[ n++ ] ).X() );
                         aPathData += aComma;
-                        aPathData += OUString::valueOf( aPolyPoint.Y() );
+                        aPathData += OUString::number( aPolyPoint.Y() );
                     }
                 }
                 else
@@ -1753,9 +1753,9 @@ OUString SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly, sal_Bool
                         nCurrentMode = 'L';
                         aPathData += "L ";
                     }
-                    aPathData += OUString::valueOf( ( aPolyPoint = rPoly[ n++ ] ).X() );
+                    aPathData += OUString::number( ( aPolyPoint = rPoly[ n++ ] ).X() );
                     aPathData += aComma;
-                    aPathData += OUString::valueOf( aPolyPoint.Y() );
+                    aPathData += OUString::number( aPolyPoint.Y() );
                 }
             }
 
@@ -1795,10 +1795,10 @@ void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2,
         aPt2 = rPt2;
     }
 
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, OUString::valueOf( aPt1.X() ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, OUString::valueOf( aPt1.Y() ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, OUString::valueOf( aPt2.X() ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::valueOf( aPt2.Y() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, OUString::number( aPt1.X() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, OUString::number( aPt1.Y() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, OUString::number( aPt2.X() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::number( aPt2.Y() ) );
 
     if( pLineColor )
     {
@@ -1821,16 +1821,16 @@ void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nR
     else
         aRect = rRect;
 
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( aRect.Left() ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aRect.Top() ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, OUString::valueOf( aRect.GetWidth() ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::valueOf( aRect.GetHeight() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::number( aRect.Left() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::number( aRect.Top() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, OUString::number( aRect.GetWidth() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::number( aRect.GetHeight() ) );
 
     if( nRadX )
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, OUString::valueOf( bApplyMapping ? ImplMap( nRadX ) : nRadX ) );
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, OUString::number( bApplyMapping ? ImplMap( nRadX ) : nRadX ) );
 
     if( nRadY )
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, OUString::valueOf( bApplyMapping ? ImplMap( nRadY ) : nRadY ) );
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, OUString::number( bApplyMapping ? ImplMap( nRadY ) : nRadY ) );
 
     {
         SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemRect, sal_True, sal_True );
@@ -1847,10 +1847,10 @@ void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long n
     else
         aCenter = rCenter;
 
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, OUString::valueOf( aCenter.X() ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, OUString::valueOf( aCenter.Y() ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, OUString::valueOf( bApplyMapping ? ImplMap( nRadX ) : nRadX ) );
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, OUString::valueOf( bApplyMapping ? ImplMap( nRadY ) : nRadY ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, OUString::number( aCenter.X() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, OUString::number( aCenter.Y() ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, OUString::number( bApplyMapping ? ImplMap( nRadX ) : nRadX ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, OUString::number( bApplyMapping ? ImplMap( nRadY ) : nRadY ) );
 
     {
         SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemEllipse, sal_True, sal_True );
@@ -1864,7 +1864,7 @@ void SVGActionWriter::ImplAddLineAttr( const LineInfo &rAttrs,
     {
         sal_Int32 nStrokeWidth = bApplyMapping ? ImplMap( rAttrs.GetWidth() ) : rAttrs.GetWidth();
         mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth,
-                               OUString::valueOf( nStrokeWidth ) );
+                               OUString::number( nStrokeWidth ) );
     }
 }
 
@@ -1907,7 +1907,7 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool
     if( rShape.mnStrokeWidth )
     {
         sal_Int32 nStrokeWidth = ( bApplyMapping ? ImplMap( rShape.mnStrokeWidth ) : rShape.mnStrokeWidth );
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth, OUString::valueOf( nStrokeWidth ) );
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth, OUString::number( nStrokeWidth ) );
     }
 
     // support for LineJoin
@@ -1969,7 +1969,7 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool
             if( k )
                 aDashArrayStr += aComma;
 
-            aDashArrayStr += OUString::valueOf( nDash );
+            aDashArrayStr += OUString::number( nDash );
         }
 
         mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeDashArray, aDashArrayStr );
@@ -1987,7 +1987,7 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly,
     {
         SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
 
-        OUString aPatternId = "pattern" + OUString::valueOf( mnCurPatternId++ );
+        OUString aPatternId = "pattern" + OUString::number( mnCurPatternId++ );
 
         {
             SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True );
@@ -1997,10 +1997,10 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly,
             Rectangle aRect;
             ImplMap( rPolyPoly.GetBoundRect(), aRect );
 
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( aRect.Left() ) );
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aRect.Top() ) );
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, OUString::valueOf( aRect.GetWidth() ) );
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::valueOf( aRect.GetHeight() ) );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::number( aRect.Left() ) );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::number( aRect.Top() ) );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, OUString::number( aRect.GetWidth() ) );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::number( aRect.GetHeight() ) );
 
             mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, OUString( "userSpaceOnUse") );
 
@@ -2010,8 +2010,8 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly,
                 // The origin of a pattern is positioned at (aRect.Left(), aRect.Top()).
                 // So we need to adjust the pattern coordinate.
                 OUString aTransform = OUString("translate") +
-                                      "(" + OUString::valueOf( -aRect.Left() ) +
-                                      "," + OUString::valueOf( -aRect.Top() ) +
+                                      "(" + OUString::number( -aRect.Left() ) +
+                                      "," + OUString::number( -aRect.Top() ) +
                                       ")";
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform );
 
@@ -2063,7 +2063,7 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly,
     {
         SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
 
-        OUString aGradientId = "gradient" + OUString::valueOf( mnCurGradientId++ );
+        OUString aGradientId = "gradient" + OUString::number( mnCurGradientId++ );
 
         {
             SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True );
@@ -2087,10 +2087,10 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly,
                 aPoly[ 1 ].Y() = aRect.Bottom();
                 aPoly.Rotate( aCenter, nAngle );
 
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, OUString::valueOf( aPoly[ 0 ].X() ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, OUString::valueOf( aPoly[ 0 ].Y() ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, OUString::valueOf( aPoly[ 1 ].X() ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::valueOf( aPoly[ 1 ].Y() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, OUString::number( aPoly[ 0 ].X() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, OUString::number( aPoly[ 0 ].Y() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, OUString::number( aPoly[ 1 ].X() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::number( aPoly[ 1 ].Y() ) );
 
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits,
                                        OUString( "userSpaceOnUse" ) );
@@ -2165,7 +2165,7 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly,
 
 void SVGActionWriter::ImplWriteGradientStop( const Color& rColor, double fOffset )
 {
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::valueOf( fOffset ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::number( fOffset ) );
 
     OUString aStyle, aColor;
     aStyle += "stop-color:";
@@ -2229,7 +2229,7 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf,
     if( nMoveX || nMoveY )
         rMtf.Move( nMoveX, nMoveY );
 
-    OUString aMaskId = "mask" + OUString::valueOf( mnCurMaskId++ );
+    OUString aMaskId = "mask" + OUString::number( mnCurMaskId++ );
 
     {
         SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True );
@@ -2395,13 +2395,13 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
         Point   aRot( aPos );
         OUString  aTransform =
                 OUString("translate") +
-                "(" + OUString::valueOf( aRot.X() ) +
-                "," + OUString::valueOf( aRot.Y() ) + ")" +
+                "(" + OUString::number( aRot.X() ) +
+                "," + OUString::number( aRot.Y() ) + ")" +
                 " rotate" +
-                "(" + OUString::valueOf( rFont.GetOrientation() * -0.1 ) + ")" +
+                "(" + OUString::number( rFont.GetOrientation() * -0.1 ) + ")" +
                 " translate" +
-                "(" + OUString::valueOf( -aRot.X() ) +
-                "," + OUString::valueOf( -aRot.Y() ) + ")";
+                "(" + OUString::number( -aRot.X() ) +
+                "," + OUString::number( -aRot.Y() ) + ")";
 
         mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform );
     }
@@ -2428,8 +2428,8 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
                 sCleanTextContent = sTextContent.copy( nFrom );
             }
             mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "PlaceholderText" );
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( aPos.X() ) );
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aPos.Y() ) );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::number( aPos.X() ) );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::number( aPos.Y() ) );
             {
                 SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_False );
                 // At least for the single slide case we need really to  export placeholder text
@@ -2475,8 +2475,8 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
                     {
                         const OUString aGlyph( rText.Copy( nLastPos, nCount ) );
 
-                        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( nX ) );
-                        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aPos.Y() ) );
+                        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::number( nX ) );
+                        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::number( aPos.Y() ) );
 
                         {
                             SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_False );
@@ -2497,8 +2497,8 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
         }
         else
         {
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( aPos.X() ) );
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aPos.Y() ) );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::number( aPos.X() ) );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::number( aPos.Y() ) );
 
             {
                 SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_False );
@@ -2580,10 +2580,10 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
                     aSz = rSz;
                 }
 
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( aPt.X() ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aPt.Y() ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, OUString::valueOf( aSz.Width() ) );
-                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::valueOf( aSz.Height() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::number( aPt.X() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::number( aPt.Y() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, OUString::number( aSz.Width() ) );
+                mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::number( aSz.Height() ) );
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, aBuffer.makeStringAndClear() );
                 {
                     SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemImage, sal_True, sal_True );
@@ -2810,7 +2810,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                         if(rLineInfo.GetWidth())
                         {
                             sal_Int32 nStrokeWidth = ImplMap(rLineInfo.GetWidth());
-                            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth, OUString::valueOf( nStrokeWidth ) );
+                            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth, OUString::number( nStrokeWidth ) );
                         }
 
                         mpContext->AddPaintAttr( mpVDev->GetLineColor(), Color( COL_TRANSPARENT ) );
@@ -2988,7 +2988,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
 
                             if( pElementId )
                             {
-                                mapCurShape->maId = *pElementId + "_" + OUString::valueOf(nEntryCount++);
+                                mapCurShape->maId = *pElementId + "_" + OUString::number(nEntryCount++);
                             }
 
                             mapCurShape->maShapePolyPoly = aShapePolyPoly;
@@ -3075,7 +3075,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
 
                         if( pElementId )
                         {
-                            mapCurShape->maId = *pElementId + "_" + OUString::valueOf(nEntryCount++);
+                            mapCurShape->maId = *pElementId + "_" + OUString::number(nEntryCount++);
                         }
 
                         mapCurShape->maShapePolyPoly = aPoly;
@@ -3140,7 +3140,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                         if(aStartArrow.Count())
                         {
                             mapCurShape->maShapePolyPoly = aStartArrow;
-                            mapCurShape->maId = *pElementId + "_" + OUString::valueOf(nEntryCount++);
+                            mapCurShape->maId = *pElementId + "_" + OUString::number(nEntryCount++);
 
                             ImplWriteShape( *mapCurShape );
                         }
@@ -3148,7 +3148,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                         if(aEndArrow.Count())
                         {
                             mapCurShape->maShapePolyPoly = aEndArrow;
-                            mapCurShape->maId = *pElementId + "_" + OUString::valueOf(nEntryCount++);
+                            mapCurShape->maId = *pElementId + "_" + OUString::number(nEntryCount++);
 
                             ImplWriteShape( *mapCurShape );
                         }
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index e2549afa5d22..8f0152562c62 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -1106,7 +1106,7 @@ sal_Bool T602ImportFilterDialog::OptionsDlg()
 void T602ImportFilterDialog::initLocale()
 {
     OString aModName( "t602filter" );
-    aModName += OString::valueOf( sal_Int32( SUPD ) );
+    aModName += OString::number( SUPD );
 
     mpResMgr = ResMgr::CreateResMgr( aModName.getStr(), LanguageTag( meLocale) );
 }
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx
index 37e1243f9e20..195069100a61 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -133,7 +133,7 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS,  const XML
                 sValue += sComma;
                 sValue += pFilter->maExtension;
                 sValue += sComma;
-                sValue += OUString::valueOf( pFilter->mnDocumentIconID );
+                sValue += OUString::number( pFilter->mnDocumentIconID );
                 sValue += sComma;
 
                 addProperty( xHandler, sData, sValue );
@@ -174,11 +174,11 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS,  const XML
                 sValue += sComma,
                 sValue += sFilterAdaptorService;
                 sValue += sComma,
-                sValue += OUString::valueOf( pFilter->maFlags );
+                sValue += OUString::number( pFilter->maFlags );
                 sValue += sComma;
                 sValue += sXSLTFilterService;
                 sValue += sDelim;
-                sValue += OUString::valueOf( pFilter->mbNeedsXSLT2 );
+                sValue += OUString::boolean( pFilter->mbNeedsXSLT2 );
                 sValue += sDelim;
 
                 const application_info_impl* pAppInfo = getApplicationInfo( pFilter->maExportService );
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 699bbfe5a961..3a9a92a6afec 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -333,7 +333,7 @@ OUString XMLFilterSettingsDialog::createUniqueFilterName( const OUString& rFilte
     {
         aFilterName = rFilterName;
         aFilterName += aSpace;
-        aFilterName += OUString::valueOf( nId++ );
+        aFilterName += OUString::number( nId++ );
     }
 
     return aFilterName;
@@ -354,7 +354,7 @@ OUString XMLFilterSettingsDialog::createUniqueTypeName( const OUString& rTypeNam
     {
         aTypeName = rTypeName;
         aTypeName += aSpace;
-        aTypeName += OUString::valueOf( nId++ );
+        aTypeName += OUString::number( nId++ );
     }
 
     return aTypeName;
@@ -1605,7 +1605,7 @@ Sequence< OUString > filter_info_impl::getFilterUserData() const
     Sequence< OUString > aUserData(8);
 
     aUserData[0] = OUString( "com.sun.star.documentconversion.XSLTFilter" );
-    aUserData[1] = OUString::valueOf( mbNeedsXSLT2 );
+    aUserData[1] = OUString::boolean( mbNeedsXSLT2 );
     aUserData[2] = maImportService;
     aUserData[3] = maExportService;
     aUserData[4] = maImportXSLT;
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 4976da058e54..fc33131b6f14 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -660,7 +660,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
                 if (xSubmitButtonComponent == xComponentSet)
                 {
                     // <name>.x=<pos.X>&<name>.y=<pos.Y>
-                    OUString aRhs = OUString::valueOf( MouseEvt.X );
+                    OUString aRhs = OUString::number( MouseEvt.X );
 
                     // Only if a name is available we have a name.x
                     OUStringBuffer aLhs(aName);
@@ -671,7 +671,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
                     rList.push_back( HtmlSuccessfulObj(aLhs.makeStringAndClear(), aRhs) );
 
                     aLhs.append(aName);
-                    aRhs = OUString::valueOf( MouseEvt.Y );
+                    aRhs = OUString::number( MouseEvt.Y );
                     if (!aName.isEmpty())
                         aLhs.append(".y");
                     else
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index f2e2de68f670..539026476279 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -400,7 +400,7 @@ namespace frm
                 if ( bIsNew )
                     ++nCount;
 
-                OUString sValue = OUString::valueOf( sal_Int32( nCount ) );
+                OUString sValue = OUString::number( nCount );
                 if ( !bFinalCount )
                     sValue += OUString(" *");
 
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index b0850e7ab9b7..58c0c44e6b20 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -450,7 +450,7 @@ namespace frm
             }
             else if ( _nFeatureId == FormFeature::MoveAbsolute )
             {
-                pNavBar->setFeatureText( _nFeatureId, OUString::valueOf(getIntegerState(_nFeatureId)) );
+                pNavBar->setFeatureText( _nFeatureId, OUString::number(getIntegerState(_nFeatureId)) );
             }
         }
 
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index 99222b267f7e..d4f677531245 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -1022,7 +1022,7 @@ void Binding::_checkBindingID()
             do
             {
                 nNumber++;
-                sName = sIDPrefix + OUString::valueOf( nNumber );
+                sName = sIDPrefix + OUString::number( nNumber );
             }
             while( xBindings->hasByName( sName ) );
             setBindingID( sName );
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index 66dbd907856a..a4f522ef50b8 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -741,7 +741,7 @@ namespace xforms
     {
         double fValue( 0 );
         normalizeValue( _rValue, fValue );
-        return OUString::valueOf( fValue );
+        return OUString::number( fValue );
     }
 
     //--------------------------------------------------------------------
@@ -959,7 +959,7 @@ namespace xforms
     {
         sal_Int16 nValue( 0 );
         OSL_VERIFY( _rValue >>= nValue );
-        return OUString::valueOf( (sal_Int32)nValue );
+        return OUString::number( nValue );
     }
 
     //--------------------------------------------------------------------
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index e4b07df13691..281638e5a28e 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -598,7 +598,7 @@ Model::XNode_t Model::createAttribute( const XNode_t& xParent,
         while( xElement->hasAttribute( sUniqueName ) )
         {
             nCount++;
-            sUniqueName = sName + OUString::valueOf( nCount );
+            sUniqueName = sName + OUString::number( nCount );
         }
 
         // TODO: implement proper namespace handling
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 06ccac4048f4..5f2d8424516d 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -456,7 +456,7 @@ namespace svt
             {
                 OSL_FAIL(
                     (   OString( "OCommonPicker::initialize: unknown argument type at position " )
-                    +=  OString::valueOf( (sal_Int32)( pArguments - _rArguments.getConstArray() ) )
+                    +=  OString::number( pArguments - _rArguments.getConstArray() )
                     ).getStr()
                 );
                 continue;
diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx
index 9e50ff352eae..27d9042c6500 100644
--- a/framework/source/accelerators/keymapping.cxx
+++ b/framework/source/accelerators/keymapping.cxx
@@ -189,7 +189,7 @@ OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode)
         return pIt->second;
 
     // If we have no well known identifier - use the pure code value!
-    return OUString::valueOf((sal_Int32)nCode);
+    return OUString::number(nCode);
 }
 
 //-----------------------------------------------
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index b1095a2fe181..6818e6a2e6df 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -166,7 +166,7 @@ MenuManager::MenuManager(
                         // Set item command for popup menu to enable it for GetImageFromURL
                         const static OUString aSlotString( "slot:" );
                         aItemCommand = aSlotString;
-                        aItemCommand += OUString::valueOf( (sal_Int32)ITEMID_ADDONLIST );
+                        aItemCommand += OUString::number( ITEMID_ADDONLIST );
                         pPopupMenu->SetItemCommand( ITEMID_ADDONLIST, aItemCommand );
 
                         AddMenu(pSubMenu,OUString(),nItemId,sal_True,sal_False);
@@ -570,7 +570,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
                 }
                 else
                 {
-                    aMenuShortCut = OUString::valueOf((sal_Int32)( i + 1 ));
+                    aMenuShortCut = OUString::number(( i + 1 ));
                     aMenuShortCut += ": ";
                 }
 
@@ -796,7 +796,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
                             {
                                 const static OUString aSlotString( "slot:" );
                                 aItemCommand = aSlotString;
-                                aItemCommand += OUString::valueOf( (sal_Int32)pMenuItemHandler->nItemId );
+                                aItemCommand += OUString::number( pMenuItemHandler->nItemId );
                                 pMenu->SetItemCommand( pMenuItemHandler->nItemId, aItemCommand );
                             }
 
@@ -946,7 +946,7 @@ sal_uInt16 MenuManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sa
     {
         const static OUString aSlotString( "slot:" );
         _rItemCommand = aSlotString;
-        _rItemCommand += OUString::valueOf( (sal_Int32)nItemId );
+        _rItemCommand += OUString::number( nItemId );
         _pMenu->SetItemCommand( nItemId, _rItemCommand );
     }
     return nItemId;
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 7141a72ae59a..2a503b03eed8 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -969,7 +969,7 @@ OUString AddonsOptions_Impl::GeneratePrefixURL()
     OUString aPopupMenuURL;
     OUStringBuffer aBuf( m_aRootAddonPopupMenuURLPrexfix.getLength() + 3 );
     aBuf.append( m_aRootAddonPopupMenuURLPrexfix );
-    aBuf.append( OUString::valueOf( ++m_nRootAddonPopupMenuId ));
+    aBuf.append( OUString::number( ++m_nRootAddonPopupMenuId ));
     aPopupMenuURL = aBuf.makeStringAndClear();
     return aPopupMenuURL;
 }
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 782eb2447f4a..36f0cf679187 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -267,7 +267,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p
             if ( aCommandURL.isEmpty() )
             {
                 aCommandURL = OUString( "slot:" );
-                aCommandURL += OUString::valueOf( (sal_Int32)nItemId );
+                aCommandURL += OUString::number( nItemId );
             }
 
             a <<= aCommandURL;
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index a1e4cbb45363..378c7c6fbb57 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -650,7 +650,7 @@ throw ( SAXException, RuntimeException )
     {
         pList->AddAttribute( m_aXMLStatusBarNS + OUString( ATTRIBUTE_WIDTH ),
                              m_aAttributeType,
-                             OUString::valueOf( (sal_Int32)nWidth ) );
+                             OUString::number( nWidth ) );
     }
 
     // offset (default STATUSBAR_OFFSET)
@@ -658,7 +658,7 @@ throw ( SAXException, RuntimeException )
     {
         pList->AddAttribute( m_aXMLStatusBarNS + OUString( ATTRIBUTE_OFFSET ),
                              m_aAttributeType,
-                             OUString::valueOf( (sal_Int32)nOffset ) );
+                             OUString::number( nOffset ) );
     }
 
     m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 8ffd7a20587b..c43538068f30 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -838,7 +838,7 @@ throw ( SAXException, RuntimeException )
     {
         pList->AddAttribute( m_aXMLToolbarNS + OUString( ATTRIBUTE_WIDTH ),
                              m_aAttributeType,
-                             OUString::valueOf( sal_Int32( nWidth )) );
+                             OUString::number( nWidth) );
     }
 
     m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index e6d54103cf56..4faaa15ed385 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -312,7 +312,7 @@ void impl_setDockingWindowVisibility( const css::uno::Reference< css::uno::XComp
         OUString aDockWinCommand( ".uno:" );
         OUString aDockWinArgName( aDockWinPrefixCommand );
 
-        aDockWinArgName += OUString::valueOf( nIndex );
+        aDockWinArgName += OUString::number( nIndex );
 
         css::uno::Sequence< css::beans::PropertyValue > aArgs(1);
         aArgs[0].Name  = aDockWinArgName;
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index 420ad32a14b5..8409d4cebc92 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -317,7 +317,7 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const OUString& aURL,
     OUString       sArrayName;
     // this value is used to name the arrays of aArgumentBuffer
     sArrayName = OUString("args");
-    sArrayName += OUString::valueOf((sal_Int32)m_nRecordingID);
+    sArrayName += OUString::number(m_nRecordingID);
 
     aScriptBuffer.appendAscii("rem ----------------------------------------------------------------------\n");
 
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index f1c4add2fd0a..f3950e1b6a43 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1176,7 +1176,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
     aPreDefPathVariables.m_FixedVar[ PREDEFVAR_VLANG ] = aLocaleStr;
 
     // Set $(langid)
-    aPreDefPathVariables.m_FixedVar[ PREDEFVAR_LANGID ] = OUString::valueOf( (sal_Int32)aPreDefPathVariables.m_eLanguageType );
+    aPreDefPathVariables.m_FixedVar[ PREDEFVAR_LANGID ] = OUString::number( aPreDefPathVariables.m_eLanguageType );
 
     // Set the other pre defined path variables
     // Set $(work)
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 3053fbbee5ed..3f7ec4bd938c 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -1212,14 +1212,14 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window
                     {
                         OUString aPosStr;
                         if ( i == PROPERTY_POS )
-                            aPosStr = OUString::valueOf( rWinStateInfo.aPos.X );
+                            aPosStr = OUString::number( rWinStateInfo.aPos.X );
                         else
-                            aPosStr = OUString::valueOf( rWinStateInfo.aDockPos.X );
+                            aPosStr = OUString::number( rWinStateInfo.aDockPos.X );
                         aPosStr += aDelim;
                         if ( i == PROPERTY_POS )
-                            aPosStr += OUString::valueOf( rWinStateInfo.aPos.Y );
+                            aPosStr += OUString::number( rWinStateInfo.aPos.Y );
                         else
-                            aPosStr += OUString::valueOf( rWinStateInfo.aDockPos.Y );
+                            aPosStr += OUString::number( rWinStateInfo.aDockPos.Y );
                         xPropSet->setPropertyValue( m_aPropArray[i], makeAny( aPosStr ) );
                         break;
                     }
@@ -1228,14 +1228,14 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window
                     {
                         OUString aSizeStr;
                         if ( i == PROPERTY_SIZE )
-                            aSizeStr = ( OUString::valueOf( rWinStateInfo.aSize.Width ));
+                            aSizeStr = ( OUString::number( rWinStateInfo.aSize.Width ));
                         else
-                            aSizeStr = ( OUString::valueOf( rWinStateInfo.aDockSize.Width ));
+                            aSizeStr = ( OUString::number( rWinStateInfo.aDockSize.Width ));
                         aSizeStr += aDelim;
                         if ( i == PROPERTY_SIZE )
-                            aSizeStr += OUString::valueOf( rWinStateInfo.aSize.Height );
+                            aSizeStr += OUString::number( rWinStateInfo.aSize.Height );
                         else
-                            aSizeStr += OUString::valueOf( rWinStateInfo.aDockSize.Height );
+                            aSizeStr += OUString::number( rWinStateInfo.aDockSize.Height );
                         xPropSet->setPropertyValue( m_aPropArray[i], makeAny( aSizeStr ) );
                         break;
                     }
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index c39d87a75dd1..cbf868e92e38 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -190,7 +190,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
                     fPoint = float( m_pHeightArray[nPos-1] ) / 10;
 
                     // Create dispatchable .uno command and set it
-                    aCommand = aFontHeightCommand + OUString::valueOf( fPoint );
+                    aCommand = aFontHeightCommand + OUString::number( fPoint );
                     pVCLPopupMenu->SetItemCommand( nPos, aCommand );
                 }
             }
@@ -209,7 +209,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
                         fPoint = float( m_pHeightArray[nPos-1] ) / 10;
 
                         // Create dispatchable .uno command and set it
-                        aCommand = aFontHeightCommand + OUString::valueOf( fPoint );
+                        aCommand = aFontHeightCommand + OUString::number( fPoint );
                         pVCLPopupMenu->SetItemCommand( nPos, aCommand );
                     }
                     pTempAry++;
@@ -228,7 +228,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
             fPoint = float( m_pHeightArray[nPos-1] ) / 10;
 
             // Create dispatchable .uno command and set it
-            aCommand = aFontHeightCommand + OUString::valueOf( fPoint );
+            aCommand = aFontHeightCommand + OUString::number( fPoint );
             pVCLPopupMenu->SetItemCommand( nPos, aCommand );
 
             pTempAry++;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index ad667efa7e01..ff46fb4e44ac 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -908,7 +908,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
                             if ( aItemCommand.isEmpty() )
                             {
                                 aItemCommand = OUString( "slot:" );
-                                aItemCommand += OUString::valueOf( (sal_Int32)pMenuItemHandler->nItemId );
+                                aItemCommand += OUString::number( pMenuItemHandler->nItemId );
                                 pMenu->SetItemCommand( pMenuItemHandler->nItemId, aItemCommand );
                             }
 
@@ -1343,7 +1343,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                         // Set item command for popup menu to enable it for GetImageFromURL
                         const OUString aSlotString( "slot:" );
                         OUString aNewItemCommand( aSlotString );
-                        aNewItemCommand += OUString::valueOf( (sal_Int32)ITEMID_ADDONLIST );
+                        aNewItemCommand += OUString::number( ITEMID_ADDONLIST );
                         pPopup->SetItemCommand( ITEMID_ADDONLIST, aNewItemCommand );
                     }
                     else
@@ -1960,7 +1960,7 @@ sal_uInt16 MenuBarManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu
     {
         const static OUString aSlotString( "slot:" );
         _rItemCommand = aSlotString;
-        _rItemCommand += OUString::valueOf( (sal_Int32)nItemId );
+        _rItemCommand += OUString::number( nItemId );
         _pMenu->SetItemCommand( nItemId, _rItemCommand );
     }
     return nItemId;
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index d5447d641f10..68c71fd362eb 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -90,7 +90,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed:
                 // use VCL popup menu pointer to set vital information that are not part of the awt implementation
 
                 OUString aCommand( aVerbCommand );
-                aCommand += OUString::valueOf( rVerb.VerbID );
+                aCommand += OUString::number( rVerb.VerbID );
                 pVCLPopupMenu->SetItemCommand( i+1, aCommand ); // Store verb command
             }
         }
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index ea55937d94c0..39c0cef03baf 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -356,8 +356,8 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star::
                 double      fValue;
                 bool        bFloat( false );
                 if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat ))
-                    aStep = bFloat ? OUString::valueOf( fValue ) :
-                                     OUString::valueOf( nValue );
+                    aStep = bFloat ? OUString::number( fValue ) :
+                                     OUString::number( nValue );
                 break;
             }
         }
@@ -374,7 +374,7 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star::
 
                 if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat ))
                 {
-                    aValue = bFloat ? OUString::valueOf( fValue ) : OUString::valueOf( nValue );
+                    aValue = bFloat ? OUString::number( fValue ) : OUString::number( nValue );
                     bFloatValue = bFloat;
                 }
                 break;
@@ -394,18 +394,18 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star::
             {
                 if ( aName.equalsAsciiL( "Value", 5 ))
                 {
-                    aValue = bFloat ? OUString::valueOf( fValue ) : OUString::valueOf( nValue );
+                    aValue = bFloat ? OUString::number( fValue ) : OUString::number( nValue );
                     bFloatValue = bFloat;
                 }
                 else if ( aName.equalsAsciiL( "Step", 4 ))
-                    aStep = bFloat ? OUString::valueOf( fValue ) :
-                                     OUString::valueOf( nValue );
+                    aStep = bFloat ? OUString::number( fValue ) :
+                                     OUString::number( nValue );
                 else if ( aName.equalsAsciiL( "LowerLimit", 10 ))
-                    aMin = bFloat ? OUString::valueOf( fValue ) :
-                                    OUString::valueOf( nValue );
+                    aMin = bFloat ? OUString::number( fValue ) :
+                                    OUString::number( nValue );
                 else if ( aName.equalsAsciiL( "UpperLimit", 10 ))
-                    aMax = bFloat ? OUString::valueOf( fValue ) :
-                                    OUString::valueOf( nValue );
+                    aMax = bFloat ? OUString::number( fValue ) :
+                                    OUString::number( nValue );
             }
             else if ( aName.equalsAsciiL( "OutputFormat", 12 ))
                 rControlCommand.Arguments[i].Value >>= m_aOutFormat;
@@ -421,8 +421,8 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star::
                 double      fValue;
                 bool        bFloat( false );
                 if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat ))
-                    aMin = bFloat ? OUString::valueOf( fValue ) :
-                                    OUString::valueOf( nValue );
+                    aMin = bFloat ? OUString::number( fValue ) :
+                                    OUString::number( nValue );
                 break;
             }
         }
@@ -437,8 +437,8 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star::
                 double      fValue;
                 bool        bFloat( false );
                 if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat ))
-                    aMax = bFloat ? OUString::valueOf( fValue ) :
-                                    OUString::valueOf( nValue );
+                    aMax = bFloat ? OUString::number( fValue ) :
+                                    OUString::number( nValue );
                 break;
             }
         }
@@ -507,9 +507,9 @@ OUString SpinfieldToolbarController::impl_formatOutputString( double fValue )
     if ( m_aOutFormat.isEmpty() )
     {
         if ( m_bFloat )
-            return OUString::valueOf( fValue );
+            return OUString::number( fValue );
         else
-            return OUString::valueOf( sal_Int32( fValue ));
+            return OUString::number( sal_Int32( fValue ));
     }
     else
     {
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index 253944b39bae..b34be307cbb0 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -717,7 +717,7 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor*
         sal_Int64       nValue = pImageList->aMaskColor.GetRGBColor();
 
         aColorStrBuffer.appendAscii( "#" );
-        aColorStrBuffer.append( OUString::valueOf( nValue, 16 ));
+        aColorStrBuffer.append( OUString::number( nValue, 16 ));
 
         pList->AddAttribute( m_aXMLImageNS + OUString( ATTRIBUTE_MASKCOLOR ),
                              m_aAttributeType,
@@ -757,7 +757,7 @@ void OWriteImagesDocumentHandler::WriteImage( const ImageItemDescriptor* pImage
 
     pList->AddAttribute( m_aXMLImageNS + OUString( ATTRIBUTE_BITMAPINDEX ),
                          m_aAttributeType,
-                         OUString::valueOf( (sal_Int32)pImage->nIndex ) );
+                         OUString::number( pImage->nIndex ) );
 
     pList->AddAttribute( m_aXMLImageNS + OUString( ATTRIBUTE_COMMAND ),
                          m_aAttributeType,
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index fe997965214a..29fa1a10f0bf 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -46,7 +46,7 @@ extern int getRepFamilyName(const char* , char *, double &ratio);
 #define rendEl(x)       do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->endElement(x); } while(0)
 #define rchars(x)       do { if (m_rxDocumentHandler.is()) m_rxDocumentHandler->characters(x); } while(0)
 #define padd(x,y,z)     pList->addAttribute(x,y,z)
-#define Double2Str(x)   OUString::valueOf((double)(x))
+#define Double2Str(x)   OUString::number((double)(x))
 #define WTI(x)          ((double)(x) / 1800.)     // unit => inch
 #define WTMM(x)     ((double)(x) / 1800. * 25.4)  // unit => mm
 #define WTSM(x)     ((int)((x) / 1800. * 2540))   // unit ==> 1/100 mm
diff --git a/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx
index 634c414efd2e..b9356948f92f 100644
--- a/i18npool/source/calendar/calendar_jewish.cxx
+++ b/i18npool/source/calendar/calendar_jewish.cxx
@@ -287,7 +287,7 @@ Calendar_jewish::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNa
 
     if (nCalendarDisplayCode == CalendarDisplayCode::SHORT_YEAR) {
         sal_Int32 value = getValue(CalendarFieldIndex::YEAR) % 1000; // take last 3 digits
-        return aNatNum.getNativeNumberString(OUString::valueOf(value), aLocale, nNativeNumberMode );
+        return aNatNum.getNativeNumberString(OUString::number(value), aLocale, nNativeNumberMode );
     }
     else
         return Calendar_gregorian::getDisplayString(nCalendarDisplayCode, nNativeNumberMode );
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 0bc185ca4810..e7c215339a18 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -342,7 +342,7 @@ void lcl_formatChars( const sal_Unicode table[], int tableSize, int n, OUString&
 
      if( n>=tableSize ) lcl_formatChars( table, tableSize, (n-tableSize)/tableSize, s );
 
-     s += OUString::valueOf( table[ n % tableSize ] );
+     s += OUString( table[ n % tableSize ] );
 }
 
 static
@@ -355,7 +355,7 @@ void lcl_formatChars1( const sal_Unicode table[], int tableSize, int n, OUString
      int repeat_count = n / tableSize + 1;
 
      for( int i=0; i<repeat_count; i++ )
-         s += OUString::valueOf( table[ n%tableSize ] );
+         s += OUString( table[ n%tableSize ] );
 }
 
 static
@@ -367,9 +367,9 @@ void lcl_formatChars2( const sal_Unicode table_capital[], const sal_Unicode tabl
      if( n>=tableSize )
      {
           lcl_formatChars2( table_capital, table_small, tableSize, (n-tableSize)/tableSize, s );
-          s += OUString::valueOf( table_small[ n % tableSize ] );
+          s += OUString( table_small[ n % tableSize ] );
      } else
-          s += OUString::valueOf( table_capital[ n % tableSize ] );
+          s += OUString( table_capital[ n % tableSize ] );
 }
 
 static
@@ -379,10 +379,10 @@ void lcl_formatChars3( const sal_Unicode table_capital[], const sal_Unicode tabl
      // if A=='A' then 0=>A, 1=>B, ..., 25=>Z, 26=>Aa, 27=>Bb, ...
 
      int repeat_count = n / tableSize + 1;
-     s += OUString::valueOf( table_capital[ n%tableSize ] );
+     s += OUString( table_capital[ n%tableSize ] );
 
      for( int i=1; i<repeat_count; i++ )
-         s += OUString::valueOf( table_small[ n%tableSize ] );
+         s += OUString( table_small[ n%tableSize ] );
 }
 
 
@@ -624,7 +624,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
                result += toRoman( number ).toAsciiLowerCase();
                break;
           case ARABIC:
-               result += OUString::valueOf( number );
+               result += OUString::number( number );
                break;
           case NUMBER_NONE:
                return OUString(""); // ignore prefix and suffix
@@ -643,7 +643,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
                break;
           case TRANSLITERATION:
                try {
-                    const OUString &tmp = OUString::valueOf( number );
+                    const OUString &tmp = OUString::number( number );
                     OUString transliteration;
                     getPropertyByName(aProperties, "Transliteration", sal_True) >>= transliteration;
                     impl_loadTranslit();
@@ -651,7 +651,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
                     result += translit->transliterateString2String(tmp, 0, tmp.getLength());
                } catch (Exception& ) {
                     // When translteration property is missing, return default number (bug #101141#)
-                    result += OUString::valueOf( number );
+                    result += OUString::number( number );
                     // OSL_ASSERT(0);
                     // throw IllegalArgumentException();
                }
@@ -856,10 +856,10 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
 
         if (natNum) {
             NativeNumberSupplier sNatNum;
-            result += sNatNum.getNativeNumberString(OUString::valueOf( number ), locale, natNum);
+            result += sNatNum.getNativeNumberString(OUString::number( number ), locale, natNum);
         } else if (tableSize) {
             if ( number > tableSize && !recycleSymbol)
-                result += OUString::valueOf( number);
+                result += OUString::number( number);
             else
                 result += OUString(&table[--number % tableSize], 1);
         }
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 80d440027f1c..7901b2fa798d 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -379,8 +379,7 @@ void SvMetaName::WriteAttributes( SvIdlDataBase &, SvStream & rOutStm,
     {
         WriteTab( rOutStm, nTab );
         rOutStm << "helpcontext("
-                << OString::valueOf(static_cast<sal_Int64>(
-                    GetHelpContext().GetValue())).getStr()
+                << OString::number(GetHelpContext().GetValue()).getStr()
                 << ")," << endl;
     }
 }
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index b926b26e21e5..e265af7255db 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -344,8 +344,7 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
             if( nId1 == nId2 && nId1 != 0 )
             {
                 OSL_FAIL( "Gleiche Id in MetaClass : " );
-                OSL_FAIL(OString::valueOf(static_cast<sal_Int32>(
-                    pS->GetSlotId().GetValue())).getStr());
+                OSL_FAIL(OString::number(pS->GetSlotId().GetValue()).getStr());
                 OSL_FAIL( pS->GetSlotId().getString().getStr() );
                 OSL_FAIL( rAttr.GetSlotId().getString().getStr() );
 
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index e77bd54d346b..9201b53d0dc1 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -1154,8 +1154,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
     rOutStm << "// Slot Nr. "
         << OString::number(nListPos).getStr()
         << " : ";
-    OString aSlotIdValue(OString::valueOf(static_cast<sal_Int32>(
-        GetSlotId().GetValue())));
+    OString aSlotIdValue(OString::number(GetSlotId().GetValue()));
     rOutStm << aSlotIdValue.getStr() << endl;
     WriteTab( rOutStm, 1 );
     if( bIsEnumSlot )
@@ -1181,11 +1180,11 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
     if( bIsEnumSlot )
     {
         rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
-            << OString::valueOf(static_cast<sal_Int32>(pLinkedSlot->GetListPos())).getStr()
+            << OString::number(pLinkedSlot->GetListPos()).getStr()
             << "] /*Offset Master*/, " << endl;
         WriteTab( rOutStm, 4 );
         rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
-            << OString::valueOf(static_cast<sal_Int32>(pNextSlot->GetListPos())).getStr()
+            << OString::number(pNextSlot->GetListPos()).getStr()
             << "] /*Offset Next*/, " << endl;
 
         WriteTab( rOutStm, 4 );
@@ -1240,13 +1239,13 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
         else
         {
             rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
-                << OString::valueOf(static_cast<sal_Int32>(pLinkedSlot->GetListPos())).getStr()
+                << OString::number(pLinkedSlot->GetListPos()).getStr()
                 << "] /*Offset Linked*/, " << endl;
             WriteTab( rOutStm, 4 );
         }
 
         rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
-            << OString::valueOf(static_cast<sal_Int32>(pNextSlot->GetListPos())).getStr()
+            << OString::number(pNextSlot->GetListPos()).getStr()
             << "] /*Offset Next*/, " << endl;
 
         WriteTab( rOutStm, 4 );
@@ -1377,8 +1376,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
                 pType = GetType();
             sal_uLong nSCount = pType->GetAttrCount();
             rOutStm
-                << OString::valueOf(static_cast<sal_Int32>(
-                    nSCount)).getStr()
+                << OString::number(nSCount).getStr()
                 << "/*Count*/";
         }
         else
@@ -1529,8 +1527,8 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
                 rTable[ nSId2 ] = this;
 
                 rOutStm << "#define " << aSId.getStr() << '\t'
-                    << OString::valueOf(
-                        static_cast<sal_Int32>(nSId2)).getStr()
+                    << OString::number(
+                        nSId2).getStr()
                     << endl;
             }
         }
@@ -1550,8 +1548,8 @@ void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm )
     rStrm << "PROJECT,";
     rStrm << GetSlotId().getString().getStr() << ',';
     rStrm
-        << OString::valueOf(
-            static_cast<sal_Int32>(GetSlotId().GetValue())).getStr()
+        << OString::number(
+            GetSlotId().GetValue()).getStr()
         << ',';
 
     if ( !GetPseudoPrefix().isEmpty() )
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index c1ecbf82cf22..642d303586da 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -419,7 +419,7 @@ void SvMetaAttribute::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm
             {
                 WriteTab( rOutStm, nTab );
                 rOutStm << "id("
-                    << OString::valueOf(static_cast<sal_Int32>(MakeSlotValue(rBase,bVar))).getStr()
+                    << OString::number(MakeSlotValue(rBase,bVar)).getStr()
                     << ")," << endl;
             }
             if( bVar && (bReadonly || IsMethod()) )
@@ -461,7 +461,7 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
         }
     }
     rOutStm << "pODKCallFunction( "
-        << OString::valueOf(static_cast<sal_Int32>(MakeSlotValue(rBase, IsVariable()))).getStr();
+        << OString::number(MakeSlotValue(rBase, IsVariable())).getStr();
     rOutStm << ',' << endl;
     WriteTab( rOutStm, 3 );
     rOutStm << " h" << rBase.aIFaceName.getStr() << " , ";
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 091fba389c68..b505b1e3259e 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -716,8 +716,7 @@ sal_Bool SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
             SvStringHashEntry* pEntry = aList[ i ];
             rOutStm << "#define " << pEntry->GetName().getStr()
                     << '\t'
-                    << OString::valueOf(static_cast<sal_Int64>(
-                        pEntry->GetValue())).getStr()
+                    << OString::number(pEntry->GetValue()).getStr()
                     << endl;
         }
     }
diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index f35d4d019f71..683695e98f97 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -1145,23 +1145,23 @@ OString AstExpression::toString()
         switch (m_exprValue->et)
         {
             case ET_short:
-                return OString::valueOf((sal_Int32)m_exprValue->u.sval);
+                return OString::number(m_exprValue->u.sval);
             case ET_ushort:
-                return OString::valueOf((sal_Int32)m_exprValue->u.usval);
+                return OString::number(m_exprValue->u.usval);
             case ET_long:
-                return OString::valueOf(m_exprValue->u.lval);
+                return OString::number(m_exprValue->u.lval);
             case ET_ulong:
-                return OString::valueOf((sal_Int32)m_exprValue->u.ulval);
+                return OString::number(m_exprValue->u.ulval);
             case ET_hyper:
-                return OString::valueOf(m_exprValue->u.hval);
+                return OString::number(m_exprValue->u.hval);
             case ET_uhyper:
-                return OString::valueOf((sal_Int64)m_exprValue->u.uhval);
+                return OString::number(m_exprValue->u.uhval);
             case ET_float:
-                return OString::valueOf(m_exprValue->u.fval);
+                return OString::number(m_exprValue->u.fval);
             case ET_double:
-                return OString::valueOf(m_exprValue->u.dval);
+                return OString::number(m_exprValue->u.dval);
             case ET_byte:
-                return OString::valueOf((sal_Int32)m_exprValue->u.byval);
+                return OString::number(m_exprValue->u.byval);
             case ET_boolean:
                 if ( m_exprValue->u.lval == 0)
                     return OString("FALSE");
diff --git a/idlc/source/idlcmain.cxx b/idlc/source/idlcmain.cxx
index 37017b9bcfd8..fbec6deb6af5 100644
--- a/idlc/source/idlcmain.cxx
+++ b/idlc/source/idlcmain.cxx
@@ -113,7 +113,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         {
             outputFile = (options.getOption("-O"));
             if ('/' != outputFile.getStr()[outputFile.getLength()-1]) {
-                outputFile += OString::valueOf('/');
+                outputFile += OString('/');
             }
             outputFile += strippedFileName.replaceAt(
                     strippedFileName.getLength() -3 , 3, "urd");
@@ -127,7 +127,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         if (options.isValid("-M")) {
             depFileUrl = convertToFileUrl(options.getOption("-M"));
             if ('/' != depFileUrl.getStr()[depFileUrl.getLength()-1]) {
-                depFileUrl += OString::valueOf('/');
+                depFileUrl += OString('/');
             }
             depFileUrl += strippedFileName.replaceAt(
                     strippedFileName.getLength() -3 , 3, "d");
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index 4601527a949f..142db5b5e603 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -51,13 +51,13 @@ namespace comphelper
             return OUString::createFromAscii( _pAsciiValue );
         }
 
-        inline OUString convertLogArgToString( double      _nValue ) { return OUString::valueOf( _nValue ); }
-        inline OUString convertLogArgToString( float       _nValue ) { return OUString::valueOf( _nValue ); }
-        inline OUString convertLogArgToString( sal_Int64   _nValue ) { return OUString::valueOf( _nValue ); }
-        inline OUString convertLogArgToString( sal_Int32   _nValue ) { return OUString::valueOf( _nValue ); }
-        inline OUString convertLogArgToString( sal_Int16   _nValue ) { return OUString::valueOf( (sal_Int32)_nValue ); }
-        inline OUString convertLogArgToString( sal_Unicode _nValue ) { return OUString::valueOf( _nValue ); }
-        inline OUString convertLogArgToString( sal_Bool    _nValue ) { return OUString::valueOf( _nValue ); }
+        inline OUString convertLogArgToString( double      _nValue ) { return OUString::number( _nValue ); }
+        inline OUString convertLogArgToString( float       _nValue ) { return OUString::number( _nValue ); }
+        inline OUString convertLogArgToString( sal_Int64   _nValue ) { return OUString::number( _nValue ); }
+        inline OUString convertLogArgToString( sal_Int32   _nValue ) { return OUString::number( _nValue ); }
+        inline OUString convertLogArgToString( sal_Int16   _nValue ) { return OUString::number( _nValue ); }
+        inline OUString convertLogArgToString( sal_Unicode _nValue ) { return OUString( _nValue ); }
+        inline OUString convertLogArgToString( sal_Bool    _nValue ) { return OUString::boolean( _nValue ); }
 
     } } // namespace log::convert
 
diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx
index 6d61eb1d7e36..e9b9fab558cd 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -214,8 +214,8 @@ public:
         @return newly created ID.
      */
     inline sal_Int32 GetUniqueId() { return mnMaxDocId++; }
-    inline OString GetUniqueIdOString() { return OString::valueOf( mnMaxDocId++ ); }
-    inline OUString GetUniqueIdOUString() { return OUString::valueOf( mnMaxDocId++ ); }
+    inline OString GetUniqueIdOString() { return OString::number( mnMaxDocId++ ); }
+    inline OUString GetUniqueIdOUString() { return OUString::number( mnMaxDocId++ ); }
 
     /** Write the document properties into into the current OPC package.
 
diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index 04c3b3375742..a712254a7478 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -20,9 +20,9 @@
 #ifndef _OOX_EXPORT_UTILS_HXX_
 #define _OOX_EXPORT_UTILS_HXX_
 
-#define I32S(x) OString::valueOf( (sal_Int32) x ).getStr()
-#define I64S(x) OString::valueOf( (sal_Int64) x ).getStr()
-#define IS(x) OString::valueOf( x ).getStr()
+#define I32S(x) OString::number( (sal_Int32) x ).getStr()
+#define I64S(x) OString::number( (sal_Int64) x ).getStr()
+#define IS(x) OString::number( x ).getStr()
 #define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr()
 
 #ifndef DBG
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index d58dc9f38e85..e54ce8e7fc29 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -1501,7 +1501,7 @@ public:
       @return   a string with the string representation of the argument.
       @deprecated use boolean()
     */
-    SAL_DEPRECATED_INTERNAL("use boolean()") static OString valueOf( sal_Bool b ) SAL_THROW(())
+    SAL_DEPRECATED("use boolean()") static OString valueOf( sal_Bool b ) SAL_THROW(())
     {
         return boolean(b);
     }
@@ -1532,7 +1532,7 @@ public:
       @return   a string with the string representation of the argument.
       @deprecated use operator, function or constructor taking char or sal_Unicode argument
     */
-    SAL_DEPRECATED_INTERNAL("convert to OString or use directly") static OString valueOf( sal_Char c ) SAL_THROW(())
+    SAL_DEPRECATED("convert to OString or use directly") static OString valueOf( sal_Char c ) SAL_THROW(())
     {
         return OString( &c, 1 );
     }
@@ -1547,7 +1547,7 @@ public:
       @return   a string with the string representation of the argument.
       @deprecated use number()
     */
-    SAL_DEPRECATED_INTERNAL("use number()") static OString valueOf( sal_Int32 i, sal_Int16 radix = 10 ) SAL_THROW(())
+    SAL_DEPRECATED("use number()") static OString valueOf( sal_Int32 i, sal_Int16 radix = 10 ) SAL_THROW(())
     {
         return number( i, radix );
     }
@@ -1562,7 +1562,7 @@ public:
       @return   a string with the string representation of the argument.
       @deprecated use number()
     */
-    SAL_DEPRECATED_INTERNAL("use number()") static OString valueOf( sal_Int64 ll, sal_Int16 radix = 10 ) SAL_THROW(())
+    SAL_DEPRECATED("use number()") static OString valueOf( sal_Int64 ll, sal_Int16 radix = 10 ) SAL_THROW(())
     {
         return number( ll, radix );
     }
@@ -1576,7 +1576,7 @@ public:
       @return   a string with the string representation of the argument.
       @deprecated use number()
     */
-    SAL_DEPRECATED_INTERNAL("use number()") static OString valueOf( float f ) SAL_THROW(())
+    SAL_DEPRECATED("use number()") static OString valueOf( float f ) SAL_THROW(())
     {
         return number(f);
     }
@@ -1590,7 +1590,7 @@ public:
       @return   a string with the string representation of the argument.
       @deprecated use number()
     */
-    SAL_DEPRECATED_INTERNAL("use number()") static OString valueOf( double d ) SAL_THROW(())
+    SAL_DEPRECATED("use number()") static OString valueOf( double d ) SAL_THROW(())
     {
         return number(d);
     }
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 94527db4c828..daa0ff52ea43 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -2113,7 +2113,7 @@ public:
       @return   a string with the string representation of the argument.
       @deprecated use boolean()
     */
-    SAL_DEPRECATED_INTERNAL("use boolean()") static OUString valueOf( sal_Bool b ) SAL_THROW(())
+    SAL_DEPRECATED("use boolean()") static OUString valueOf( sal_Bool b ) SAL_THROW(())
     {
         return boolean(b);
     }
@@ -2144,7 +2144,7 @@ public:
       @return   a string with the string representation of the argument.
       @deprecated use operator, function or constructor taking char or sal_Unicode argument
     */
-    SAL_DEPRECATED_INTERNAL("convert to OUString or use directly") static OUString valueOf( sal_Unicode c ) SAL_THROW(())
+    SAL_DEPRECATED("convert to OUString or use directly") static OUString valueOf( sal_Unicode c ) SAL_THROW(())
     {
         return OUString( &c, 1 );
     }
@@ -2159,7 +2159,7 @@ public:
       @return   a string with the string representation of the argument.
       @deprecated use number()
     */
-    SAL_DEPRECATED_INTERNAL("use number()") static OUString valueOf( sal_Int32 i, sal_Int16 radix = 10 ) SAL_THROW(())
+    SAL_DEPRECATED("use number()") static OUString valueOf( sal_Int32 i, sal_Int16 radix = 10 ) SAL_THROW(())
     {
         return number( i, radix );
     }
@@ -2174,7 +2174,7 @@ public:
       @return   a string with the string representation of the argument.
       @deprecated use number()
     */
-    SAL_DEPRECATED_INTERNAL("use number()") static OUString valueOf( sal_Int64 ll, sal_Int16 radix = 10 ) SAL_THROW(())
+    SAL_DEPRECATED("use number()") static OUString valueOf( sal_Int64 ll, sal_Int16 radix = 10 ) SAL_THROW(())
     {
         return number( ll, radix );
     }
@@ -2188,7 +2188,7 @@ public:
       @return   a string with the string representation of the argument.
       @deprecated use number()
     */
-    SAL_DEPRECATED_INTERNAL("use number()") static OUString valueOf( float f ) SAL_THROW(())
+    SAL_DEPRECATED("use number()") static OUString valueOf( float f ) SAL_THROW(())
     {
         return number(f);
     }
@@ -2202,7 +2202,7 @@ public:
       @return   a string with the string representation of the argument.
       @deprecated use number()
     */
-    SAL_DEPRECATED_INTERNAL("use number()") static OUString valueOf( double d ) SAL_THROW(())
+    SAL_DEPRECATED("use number()") static OUString valueOf( double d ) SAL_THROW(())
     {
         return number(d);
     }
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index fce623d58569..6e06a83cce02 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -676,7 +676,7 @@ private:
         {
             return ImpGetNatNumString( rNum, nVal, nMinDigits );
         }
-        return OUString::valueOf(nVal);
+        return OUString::number(nVal);
     }
 
     // transliterate according to NativeNumber
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx
index 6c0a8cabadcc..8f713e713185 100644
--- a/io/source/acceptor/acc_pipe.cxx
+++ b/io/source/acceptor/acc_pipe.cxx
@@ -72,7 +72,7 @@ namespace io_acceptor
     {
         // make it unique
         m_sDescription += ",uniqueValue=";
-        m_sDescription += OUString::valueOf(
+        m_sDescription += OUString::number(
             sal::static_int_cast<sal_Int64 >(
                 reinterpret_cast< sal_IntPtr >(&m_pipe)),
             10 );
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx
index 1eda5fc1234b..6a10eb4fd5cf 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -164,7 +164,7 @@ namespace io_acceptor {
     {
         // make it unique
         m_sDescription += ",uniqueValue=" ;
-        m_sDescription += OUString::valueOf(
+        m_sDescription += OUString::number(
             sal::static_int_cast< sal_Int64 >(
                 reinterpret_cast< sal_IntPtr >(&m_socket)),
             10 );
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index 5356f3932b3d..22bee639e9fd 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -100,7 +100,7 @@ namespace stoc_connector
                     OUString sMessage("Connector : couldn't connect to pipe ");
                     sMessage += aName;
                     sMessage += "(";
-                    sMessage += OUString::valueOf( (sal_Int32 ) pConn->m_pipe.getError() );
+                    sMessage += OUString::number(  pConn->m_pipe.getError() );
                     sMessage += ")";
                     delete pConn;
                     throw NoConnectException( sMessage ,Reference< XInterface > () );
diff --git a/io/source/connector/ctr_pipe.cxx b/io/source/connector/ctr_pipe.cxx
index b4f5c7f9eb44..5533bcf79e52 100644
--- a/io/source/connector/ctr_pipe.cxx
+++ b/io/source/connector/ctr_pipe.cxx
@@ -35,7 +35,7 @@ namespace stoc_connector {
     {
         // make it unique
         m_sDescription += ",uniqueValue=";
-        m_sDescription += OUString::valueOf(
+        m_sDescription += OUString::number(
             sal::static_int_cast< sal_Int64 >(
                 reinterpret_cast< sal_IntPtr >(&m_pipe)),
             10 );
diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx
index 745644790adf..e27d9af76cf5 100644
--- a/io/source/connector/ctr_socket.cxx
+++ b/io/source/connector/ctr_socket.cxx
@@ -86,7 +86,7 @@ namespace stoc_connector {
     {
         // make it unique
         m_sDescription += ",uniqueValue=";
-        m_sDescription += OUString::valueOf(
+        m_sDescription += OUString::number(
             sal::static_int_cast< sal_Int64 >(
                 reinterpret_cast< sal_IntPtr >(&m_socket)),
             10 );
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 0e323cfb9f96..75c34129a4c7 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -405,7 +405,7 @@ bool getJavaProps(const OUString & exePath,
     rtl_uString *args[4] = {arg1.pData, arg2.pData, arg3.pData};
 
     // Only add the fourth param if the bootstrap parameter is set.
-    if (sValue.equals(OUString::valueOf((sal_Int32) 1)))
+    if (sValue.equals(OUString::number( 1)))
     {
         args[3] = arg4.pData;
         cArgs = 4;
@@ -1215,7 +1215,7 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
                         JFW_TRACE2(OUString("[Java framework] sunjavaplugin: ")
                                    + "Could not read directory "
                                    + usDir2 + ". Osl file error: "
-                                   + OUString::valueOf((sal_Int32) openErr));
+                                   + OUString::number(openErr));
                         continue;
                     }
 
@@ -1228,7 +1228,7 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
                         if ((errStatus = curIt.getFileStatus(aStatus)) != File::E_None)
                         {
                             JFW_TRACE2(excMessage + "getFileStatus failed with error "
-                                + OUString::valueOf((sal_Int32) errStatus));
+                                + OUString::number(errStatus));
                             continue;
                         }
                         JFW_TRACE2(OUString("[Java framework] sunjavaplugin: ") +
@@ -1242,7 +1242,7 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
                                 OUString("[Java framework] sunjavaplugin: ")
                                 + "Error while iterating over contens of "
                                 + usDir2 + ". Osl file error: "
-                                + OUString::valueOf((sal_Int32) openErr));
+                                + OUString::number(openErr));
                 }
                 else
                 {
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 712939b94e6f..db5c3e24bd22 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -996,8 +996,8 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
     xmlAddChild(pJavaInfoNode, nodeCrLf);
 
     //Create the features element
-    OUString sFeatures = OUString::valueOf(
-        (sal_Int64)nFeatures, 16);
+    OUString sFeatures = OUString::number(
+        nFeatures, 16);
     xmlNewTextChild(pJavaInfoNode, NULL, (xmlChar*) "features",
                     CXmlCharPtr(sFeatures));
     //add a new line for better readability
@@ -1006,8 +1006,8 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
 
 
     //Create the requirements element
-    OUString sRequirements = OUString::valueOf(
-        (sal_Int64) nRequirements, 16);
+    OUString sRequirements = OUString::number(
+         nRequirements, 16);
     xmlNewTextChild(pJavaInfoNode, NULL, (xmlChar*) "requirements",
                     CXmlCharPtr(sRequirements));
     //add a new line for better readability
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index c4110a3a77ce..1b4cf3ccec07 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -322,7 +322,7 @@ OUString VendorSettings::getPluginLibrary(const OUString& sVendor)
 
     for (sal_Int32 i = 1; ; i++)
     {
-        OUString sName = OUString(UNO_JAVA_JFW_PARAMETER) + OUString::valueOf(i);
+        OUString sName = OUString(UNO_JAVA_JFW_PARAMETER) + OUString::number(i);
         OUString sValue;
         if (Bootstrap::get()->getFrom(sName, sValue) == sal_True)
         {
@@ -528,7 +528,7 @@ JFW_MODE getMode()
                     {
                         OUString sParams = OUString(
                             UNO_JAVA_JFW_PARAMETER) +
-                            OUString::valueOf((sal_Int32)1);
+                            OUString::number(1);
                         if (aBoot->getFrom(sParams, sValue) == sal_False)
                         {
                             bDirectMode = false;
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index a481a5576605..b43938966045 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -951,7 +951,7 @@ sal_Bool Export::WriteExportList(ResData *pResData, ExportList *pExportList,
         }
         else
         {
-            sLID = OString::valueOf(static_cast<sal_Int64>(i + 1));
+            sLID = OString::number(i + 1);
             sText = StripList( sText );
             if( sText == "\\\"" )
                 sText = "\"";
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 55bf4bc7688f..40550bcd6e85 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -1083,10 +1083,10 @@ XMLFile *SimpleXMLParser::Execute( const OUString &rFileName, XMLFile* pXMLFileI
             aErrorInformation.sMessage += pXMLFile->GetName();
         else
             aErrorInformation.sMessage += OUString( "XML-File (");
-        aErrorInformation.sMessage += OUString::valueOf(
+        aErrorInformation.sMessage += OUString::number(
             sal::static_int_cast< sal_Int64 >(aErrorInformation.nLine));
         aErrorInformation.sMessage += OUString( ",");
-        aErrorInformation.sMessage += OUString::valueOf(
+        aErrorInformation.sMessage += OUString::number(
             sal::static_int_cast< sal_Int64 >(aErrorInformation.nColumn));
         aErrorInformation.sMessage += OUString( "): ");
 
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 91a30d367bad..80b8beedf71d 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -366,7 +366,7 @@ void ConvDicXMLExport::_ExportContent()
             DBG_ASSERT( nPropertyType, "property-type not found" );
             if (nPropertyType == -1)
                 nPropertyType = ConversionPropertyType::NOT_DEFINED;
-            AddAttribute( XML_NAMESPACE_TCD, "property-type", OUString::valueOf( (sal_Int32) nPropertyType ) );
+            AddAttribute( XML_NAMESPACE_TCD, "property-type", OUString::number(  nPropertyType ) );
         }
         SvXMLElementExport aEntryMain( *this, XML_NAMESPACE_TCD,
                 "entry" , sal_True, sal_True );
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index a8e6db0e1b23..b806c22047d9 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -292,7 +292,7 @@ OUString GrammarCheckingIterator::GetOrCreateDocId(
         else // add new entry
         {
             sal_Int32 nRes = NextDocId();
-            aRes = OUString::valueOf( nRes );
+            aRes = OUString::number( nRes );
             m_aDocIdMap[ xComponent.get() ] = aRes;
             xComponent->addEventListener( this );
         }
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index e3d4639b6e05..95e165f732ac 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -622,7 +622,7 @@ namespace
             Sequence< OUString > aNames(1);
             OUString &rNodeName = aNames.getArray()[0];
             rNodeName = rLastFoundList;
-            rNodeName += OUString::valueOf( (sal_Unicode)'/' );
+            rNodeName += OUString( (sal_Unicode)'/' );
             rNodeName += aCfgLocaleStr;
             Sequence< Any > aValues( rCfg.GetProperties( aNames ) );
             if (aValues.getLength())
@@ -802,7 +802,7 @@ void LngSvcMgr::UpdateAll()
             while (aIt != rCurMap.end())
             {
                 OUString aCfgEntryName( aSubNodeName );
-                aCfgEntryName += OUString::valueOf( (sal_Unicode) '/' );
+                aCfgEntryName += OUString( (sal_Unicode) '/' );
                 aCfgEntryName += (*aIt).first;
 
                 pNewValue->Name  = aCfgEntryName;
@@ -870,7 +870,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
             if (lcl_SeqHasString( aSpellCheckerListEntries, aKeyText ))
             {
                 OUString aPropName( aNode );
-                aPropName += OUString::valueOf( (sal_Unicode) '/' );
+                aPropName += OUString( (sal_Unicode) '/' );
                 aPropName += aKeyText;
                 pNames[0] = aPropName;
                 aValues = /*aCfg.*/GetProperties( aNames );
@@ -895,7 +895,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
             if (lcl_SeqHasString( aGrammarCheckerListEntries, aKeyText ))
             {
                 OUString aPropName( aNode );
-                aPropName += OUString::valueOf( (sal_Unicode) '/' );
+                aPropName += OUString( (sal_Unicode) '/' );
                 aPropName += aKeyText;
                 pNames[0] = aPropName;
                 aValues = /*aCfg.*/GetProperties( aNames );
@@ -923,7 +923,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
             if (lcl_SeqHasString( aHyphenatorListEntries, aKeyText ))
             {
                 OUString aPropName( aNode );
-                aPropName += OUString::valueOf( (sal_Unicode) '/' );
+                aPropName += OUString( (sal_Unicode) '/' );
                 aPropName += aKeyText;
                 pNames[0] = aPropName;
                 aValues = /*aCfg.*/GetProperties( aNames );
@@ -948,7 +948,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
             if (lcl_SeqHasString( aThesaurusListEntries, aKeyText ))
             {
                 OUString aPropName( aNode );
-                aPropName += OUString::valueOf( (sal_Unicode) '/' );
+                aPropName += OUString( (sal_Unicode) '/' );
                 aPropName += aKeyText;
                 pNames[0] = aPropName;
                 aValues = /*aCfg.*/GetProperties( aNames );
@@ -1819,7 +1819,7 @@ sal_Bool LngSvcMgr::SaveCfgSvcs( const String &rServiceName )
             OUString aCfgLocaleStr( (LanguageTag(pLocale[i])).getBcp47() );
             pValue->Value = aCfgAny;
             pValue->Name  = aNodeName;
-            pValue->Name += OUString::valueOf( (sal_Unicode) '/' );
+            pValue->Name += OUString( (sal_Unicode) '/' );
             pValue->Name += aCfgLocaleStr;
             pValue++;
         }
@@ -1916,7 +1916,7 @@ uno::Sequence< OUString > SAL_CALL
         if (lcl_SeqHasString( aNodeEntries, aCfgLocale ))
         {
             OUString aPropName( aNode );
-            aPropName += OUString::valueOf( (sal_Unicode) '/' );
+            aPropName += OUString( (sal_Unicode) '/' );
             aPropName += aCfgLocale;
             pNames[0] = aPropName;
             aValues = /*aCfg.*/GetProperties( aNames );
@@ -1931,7 +1931,7 @@ uno::Sequence< OUString > SAL_CALL
         if (lcl_SeqHasString( aNodeEntries, aCfgLocale ))
         {
             OUString aPropName( aNode );
-            aPropName += OUString::valueOf( (sal_Unicode) '/' );
+            aPropName += OUString( (sal_Unicode) '/' );
             aPropName += aCfgLocale;
             pNames[0] = aPropName;
             aValues = /*aCfg.*/GetProperties( aNames );
@@ -1946,7 +1946,7 @@ uno::Sequence< OUString > SAL_CALL
         if (lcl_SeqHasString( aNodeEntries, aCfgLocale ))
         {
             OUString aPropName( aNode );
-            aPropName += OUString::valueOf( (sal_Unicode) '/' );
+            aPropName += OUString( (sal_Unicode) '/' );
             aPropName += aCfgLocale;
             pNames[0] = aPropName;
             aValues = /*aCfg.*/GetProperties( aNames );
@@ -1961,7 +1961,7 @@ uno::Sequence< OUString > SAL_CALL
         if (lcl_SeqHasString( aNodeEntries, aCfgLocale ))
         {
             OUString aPropName( aNode );
-            aPropName += OUString::valueOf( (sal_Unicode) '/' );
+            aPropName += OUString( (sal_Unicode) '/' );
             aPropName += aCfgLocale;
             pNames[0] = aPropName;
             aValues = /*aCfg.*/GetProperties( aNames );
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index fe1e0c75a53f..37b11492cf4a 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -448,7 +448,7 @@ LwpFormulaConst::LwpFormulaConst(double dVal)
 
 OUString LwpFormulaConst::ToString(LwpTableLayout* /*pCellsMap*/)
 {
-    return OUString::valueOf(m_dVal);
+    return OUString::number(m_dVal);
 }
 
 /**
diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
index fe66d2cb7fe9..12394134794a 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
@@ -107,7 +107,7 @@ void    XFTextContent::ToXml(IXFStream *pStrm)
             }
             IXFAttrList *pAttrList = pStrm->GetAttrList();
             pAttrList->Clear();
-            pAttrList->AddAttribute( A2OUSTR("text:c"), OUString::valueOf(j-nIndex) );
+            pAttrList->AddAttribute( A2OUSTR("text:c"), OUString::number(j-nIndex) );
             pStrm->StartElement( A2OUSTR("text:s") );
             pStrm->EndElement( A2OUSTR("text:s") );
 
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx b/lotuswordpro/source/filter/xfilter/xfutil.cxx
index 89803b599f09..f1d33797294c 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx
@@ -71,7 +71,7 @@ OUString Int32ToOUString(sal_Int32 num)
     sstrm<<(int)num;
     return OUString::createFromAscii(sstrm.str().c_str());
     */
-    return OUString::valueOf(num);
+    return OUString::number(num);
 }
 
 OUString Int16ToOUString(sal_Int16 num)
@@ -82,7 +82,7 @@ OUString Int16ToOUString(sal_Int16 num)
     return OUString::createFromAscii(sstrm.str().c_str());
     */
     sal_Int32 nNum = static_cast<sal_Int32>(num);
-    return OUString::valueOf(nNum);
+    return OUString::number(nNum);
 }
 
 OUString   FloatToOUString(float num, sal_Int32 /*precision*/)
@@ -94,7 +94,7 @@ OUString   FloatToOUString(float num, sal_Int32 /*precision*/)
     sstrm<<num;
     return OUString::createFromAscii(sstrm.str().c_str());
     */
-    return OUString::valueOf(num);
+    return OUString::number(num);
 }
 
 OUString   DoubleToOUString(double num, sal_Int32 /*precision*/)
@@ -106,7 +106,7 @@ OUString   DoubleToOUString(double num, sal_Int32 /*precision*/)
     sstrm<<num;
     return OUString::createFromAscii(sstrm.str().c_str());
     */
-    return OUString::valueOf(num);
+    return OUString::number(num);
 }
 
 OUString   DateTimeToOUString(XFDateTime& dt)
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index c7cfe1d8723f..0b723a4a3c69 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -461,7 +461,7 @@ static void
 writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, const sal_Int32 nValue )
 {
     pDoc->startElement( nXmlElement, FSEND );
-    pDoc->write( OUString::valueOf( nValue ) );
+    pDoc->write( OUString::number( nValue ) );
     pDoc->endElement( nXmlElement );
 }
 
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index 526ea26308c2..115d3fbe3d6a 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -99,13 +99,13 @@ OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter )
             {
                 double fValue = 0.0;
                 if ( rParameter.Value >>= fValue )
-                    aRet = OUString::valueOf( fValue );
+                    aRet = OUString::number( fValue );
             }
             else
             {
                 sal_Int32 nValue = 0;
                 if ( rParameter.Value >>= nValue )
-                    aRet = OUString::valueOf( nValue );
+                    aRet = OUString::number( nValue );
             }
         }
         break;
@@ -117,7 +117,7 @@ OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter )
                 if ( rParameter.Value >>= nFormulaIndex )
                 {
                     aRet = "?"
-                        + OUString::valueOf( nFormulaIndex )
+                        + OUString::number( nFormulaIndex )
                             + " ";
                 }
             }
@@ -135,7 +135,7 @@ OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter )
                 if ( rParameter.Value >>= nAdjustmentIndex )
                 {
                     aRet = "$"
-                        + OUString::valueOf( nAdjustmentIndex )
+                        + OUString::number( nAdjustmentIndex )
                             + " ";
                 }
             }
@@ -281,7 +281,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
 
                 CustomShapeGuide aGuide;
                 aGuide.maName = rValue;
-                aGuide.maFormula = "logheight/" + OUString::valueOf( nIntVal );
+                aGuide.maFormula = "logheight/" + OUString::number( nIntVal );
 
                 aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
                 aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
@@ -332,7 +332,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
 
                 CustomShapeGuide aGuide;
                 aGuide.maName = rValue;
-                aGuide.maFormula = "min(logwidth,logheight)/" + OUString::valueOf( nIntVal );
+                aGuide.maFormula = "min(logwidth,logheight)/" + OUString::number( nIntVal );
 
                 aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
                 aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
@@ -379,7 +379,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
 
                 CustomShapeGuide aGuide;
                 aGuide.maName = rValue;
-                aGuide.maFormula = "logwidth/" + OUString::valueOf( nIntVal );
+                aGuide.maFormula = "logwidth/" + OUString::number( nIntVal );
 
                 aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
                 aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
@@ -1086,7 +1086,7 @@ ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken,
             sal_Int32 nArcNum = mrCustomShapeProperties.getArcNum();
 
             // start angle
-            aGuide.maName = "arctosa" + OUString::valueOf( nArcNum );
+            aGuide.maName = "arctosa" + OUString::number( nArcNum );
             aGuide.maFormula = "("
                 + GetFormulaParameter( GetAdjCoordinate( mrCustomShapeProperties, rAttribs.getString( XML_stAng ).get() ) )
                 + ")/60000.0";
@@ -1094,7 +1094,7 @@ ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken,
             aAngles.First.Type = EnhancedCustomShapeParameterType::EQUATION;
 
             // swing angle
-            aGuide.maName = "arctosw" + OUString::valueOf( nArcNum );
+            aGuide.maName = "arctosw" + OUString::number( nArcNum );
             aGuide.maFormula = "("
                 + GetFormulaParameter( GetAdjCoordinate( mrCustomShapeProperties, rAttribs.getString( XML_swAng ).get() ) )
                 + ")/60000.0";
diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx
index c84c17171239..036849b4878d 100644
--- a/oox/source/drawingml/hyperlinkcontext.cxx
+++ b/oox/source/drawingml/hyperlinkcontext.cxx
@@ -126,9 +126,9 @@ HyperLinkContext::HyperLinkContext( ContextHandler2Helper& rParent,
                         const OUString sNotesSlide( "notesSlide" );
                         const OUString aSlideType( sHref.copy( 0, nIndex2 ) );
                         if ( aSlideType.match( sSlide ) )
-                            sURL = OUString( "#Slide " ).concat( OUString::valueOf( nPageNumber ) );
+                            sURL = OUString( "#Slide " ).concat( OUString::number( nPageNumber ) );
                         else if ( aSlideType.match( sNotesSlide ) )
-                            sURL = OUString( "#Notes " ).concat( OUString::valueOf( nPageNumber ) );
+                            sURL = OUString( "#Notes " ).concat( OUString::number( nPageNumber ) );
 //                      else: todo for other types such as notesMaster or slideMaster as they can't be referenced easily
                     }
                 }
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 6f1c744fc1bb..cd2920411c2d 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -246,7 +246,7 @@ void StringHelper::appendDec( OUStringBuffer& rStr, sal_uInt32 nData, sal_Int32
 
 void StringHelper::appendDec( OUStringBuffer& rStr, sal_Int32 nData, sal_Int32 nWidth, sal_Unicode cFill )
 {
-    appendString( rStr, OUString::valueOf( nData ), nWidth, cFill );
+    appendString( rStr, OUString::number( nData ), nWidth, cFill );
 }
 
 void StringHelper::appendDec( OUStringBuffer& rStr, sal_uInt64 nData, sal_Int32 nWidth, sal_Unicode cFill )
@@ -256,14 +256,14 @@ void StringHelper::appendDec( OUStringBuffer& rStr, sal_uInt64 nData, sal_Int32
         will be written separately. */
     OUStringBuffer aBuffer;
     if( nData > 9 )
-        aBuffer.append( OUString::valueOf( static_cast< sal_Int64 >( nData / 10 ) ) );
+        aBuffer.append( OUString::number( nData / 10 ) );
     aBuffer.append( static_cast< sal_Unicode >( '0' + (nData % 10) ) );
     appendString( rStr, aBuffer.makeStringAndClear(), nWidth, cFill );
 }
 
 void StringHelper::appendDec( OUStringBuffer& rStr, sal_Int64 nData, sal_Int32 nWidth, sal_Unicode cFill )
 {
-    appendString( rStr, OUString::valueOf( nData ), nWidth, cFill );
+    appendString( rStr, OUString::number( nData ), nWidth, cFill );
 }
 
 void StringHelper::appendDec( OUStringBuffer& rStr, double fData, sal_Int32 nWidth, sal_Unicode cFill )
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index bd38cd4dc64b..59ce8a6652f7 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -59,13 +59,13 @@ sal_Int32 OleInputObjectBase::dumpStdClipboardFormat( const String& rName )
 OUString OleInputObjectBase::dumpAnsiString32OrStdClip( const String& rName )
 {
     sal_Int32 nLen = mxStrm->readInt32();
-    return (nLen < 0) ? OUString::valueOf( dumpStdClipboardFormat( rName ) ) : dumpCharArray( rName, nLen, RTL_TEXTENCODING_MS_1252 );
+    return (nLen < 0) ? OUString::number( dumpStdClipboardFormat( rName ) ) : dumpCharArray( rName, nLen, RTL_TEXTENCODING_MS_1252 );
 }
 
 OUString OleInputObjectBase::dumpUniString32OrStdClip( const String& rName )
 {
     sal_Int32 nLen = mxStrm->readInt32();
-    return (nLen < 0) ? OUString::valueOf( dumpStdClipboardFormat( rName ) ) : dumpUnicodeArray( rName, nLen );
+    return (nLen < 0) ? OUString::number( dumpStdClipboardFormat( rName ) ) : dumpUnicodeArray( rName, nLen );
 }
 
 void OleInputObjectBase::writeOleColorItem( const String& rName, sal_uInt32 nColor )
@@ -1944,7 +1944,7 @@ bool VbaContainerStorageObject::isFormStorage( const OUString& rStrgPath ) const
         if( (aId.getLength() == 2) && (aId[ 0 ] == '0') )
             aId = aId.copy( 1 );
         sal_Int32 nId = aId.toInt32();
-        if( (nId > 0) && (OUString::valueOf( nId ) == aId) )
+        if( (nId > 0) && (OUString::number( nId ) == aId) )
             for( VbaFormSiteInfoVector::const_iterator aIt = maFormData.maSiteInfos.begin(), aEnd = maFormData.maSiteInfos.end(); aIt != aEnd; ++aIt )
                 if( aIt->mnId == nId )
                     return true;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 7d08cabed790..db4b534e6d08 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -147,7 +147,7 @@ bool DrawingML::GetPropertyAndState( Reference< XPropertySet > rXPropSet, Refere
 
 void DrawingML::WriteColor( sal_uInt32 nColor )
 {
-    OString sColor = OString::valueOf( ( sal_Int64 ) nColor, 16 );
+    OString sColor = OString::number(  nColor, 16 );
     if( sColor.getLength() < 6 ) {
         OStringBuffer sBuf( "0" );
         int remains = 5 - sColor.getLength();
@@ -1371,8 +1371,8 @@ void DrawingML::WritePresetShape( const char* pShape, MSO_SPT eShapeType, sal_Bo
         for( sal_Int32 i=0; i < nLength; i++ )
             if( EscherPropertyContainer::GetAdjustmentValue( aAdjustmentSeq[ i ], i, nAdjustmentsWhichNeedsToBeConverted, nValue ) )
                 mpFS->singleElementNS( XML_a, XML_gd,
-                                       XML_name, aAdjustmentSeq[ i ].Name.getLength() > 0 ? USS(aAdjustmentSeq[ i ].Name) : (nLength > 1 ? OString( "adj" + OString::valueOf( i + 1 ) ).getStr() : "adj"),
-                                       XML_fmla, OString("val " + OString::valueOf( nValue )).getStr(),
+                                       XML_name, aAdjustmentSeq[ i ].Name.getLength() > 0 ? USS(aAdjustmentSeq[ i ].Name) : (nLength > 1 ? OString( "adj" + OString::number( i + 1 ) ).getStr() : "adj"),
+                                       XML_fmla, OString("val " + OString::number( nValue )).getStr(),
                                        FSEND );
     }
 
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 74fa5b945357..968d07953acd 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -107,7 +107,7 @@ using ::com::sun::star::sheet::XSpreadsheetDocument;
 using ::comphelper::MediaDescriptor;
 using ::sax_fastparser::FSHelperPtr;
 
-#define IDS(x) OString(OStringLiteral(#x " ") + OString::valueOf( mnShapeIdMax++ )).getStr()
+#define IDS(x) OString(OStringLiteral(#x " ") + OString::number( mnShapeIdMax++ )).getStr()
 
 struct CustomShapeTypeTranslationTable
 {
@@ -846,7 +846,7 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, const
 
     pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
                           XML_id,     I32S( GetNewShapeID( xShape ) ),
-                          XML_name,   bHaveName ? USS( sName ) : OString( "Picture " + OString::valueOf( mnPictureIdMax++ )).getStr(),
+                          XML_name,   bHaveName ? USS( sName ) : OString( "Picture " + OString::number( mnPictureIdMax++ )).getStr(),
                           XML_descr,  bHaveDesc ? USS( sDescr ) : NULL,
                           FSEND );
     // OOXTODO: //cNvPr children: XML_extLst, XML_hlinkClick, XML_hlinkHover
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index cba9ea17b663..0c24040f0b91 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -816,17 +816,17 @@ void VMLExport::AddLineDimensions( const Rectangle& rRectangle )
     if ( mnGroupLevel == 1 )
     {
         const OString aPt( "pt" );
-        aLeft = OString::valueOf( double( rRectangle.Left() ) / 20 ) + aPt;
-        aTop = OString::valueOf( double( rRectangle.Top() ) / 20 ) + aPt;
-        aRight = OString::valueOf( double( rRectangle.Right() ) / 20 ) + aPt;
-        aBottom = OString::valueOf( double( rRectangle.Bottom() ) / 20 ) + aPt;
+        aLeft = OString::number( double( rRectangle.Left() ) / 20 ) + aPt;
+        aTop = OString::number( double( rRectangle.Top() ) / 20 ) + aPt;
+        aRight = OString::number( double( rRectangle.Right() ) / 20 ) + aPt;
+        aBottom = OString::number( double( rRectangle.Bottom() ) / 20 ) + aPt;
     }
     else
     {
-        aLeft = OString::valueOf( rRectangle.Left() );
-        aTop = OString::valueOf( rRectangle.Top() );
-        aRight = OString::valueOf( rRectangle.Right() );
-        aBottom = OString::valueOf( rRectangle.Bottom() );
+        aLeft = OString::number( rRectangle.Left() );
+        aTop = OString::number( rRectangle.Top() );
+        aRight = OString::number( rRectangle.Right() );
+        aBottom = OString::number( rRectangle.Bottom() );
     }
 
     m_pShapeAttrList->add( XML_from,
diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx
index 7d3954710974..eec597ada47c 100644
--- a/oox/source/helper/modelobjecthelper.cxx
+++ b/oox/source/helper/modelobjecthelper.cxx
@@ -62,7 +62,7 @@ OUString ObjectContainer::insertObject( const OUString& rObjName, const Any& rOb
     if( mxContainer.is() )
     {
         if( bInsertByUnusedName )
-            return ContainerHelper::insertByUnusedName( mxContainer, rObjName + OUString::valueOf( ++mnIndex ), ' ', rObj );
+            return ContainerHelper::insertByUnusedName( mxContainer, rObjName + OUString::number( ++mnIndex ), ' ', rObj );
         if( ContainerHelper::insertByName( mxContainer, rObjName, rObj ) )
             return rObjName;
     }
diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx
index 9d089607517e..9f3f27da30c6 100644
--- a/oox/source/ole/oleobjecthelper.cxx
+++ b/oox/source/ole/oleobjecthelper.cxx
@@ -95,7 +95,7 @@ bool OleObjectHelper::importOleObject( PropertyMap& rPropMap, const OleObjectInf
         // embedded OLE object - import the embedded data
         if( rOleObject.maEmbeddedData.hasElements() && mxResolver.is() ) try
         {
-            OUString aObjectId = "Obj" + OUString::valueOf( mnObjectId++ );
+            OUString aObjectId = "Obj" + OUString::number( mnObjectId++ );
 
             Reference< XNameAccess > xResolverNA( mxResolver, UNO_QUERY_THROW );
             Reference< XOutputStream > xOutStrm( xResolverNA->getByName( aObjectId ), UNO_QUERY_THROW );
diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx
index ddc4c14aeb3a..c551a74250a7 100644
--- a/oox/source/ppt/commontimenodecontext.cxx
+++ b/oox/source/ppt/commontimenodecontext.cxx
@@ -358,7 +358,7 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId
     if( pStr )
         return OUString::createFromAscii( pStr );
     else
-        return OUString::valueOf( nPresetSubType );
+        return OUString::number( nPresetSubType );
 }
 
 // END
diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index 309d3bf0b2fa..ea483c1137f3 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -595,7 +595,7 @@ namespace oox { namespace ppt {
 
     void    TimeNode::setId( sal_Int32 nId )
     {
-        msId = OUString::valueOf(nId);
+        msId = OUString::number(nId);
     }
 
     void TimeNode::setTo( const Any & aTo )
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index 89972853dd4f..f76777d6c12c 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -58,7 +58,7 @@ OUString lclGetShapeId( sal_Int32 nShapeId )
 {
     // identifier consists of a literal NUL character, a lowercase 's', and the id
     sal_Unicode aStr[2] = { '\0', 's' };
-    return OUString( aStr, 2 ) + OUString::valueOf( nShapeId );
+    return OUString( aStr, 2 ) + OUString::number( nShapeId );
 }
 
 /** Returns the numeric VML shape identifier from its textual representation. */
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 47d8ceb65727..40281cf545df 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -858,7 +858,7 @@ Reference< XShape > CustomShape::implConvertAndInsert( const Reference< XShapes
     {
         // create the custom shape geometry
         Reference< XEnhancedCustomShapeDefaulter > xDefaulter( xShape, UNO_QUERY_THROW );
-        xDefaulter->createCustomShapeDefaults( OUString::valueOf( getShapeType() ) );
+        xDefaulter->createCustomShapeDefaults( OUString::number( getShapeType() ) );
         // convert common properties
         convertShapeProperties( xShape );
     }
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index 48340d55c8f1..be12b954224e 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -298,7 +298,7 @@ ShapeTypeContext::ShapeTypeContext( ContextHandler2Helper& rParent, ShapeType& r
         // - given width is used only if explicit o:hrpct="0" is given
         OUString hrpct = rAttribs.getString( O_TOKEN( hrpct ), "1000" );
         if( hrpct != "0" )
-            mrTypeModel.maWidth = OUString::valueOf( hrpct.toInt32() / 10 ) + "%";
+            mrTypeModel.maWidth = OUString::number( hrpct.toInt32() / 10 ) + "%";
     }
 
     // stroke settings (may be overridden by v:stroke element later)
diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index b0acad2686fe..afce398a511b 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -79,18 +79,18 @@ uno::Sequence< OUString > OZipFileAccess::GetPatternsFromString_Impl( const OUSt
 
             if ( *pString == (sal_Unicode)'\\' )
             {
-                aPattern[nInd] += OUString::valueOf( (sal_Unicode)'\\' );
+                aPattern[nInd] += OUString( (sal_Unicode)'\\' );
                 pString++;
             }
             else if ( *pString == (sal_Unicode)'*' )
             {
-                aPattern[nInd] += OUString::valueOf( (sal_Unicode)'*' );
+                aPattern[nInd] += OUString( (sal_Unicode)'*' );
                 pString++;
             }
             else
             {
                 OSL_FAIL( "The backslash is not guarded!\n" );
-                aPattern[nInd] += OUString::valueOf( (sal_Unicode)'\\' );
+                aPattern[nInd] += OUString( (sal_Unicode)'\\' );
             }
         }
         else if ( *pString == (sal_Unicode)'*' )
@@ -100,7 +100,7 @@ uno::Sequence< OUString > OZipFileAccess::GetPatternsFromString_Impl( const OUSt
         }
         else
         {
-            aPattern[nInd] += OUString::valueOf( *pString );
+            aPattern[nInd] += OUString( *pString );
             pString++;
         }
     }
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index bb3487abe5f9..852c7555dbef 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -1068,7 +1068,7 @@ OUString AddPrinterDialog::uniquePrinterName( const OUString& rBase )
     {
         aResult = rBase;
         aResult +=  "_"  ;
-        aResult += OUString::valueOf(nVersion++);
+        aResult += OUString::number(nVersion++);
     }
 
     return aResult;
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index bbbbdc7a564a..e1455e856e16 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -123,7 +123,7 @@ void CommandStore::getStoredCommands( const char* pGroup, ::std::list< String >&
     ::std::list< String >::const_iterator it;
     while( nKeys-- )
     {
-        OUString aCommand( rConfig.ReadKey(OString::valueOf(nKeys), RTL_TEXTENCODING_UTF8 ) );
+        OUString aCommand( rConfig.ReadKey(OString::number(nKeys), RTL_TEXTENCODING_UTF8 ) );
         if( !aCommand.isEmpty() )
         {
             for( it = rCommands.begin(); it != rCommands.end() && *it != aCommand; ++it )
@@ -166,7 +166,7 @@ void CommandStore::setCommands(
         nWritten--;
     }
     for( nWritten = 0, it = aWriteList.begin(); it != aWriteList.end(); ++it, ++nWritten )
-        rConfig.WriteKey( OString::valueOf(nWritten), OUStringToOString(*it, RTL_TEXTENCODING_UTF8) );
+        rConfig.WriteKey( OString::number(nWritten), OUStringToOString(*it, RTL_TEXTENCODING_UTF8) );
 }
 
 
diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx
index cd8626778cc8..56c2cbd2bc7c 100644
--- a/padmin/source/newppdlg.cxx
+++ b/padmin/source/newppdlg.cxx
@@ -69,7 +69,7 @@ PPDImportDialog::PPDImportDialog( Window* pParent ) :
     m_aPathBox.SetText( OStringToOUString(rConfig.ReadKey("LastDir"), RTL_TEXTENCODING_UTF8) );
     for (sal_Int32 i = 0; i < 11; ++i)
     {
-        OString aEntry(rConfig.ReadKey(OString::valueOf(i)));
+        OString aEntry(rConfig.ReadKey(OString::number(i)));
         if (!aEntry.isEmpty())
             m_aPathBox.InsertEntry(OStringToOUString(aEntry, RTL_TEXTENCODING_UTF8));
     }
@@ -108,9 +108,9 @@ void PPDImportDialog::Import()
     if( nEntries < 0 )
     {
         sal_Int32 nNextEntry = rConfig.ReadKey("NextEntry").toInt32();
-        rConfig.WriteKey( OString::valueOf(nNextEntry), OUStringToOString(aImportPath, RTL_TEXTENCODING_UTF8) );
+        rConfig.WriteKey( OString::number(nNextEntry), OUStringToOString(aImportPath, RTL_TEXTENCODING_UTF8) );
         nNextEntry = nNextEntry < 10 ? nNextEntry+1 : 0;
-        rConfig.WriteKey( "NextEntry", OString::valueOf(nNextEntry) );
+        rConfig.WriteKey( "NextEntry", OString::number(nNextEntry) );
         m_aPathBox.InsertEntry( aImportPath );
     }
     while( m_aDriverLB.GetEntryCount() )
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index a7bb1f28dc35..0446d7b26d7b 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -217,7 +217,7 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile )
                 osl_getSystemPathFromFileURL( str.pData, &str.pData);
                 OString o = OUStringToOString( str, osl_getThreadTextEncoding() );
                 o += ".";
-                o += OString::valueOf( (sal_Int32)data.Ident );
+                o += OString::number( data.Ident );
 
                 *ppFile = fopen( o.getStr() , "w" );
                 if ( *ppFile )
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index d849b2a0ae57..a08a3756c1ec 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -554,10 +554,10 @@ static sal_uInt32 checkConstValue(Options_Impl const & options,
                         stdout, "  Field %d: Value1 = %s  !=  Value2 = %s\n",
                         index1,
                         OUStringToOString(
-                            OUString::valueOf(constValue1.m_value.aHyper),
+                            OUString::number(constValue1.m_value.aHyper),
                             RTL_TEXTENCODING_ASCII_US).getStr(),
                         OUStringToOString(
-                            OUString::valueOf(constValue2.m_value.aHyper),
+                            OUString::number(constValue2.m_value.aHyper),
                             RTL_TEXTENCODING_ASCII_US).getStr());
                 }
                 return 1;
@@ -573,14 +573,12 @@ static sal_uInt32 checkConstValue(Options_Impl const & options,
                         stdout, "  Field %d: Value1 = %s  !=  Value2 = %s\n",
                         index1,
                         OUStringToOString(
-                            OUString::valueOf(
-                                static_cast< sal_Int64 >(
-                                    constValue1.m_value.aUHyper)),
+                            OUString::number(
+                                constValue1.m_value.aUHyper),
                             RTL_TEXTENCODING_ASCII_US).getStr(),
                         OUStringToOString(
-                            OUString::valueOf(
-                                static_cast< sal_Int64 >(
-                                    constValue2.m_value.aUHyper)),
+                            OUString::number(
+                                constValue2.m_value.aUHyper),
                             RTL_TEXTENCODING_ASCII_US).getStr());
                         // printing the unsigned values as signed should be
                         // acceptable...
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 52cb74e7656f..567743238999 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -1540,7 +1540,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
                 {
                     case report::GroupOn::PREFIX_CHARACTERS:
                         sFunction = OUString("LEFT");
-                        sPrefix = OUString(";") + OUString::valueOf(xGroup->getGroupInterval());
+                        sPrefix = OUString(";") + OUString::number(xGroup->getGroupInterval());
                         break;
                     case report::GroupOn::YEAR:
                         sFunction = OUString("YEAR");
@@ -1577,7 +1577,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
                             sExpression = sCountName;
                             // The reference to sCountName in the formula of sFunctionName refers to the *old* value
                             // so we need to expand the the formula of sCountName
-                            sPrefix = OUString(" + 1) / ") + OUString::valueOf(xGroup->getGroupInterval());
+                            sPrefix = OUString(" + 1) / ") + OUString::number(xGroup->getGroupInterval());
                             sFunctionName = sFunction + OUString("_") + sExpression;
                             sFunction = sFunction + OUString("(");
                             sInitialFormula = OUString("rpt:0");
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 4d4f9fd078f1..5a09d586b8ff 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -1345,7 +1345,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x
             nPos = 0;
     }
     m_aGroupOnLst.SelectEntryPos(nPos);
-    m_aGroupIntervalEd.SetText(OUString::valueOf(_xGroup->getGroupInterval()));
+    m_aGroupIntervalEd.SetText(OUString::number(_xGroup->getGroupInterval()));
     m_aGroupIntervalEd.SaveValue();
     m_aGroupIntervalEd.Enable( nPos != 0 );
     m_aKeepTogetherLst.SelectEntryPos(_xGroup->getKeepTogether());
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index e96fb0bf9943..683b55f9ffa3 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -162,14 +162,14 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32
     if ( _xGroup->getHeaderOn() && _xGroup->getHeader()->getName().isEmpty() )
     {
         OUString sName = String(ModuleRes(RID_STR_GROUPHEADER));
-        sName += OUString::valueOf(_nPos);
+        sName += OUString::number(_nPos);
         _xGroup->getHeader()->setName(sName);
     }
 
     if ( _xGroup->getFooterOn() && _xGroup->getFooter()->getName().isEmpty() )
     {
         OUString sName = String(ModuleRes(RID_STR_GROUPFOOTER));
-        sName += OUString::valueOf(_nPos);
+        sName += OUString::number(_nPos);
         _xGroup->getFooter()->setName(sName);
     }
 }
diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index 29da7b660a53..632ffb9a858c 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -79,7 +79,7 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage )
             if( 1 == nErrors )
                 StdLstErr(OString::number(nErrors).getStr());
             else
-                StdLstErr(OString::valueOf(static_cast<sal_Int32>(nErrors -1)).getStr());
+                StdLstErr(OString::number(nErrors -1).getStr());
             StdLstErr( " Error" );
             StdLstErr( " found!!" );
         }
diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y
index 0c72461cfd67..5117e7698cc4 100644
--- a/rsc/source/parser/rscyacc.y
+++ b/rsc/source/parser/rscyacc.y
@@ -112,7 +112,7 @@ RscId MakeRscId( RscExpType aExpType )
         if( lValue < 1 || lValue > (sal_Int32)0x7FFF )
         {
             pTC->pEH->Error( ERR_IDRANGE, NULL, RscId(),
-                             rtl::OString::valueOf(lValue).getStr() );
+                             rtl::OString::number(lValue).getStr() );
         }
 
         if( aExpType.IsDefinition() )
diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx
index 0c7903458c09..c220f5a9db80 100644
--- a/rsc/source/tools/rscdef.cxx
+++ b/rsc/source/tools/rscdef.cxx
@@ -157,7 +157,7 @@ void RscDefine::DefineToNumber()
     if( pExp )
         delete pExp;
     pExp = NULL;
-    SetName(OString::valueOf(lId));
+    SetName(OString::number(lId));
 }
 
 bool RscDefine::Evaluate()
@@ -179,7 +179,7 @@ OString RscDefine::GetMacro()
 {
     if( pExp )
         return pExp->GetMacro();
-    return OString::valueOf(lId);
+    return OString::number(lId);
 }
 
 RscDefine * RscDefineList::New( sal_uLong lFileKey, const OString& rDefName,
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index ca5274dc1900..41477e92d56c 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -14699,7 +14699,7 @@ namespace rtl_OStringBuffer
         bool checkIfStrBufContainAtPosTheFloat(rtl::OStringBuffer const& _sStrBuf, sal_Int32 _nLen, float _nFloat)
             {
                 OString sFloatValue;
-                sFloatValue = rtl::OString::valueOf(_nFloat);
+                sFloatValue = OString::number(_nFloat);
 
                 OString sBufferString(_sStrBuf.getStr());
                 sal_Int32 nPos = sBufferString.indexOf(sFloatValue);
@@ -16186,7 +16186,7 @@ namespace rtl_OStringBuffer
         bool checkIfStrBufContainAtPosTheDouble(rtl::OStringBuffer const& _sStrBuf, sal_Int32 _nLen, double _nDouble)
             {
                 OString sDoubleValue;
-                sDoubleValue = rtl::OString::valueOf(_nDouble);
+                sDoubleValue = OString::number(_nDouble);
 
                 OString sBufferString(_sStrBuf.getStr());
                 sal_Int32 nPos = sBufferString.indexOf(sDoubleValue);
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 6357a8b028cd..ab22c8549583 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -6281,7 +6281,7 @@ inline ::rtl::OUString getCurrentPID(  )
 #else
     nPID = getpid();
 #endif
-    return ( ::rtl::OUString::valueOf( ( long )nPID ) );
+    return ( OUString::number( nPID ) );
 }
 
 
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 6d8a29e7b8f1..e9ad1a75aade 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -361,7 +361,7 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
     CPPUNIT_ASSERT_MESSAGE( "getpwuid: no password entry\n",( pw = getpwuid( getuid() ) ) != NULL );
 
     /// get user ID;
-    strUserID = ::rtl::OUString::valueOf( ( sal_Int32 )getuid( ) );
+    strUserID = OUString::number( getuid( ) );
 
     /// get user Name;
     strUserName = ::rtl::OUString::createFromAscii( pw->pw_name );
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 58b2e4410c3d..47812e80f06f 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -731,7 +731,7 @@ OUString getErrorMessage( XML_Error xmlE, OUString sSystemId , sal_Int32 nLine )
     OUString str("[");
     str += sSystemId;
     str += " line ";
-    str += OUString::valueOf( nLine );
+    str += OUString::number( nLine );
     str += "]: ";
     str += Message;
     str += "error";
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index ac1d488ba76d..ee041fd87480 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -756,7 +756,7 @@ bool Converter::convertDuration(double& rfTime,
                 }
                 else
                 {
-                    sDoubleStr += OUString::valueOf(c);
+                    sDoubleStr += OUString(c);
                 }
             }
         }
diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index 2f96cca7f6f3..f4b8ddd50610 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -118,17 +118,17 @@ FastSerializerHelper* FastSerializerHelper::write(const OUString& value)
 
 FastSerializerHelper* FastSerializerHelper::write(sal_Int32 value)
 {
-    return write(OUString::valueOf(value));
+    return write(OUString::number(value));
 }
 
 FastSerializerHelper* FastSerializerHelper::write(sal_Int64 value)
 {
-    return write(OUString::valueOf(value));
+    return write(OUString::number(value));
 }
 
 FastSerializerHelper* FastSerializerHelper::write(double value)
 {
-    return write(OUString::valueOf(value));
+    return write(OUString::number(value));
 }
 
 FastSerializerHelper* FastSerializerHelper::writeEscaped(const char* value)
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 36ae617a449d..dd4b165f5b0f 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -980,7 +980,7 @@ void checkMergedCells( ScDocument* pDoc, const ScAddress& rStartAddress,
     SCROW nActualEndRow = rStartAddress.Row();
     pDoc->ExtendMerge( rStartAddress.Col(), rStartAddress.Row(),
                        nActualEndCol, nActualEndRow, rStartAddress.Tab(), false );
-    OString sTab = OString::valueOf( static_cast<sal_Int32>(rStartAddress.Tab() + 1) );
+    OString sTab = OString::number( rStartAddress.Tab() + 1 );
     OString msg = "Merged cells are not correctly imported on sheet" + sTab;
     OString msgCol = msg + "; end col";
     OString msgRow = msg + "; end row";
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index da101f6fdfb8..26f561a44fa1 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1069,26 +1069,26 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const
         case SC_COND_BEGINS_WITH:
             if(aStrVal1.isEmpty())
             {
-                OUString aStr = OUString::valueOf(nVal1);
-                OUString aStr2 = OUString::valueOf(nArg);
+                OUString aStr = OUString::number(nVal1);
+                OUString aStr2 = OUString::number(nArg);
                 bValid = aStr2.indexOf(aStr) == 0;
             }
             else
             {
-                OUString aStr2 = OUString::valueOf(nArg);
+                OUString aStr2 = OUString::number(nArg);
                 bValid = aStr2.indexOf(aStrVal1) == 0;
             }
             break;
         case SC_COND_ENDS_WITH:
             if(aStrVal1.isEmpty())
             {
-                OUString aStr = OUString::valueOf(nVal1);
-                OUString aStr2 = OUString::valueOf(nArg);
+                OUString aStr = OUString::number(nVal1);
+                OUString aStr2 = OUString::number(nArg);
                 bValid = aStr2.endsWith(aStr) == 0;
             }
             else
             {
-                OUString aStr2 = OUString::valueOf(nArg);
+                OUString aStr2 = OUString::number(nArg);
                 bValid = aStr2.endsWith(aStrVal1) == 0;
             }
             break;
@@ -1096,13 +1096,13 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const
         case SC_COND_NOT_CONTAINS_TEXT:
             if(aStrVal1.isEmpty())
             {
-                OUString aStr = OUString::valueOf(nVal1);
-                OUString aStr2 = OUString::valueOf(nArg);
+                OUString aStr = OUString::number(nVal1);
+                OUString aStr2 = OUString::number(nArg);
                 bValid = aStr2.indexOf(aStr) != -1;
             }
             else
             {
-                OUString aStr2 = OUString::valueOf(nArg);
+                OUString aStr2 = OUString::number(nArg);
                 bValid = aStr2.indexOf(aStrVal1) != -1;
             }
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index db97f7773e6c..f316581c7c23 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -156,7 +156,7 @@ void ScDocument::MakeTable( SCTAB nTab,bool _bNeedsNameCheck )
         const ScDefaultsOptions& rOpt = SC_MOD()->GetDefaultsOptions();
         OUString aString = rOpt.GetInitTabPrefix();
 
-        aString += OUString::valueOf(static_cast<sal_Int32>(nTab+1));
+        aString += OUString::number(nTab+1);
         if ( _bNeedsNameCheck )
             CreateValidTabName( aString );  // no doubles
         if (nTab < static_cast<SCTAB>(maTabs.size()))
diff --git a/sc/source/core/data/dpitemdata.cxx b/sc/source/core/data/dpitemdata.cxx
index c417317ff1fd..0598379dc586 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -365,9 +365,9 @@ OUString ScDPItemData::GetString() const
             return *mpString;
         case Value:
         case RangeStart:
-            return OUString::valueOf(mfValue);
+            return OUString::number(mfValue);
         case GroupValue:
-            return OUString::valueOf(maGroupValue.mnValue);
+            return OUString::number(maGroupValue.mnValue);
         case Empty:
         default:
             ;
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 17b0fab6ac33..6e5d243dc163 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -2559,7 +2559,7 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
                         ;
                 }
                 if (aName.isEmpty())
-                    aName = OUString::valueOf(nVal);
+                    aName = OUString::number(nVal);
 
                 ScDPItemData aData(nGroupBy, nVal);
                 SCROW nId = pSource->GetCache()->GetIdByItemData(nDim, aData);
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index 7952c1076205..3e4a290b9504 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -92,7 +92,7 @@ OUString ScDPUtil::getDateGroupName(
     switch ( nDatePart )
     {
         case sheet::DataPilotFieldGroupBy::YEARS:
-            return OUString::valueOf(nValue);
+            return OUString::number(nValue);
         case sheet::DataPilotFieldGroupBy::QUARTERS:
             return ScGlobal::pLocaleData->getQuarterAbbreviation(sal_Int16(nValue-1));    // nValue is 1-based
         case com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS:
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 3cc1eefd7380..80497c1bf8ee 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -1283,7 +1283,7 @@ bool ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& r
             if ( rDesc.ppDefArgNames[nArg]->isEmpty() )
             {
                 OUString aDefName("arg");
-                aDefName += OUString::valueOf( nArg+1 );
+                aDefName += OUString::number( nArg+1 );
                 *rDesc.ppDefArgNames[nArg] = aDefName;
             }
 
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 8935fad0a4c7..0a0a0571c6d2 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -714,7 +714,7 @@ static OUString lcl_GetNumStr(sal_Int32 nNo, SvxNumType eType)
 
 //      case ARABIC:    ist jetzt default
         default:
-            aTmpStr = OUString::valueOf(nNo);
+            aTmpStr = OUString::number(nNo);
             break;
         }
 
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 3d573267fc50..5043272679a3 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2635,7 +2635,7 @@ void ScInterpreter::ScCellExternal()
                 PushString(pToken->GetString());
             break;
             case svDouble:
-                PushString(OUString::valueOf(pToken->GetDouble()));
+                PushString(OUString::number(pToken->GetDouble()));
             break;
             case svError:
                 PushString(ScGlobal::GetErrorString(pToken->GetError()));
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index e24e122b88d7..938e89ac1efc 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -514,7 +514,7 @@ void XclExpSheetProtection::SaveXml( XclExpXmlStream& rStrm )
         {
             nHash = ((aHash[0] << 8) & 0xFFFF);
             nHash |= (aHash[1] & 0xFF);
-            sHash = OString::valueOf( static_cast<sal_Int32>(nHash), 16 );
+            sHash = OString::number( nHash, 16 );
         }
         sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
         rWorksheet->singleElement( XML_sheetProtection,
@@ -646,8 +646,8 @@ static OString lcl_GetValue( sal_uInt8 nType, double fVal, XclExpString* pStr )
     switch( nType )
     {
         case EXC_AFTYPE_STRING:     return XclXmlUtils::ToOString( *pStr );
-        case EXC_AFTYPE_DOUBLE:     return OString::valueOf( fVal );
-        case EXC_AFTYPE_BOOLERR:    return OString::valueOf( (sal_Int32) ( fVal != 0 ? 1 : 0 ) );
+        case EXC_AFTYPE_DOUBLE:     return OString::number( fVal );
+        case EXC_AFTYPE_BOOLERR:    return OString::number(  ( fVal != 0 ? 1 : 0 ) );
         default:                    return OString();
     }
 }
@@ -852,7 +852,7 @@ void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm )
     sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
 
     rWorksheet->startElement( XML_filterColumn,
-            XML_colId,          OString::valueOf( (sal_Int32) nCol ).getStr(),
+            XML_colId,          OString::number(  nCol ).getStr(),
             // OOXTODO: XML_hiddenButton,   AutoFilter12 fHideArrow?
             // OOXTODO: XML_showButton,
             FSEND );
@@ -866,7 +866,7 @@ void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm )
                 rWorksheet->singleElement( XML_top10,
                         XML_top,        XclXmlUtils::ToPsz( get_flag( nFlags, EXC_AFFLAG_TOP10TOP ) ),
                         XML_percent,    XclXmlUtils::ToPsz( get_flag( nFlags, EXC_AFFLAG_TOP10PERC ) ),
-                        XML_val,        OString::valueOf( (sal_Int32) (nFlags >> 7 ) ).getStr(),
+                        XML_val,        OString::number(  (nFlags >> 7 ) ).getStr(),
                         // OOXTODO: XML_filterVal,
                         FSEND );
             }
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 19f2ecc685ad..ceaa95168b64 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -213,8 +213,8 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm )
 
     pSst->startElement( XML_sst,
             XML_xmlns, "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
-            XML_count, OString::valueOf( (sal_Int32) mnTotal ).getStr(),
-            XML_uniqueCount, OString::valueOf( (sal_Int32) mnSize ).getStr(),
+            XML_count, OString::number(  mnTotal ).getStr(),
+            XML_uniqueCount, OString::number(  mnSize ).getStr(),
             FSEND );
 
     for( XclExpStringList::const_iterator aIt = maStringList.begin(), aEnd = maStringList.end(); aIt != aEnd; ++aIt )
@@ -312,7 +312,7 @@ void XclExpMergedcells::SaveXml( XclExpXmlStream& rStrm )
         return;
     sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
     rWorksheet->startElement( XML_mergeCells,
-            XML_count,  OString::valueOf( (sal_Int32) nCount ).getStr(),
+            XML_count,  OString::number(  nCount ).getStr(),
             FSEND );
     for( size_t i = 0; i < nCount; ++i )
     {
@@ -923,15 +923,15 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
     sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
     rWorksheet->startElement( XML_cfRule,
             XML_type, GetTypeString( mrFormatEntry.GetOperation() ),
-            XML_priority, OString::valueOf( mnPriority + 1 ).getStr(),
+            XML_priority, OString::number( mnPriority + 1 ).getStr(),
             XML_operator, GetOperatorString( mrFormatEntry.GetOperation(), bFmla2 ),
-            XML_aboveAverage, OString::valueOf( nAboveAverage ).getStr(),
-            XML_equalAverage, OString::valueOf( nEqualAverage ).getStr(),
-            XML_bottom, OString::valueOf( nBottom ).getStr(),
-            XML_percent, OString::valueOf( nPercent ).getStr(),
+            XML_aboveAverage, OString::number( nAboveAverage ).getStr(),
+            XML_equalAverage, OString::number( nEqualAverage ).getStr(),
+            XML_bottom, OString::number( nBottom ).getStr(),
+            XML_percent, OString::number( nPercent ).getStr(),
             XML_rank, aRank.getStr(),
             XML_text, aText.getStr(),
-            XML_dxfId, OString::valueOf( GetDxfs().GetDxfId( mrFormatEntry.GetStyle() ) ).getStr(),
+            XML_dxfId, OString::number( GetDxfs().GetDxfId( mrFormatEntry.GetStyle() ) ).getStr(),
             FSEND );
     if(!IsTextRule(eOperation) && !IsTopBottomRule(eOperation))
     {
@@ -1030,9 +1030,9 @@ void XclExpDateFormat::SaveXml( XclExpXmlStream& rStrm )
     sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
     rWorksheet->startElement( XML_cfRule,
             XML_type, "timePeriod",
-            XML_priority, OString::valueOf( mnPriority + 1 ).getStr(),
+            XML_priority, OString::number( mnPriority + 1 ).getStr(),
             XML_timePeriod, sTimePeriod,
-            XML_dxfId, OString::valueOf( GetDxfs().GetDxfId( mrFormatEntry.GetStyleName() ) ).getStr(),
+            XML_dxfId, OString::number( GetDxfs().GetDxfId( mrFormatEntry.GetStyleName() ) ).getStr(),
             FSEND );
     rWorksheet->endElement( XML_cfRule);
 }
@@ -1089,7 +1089,7 @@ void XclExpCfvo::SaveXml( XclExpXmlStream& rStrm )
     }
     else
     {
-        aValue = OString::valueOf( mrEntry.GetValue() );
+        aValue = OString::number( mrEntry.GetValue() );
     }
 
     rWorksheet->startElement( XML_cfvo,
@@ -1222,7 +1222,7 @@ void XclExpColorScale::SaveXml( XclExpXmlStream& rStrm )
 
     rWorksheet->startElement( XML_cfRule,
             XML_type, "colorScale",
-            XML_priority, OString::valueOf( mnPriority + 1 ).getStr(),
+            XML_priority, OString::number( mnPriority + 1 ).getStr(),
             FSEND );
 
     rWorksheet->startElement( XML_colorScale, FSEND );
@@ -1239,7 +1239,7 @@ namespace {
 
 OString createHexStringFromDigit(sal_uInt8 nDigit)
 {
-    OString aString = OString::valueOf( static_cast<sal_Int32>(nDigit), 16 );
+    OString aString = OString::number( nDigit, 16 );
     if(aString.getLength() == 1)
         aString = aString + OString::number(0);
     return aString;
@@ -1296,7 +1296,7 @@ void XclExpDataBar::SaveXml( XclExpXmlStream& rStrm )
 
     rWorksheet->startElement( XML_cfRule,
             XML_type, "dataBar",
-            XML_priority, OString::valueOf( mnPriority + 1 ).getStr(),
+            XML_priority, OString::number( mnPriority + 1 ).getStr(),
             FSEND );
 
     rWorksheet->startElement( XML_dataBar, FSEND );
@@ -1364,7 +1364,7 @@ void XclExpIconSet::SaveXml( XclExpXmlStream& rStrm )
 
     rWorksheet->startElement( XML_cfRule,
             XML_type, "iconSet",
-            XML_priority, OString::valueOf( mnPriority + 1 ).getStr(),
+            XML_priority, OString::number( mnPriority + 1 ).getStr(),
             FSEND );
 
     const char* pIconSetName = getIconSetName(mrFormat.GetIconSetData()->eIconSetType);
@@ -1732,7 +1732,7 @@ void XclExpDval::SaveXml( XclExpXmlStream& rStrm )
 
     sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
     rWorksheet->startElement( XML_dataValidations,
-            XML_count, OString::valueOf( (sal_Int32) maDVList.GetSize() ).getStr(),
+            XML_count, OString::number(  maDVList.GetSize() ).getStr(),
             // OOXTODO: XML_disablePrompts,
             // OOXTODO: XML_xWindow,
             // OOXTODO: XML_yWindow,
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 54f9eac08f06..486976c415e0 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -143,16 +143,16 @@ static const char *ToVertAlign( SdrTextVertAdjust eAdjust )
 static void lcl_WriteAnchorVertex( sax_fastparser::FSHelperPtr rComments, Rectangle &aRect )
 {
     rComments->startElement( FSNS( XML_xdr, XML_col ), FSEND );
-    rComments->writeEscaped( OUString::valueOf( aRect.Left() ) );
+    rComments->writeEscaped( OUString::number( aRect.Left() ) );
     rComments->endElement( FSNS( XML_xdr, XML_col ) );
     rComments->startElement( FSNS( XML_xdr, XML_colOff ), FSEND );
-    rComments->writeEscaped( OUString::valueOf( aRect.Top() ) );
+    rComments->writeEscaped( OUString::number( aRect.Top() ) );
     rComments->endElement( FSNS( XML_xdr, XML_colOff ) );
     rComments->startElement( FSNS( XML_xdr, XML_row ), FSEND );
-    rComments->writeEscaped( OUString::valueOf( aRect.Right() ) );
+    rComments->writeEscaped( OUString::number( aRect.Right() ) );
     rComments->endElement( FSNS( XML_xdr, XML_row ) );
     rComments->startElement( FSNS( XML_xdr, XML_rowOff ), FSEND );
-    rComments->writeEscaped( OUString::valueOf( aRect.Bottom() ) );
+    rComments->writeEscaped( OUString::number( aRect.Bottom() ) );
     rComments->endElement( FSNS( XML_xdr, XML_rowOff ) );
 }
 #endif
@@ -1334,7 +1334,7 @@ void XclExpNote::WriteXml( sal_Int32 nAuthorId, XclExpXmlStream& rStrm )
 
     rComments->startElement( XML_comment,
             XML_ref,        XclXmlUtils::ToOString( maScPos ).getStr(),
-            XML_authorId,   OString::valueOf( nAuthorId ).getStr(),
+            XML_authorId,   OString::number( nAuthorId ).getStr(),
             // OOXTODO: XML_guid,
             FSEND );
     rComments->startElement( XML_text, FSEND );
diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx
index 58594fe01a13..92fb6c6bac7f 100644
--- a/sc/source/filter/excel/xeextlst.cxx
+++ b/sc/source/filter/excel/xeextlst.cxx
@@ -68,7 +68,7 @@ XclExpExtCfvo::XclExpExtCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry&
         maValue = OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 );
     }
     else
-        maValue = OString::valueOf(rEntry.GetValue());
+        maValue = OString::number(rEntry.GetValue());
 }
 
 namespace {
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index 54f2e8d867db..ca472a6d665f 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -319,7 +319,7 @@ void XclExpName::SaveXml( XclExpXmlStream& rStrm )
             // OOXTODO: XML_functionGroupId, "",
             // OOXTODO: XML_help, "",
             XML_hidden, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_NAME_HIDDEN ) ),
-            XML_localSheetId, mnScTab == SCTAB_GLOBAL ? NULL : OString::valueOf( (sal_Int32)mnScTab ).getStr(),
+            XML_localSheetId, mnScTab == SCTAB_GLOBAL ? NULL : OString::number( mnScTab ).getStr(),
             XML_name, XclXmlUtils::ToOString( maOrigName ).getStr(),
             // OOXTODO: XML_publishToServer, "",
             // OOXTODO: XML_shortcutKey, "",
diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx
index 370188788a34..4092eb89d375 100644
--- a/sc/source/filter/excel/xepage.cxx
+++ b/sc/source/filter/excel/xepage.cxx
@@ -89,18 +89,18 @@ void XclExpSetup::SaveXml( XclExpXmlStream& rStrm )
     if( rStrm.getVersion() != oox::core::ISOIEC_29500_2008 ||
         mrData.mnStrictPaperSize != EXC_PAPERSIZE_USER )
     {
-        pAttrList->add( XML_paperSize,           OString::valueOf( (sal_Int32) mrData.mnPaperSize ).getStr() );
+        pAttrList->add( XML_paperSize,           OString::number(  mrData.mnPaperSize ).getStr() );
     }
     else
     {
-        pAttrList->add( XML_paperWidth,          OString::valueOf( (sal_Int32) mrData.mnPaperWidth ).concat(OString("mm")).getStr() );
-        pAttrList->add( XML_paperHeight,         OString::valueOf( (sal_Int32) mrData.mnPaperHeight ).concat(OString("mm")).getStr() );
+        pAttrList->add( XML_paperWidth,          OString::number(  mrData.mnPaperWidth ).concat(OString("mm")).getStr() );
+        pAttrList->add( XML_paperHeight,         OString::number(  mrData.mnPaperHeight ).concat(OString("mm")).getStr() );
         // pAttrList->add( XML_paperUnits,          "mm" );
     }
-    pAttrList->add( XML_scale,              OString::valueOf( (sal_Int32) mrData.mnScaling ).getStr() );
-    pAttrList->add( XML_firstPageNumber,    OString::valueOf( (sal_Int32) mrData.mnStartPage ).getStr() );
-    pAttrList->add( XML_fitToWidth,         OString::valueOf( (sal_Int32) mrData.mnFitToWidth ).getStr() );
-    pAttrList->add( XML_fitToHeight,        OString::valueOf( (sal_Int32) mrData.mnFitToHeight ).getStr() );
+    pAttrList->add( XML_scale,              OString::number(  mrData.mnScaling ).getStr() );
+    pAttrList->add( XML_firstPageNumber,    OString::number(  mrData.mnStartPage ).getStr() );
+    pAttrList->add( XML_fitToWidth,         OString::number(  mrData.mnFitToWidth ).getStr() );
+    pAttrList->add( XML_fitToHeight,        OString::number(  mrData.mnFitToHeight ).getStr() );
     pAttrList->add( XML_pageOrder,          mrData.mbPrintInRows ? "overThenDown" : "downThenOver" );
     pAttrList->add( XML_orientation,        mrData.mbPortrait ? "portrait" : "landscape" );   // OOXTODO: "default"?
     pAttrList->add( XML_usePrinterDefaults, XclXmlUtils::ToPsz( !mrData.mbValid ) );
@@ -109,9 +109,9 @@ void XclExpSetup::SaveXml( XclExpXmlStream& rStrm )
     pAttrList->add( XML_cellComments,       mrData.mbPrintNotes ? "atEnd" : "none" );         // OOXTODO: "asDisplayed"?
     pAttrList->add( XML_useFirstPageNumber, XclXmlUtils::ToPsz( mrData.mbManualStart ) );
     // OOXTODO: XML_errors, // == displayed|blank|dash|NA
-    pAttrList->add( XML_horizontalDpi,      OString::valueOf( (sal_Int32) mrData.mnHorPrintRes ).getStr() );
-    pAttrList->add( XML_verticalDpi,        OString::valueOf( (sal_Int32) mrData.mnVerPrintRes ).getStr() );
-    pAttrList->add( XML_copies,             OString::valueOf( (sal_Int32) mrData.mnCopies ).getStr() );
+    pAttrList->add( XML_horizontalDpi,      OString::number(  mrData.mnHorPrintRes ).getStr() );
+    pAttrList->add( XML_verticalDpi,        OString::number(  mrData.mnVerPrintRes ).getStr() );
+    pAttrList->add( XML_copies,             OString::number(  mrData.mnCopies ).getStr() );
     // OOXTODO: devMode settings part RelationshipId: FSNS( XML_r, XML_id ),
 
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList > aAttrs(pAttrList);
@@ -185,7 +185,7 @@ void XclExpPageBreaks::SaveXml( XclExpXmlStream& rStrm )
 
     sal_Int32 nElement = GetRecId() == EXC_ID_HORPAGEBREAKS ? XML_rowBreaks : XML_colBreaks;
     sax_fastparser::FSHelperPtr& pWorksheet = rStrm.GetCurrentStream();
-    OString sNumPageBreaks = OString::valueOf( (sal_Int32) mrPageBreaks.size() );
+    OString sNumPageBreaks = OString::number(  mrPageBreaks.size() );
     pWorksheet->startElement( nElement,
             XML_count,              sNumPageBreaks.getStr(),
             XML_manualBreakCount,   sNumPageBreaks.getStr(),
@@ -193,9 +193,9 @@ void XclExpPageBreaks::SaveXml( XclExpXmlStream& rStrm )
     for( ScfUInt16Vec::const_iterator aIt = mrPageBreaks.begin(), aEnd = mrPageBreaks.end(); aIt != aEnd; ++aIt )
     {
         pWorksheet->singleElement( XML_brk,
-                XML_id,     OString::valueOf( (sal_Int32) *aIt ).getStr(),
+                XML_id,     OString::number(  *aIt ).getStr(),
                 XML_man,    "true",
-                XML_max,    OString::valueOf( (sal_Int32) mnMaxPos ).getStr(),
+                XML_max,    OString::number(  mnMaxPos ).getStr(),
                 XML_min,    "0",
                 // OOXTODO: XML_pt, "",
                 FSEND );
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index a3f269b9dbe1..c9214942f839 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -752,7 +752,7 @@ void XclExpPivotCache::SaveXml( XclExpXmlStream&
         .append( rStrm.GetUniqueIdOUString() )
         .makeStringAndClear();
     rWorkbook->startElement( XML_pivotCache,
-            XML_cacheId, OString::valueOf( (sal_Int32)maPCInfo.mnStrmId ).getStr(),
+            XML_cacheId, OString::number( maPCInfo.mnStrmId ).getStr(),
             FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( sId ).getStr(),
             FSEND );
     // SXIDSTM
@@ -1362,10 +1362,10 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm )
     aPivotTableDefinition->startElement( XML_pivotTableDefinition,
             XML_xmlns,                      "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
             XML_name,                       XclXmlUtils::ToOString( maPTInfo.maTableName ).getStr(),
-            XML_cacheId,                    OString::valueOf( (sal_Int32) maPTInfo.mnCacheIdx ).getStr(),
+            XML_cacheId,                    OString::number(  maPTInfo.mnCacheIdx ).getStr(),
             XML_dataOnRows,                 XclXmlUtils::ToPsz( maPTInfo.mnDataAxis == EXC_SXVD_AXIS_COL ),
-            XML_dataPosition,               OString::valueOf( (sal_Int32) maPTInfo.mnDataPos ).getStr(),
-            XML_autoFormatId,               OString::valueOf( (sal_Int32) maPTInfo.mnAutoFmtIdx ).getStr(),
+            XML_dataPosition,               OString::number(  maPTInfo.mnDataPos ).getStr(),
+            XML_autoFormatId,               OString::number(  maPTInfo.mnAutoFmtIdx ).getStr(),
             // OOXTODO: XML_applyNumberFormats,         [ SXVIEW fAtrNum (maPTInfo.mnFlags) ]
             // OOXTODO: XML_applyBorderFormats,         [ SXVIEW fAtrBdr (maPTInfo.mnFlags) ]
             // OOXTODO: XML_applyFontFormats,           [ SXVIEW fAtrFnt (maPTInfo.mnFlags) ]
@@ -1432,11 +1432,11 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm )
 
     aPivotTableDefinition->singleElement( XML_location,
             XML_ref,            XclXmlUtils::ToOString( maPTInfo.maOutXclRange ).getStr(),
-            XML_firstHeaderRow, OString::valueOf( (sal_Int32) maPTInfo.mnFirstHeadRow ).getStr(),
-            XML_firstDataRow,   OString::valueOf( (sal_Int32) maPTInfo.maDataXclPos.mnRow ).getStr(),
-            XML_firstDataCol,   OString::valueOf( (sal_Int32) maPTInfo.maDataXclPos.mnCol ).getStr(),
-            XML_rowPageCount,   OString::valueOf( (sal_Int32) maPTInfo.mnDataRows ).getStr(),   // OOXTODO?
-            XML_colPageCount,   OString::valueOf( (sal_Int32) maPTInfo.mnDataCols ).getStr(),   // OOXTODO?
+            XML_firstHeaderRow, OString::number(  maPTInfo.mnFirstHeadRow ).getStr(),
+            XML_firstDataRow,   OString::number(  maPTInfo.maDataXclPos.mnRow ).getStr(),
+            XML_firstDataCol,   OString::number(  maPTInfo.maDataXclPos.mnCol ).getStr(),
+            XML_rowPageCount,   OString::number(  maPTInfo.mnDataRows ).getStr(),   // OOXTODO?
+            XML_colPageCount,   OString::number(  maPTInfo.mnDataCols ).getStr(),   // OOXTODO?
             FSEND );
 
     // OOXTODO: XML_pivotFields
@@ -1445,7 +1445,7 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm )
     if( maPTInfo.mnRowFields )
     {
         aPivotTableDefinition->startElement( XML_rowFields,
-                XML_count,  OString::valueOf( (sal_Int32) maPTInfo.mnRowFields ).getStr(),
+                XML_count,  OString::number(  maPTInfo.mnRowFields ).getStr(),
                 FSEND );
         aPivotTableDefinition->endElement( XML_rowFields );
     }
@@ -1455,7 +1455,7 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm )
     if( maPTInfo.mnColFields )
     {
         aPivotTableDefinition->startElement( XML_colFields,
-                XML_count,  OString::valueOf( (sal_Int32) maPTInfo.mnColFields ).getStr(),
+                XML_count,  OString::number(  maPTInfo.mnColFields ).getStr(),
                 FSEND );
         aPivotTableDefinition->endElement( XML_colFields );
     }
@@ -1465,7 +1465,7 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm )
     if( maPTInfo.mnPageFields )
     {
         aPivotTableDefinition->startElement( XML_pageFields,
-                XML_count,  OString::valueOf( (sal_Int32) maPTInfo.mnPageFields ).getStr(),
+                XML_count,  OString::number(  maPTInfo.mnPageFields ).getStr(),
                 FSEND );
         aPivotTableDefinition->endElement( XML_pageFields );
     }
@@ -1473,7 +1473,7 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm )
     if( maPTInfo.mnDataFields )
     {
         aPivotTableDefinition->startElement( XML_dataFields,
-                XML_count,  OString::valueOf( (sal_Int32) maPTInfo.mnDataFields ).getStr(),
+                XML_count,  OString::number(  maPTInfo.mnDataFields ).getStr(),
                 FSEND );
         aPivotTableDefinition->endElement( XML_dataFields );
     }
diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx
index 4c1c5e0c2ebc..94f0d31a028a 100644
--- a/sc/source/filter/excel/xerecord.cxx
+++ b/sc/source/filter/excel/xerecord.cxx
@@ -172,7 +172,7 @@ void XclExpValueRecord<double>::SaveXml( XclExpXmlStream& rStrm )
     if( mnAttribute == -1 )
         return;
     rStrm.WriteAttributes(
-        mnAttribute,    OString::valueOf( maValue ).getStr(),
+        mnAttribute,    OString::number( maValue ).getStr(),
         FSEND );
 }
 
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index c90719a9d41b..16576b6dfcf1 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -689,7 +689,7 @@ void XclXmlUtils::GetFormulaTypeAndValue( ScFormulaCell& rCell, const char*& rsT
         {
             // either value or error code
             rsType = "n";
-            rsValue = OUString::valueOf( rCell.GetValue() );
+            rsValue = OUString::number( rCell.GetValue() );
         }
         break;
 
@@ -957,7 +957,7 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData( sax_fastparser::FSHelper
     lcl_WriteValue( pStream, XML_shadow,     rFontData.mbShadow ? XclXmlUtils::ToPsz( rFontData.mbShadow ) : NULL );
     lcl_WriteValue( pStream, XML_u,          bHaveUnderline ? pUnderline : NULL );
     lcl_WriteValue( pStream, XML_vertAlign,  bHaveVertAlign ? pVertAlign : NULL );
-    lcl_WriteValue( pStream, XML_sz,         OString::valueOf( (double) (rFontData.mnHeight / 20.0) ).getStr() );  // Twips->Pt
+    lcl_WriteValue( pStream, XML_sz,         OString::number( (double) (rFontData.mnHeight / 20.0) ).getStr() );  // Twips->Pt
     if( rFontData.maColor != Color( 0xFF, 0xFF, 0xFF, 0xFF ) )
         pStream->singleElement( XML_color,
                 // OOXTODO: XML_auto,       bool
@@ -967,8 +967,8 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData( sax_fastparser::FSHelper
                 // OOXTODO: XML_tint,       double
                 FSEND );
     lcl_WriteValue( pStream, nFontId,        XclXmlUtils::ToOString( rFontData.maName ).getStr() );
-    lcl_WriteValue( pStream, XML_family,     OString::valueOf( (sal_Int32) rFontData.mnFamily ).getStr() );
-    lcl_WriteValue( pStream, XML_charset,    rFontData.mnCharSet != 0 ? OString::valueOf( (sal_Int32) rFontData.mnCharSet ).getStr() : NULL );
+    lcl_WriteValue( pStream, XML_family,     OString::number(  rFontData.mnFamily ).getStr() );
+    lcl_WriteValue( pStream, XML_charset,    rFontData.mnCharSet != 0 ? OString::number(  rFontData.mnCharSet ).getStr() : NULL );
 
     return pStream;
 }
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 8158af522ef4..2c2ece8086b6 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1129,7 +1129,7 @@ void XclExpFontBuffer::SaveXml( XclExpXmlStream& rStrm )
 
     sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream();
     rStyleSheet->startElement( XML_fonts,
-            XML_count,  OString::valueOf( (sal_Int32) maFontList.GetSize() ).getStr(),
+            XML_count,  OString::number(  maFontList.GetSize() ).getStr(),
             FSEND );
 
     maFontList.SaveXml( rStrm );
@@ -1279,7 +1279,7 @@ void XclExpNumFmtBuffer::SaveXml( XclExpXmlStream& rStrm )
 
     sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream();
     rStyleSheet->startElement( XML_numFmts,
-            XML_count,  OString::valueOf( (sal_Int32) maFormatMap.size() ).getStr(),
+            XML_count,  OString::number(  maFormatMap.size() ).getStr(),
             FSEND );
     for( XclExpNumFmtVec::iterator aIt = maFormatMap.begin(), aEnd = maFormatMap.end(); aIt != aEnd; ++aIt )
     {
@@ -1531,9 +1531,9 @@ void XclExpCellAlign::SaveXml( XclExpXmlStream& rStrm ) const
     rStrm.GetCurrentStream()->singleElement( XML_alignment,
             XML_horizontal,         ToHorizontalAlignment( mnHorAlign ),
             XML_vertical,           ToVerticalAlignment( mnVerAlign ),
-            XML_textRotation,       OString::valueOf( (sal_Int32) mnRotation ).getStr(),
+            XML_textRotation,       OString::number(  mnRotation ).getStr(),
             XML_wrapText,           XclXmlUtils::ToPsz( mbLineBreak ),
-            XML_indent,             OString::valueOf( (sal_Int32) mnIndent ).getStr(),
+            XML_indent,             OString::number(  mnIndent ).getStr(),
             // OOXTODO: XML_relativeIndent,     mnIndent?
             // OOXTODO: XML_justifyLastLine,
             XML_shrinkToFit,        XclXmlUtils::ToPsz( mbShrink ),
@@ -2110,11 +2110,11 @@ void XclExpXF::SaveXml( XclExpXmlStream& rStrm )
     }
 
     rStyleSheet->startElement( XML_xf,
-            XML_numFmtId,           OString::valueOf( (sal_Int32) mnXclNumFmt ).getStr(),
-            XML_fontId,             OString::valueOf( (sal_Int32) mnXclFont ).getStr(),
-            XML_fillId,             OString::valueOf( (sal_Int32) mnFillId ).getStr(),
-            XML_borderId,           OString::valueOf( (sal_Int32) mnBorderId ).getStr(),
-            XML_xfId,               IsStyleXF() ? NULL : OString::valueOf( nXfId ).getStr(),
+            XML_numFmtId,           OString::number(  mnXclNumFmt ).getStr(),
+            XML_fontId,             OString::number(  mnXclFont ).getStr(),
+            XML_fillId,             OString::number(  mnFillId ).getStr(),
+            XML_borderId,           OString::number(  mnBorderId ).getStr(),
+            XML_xfId,               IsStyleXF() ? NULL : OString::number( nXfId ).getStr(),
             // OOXTODO: XML_quotePrefix,
             // OOXTODO: XML_pivotButton,
             // OOXTODO: XML_applyNumberFormat,  ;
@@ -2231,11 +2231,11 @@ void XclExpStyle::SaveXml( XclExpXmlStream& rStrm )
     nXFId = rStrm.GetRoot().GetXFBuffer().GetXmlStyleIndex( nXFId );
     rStrm.GetCurrentStream()->singleElement( XML_cellStyle,
             XML_name,           sName.getStr(),
-            XML_xfId,           OString::valueOf( nXFId ).getStr(),
+            XML_xfId,           OString::number( nXFId ).getStr(),
 /* mso-excel 2007 complains when it finds builtinId >= 55, it is not
  * bothered by multiple 54 values. */
 #define CELL_STYLE_MAX_BUILTIN_ID 55
-                                             XML_builtinId, OString::valueOf( std::min( static_cast<sal_Int32>( CELL_STYLE_MAX_BUILTIN_ID - 1 ), static_cast <sal_Int32>( mnStyleId ) ) ).getStr(),
+                                             XML_builtinId, OString::number( std::min( static_cast<sal_Int32>( CELL_STYLE_MAX_BUILTIN_ID - 1 ), static_cast <sal_Int32>( mnStyleId ) ) ).getStr(),
             // OOXTODO: XML_iLevel,
             // OOXTODO: XML_hidden,
             XML_customBuiltin,  XclXmlUtils::ToPsz( ! IsBuiltIn() ),
@@ -2519,7 +2519,7 @@ void XclExpXFBuffer::SaveXml( XclExpXmlStream& rStrm )
     sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream();
 
     rStyleSheet->startElement( XML_fills,
-            XML_count,  OString::valueOf( (sal_Int32) maFills.size() ).getStr(),
+            XML_count,  OString::number(  maFills.size() ).getStr(),
             FSEND );
     for( XclExpFillList::iterator aIt = maFills.begin(), aEnd = maFills.end();
             aIt != aEnd; ++aIt )
@@ -2529,7 +2529,7 @@ void XclExpXFBuffer::SaveXml( XclExpXmlStream& rStrm )
     rStyleSheet->endElement( XML_fills );
 
     rStyleSheet->startElement( XML_borders,
-            XML_count,  OString::valueOf( (sal_Int32) maBorders.size() ).getStr(),
+            XML_count,  OString::number(  maBorders.size() ).getStr(),
             FSEND );
     for( XclExpBorderList::iterator aIt = maBorders.begin(), aEnd = maBorders.end();
             aIt != aEnd; ++aIt )
@@ -2545,7 +2545,7 @@ void XclExpXFBuffer::SaveXml( XclExpXmlStream& rStrm )
     if( nStyles > 0 )
     {
         rStyleSheet->startElement( XML_cellStyleXfs,
-                XML_count,  OString::valueOf( nStyles ).getStr(),
+                XML_count,  OString::number( nStyles ).getStr(),
                 FSEND );
         size_t nXFCount = maSortedXFList.GetSize();
         for( size_t i = 0; i < nXFCount; ++i )
@@ -2561,7 +2561,7 @@ void XclExpXFBuffer::SaveXml( XclExpXmlStream& rStrm )
     if( nCells > 0 )
     {
         rStyleSheet->startElement( XML_cellXfs,
-                XML_count,  OString::valueOf( nCells ).getStr(),
+                XML_count,  OString::number( nCells ).getStr(),
                 FSEND );
         size_t nXFCount = maSortedXFList.GetSize();
         for( size_t i = 0; i < nXFCount; ++i )
@@ -2576,7 +2576,7 @@ void XclExpXFBuffer::SaveXml( XclExpXmlStream& rStrm )
 
     // save all STYLE records
     rStyleSheet->startElement( XML_cellStyles,
-            XML_count,  OString::valueOf( (sal_Int32) maStyleList.GetSize() ).getStr(),
+            XML_count,  OString::number(  maStyleList.GetSize() ).getStr(),
             FSEND );
     maStyleList.SaveXml( rStrm );
     rStyleSheet->endElement( XML_cellStyles );
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index b63aa96f03d7..8b6ed14c23e1 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -577,7 +577,7 @@ XclExpNumberCell::XclExpNumberCell(
 
 static OString lcl_GetStyleId( XclExpXmlStream& rStrm, sal_uInt32 nXFIndex )
 {
-    return OString::valueOf( rStrm.GetRoot().GetXFBuffer()
+    return OString::number( rStrm.GetRoot().GetXFBuffer()
             .GetXmlCellIndex( nXFIndex ) );
 }
 
@@ -1567,12 +1567,12 @@ void XclExpColinfo::SaveXml( XclExpXmlStream& rStrm )
             XML_collapsed,      XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_COLINFO_COLLAPSED ) ),
             // OOXTODO: XML_customWidth,
             XML_hidden,         XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_COLINFO_HIDDEN ) ),
-            XML_max,            OString::valueOf( (sal_Int32) (nLastXclCol+1) ).getStr(),
-            XML_min,            OString::valueOf( (sal_Int32) (mnFirstXclCol+1) ).getStr(),
+            XML_max,            OString::number(  (nLastXclCol+1) ).getStr(),
+            XML_min,            OString::number(  (mnFirstXclCol+1) ).getStr(),
             // OOXTODO: XML_outlineLevel,
             // OOXTODO: XML_phonetic,
             XML_style,          lcl_GetStyleId( rStrm, maXFId.mnXFIndex ).getStr(),
-            XML_width,          OString::valueOf( (double) (mnScWidth / (double)sc::TwipsToHMM( GetCharWidth() )) ).getStr(),
+            XML_width,          OString::number( (double) (mnScWidth / (double)sc::TwipsToHMM( GetCharWidth() )) ).getStr(),
             FSEND );
 }
 
@@ -1990,14 +1990,14 @@ void XclExpRow::SaveXml( XclExpXmlStream& rStrm )
     for ( sal_uInt32 i=0; i<mnXclRowRpt; ++i )
     {
         rWorksheet->startElement( XML_row,
-                XML_r,              OString::valueOf( (sal_Int32) (mnCurrentRow++) ).getStr(),
+                XML_r,              OString::number(  (mnCurrentRow++) ).getStr(),
                 // OOXTODO: XML_spans,          optional
                 XML_s,              haveFormat ? lcl_GetStyleId( rStrm, mnXFIndex ).getStr() : NULL,
                 XML_customFormat,   XclXmlUtils::ToPsz( haveFormat ),
-                XML_ht,             OString::valueOf( (double) mnHeight / 20.0 ).getStr(),
+                XML_ht,             OString::number( (double) mnHeight / 20.0 ).getStr(),
                 XML_hidden,         XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_ROW_HIDDEN ) ),
                 XML_customHeight,   XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_ROW_UNSYNCED ) ),
-                XML_outlineLevel,   OString::valueOf( (sal_Int32) mnOutlineLevel ).getStr(),
+                XML_outlineLevel,   OString::number(  mnOutlineLevel ).getStr(),
                 XML_collapsed,      XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_ROW_COLLAPSED ) ),
                 // OOXTODO: XML_thickTop,       bool
                 // OOXTODO: XML_thickBot,       bool
@@ -2498,7 +2498,7 @@ void XclExpCellTable::SaveXml( XclExpXmlStream& rStrm )
     XclExpDefaultRowData& rDefData = mxDefrowheight->GetDefaultData();
     sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
     rWorksheet->startElement( XML_sheetFormatPr,
-        XML_defaultRowHeight, OString::valueOf( (double) rDefData.mnHeight / 20.0 ).getStr(), FSEND );
+        XML_defaultRowHeight, OString::number( (double) rDefData.mnHeight / 20.0 ).getStr(), FSEND );
     rWorksheet->endElement( XML_sheetFormatPr );
 
     maColInfoBfr.SaveXml( rStrm );
diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx
index 37d409097c09..1c35f72f952b 100644
--- a/sc/source/filter/excel/xeview.cxx
+++ b/sc/source/filter/excel/xeview.cxx
@@ -56,11 +56,11 @@ void XclExpWindow1::SaveXml( XclExpXmlStream& rStrm )
             XML_showSheetTabs,          XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_WIN1_TABBAR ) ),
             XML_xWindow,                "0",
             XML_yWindow,                "0",
-            XML_windowWidth,            OString::valueOf( (sal_Int32)0x4000 ).getStr(),
-            XML_windowHeight,           OString::valueOf( (sal_Int32)0x2000 ).getStr(),
-            XML_tabRatio,               OString::valueOf( (sal_Int32)mnTabBarSize ).getStr(),
-            XML_firstSheet,             OString::valueOf( (sal_Int32)rTabInfo.GetFirstVisXclTab() ).getStr(),
-            XML_activeTab,              OString::valueOf( (sal_Int32)rTabInfo.GetDisplayedXclTab() ).getStr(),
+            XML_windowWidth,            OString::number( 0x4000 ).getStr(),
+            XML_windowHeight,           OString::number( 0x2000 ).getStr(),
+            XML_tabRatio,               OString::number( mnTabBarSize ).getStr(),
+            XML_firstSheet,             OString::number( rTabInfo.GetFirstVisXclTab() ).getStr(),
+            XML_activeTab,              OString::number( rTabInfo.GetDisplayedXclTab() ).getStr(),
             // OOXTODO: XML_autoFilterDateGrouping,     // bool; AUTOFILTER12? 87Eh
             FSEND );
 }
@@ -185,8 +185,8 @@ static const char* lcl_GetActivePane( sal_uInt8 nActivePane )
 void XclExpPane::SaveXml( XclExpXmlStream& rStrm )
 {
     rStrm.GetCurrentStream()->singleElement( XML_pane,
-            XML_xSplit,         OString::valueOf( (sal_Int32)mnSplitX ).getStr(),
-            XML_ySplit,         OString::valueOf( (sal_Int32)mnSplitY ).getStr(),
+            XML_xSplit,         OString::number( mnSplitX ).getStr(),
+            XML_ySplit,         OString::number( mnSplitY ).getStr(),
             XML_topLeftCell,    XclXmlUtils::ToOString( maSecondXclPos ).getStr(),
             XML_activePane,     lcl_GetActivePane( mnActivePane ),
             XML_state,          mbFrozenPanes ? "frozen" : "split",
@@ -233,7 +233,7 @@ void XclExpSelection::SaveXml( XclExpXmlStream& rStrm )
     rStrm.GetCurrentStream()->singleElement( XML_selection,
             XML_pane,           lcl_GetActivePane( mnPane ),
             XML_activeCell,     XclXmlUtils::ToOString( maSelData.maXclCursor ).getStr(),
-            XML_activeCellId,   OString::valueOf( (sal_Int32) maSelData.mnCursorIdx ).getStr(),
+            XML_activeCellId,   OString::number(  maSelData.mnCursorIdx ).getStr(),
             XML_sqref,          XclXmlUtils::ToOString( maSelData.maXclSelection ).getStr(),
             FSEND );
 }
@@ -416,7 +416,7 @@ static void lcl_WriteSelection( XclExpXmlStream& rStrm, const XclTabViewData& rD
 static OString lcl_GetZoom( sal_uInt16 nZoom )
 {
     if( nZoom )
-        return OString::valueOf( (sal_Int32)nZoom );
+        return OString::number( nZoom );
     return OString( "100" );
 }
 
@@ -438,7 +438,7 @@ void XclExpTabViewSettings::SaveXml( XclExpXmlStream& rStrm )
             // OOXTODO: XML_showWhiteSpace,
             XML_view,                       maData.mbPageMode ? "pageBreakPreview" : "normal",  // OOXTODO: pageLayout
             XML_topLeftCell,                XclXmlUtils::ToOString( maData.maFirstXclPos ).getStr(),
-            XML_colorId,                    OString::valueOf( (sal_Int32) rStrm.GetRoot().GetPalette().GetColorIndex( mnGridColorId ) ).getStr(),
+            XML_colorId,                    OString::number(  rStrm.GetRoot().GetPalette().GetColorIndex( mnGridColorId ) ).getStr(),
             XML_zoomScale,                  lcl_GetZoom( maData.mnCurrentZoom ).getStr(),
             XML_zoomScaleNormal,            lcl_GetZoom( maData.mnNormalZoom ).getStr(),
             // OOXTODO: XML_zoomScaleSheetLayoutView,
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index adeb3d8b7491..0b4fb7445d21 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -2320,10 +2320,10 @@ void XclImpOptionButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const
             if ( xCtrlModel.is() )
             {
                 ScfPropertySet aProps( xCtrlModel );
-                OUString sGroupName = OUString::valueOf( static_cast< sal_Int32 >( pLeader->GetDffShapeId() ) );
+                OUString sGroupName = OUString::number( pLeader->GetDffShapeId() );
 
                 aProps.SetStringProperty( "GroupName", sGroupName );
-                aProps.SetStringProperty( "RefValue", OUString::valueOf( nRefVal++ ) );
+                aProps.SetStringProperty( "RefValue", OUString::number( nRefVal++ ) );
                 if ( pLeader->HasCellLink() && !pTbxObj->HasCellLink() )
                 {
                     // propagate cell link info
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index 20965db3ace4..0f238a7cf873 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -645,7 +645,7 @@ OUString XclChObjectTable::InsertObject( const Any& rObj )
         // create new unused identifier
         do
         {
-            aObjName = maObjNameBase + OUString::valueOf( ++mnIndex );
+            aObjName = maObjNameBase + OUString::number( ++mnIndex );
         }
         while( mxContainer->hasByName( aObjName ) );
 
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index 3538ddec7125..b207769f8587 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -626,7 +626,7 @@ bool XclTools::GetBuiltInStyleId( sal_uInt8& rnStyleId, sal_uInt8& rnLevel, cons
         {
             OUString aLevel = rStyleName.copy(nNextChar);
             sal_Int32 nLevel = aLevel.toInt32();
-            if (OUString::valueOf(nLevel) == aLevel && nLevel > 0 && nLevel <= EXC_STYLE_LEVELCOUNT)
+            if (OUString::number(nLevel) == aLevel && nLevel > 0 && nLevel <= EXC_STYLE_LEVELCOUNT)
             {
                 rnStyleId = nStyleId;
                 rnLevel = static_cast< sal_uInt8 >( nLevel - 1 );
diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx
index 78241e8a841e..4ebb771a1439 100644
--- a/sc/source/filter/inc/xerecord.hxx
+++ b/sc/source/filter/inc/xerecord.hxx
@@ -221,7 +221,7 @@ void XclExpValueRecord< Type >::SaveXml( XclExpXmlStream& rStrm )
     if( mnAttribute == -1 )
         return;
     rStrm.WriteAttributes(
-        mnAttribute,    OString::valueOf( (sal_Int32) maValue ).getStr(),
+        mnAttribute,    OString::number( maValue ).getStr(),
         FSEND );
 }
 
diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index 7c864cc63de1..dc879e202855 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -531,7 +531,7 @@ Reference< XShape > VmlDrawing::createAndInsertClientXShape( const ::oox::vml::S
                 AxCheckBoxModel& rAxModel = aControl.createModel< AxCheckBoxModel >();
                 convertControlText( rAxModel.maFontData, rAxModel.mnTextColor, rAxModel.maCaption, pTextBox, pClientData->mnTextHAlign );
                 convertControlBackground( rAxModel, rShape );
-                rAxModel.maValue = OUString::valueOf( pClientData->mnChecked );
+                rAxModel.maValue = OUString::number( pClientData->mnChecked );
                 rAxModel.mnSpecialEffect = pClientData->mbNo3D ? AX_SPECIALEFFECT_FLAT : AX_SPECIALEFFECT_SUNKEN;
                 rAxModel.mnVerticalAlign = pClientData->mnTextVAlign;
                 bool bTriState = (pClientData->mnChecked != ::oox::vml::VML_CLIENTDATA_UNCHECKED) && (pClientData->mnChecked != ::oox::vml::VML_CLIENTDATA_CHECKED);
@@ -544,7 +544,7 @@ Reference< XShape > VmlDrawing::createAndInsertClientXShape( const ::oox::vml::S
                 AxOptionButtonModel& rAxModel = aControl.createModel< AxOptionButtonModel >();
                 convertControlText( rAxModel.maFontData, rAxModel.mnTextColor, rAxModel.maCaption, pTextBox, pClientData->mnTextHAlign );
                 convertControlBackground( rAxModel, rShape );
-                rAxModel.maValue = OUString::valueOf( pClientData->mnChecked );
+                rAxModel.maValue = OUString::number( pClientData->mnChecked );
                 rAxModel.mnSpecialEffect = pClientData->mbNo3D ? AX_SPECIALEFFECT_FLAT : AX_SPECIALEFFECT_SUNKEN;
                 rAxModel.mnVerticalAlign = pClientData->mnTextVAlign;
             }
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index c2639a29e702..ac836c88ac56 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -304,10 +304,10 @@ OUString PivotCacheItem::getName() const
     {
         case XML_m: return OUString();
         case XML_s: return maValue.get< OUString >();
-        case XML_n: return OUString::valueOf( maValue.get< double >() );                            // !TODO
-        case XML_i: return OUString::valueOf( maValue.get< sal_Int32 >() );
+        case XML_n: return OUString::number( maValue.get< double >() );                            // !TODO
+        case XML_i: return OUString::number( maValue.get< sal_Int32 >() );
         case XML_d: return OUString();                                                              // !TODO
-        case XML_b: return OUString::valueOf( static_cast< sal_Bool >( maValue.get< bool >() ) );   // !TODO
+        case XML_b: return OUString::boolean( static_cast< sal_Bool >( maValue.get< bool >() ) );   // !TODO
         case XML_e: return OUString();                                                              // !TODO
     }
     OSL_FAIL( "PivotCacheItem::getName - invalid data type" );
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index 0ab1395c3af1..14153c03fe0b 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -110,7 +110,7 @@ void ScRTFExport::WriteTab( SCTAB nTab )
 void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
 {
     rStrm << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH << "30" << OOO_STRING_SVTOOLS_RTF_TRLEFT << "-30";
-    rStrm << OOO_STRING_SVTOOLS_RTF_TRRH << OString::valueOf(static_cast<sal_Int32>(pDoc->GetRowHeight(nRow, nTab))).getStr();
+    rStrm << OOO_STRING_SVTOOLS_RTF_TRRH << OString::number(pDoc->GetRowHeight(nRow, nTab)).getStr();
     SCCOL nCol;
     SCCOL nEndCol = aRange.aEnd.Col();
     for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ )
@@ -141,7 +141,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
         if ( pChar )
             rStrm << pChar;
 
-        rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::valueOf(static_cast<sal_Int32>(pCellX[nCol+1])).getStr();
+        rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::number(pCellX[nCol+1]).getStr();
         if ( (nCol & 0x0F) == 0x0F )
             rStrm << sNewLine;      // Zeilen nicht zu lang werden lassen
     }
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index e6a05fb90938..f4d67bc04a4b 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -576,12 +576,12 @@ void XclExpChTrTabId::SaveXml( XclExpXmlStream& rRevisionLogStrm )
 
     sax_fastparser::FSHelperPtr pHeader = rRevisionLogStrm.GetCurrentStream();
     pHeader->startElement( XML_sheetIdMap,
-            XML_count,  OString::valueOf( sal_Int32( nTabCount ) ).getStr(),
+            XML_count,  OString::number( nTabCount ).getStr(),
             FSEND );
     for( int i = 0; i < nTabCount; ++i )
     {
         pHeader->singleElement( XML_sheetId,
-                XML_val,    OString::valueOf( sal_Int32( pBuffer[ i ] ) ).getStr(),
+                XML_val,    OString::number( pBuffer[ i ] ).getStr(),
                 FSEND );
     }
     pHeader->endElement( XML_sheetIdMap );
@@ -1006,10 +1006,10 @@ void XclExpChTrCellContent::SaveXml( XclExpXmlStream& rRevisionLogStrm )
 {
     sax_fastparser::FSHelperPtr pStream = rRevisionLogStrm.GetCurrentStream();
     pStream->startElement( XML_rcc,
-            XML_rId,                    OString::valueOf( (sal_Int32) GetActionNumber() ).getStr(),
+            XML_rId,                    OString::number(  GetActionNumber() ).getStr(),
             XML_ua,                     XclXmlUtils::ToPsz( GetAccepted () ),   // OOXTODO? bAccepted == ua or ra; not sure.
             XML_ra,                     NULL,       // OOXTODO: RRD.fUndoAction?  Or RRD.fAccepted?
-            XML_sId,                    OString::valueOf( (sal_Int32) GetTabId( aPosition.Tab() ) ).getStr(),
+            XML_sId,                    OString::number(  GetTabId( aPosition.Tab() ) ).getStr(),
             XML_odxf,                   NULL,       // OOXTODO: not supported
             XML_xfDxf,                  NULL,       // OOXTODO: not supported
             XML_s,                      NULL,       // OOXTODO: not supported
@@ -1122,10 +1122,10 @@ void XclExpChTrInsert::SaveXml( XclExpXmlStream& rRevisionLogStrm )
 {
     sax_fastparser::FSHelperPtr pStream = rRevisionLogStrm.GetCurrentStream();
     pStream->startElement( XML_rrc,
-            XML_rId,    OString::valueOf( (sal_Int32) GetActionNumber() ).getStr(),
+            XML_rId,    OString::number(  GetActionNumber() ).getStr(),
             XML_ua,     XclXmlUtils::ToPsz( GetAccepted () ),   // OOXTODO? bAccepted == ua or ra; not sure.
             XML_ra,     NULL,       // OOXTODO: RRD.fUndoAction?  Or RRD.fAccepted?
-            XML_sId,    OString::valueOf( (sal_Int32) GetTabId( aRange.aStart.Tab() ) ).getStr(),
+            XML_sId,    OString::number(  GetTabId( aRange.aStart.Tab() ) ).getStr(),
             XML_eol,    NULL,       // OOXTODO: not supported?
             XML_ref,    XclXmlUtils::ToOString( aRange ).getStr(),
             XML_action, lcl_GetAction( nOpCode ),
@@ -1182,12 +1182,12 @@ void XclExpChTrInsertTab::SaveXml( XclExpXmlStream& rStrm )
 {
     sax_fastparser::FSHelperPtr pStream = rStrm.GetCurrentStream();
     pStream->singleElement( XML_ris,
-            XML_rId,            OString::valueOf( (sal_Int32) GetActionNumber() ).getStr(),
+            XML_rId,            OString::number(  GetActionNumber() ).getStr(),
             XML_ua,             XclXmlUtils::ToPsz( GetAccepted () ),   // OOXTODO? bAccepted == ua or ra; not sure.
             XML_ra,             NULL,       // OOXTODO: RRD.fUndoAction?  Or RRD.fAccepted?
-            XML_sheetId,        OString::valueOf( (sal_Int32) GetTabId( nTab ) ).getStr(),
+            XML_sheetId,        OString::number(  GetTabId( nTab ) ).getStr(),
             XML_name,           XclXmlUtils::ToOString( GetTabInfo().GetScTabName( nTab ) ).getStr(),
-            XML_sheetPosition,  OString::valueOf( (sal_Int32) nTab ).getStr(),
+            XML_sheetPosition,  OString::number(  nTab ).getStr(),
             FSEND );
 }
 
@@ -1252,13 +1252,13 @@ void XclExpChTrMoveRange::SaveXml( XclExpXmlStream& rRevisionLogStrm )
     sax_fastparser::FSHelperPtr pStream = rRevisionLogStrm.GetCurrentStream();
 
     pStream->startElement( XML_rm,
-            XML_rId,            OString::valueOf( (sal_Int32) GetActionNumber() ).getStr(),
+            XML_rId,            OString::number(  GetActionNumber() ).getStr(),
             XML_ua,             XclXmlUtils::ToPsz( GetAccepted () ),   // OOXTODO? bAccepted == ua or ra; not sure.
             XML_ra,             NULL,       // OOXTODO: RRD.fUndoAction?  Or RRD.fAccepted?
-            XML_sheetId,        OString::valueOf( (sal_Int32) GetTabId( aDestRange.aStart.Tab() ) ).getStr(),
+            XML_sheetId,        OString::number(  GetTabId( aDestRange.aStart.Tab() ) ).getStr(),
             XML_source,         XclXmlUtils::ToOString( aSourceRange ).getStr(),
             XML_destination,    XclXmlUtils::ToOString( aDestRange ).getStr(),
-            XML_sourceSheetId,  OString::valueOf( (sal_Int32) GetTabId( aSourceRange.aStart.Tab() ) ).getStr(),
+            XML_sourceSheetId,  OString::number(  GetTabId( aSourceRange.aStart.Tab() ) ).getStr(),
             FSEND );
     // OOXTODO: does this handle XML_rfmt, XML_undo?
     XclExpChTrAction* pAction = GetAddAction();
@@ -1306,7 +1306,7 @@ void XclExpChTr0x014A::SaveXml( XclExpXmlStream& rStrm )
     sax_fastparser::FSHelperPtr pStream = rStrm.GetCurrentStream();
 
     pStream->startElement( XML_rfmt,
-            XML_sheetId,    OString::valueOf( (sal_Int32) GetTabId( aRange.aStart.Tab() ) ).getStr(),
+            XML_sheetId,    OString::number(  GetTabId( aRange.aStart.Tab() ) ).getStr(),
             XML_xfDxf,      NULL,   // OOXTODO: not supported
             XML_s,          NULL,   // OOXTODO: style
             XML_sqref,      XclXmlUtils::ToOString( aRange ).getStr(),
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index dcd62b5b5ab5..c5821e0157e7 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -1120,7 +1120,7 @@ void ExcBundlesheet8::SaveXml( XclExpXmlStream& rStrm )
 
     rStrm.GetCurrentStream()->singleElement( XML_sheet,
             XML_name,               XclXmlUtils::ToOString( sUnicodeName ).getStr(),
-            XML_sheetId,            OString::valueOf( (sal_Int32)( nTab+1 ) ).getStr(),
+            XML_sheetId,            OString::number( ( nTab+1 ) ).getStr(),
             XML_state,              nGrbit == 0x0000 ? "visible" : "hidden",
             FSNS( XML_r, XML_id ),  XclXmlUtils::ToOString( sId ).getStr(),
             FSEND );
@@ -1317,7 +1317,7 @@ void ExcEScenario::SaveXml( XclExpXmlStream& rStrm )
             XML_name,       XclXmlUtils::ToOString( sName ).getStr(),
             XML_locked,     XclXmlUtils::ToPsz( nProtected ),
             // OOXTODO: XML_hidden,
-            XML_count,      OString::valueOf( (sal_Int32) aCells.size() ).getStr(),
+            XML_count,      OString::number(  aCells.size() ).getStr(),
             XML_user,       XESTRING_TO_PSZ( sUserName ),
             XML_comment,    XESTRING_TO_PSZ( sComment ),
             FSEND );
@@ -1384,8 +1384,8 @@ void ExcEScenarioManager::SaveXml( XclExpXmlStream& rStrm )
 
     sax_fastparser::FSHelperPtr& rWorkbook = rStrm.GetCurrentStream();
     rWorkbook->startElement( XML_scenarios,
-            XML_current,    OString::valueOf( (sal_Int32)nActive ).getStr(),
-            XML_show,       OString::valueOf( (sal_Int32)nActive ).getStr(),
+            XML_current,    OString::number( nActive ).getStr(),
+            XML_show,       OString::number( nActive ).getStr(),
             // OOXTODO: XML_sqref,
             FSEND );
 
@@ -1504,7 +1504,7 @@ sal_Size XclCalccount::GetLen() const
 void XclCalccount::SaveXml( XclExpXmlStream& rStrm )
 {
     rStrm.WriteAttributes(
-            XML_iterateCount, OString::valueOf( (sal_Int32)nCount ).getStr(),
+            XML_iterateCount, OString::number( nCount ).getStr(),
             FSEND );
 }
 
@@ -1573,7 +1573,7 @@ sal_Size XclDelta::GetLen() const
 void XclDelta::SaveXml( XclExpXmlStream& rStrm )
 {
     rStrm.WriteAttributes(
-            XML_iterateDelta, OString::valueOf( fDelta ).getStr(),
+            XML_iterateDelta, OString::number( fDelta ).getStr(),
             FSEND );
 }
 
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
index 7d7030af8c9f..c9b9b3b13d5f 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -108,7 +108,7 @@ OUString ScXMLExportDataPilot::getDPOperatorXML(
 
 void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, bool bIsCaseSensitive, bool bUseRegularExpressions)
 {
-    rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::valueOf(sal_Int32(aQueryEntry.nField)));
+    rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::number(aQueryEntry.nField));
     if (bIsCaseSensitive)
         rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE);
     const ScQueryEntry::Item& rItem = aQueryEntry.GetQueryItem();
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index 4fa8b2ad491d..8336e497ddec 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -339,7 +339,7 @@ private:
         {
             // Convert field value from absolute to relative.
             SCCOLROW nField = aParam.maKeyState[i].nField - nFieldStart;
-            mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::valueOf(nField));
+            mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::number(nField));
 
             if (!aParam.maKeyState[i].bAscending)
                 mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ORDER, XML_DESCENDING);
@@ -431,7 +431,7 @@ private:
 
     void writeCondition(const ScQueryEntry& rEntry, SCCOLROW nFieldStart, bool bCaseSens, bool bRegExp)
     {
-        mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::valueOf(rEntry.nField - nFieldStart));
+        mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::number(rEntry.nField - nFieldStart));
         if (bCaseSens)
             mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE);
 
@@ -653,7 +653,7 @@ private:
                 break;
 
             sal_Int32 nFieldCol = static_cast<sal_Int32>(aParam.nField[i]);
-            mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, OUString::valueOf(nFieldCol));
+            mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, OUString::number(nFieldCol));
             SvXMLElementExport aElemSTR(mrExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, true, true);
 
             for (SCCOL j = 0, n = aParam.nSubTotals[i]; j < n; ++j)
@@ -661,7 +661,7 @@ private:
                 sal_Int32 nCol = static_cast<sal_Int32>(aParam.pSubTotals[i][j]);
                 ScSubTotalFunc eFunc = aParam.pFunctions[i][j];
 
-                mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::valueOf(nCol));
+                mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::number(nCol));
                 OUString aFuncStr;
                 ScXMLConverter::GetStringFromFunction(aFuncStr, eFunc);
                 mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, aFuncStr);
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 882948dbce9a..a9d59ad1b12c 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -162,7 +162,7 @@ bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny,
             else
             {
                 sal_Int32 nNameIndex(nCount + 1);
-                OUString sCount(OUString::valueOf(nNameIndex));
+                OUString sCount(OUString::number(nNameIndex));
                 OUString sPrefix("val");
                 aValidation.sName += sPrefix;
                 aValidation.sName += sCount;
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 541924cc513d..8d12427e75ef 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3346,7 +3346,7 @@ void ScXMLExport::SetRepeatAttribute(sal_Int32 nEqualCellCount, bool bIncProgres
     if (nEqualCellCount > 0)
     {
         sal_Int32 nTemp(nEqualCellCount + 1);
-        OUString sOUEqualCellCount(OUString::valueOf(nTemp));
+        OUString sOUEqualCellCount(OUString::number(nTemp));
         AddAttribute(sAttrColumnsRepeated, sOUEqualCellCount);
         if (bIncProgress)
             IncrementProgressBar(sal_False, nEqualCellCount);
@@ -4024,7 +4024,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
                                 AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula);
                             }
                             else
-                                AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(it->GetValue()));
+                                AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::number(it->GetValue()));
 
                             AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*it));
                             OUStringBuffer aBuffer;
@@ -4085,7 +4085,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
                                 AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula);
                             }
                             else
-                                AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(pFormatData->mpLowerLimit->GetValue()));
+                                AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::number(pFormatData->mpLowerLimit->GetValue()));
                             AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*pFormatData->mpLowerLimit, true));
                             SvXMLElementExport aElementDataBarEntryLower(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true);
                         }
@@ -4097,7 +4097,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
                                 AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula);
                             }
                             else
-                                AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(pFormatData->mpUpperLimit->GetValue()));
+                                AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::number(pFormatData->mpUpperLimit->GetValue()));
                             AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*pFormatData->mpUpperLimit, false));
                             SvXMLElementExport aElementDataBarEntryUpper(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true);
                         }
@@ -4119,7 +4119,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
                                 AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula);
                             }
                             else
-                                AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(it->GetValue()));
+                                AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::number(it->GetValue()));
 
                             AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*it));
                             SvXMLElementExport aElementColorScaleEntry(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true);
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index c1bbd3a0592b..1e39316f101f 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2661,7 +2661,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const OUString& r
                 OUString sErrorMessage("Fehler im Formatstring ");
                 sErrorMessage += sFormatString;
                 sErrorMessage += OUString(" an Position ");
-                sErrorMessage += OUString::valueOf(rException.CheckPos);
+                sErrorMessage += OUString::number(rException.CheckPos);
                 uno::Sequence<OUString> aSeq(1);
                 aSeq[0] = sErrorMessage;
                 uno::Reference<xml::sax::XLocator> xLocator;
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index ac0749b9101a..4801a6d235b0 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1932,7 +1932,7 @@ OUString SAL_CALL
     IsObjectValid();
     OUString sName = String(ScResId(STR_ACC_DOC_NAME));
     sal_Int32 nNumber(sal_Int32(meSplitPos) + 1);
-    sName += OUString::valueOf(nNumber);
+    sName += OUString::number(nNumber);
     return sName;
 }
 
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index 12315f148b96..216d7171787d 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -387,7 +387,7 @@ OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() throw(un
     else
     {
         // name of row header
-        sName += OUString::valueOf( (sal_Int32) ( maCellPos.Row() + 1 ) );
+        sName += OUString::number(  ( maCellPos.Row() + 1 ) );
     }
 
     return sName;
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 5d6e2181817f..94bb5a67111a 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -69,7 +69,7 @@ void ScTbxInsertCtrl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState,
             nLastSlotId = pItem->GetValue();
             sal_uInt16 nImageId = nLastSlotId ? nLastSlotId : GetSlotId();
             OUString aSlotURL( "slot:" );
-            aSlotURL += OUString::valueOf( sal_Int32( nImageId ));
+            aSlotURL += OUString::number( nImageId);
             Image aImage = GetImage( m_xFrame,
                                      aSlotURL,
                                      hasBigImages()
diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx
index 581da4846aea..9c8e57e149ae 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -53,7 +53,7 @@ void SetValue( ScColorScaleEntry* pEntry, Edit& aEdit)
     if(pEntry->GetType() == COLORSCALE_FORMULA)
         aEdit.SetText(pEntry->GetFormula(formula::FormulaGrammar::GRAM_DEFAULT));
     else if(pEntry->GetType() != COLORSCALE_MIN && pEntry->GetType() != COLORSCALE_MAX)
-        aEdit.SetText(OUString::valueOf(pEntry->GetValue()));
+        aEdit.SetText(OUString::number(pEntry->GetValue()));
     else
         aEdit.Disable();
 }
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 2fb93e08a136..ee1fd1873bff 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -66,7 +66,7 @@ void ScCondFrmtEntry::SetIndex(sal_Int32 nIndex)
 {
     mnIndex = nIndex;
     OUStringBuffer aBuffer(maStrCondition);
-    aBuffer.append(OUString::valueOf(nIndex));
+    aBuffer.append(OUString::number(nIndex));
     maFtCondNr.SetText(aBuffer.makeStringAndClear());
 }
 
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 5c1b7a64e698..c28843a99aec 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -2900,7 +2900,7 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sModuleName
              nNum = 1;
         }
         while( xLib->hasByName( genModuleName ) )
-            genModuleName = OUString( "Sheet") + OUString::valueOf( ++nNum );
+            genModuleName = OUString( "Sheet") + OUString::number( ++nNum );
 
         uno::Any aSourceAny;
         OUString sTmpSource = sSource;
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 7ad46023b492..12edd679a729 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -307,7 +307,7 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos)
     // adding a second copy to sc (see ScTbxInsertCtrl::StateChanged)
 
     OUString aSlotURL( "slot:" );
-    aSlotURL += OUString::valueOf( sal_Int32( SID_DEL_ROWS ) );
+    aSlotURL += OUString::number( SID_DEL_ROWS );
     uno::Reference<frame::XFrame> xFrame = GetBindings().GetActiveFrame();
     Image aDelNm = ::GetImage( xFrame, aSlotURL, false );
 
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index c7c45cbeaa24..fa7885d687f3 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -99,7 +99,7 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const
             rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
             ScGlobal::GetpLocaleData()->getNumDecimalSep()[0], true );
     else
-        sTxt += OUString::valueOf(mnIntValue);
+        sTxt += OUString::number(mnIntValue);
     rDev.SetFont( aFont );
     rDev.DrawText( aNewPos, sTxt );
 
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 6b38aee605ee..51aa29aa585c 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -425,7 +425,7 @@ sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() throw(uno::RuntimeExce
 static OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex )
 {
     OUString aRet( "Entry" );
-    aRet += OUString::valueOf( nIndex );
+    aRet += OUString::number( nIndex );
     return aRet;
 }
 
diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx
index 449b9d744ad1..700ecc20a7b2 100644
--- a/sc/source/ui/vba/vbachart.cxx
+++ b/sc/source/ui/vba/vbachart.cxx
@@ -633,7 +633,7 @@ ScVbaChart::getDefaultSeriesDescriptions( sal_Int32 _nCount )
     sal_Int32 nLen = sDescriptions.getLength();
     for (sal_Int32 i = 0; i < nLen; i++)
     {
-        sDescriptions[i] = DEFAULTSERIESPREFIX + OUString::valueOf(i+1);
+        sDescriptions[i] = DEFAULTSERIESPREFIX + OUString::number(i+1);
     }
     return sDescriptions;
 }
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index 9af64aab38f2..cba17fa227fe 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -396,9 +396,9 @@ void PrintOutHelper( const uno::Any& From, const uno::Any& To, const uno::Any& C
     if (( nFrom || nTo ) )
     {
         if ( nFrom )
-            sRange = OUString::valueOf( nFrom ) + sRange;
+            sRange = OUString::number( nFrom ) + sRange;
         if ( nTo )
-            sRange += OUString::valueOf( nTo );
+            sRange += OUString::number( nTo );
     }
 
     if (  PrToFileName.getValue() )
@@ -479,7 +479,7 @@ OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeExcepti
         {
             sal_Bool bBool = false;
             pvargItem >>= bBool;
-            sString = OUString::valueOf( bBool );
+            sString = OUString::boolean( bBool );
             break;
         }
         case uno::TypeClass_STRING:
@@ -489,14 +489,14 @@ OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeExcepti
             {
                 float aFloat = 0;
                 pvargItem >>= aFloat;
-                sString = OUString::valueOf( aFloat );
+                sString = OUString::number( aFloat );
                 break;
             }
         case uno::TypeClass_DOUBLE:
             {
                 double aDouble = 0;
                 pvargItem >>= aDouble;
-                sString = OUString::valueOf( aDouble );
+                sString = OUString::number( aDouble );
                 break;
             }
         case uno::TypeClass_SHORT:
@@ -505,7 +505,7 @@ OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeExcepti
             {
                 sal_Int32 aNum = 0;
                 pvargItem >>= aNum;
-                sString = OUString::valueOf( aNum );
+                sString = OUString::number( aNum );
                 break;
             }
 
@@ -513,7 +513,7 @@ OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeExcepti
             {
                 sal_Int64 aHyper = 0;
                 pvargItem >>= aHyper;
-                sString = OUString::valueOf( aHyper );
+                sString = OUString::number( aHyper );
                 break;
             }
         default:
@@ -548,7 +548,7 @@ ContainerUtilities::getUniqueName( const uno::Sequence< OUString >& _slist, cons
                 return scompname;
             }
         }
-        scompname = _sElementName + _sSuffixSeparator + OUString::valueOf( a++ );
+        scompname = _sElementName + _sSuffixSeparator + OUString::number( a++ );
     }
     return OUString();
 }
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index 840c7956ad67..f0c1f097e6b0 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -267,7 +267,7 @@ ScVbaInterior::SetAttributeData( sal_Int32 nValue )
 {
     xml::AttributeData aAttributeData;
     aAttributeData.Type = OUString( "sal_Int32" );
-    aAttributeData.Value = OUString::valueOf( nValue );
+    aAttributeData.Value = OUString::number( nValue );
     return uno::makeAny( aAttributeData );
 }
 uno::Any
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index a0a88e870ccc..af8bf07e12cb 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -3166,11 +3166,11 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L
     }
     else if( What >>= nWhat )
     {
-        sWhat = OUString::valueOf( nWhat );
+        sWhat = OUString::number( nWhat );
     }
     else if( What >>= fWhat )
     {
-        sWhat = OUString::valueOf( fWhat );
+        sWhat = OUString::number( fWhat );
     }
     else
         throw uno::RuntimeException("Range::Find, missing params", uno::Reference< uno::XInterface >() );
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx
index 5c5d4c96e0a5..b2f49a819eca 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -342,7 +342,7 @@ ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/
 
         getCurrentDelim() = nDelim; //set new current
 
-        sFormat = OUString::valueOf( (sal_Int32)nDelim ) + sRestOfFormat;
+        sFormat = OUString::number( nDelim ) + sRestOfFormat;
         sProps[ nIndex++ ].Value <<= sFormat;
         sProps[ nIndex ].Name = OUString("FilterName");
         sProps[ nIndex++ ].Value <<= OUString( "Text - txt - csv (StarCalc)" );
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index ffd9f468cbbc..05b6bbfbd237 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -696,7 +696,7 @@ OUString ConvertFromDec( double fNum, double fMin, double fMax, sal_uInt16 nBase
     if( bNeg )
         nNum = sal_Int64( pow( double( nBase ), double( nMaxPlaces ) ) ) + nNum;
 
-    OUString          aRet( OUString::valueOf( nNum, nBase ).toAsciiUpperCase() );
+    OUString          aRet( OUString::number( nNum, nBase ).toAsciiUpperCase() );
 
 
     if( bUsePlaces )
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 10541d65450a..7a923c49182c 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -723,7 +723,7 @@ SdStyleSheet* SdStyleSheet::CreateEmptyUserStyle( SfxStyleSheetBasePool& rPool,
     sal_Int32 nIndex = 1;
     do
     {
-        aName = aPrefix + OUString::valueOf( nIndex++ );
+        aName = aPrefix + OUString::number( nIndex++ );
     }
     while( rPool.Find( aName, eFamily ) != 0 );
 
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 7a0ebb763f63..9b7bf4354acd 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1229,7 +1229,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
                                 if ( pIter != maSlideNameList.end() )
                                 {
                                     nPageIndex = pIter - maSlideNameList.begin();
-                                    aPageUrl = OUString::valueOf(static_cast<sal_Int32>(256 + nPageIndex));
+                                    aPageUrl = OUString::number(256 + nPageIndex);
                                     aPageUrl.Append( OUString( "," ) );
                                     aPageUrl.Append( OUString::number( nPageIndex + 1 ) );
                                     aPageUrl.Append( OUString( ",Slide " ) );
@@ -2070,7 +2070,7 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat
                         nHyperLinkType = 7;
 
                         String aEmpty;
-                        String aHyperString = OUString::valueOf(static_cast<sal_Int32>(256 + nIndex));
+                        String aHyperString = OUString::number(256 + nIndex);
                         aHyperString.Append( OUString( "," ) );
                         aHyperString.Append( OUString::number( nIndex + 1 ) );
                         aHyperString.Append( OUString( ",Slide " ) );
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index fa2160b83d69..951b2cf44744 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -1163,7 +1163,7 @@ sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt1
                     if ( eTranslateMode & TRANSLATE_NUMBER_TO_STRING )
                     {
                         Any aAny;
-                        OUString aNumber( OUString::valueOf( fVal ) );
+                        OUString aNumber( OUString::number( fVal ) );
                         aAny <<= aNumber;
                         exportAnimPropertyString( rStrm, nPropertyId, aNumber, eTranslateMode );
                     }
@@ -1423,7 +1423,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const OUStr
     {
         double fNumber = 0.0;
         if ( rSourceValue >>= fNumber )
-            aDest += OUString::valueOf( fNumber );
+            aDest += OUString::number( fNumber );
     }
     else if ( rAttributeName == "Color"
             || rAttributeName == "FillColor"     // "Fillcolor" or "FillColor" ?
@@ -1437,21 +1437,21 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const OUStr
         if ( rSourceValue >>= aHSL )
         {
             aDest += "hsl(";
-            aDest += OUString::valueOf( (sal_Int32)( aHSL[ 0 ] / ( 360.0 / 255 ) ) );
+            aDest += OUString::number( (sal_Int32)( aHSL[ 0 ] / ( 360.0 / 255 ) ) );
             aDest += aP;
-            aDest += OUString::valueOf( (sal_Int32)( aHSL[ 1 ] * 255.0 ) );
+            aDest += OUString::number( (sal_Int32)( aHSL[ 1 ] * 255.0 ) );
             aDest += aP;
-            aDest += OUString::valueOf( (sal_Int32)( aHSL[ 2 ] * 255.0 ) );
+            aDest += OUString::number( (sal_Int32)( aHSL[ 2 ] * 255.0 ) );
             aDest += ")";
         }
         else if ( rSourceValue >>= nColor )
         {
             aDest += "rgb(";
-            aDest += OUString::valueOf( (sal_Int32)( (sal_Int8)nColor ) );
+            aDest += OUString::number( ( (sal_Int8)nColor ) );
             aDest += aP;
-            aDest += OUString::valueOf( (sal_Int32)( (sal_Int8)( nColor >> 8 ) ) );
+            aDest += OUString::number( ( (sal_Int8)( nColor >> 8 ) ) );
             aDest += aP;
-            aDest += OUString::valueOf( (sal_Int32)( (sal_Int8)( nColor >> 16 ) ) );
+            aDest += OUString::number( ( (sal_Int8)( nColor >> 16 ) ) );
             aDest += ")";
         }
     }
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index ca78715b6869..18cdd31239a3 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -95,7 +95,7 @@ using ::sax_fastparser::FSHelperPtr;
 
 void dump_pset(Reference< XPropertySet > rXPropSet);
 
-#define IDS(x) OString(OStringLiteral(#x " ") + OString::valueOf( mnShapeIdMax++ )).getStr()
+#define IDS(x) OString(OStringLiteral(#x " ") + OString::number( mnShapeIdMax++ )).getStr()
 
 namespace oox {
     using namespace drawingml;
@@ -1526,7 +1526,7 @@ void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPr
                                    .makeStringAndClear() );
 
     mPresentationFS->singleElementNS( XML_p, XML_sldMasterId,
-                                      XML_id, OString::valueOf( (sal_Int64) GetNewSlideMasterId() ).getStr(),
+                                      XML_id, OString::number(  GetNewSlideMasterId() ).getStr(),
                                       FSNS( XML_r, XML_id ), USS( sRelId ),
                                       FSEND );
 
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index a51ef5a6a714..1c3bf81f9c55 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1994,7 +1994,7 @@ bool HtmlExport::CreateNotesPages()
         aStr.AppendAscii( "</body>\r\n</html>" );
 
         OUString aFileName( "note" );
-        aFileName += OUString::valueOf(nSdPage);
+        aFileName += OUString(nSdPage);
         bOk = WriteHtml( aFileName, true, aStr );
 
 
@@ -2062,7 +2062,7 @@ bool HtmlExport::CreateOutlinePages()
         aStr.AppendAscii( "</body>\r\n</html>" );
 
         OUString aFileName( "outline" );
-        aFileName += OUString::valueOf(nPage);
+        aFileName += OUString::number(nPage);
         bOk = WriteHtml( aFileName, true, aStr );
 
         if (mpProgress)
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 2a3975815e9e..9dc23d05223b 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -146,7 +146,7 @@ SdPublishingDesign::SdPublishingDesign()
     String  aFilterConfigPath( "Office.Common/Filter/Graphic/Export/JPG" );
     FilterConfigItem aFilterConfigItem( aFilterConfigPath );
     sal_Int32 nCompression = aFilterConfigItem.ReadInt32( OUString( KEY_QUALITY ), 75 );
-    m_aCompression = OUString::valueOf( nCompression );
+    m_aCompression = OUString::number( nCompression );
     m_aCompression.Append( sal_Unicode('%') );
 
     SvtUserOptions aUserOptions;
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index a59b7cb74477..f52379c0708f 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -229,7 +229,7 @@ int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRec
 #ifdef DBG_ANIM_LOG
     static int ppt_anim_debug_stream_number = 1;
     OUString ppt_anim_debug_filename("ppt-animation-import-debug-output-");
-    ppt_anim_debug_filename += OUString::valueOf(ppt_anim_debug_stream_number++);
+    ppt_anim_debug_filename += OUString::number(ppt_anim_debug_stream_number++);
     ppt_anim_debug_filename += OUString(".xml");
     mpFile = fopen( OUStringToOString( ppt_anim_debug_filename, RTL_TEXTENCODING_UTF8).getStr() , "w+" );
 #endif
@@ -1101,7 +1101,7 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId
     if( pStr )
         return OUString::createFromAscii( pStr );
     else
-        return OUString::valueOf( nPresetSubType );
+        return OUString::number( nPresetSubType );
 }
 
 // --------------------------------------------------------------------
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index d07489869b6a..42758e1fd5e7 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -266,7 +266,7 @@ Reference<XAccessible> SAL_CALL
         if (nIndex == 0)
             return mxAccessibleOLEObject;
 
-    throw lang::IndexOutOfBoundsException ( "no child with index " + OUString::valueOf(nIndex), NULL);
+    throw lang::IndexOutOfBoundsException ( "no child with index " + OUString::number(nIndex), NULL);
 }
 
 
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 7d0f2f6a46b5..ddb04b177acd 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -239,7 +239,7 @@ uno::Reference<XAccessible> SAL_CALL
     }
     else
         throw lang::IndexOutOfBoundsException (
-            "no accessible child with index " + OUString::valueOf(nIndex),
+            "no accessible child with index " + OUString::number(nIndex),
             static_cast<uno::XWeak*>(this));
 }
 
@@ -683,7 +683,7 @@ void AccessibleDrawDocumentView::UpdateAccessibleName (void)
                 sal_Int16 nPageNumber (0);
                 if (xProperties->getPropertyValue("Number") >>= nPageNumber)
                 {
-                    sNewName += OUString::valueOf(sal_Int32(nPageNumber));
+                    sNewName += OUString::number(nPageNumber);
                 }
             }
             catch (beans::UnknownPropertyException&)
@@ -699,7 +699,7 @@ void AccessibleDrawDocumentView::UpdateAccessibleName (void)
         if (xPages.is())
         {
             sNewName += " / ";
-            sNewName += OUString::valueOf(xPages->getCount());
+            sNewName += OUString::number(xPages->getCount());
         }
     }
 
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 9e41ebb52e76..8af343d7c95f 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1789,7 +1789,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
             if( nPos != LISTBOX_ENTRY_NOTFOUND )
                 mpCBDuration->SelectEntryPos( nPos );
             else
-                mpCBDuration->SetText(OUString::valueOf(fDuration));
+                mpCBDuration->SetText(OUString::number(fDuration));
         }
     }
 
@@ -1820,7 +1820,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
             if( nPos != LISTBOX_ENTRY_NOTFOUND )
                 mpCBRepeat->SelectEntryPos( nPos );
             else
-                mpCBRepeat->SetText(OUString::valueOf(fRepeat));
+                mpCBRepeat->SetText(OUString::number(fRepeat));
         }
         else if( aRepeatCount.getValueType() == ::getCppuType((const Timing*)0) )
         {
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 1d06e7979b7c..23ae228aea30 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -134,7 +134,7 @@ OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText
     }
 
     aDescription += " ";
-    aDescription += OUString::valueOf( getShapeIndex( xShape ) );
+    aDescription += OUString::number( getShapeIndex( xShape ) );
 
     if( bWithText )
     {
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 099b860df468..a74608c806a0 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -1039,7 +1039,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation
             if( pMenu->IsItemEnabled( nId ) )
             {
                 OUString sSlotURL( "slot:" );
-                sSlotURL += OUString::valueOf( sal_Int32( nId ));
+                sSlotURL += OUString::number( nId);
 
                 Image aImage( GetImage( xFrame, sSlotURL, false ) );
                 if( !!aImage )
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index d60c467535d1..7ee5715c34e6 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -589,7 +589,7 @@ BitmapEx AnnotationTag::CreateAnnotationBitmap( bool bSelected )
 
     OUString sAuthor( getInitials( mxAnnotation->getAuthor() ) );
     sAuthor += OUString( sal_Unicode( ' ' ) );
-    sAuthor += OUString::valueOf( (sal_Int32)mnIndex );
+    sAuthor += OUString::number( mnIndex );
 
     aVDev.SetFont( mrFont );
 
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index 74a268a45175..8a8204526801 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -149,7 +149,7 @@ void SdTbxControl::StateChanged( sal_uInt16 nSId,
             else
             {
                 OUString aSlotURL( "slot:" );
-                aSlotURL += OUString::valueOf( sal_Int32( nImage ));
+                aSlotURL += OUString::number( nImage);
                 Image aImage = GetImage( m_xFrame,
                                          aSlotURL,
                                          hasBigImages()
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index d7b00033f394..bce4935e2ac2 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -563,7 +563,7 @@ long ClientBox::PointToPos( const Point& rPos )
 
 OUString ClientBox::getPin()
 {
-    return OUString::valueOf( m_aPinBox.GetValue() );
+    return OUString::number( m_aPinBox.GetValue() );
 }
 
 //------------------------------------------------------------------------------
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 53db5b9c1c0c..57c5325908d2 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -581,8 +581,8 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls)
     aCtlDisplay.Invalidate();
     aCtlDisplay.Update();
 
-    aFiCount.SetText(OUString::valueOf(
-                static_cast<sal_Int64>(m_FrameList.size())));
+    aFiCount.SetText(OUString::number(
+                m_FrameList.size()));
 
     if (!m_FrameList.empty() && !bMovie)
     {
@@ -887,7 +887,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
                             if( !nLoopCount ) // endless
                                 aLbLoopCount.SelectEntryPos( aLbLoopCount.GetEntryCount() - 1);
                             else
-                                aLbLoopCount.SelectEntry(OUString::valueOf( nLoopCount ) );
+                                aLbLoopCount.SelectEntry(OUString::number( nLoopCount ) );
                         }
 
                         long nTime = rAnimBmp.nWait;
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 57d98ba620c5..676de78922a4 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -111,9 +111,9 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
     }
 
     // which object is shown at the moment?
-    OUString info = OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetCurObj() ) )
+    OUString info = OUString::number( pProgrInfo->GetCurObj() )
             + "/"
-            + OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetObjCount() ) );
+            + OUString::number( pProgrInfo->GetObjCount() );
     aFiObjInfo.SetText(info);
 
     // how many actions are started?
@@ -123,9 +123,9 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
     }
     else
     {
-        info = OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetCurAction() ) )
+        info = OUString::number( pProgrInfo->GetCurAction() )
             + "/"
-            + OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetActionCount() ) );
+            + OUString::number( pProgrInfo->GetActionCount() );
         aFiActInfo.SetText(info);
     }
 
@@ -136,9 +136,9 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
     }
     else
     {
-        info = OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetCurInsert() ) )
+        info = OUString::number( pProgrInfo->GetCurInsert() )
             + "/"
-            + OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetInsertCount() ) );
+            + OUString::number( pProgrInfo->GetInsertCount() );
         aFiInsInfo.SetText(info);
     }
 
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index ca4f23856b37..14c64aa8e60b 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -107,10 +107,10 @@ CopyDlg::~CopyDlg()
     rStr += OUString::number(m_pMtrFldHeight->GetValue());
     rStr.Append( TOKEN );
 
-    rStr += OUString::valueOf( (long)m_pLbStartColor->GetSelectEntryColor().GetColor() );
+    rStr += OUString::number( m_pLbStartColor->GetSelectEntryColor().GetColor() );
     rStr.Append( TOKEN );
 
-    rStr += OUString::valueOf( (long)m_pLbEndColor->GetSelectEntryColor().GetColor() );
+    rStr += OUString::number( m_pLbEndColor->GetSelectEntryColor().GetColor() );
 }
 
 /**
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index ac564ee7da1e..1878f5ddb344 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -188,14 +188,14 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
             sal_Int32 nNum = 1;
             if( nStrPos < 0 )
             {
-                aStr = aStr + " ("  + aStrCopy + OUString::valueOf( nNum ) + ")";
+                aStr = aStr + " ("  + aStrCopy + OUString::number( nNum ) + ")";
                 nStrPos = aStr.indexOf( aStrCopy );
             }
             nStrPos = nStrPos + aStrCopy.getLength();
             // that we do not access into the nirvana (--> endless loop)
             if( nStrPos >= aStr.getLength() )
             {
-                aStr = aStr + " " + OUString::valueOf( nNum );
+                aStr = aStr + " " + OUString::number( nNum );
             }
 
             // check name...
@@ -218,7 +218,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
                     const CharClass* pCharClass = rDoc.GetCharClass();
                     while( pCharClass->isDigit( aStr, nStrPos ) )
                         aStr = aStr.replaceAt( nStrPos, 1, "" );
-                    aStr = aStr.copy( 0, nStrPos) + OUString::valueOf( ++nNum ) + aStr.copy( nStrPos);
+                    aStr = aStr.copy( 0, nStrPos) + OUString::number( ++nNum ) + aStr.copy( nStrPos);
                 }
 
             }
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 9313cb26d161..3476358888f0 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -203,7 +203,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
         case PO_OUTLINE_8:
         case PO_OUTLINE_9:
             aTitle = OUString(SdResId( STR_PSEUDOSHEET_OUTLINE )) + " " +
-                OUString::valueOf( static_cast<sal_Int32>( ePO - PO_OUTLINE_1 + 1 ) );
+                OUString::number( ePO - PO_OUTLINE_1 + 1 );
         break;
 
         case PO_NOTES:
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 30a540df7855..e27b406e4615 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -826,7 +826,7 @@ String SdTPAction::GetEditText( sal_Bool bFullDocDestination )
             {
                 const sal_uInt16 nPos = aLbOLEAction.GetSelectEntryPos();
                 if( nPos < aVerbVector.size() )
-                    aStr = OUString::valueOf( aVerbVector[ nPos ] );
+                    aStr = OUString::number( aVerbVector[ nPos ] );
                 return aStr;
             }
         case presentation::ClickAction_DOCUMENT:
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index da7e24ec84da..6bc07433eed3 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -578,9 +578,9 @@ void    SdTpOptionsMisc::SetDrawMode()
 
 String SdTpOptionsMisc::GetScale( sal_Int32 nX, sal_Int32 nY )
 {
-    String aScale( OUString::valueOf( nX ) );
+    String aScale( OUString::number( nX ) );
     aScale.Append( TOKEN );
-    aScale.Append( OUString::valueOf( nY ) );
+    aScale.Append( OUString::number( nY ) );
 
     return( aScale );
 }
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index a87cccd0cb12..9dca799fd096 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -99,7 +99,7 @@ void ImagePreparer::sendPreview( sal_uInt32 aSlideNumber )
 
     aBuffer.append( "slide_preview\n" );
 
-    aBuffer.append( OString::valueOf( sal_Int32( aSlideNumber ) ).getStr() );
+    aBuffer.append( OString::number( aSlideNumber ).getStr() );
     aBuffer.append( "\n" );
 
     aBuffer.append( aEncodedShortString.getStr() );
@@ -190,7 +190,7 @@ void ImagePreparer::sendNotes( sal_uInt32 aSlideNumber )
 
     aBuffer.append( "slide_notes\n" );
 
-    aBuffer.append( OString::valueOf( sal_Int32( aSlideNumber ) ).getStr() );
+    aBuffer.append( OString::number( aSlideNumber ).getStr() );
     aBuffer.append( "\n" );
 
     aBuffer.append( "<html><body>" );
diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx
index d28a526c86c8..be0c9cee6c7c 100644
--- a/sd/source/ui/remotecontrol/Listener.cxx
+++ b/sd/source/ui/remotecontrol/Listener.cxx
@@ -46,8 +46,8 @@ void Listener::init( const css::uno::Reference< css::presentation::XSlideShowCon
         sal_Int32 aCurrentSlide = aController->getCurrentSlideIndex();
         OStringBuffer aBuffer;
         aBuffer.append( "slideshow_started\n" )
-               .append( OString::valueOf( aSlides ) ).append("\n")
-        .append( OString::valueOf( aCurrentSlide ) ).append( "\n\n" );
+               .append( OString::number( aSlides ) ).append("\n")
+        .append( OString::number( aCurrentSlide ) ).append( "\n\n" );
 
         pTransmitter->addMessage( aBuffer.makeStringAndClear(),
                                   Transmitter::PRIORITY_HIGH );
@@ -114,7 +114,7 @@ void SAL_CALL Listener::slideTransitionStarted (void)
     sal_Int32 aSlide = mController->getCurrentSlideIndex();
 
     OStringBuffer aBuilder( "slide_updated\n" );
-    aBuilder.append( OString::valueOf( aSlide ) );
+    aBuilder.append( OString::number( aSlide ) );
     aBuilder.append( "\n\n" );
 
     if ( pTransmitter )
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index be41524594c9..33633f7f3ea4 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -270,7 +270,7 @@ void RecentlyUsedMasterPages::SavePersistentValues (void)
         {
             // Create new child.
             OUString sKey ("index_");
-            sKey += OUString::valueOf(nIndex);
+            sKey += OUString::number(nIndex);
             Reference<container::XNameReplace> xChild(
                 xChildFactory->createInstance(), UNO_QUERY);
             if (xChild.is())
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index b4fb2b0d218c..822e8bee6db3 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -133,7 +133,7 @@ void SlideShowRestarter::StartPresentation (void)
         {
             Sequence<css::beans::PropertyValue> aProperties (1);
             aProperties[0].Name = "FirstPage";
-            aProperties[0].Value <<= "page" + OUString::valueOf(mnCurrentSlideNumber+1);
+            aProperties[0].Value <<= "page" + OUString::number(mnCurrentSlideNumber+1);
             mpSlideShow->startWithArguments(aProperties);
         }
         mpSelf.reset();
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index dfd04baeb23f..9b7dcf3bf67e 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -743,7 +743,7 @@ void SlideSorterView::CompleteRedraw (
     mrSlideSorter.GetContentWindow()->SetTextColor(COL_WHITE);
     mrSlideSorter.GetContentWindow()->DrawText(
         gFrameTimeBox,
-        OUString::valueOf(1 / (gFrameTimeSum / gFrameTimeCount)),
+        OUString::number(1 / (gFrameTimeSum / gFrameTimeCount)),
         TEXT_DRAW_RIGHT | TEXT_DRAW_VCENTER);
     //    mrSlideSorter.GetContentWindow()->Invalidate(gFrameTimeBox);
 #endif
diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index 4375dfa2b7f6..87d91d2aca4c 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -270,7 +270,7 @@ void InsertionIndicatorOverlay::PaintPageCount (
     ::boost::shared_ptr<Font> pFont(Theme::GetFont(Theme::Font_PageCount, rDevice));
     if (pFont)
     {
-        OUString sNumber (OUString::valueOf(nSelectionCount));
+        OUString sNumber (OUString::number(nSelectionCount));
 
         // Determine the size of the (painted) text and create a bounding
         // box that centers the text on the first preview.
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index a87d7a77711f..0eafa0b21eeb 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -331,7 +331,7 @@ void PageObjectPainter::PaintPageNumber (
     // Paint the page number.
     OSL_ASSERT(rpDescriptor->GetPage()!=NULL);
     const sal_Int32 nPageNumber ((rpDescriptor->GetPage()->GetPageNum() - 1) / 2 + 1);
-    const OUString sPageNumber(OUString::valueOf(nPageNumber));
+    const OUString sPageNumber(OUString::number(nPageNumber));
     rDevice.SetFont(*mpPageNumberFont);
     rDevice.SetTextColor(aPageNumberColor);
     rDevice.DrawText(aBox, sPageNumber, TEXT_DRAW_RIGHT | TEXT_DRAW_VCENTER);
diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
index b471040d4b53..da68fab327da 100644
--- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
@@ -273,7 +273,7 @@ void RecentlyUsedMasterPages::SavePersistentValues (void)
         {
             // Create new child.
             OUString sKey ("index_");
-            sKey += OUString::valueOf(nIndex);
+            sKey += OUString::number(nIndex);
             Reference<container::XNameReplace> xChild(
                 xChildFactory->createInstance(), UNO_QUERY);
             if (xChild.is())
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 15dfadcde042..bf523c10fb0f 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -531,7 +531,7 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal
         while( aLayerName.Len()==0 || rLayerAdmin.GetLayer( aLayerName, sal_False) )
         {
             aLayerName = String(SdResId(STR_LAYER));
-            aLayerName += OUString::valueOf(nLayer);
+            aLayerName += OUString::number(nLayer);
             ++nLayer;
         }
 
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 51b0a450b86d..4597e7e9925a 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -210,7 +210,7 @@ namespace {
             if (nContent == 2 && // selection
                 nCurrentPageIndex >= 0)
             {
-                return OUString::valueOf(nCurrentPageIndex + 1);
+                return OUString::number(nCurrentPageIndex + 1);
             }
 
             return OUString();
@@ -640,7 +640,7 @@ namespace {
             vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, sal_True );
             AddDialogControl(vcl::PrinterOptionsHelper::setEditControlOpt("pagerange", "",
                                 ".HelpID:vcl:PrintDialog:PageRange:Edit", "PageRange",
-                                OUString::valueOf(mnCurPage + 1), aPageRangeOpt));
+                                OUString::number(mnCurPage + 1), aPageRangeOpt));
 
             FreeResource();
         }
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index d41c9261e13f..18dd7d1056f3 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -720,13 +720,13 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
         // Always show the slide/page number.
         OUString aOUString = SD_RESSTR(STR_SD_PAGE);
         aOUString += " ";
-        aOUString += OUString::valueOf( sal_Int32(maTabControl.GetCurPageId()) );
+        aOUString += OUString::number( maTabControl.GetCurPageId() );
         aOUString += " / " ;
-        aOUString += OUString::valueOf( nPageCount );
+        aOUString += OUString::number( nPageCount );
         if (nPageCount != nActivePageCount)
         {
             aOUString += " (";
-            aOUString += OUString::valueOf( nActivePageCount );
+            aOUString += OUString::number( nActivePageCount );
             aOUString += ")";
         }
 
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index e055ad415a26..8a7702afb688 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -202,7 +202,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal )
     double fVal( static_cast<double>( rVal ) );
     fVal /= ( 1 << 20 );
     fVal += 0.05;
-    OUStringBuffer aVal( OUString::valueOf( fVal ) );
+    OUStringBuffer aVal( OUString::number( fVal ) );
     sal_Int32 nX( OUString( aVal.getStr() ).indexOf( '.', 0 ) );
     if ( nX > 0 )
         aVal.setLength( nX + 2 );
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index bc031a538d0e..d07b3d3ba4e6 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -505,7 +505,7 @@ void OptimizerDialog::UpdateControlStatesPage2()
     else if ( getString( STR_IMAGE_RESOLUTION_3 ).getToken( 0, ';', nI3 ).toInt32() == nImageResolution )
         aResolutionText = aResolutionItemList[ 3 ];
     if ( aResolutionText.isEmpty() )
-        aResolutionText = OUString::valueOf( nImageResolution );
+        aResolutionText = OUString::number( nImageResolution );
 
     setControlProperty( TKGet( TK_RadioButton0Pg1 ), TKGet( TK_State ), Any( (sal_Int16)( bJPEGCompression != sal_True ) ) );
     setControlProperty( TKGet( TK_RadioButton1Pg1 ), TKGet( TK_State ), Any( (sal_Int16)( bJPEGCompression != sal_False ) ) );
@@ -590,7 +590,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal, sal_Unicode nSeparator =
     double fVal( static_cast<double>( rVal ) );
     fVal /= ( 1 << 20 );
     fVal += 0.05;
-    OUStringBuffer aVal( OUString::valueOf( fVal ) );
+    OUStringBuffer aVal( OUString::number( fVal ) );
     sal_Int32 nX( OUString( aVal.getStr() ).indexOf( '.', 0 ) );
     if ( nX >= 0 )
     {
@@ -737,7 +737,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
         OUString aPlaceholder( "%SLIDES"  );
         sal_Int32 i = aStr.indexOf( aPlaceholder, 0 );
         if ( i >= 0 )
-            aStr = aStr.replaceAt( i, aPlaceholder.getLength(), OUString::valueOf( nDeletedSlides ) );
+            aStr = aStr.replaceAt( i, aPlaceholder.getLength(), OUString::number( nDeletedSlides ) );
         aSummaryStrings.push_back( aStr );
     }
 
@@ -757,15 +757,15 @@ void OptimizerDialog::UpdateControlStatesPage4()
         OUString aResolutionPlaceholder( "%RESOLUTION"  );
         sal_Int32 i = aStr.indexOf( aImagePlaceholder, 0 );
         if ( i >= 0 )
-            aStr = aStr.replaceAt( i, aImagePlaceholder.getLength(), OUString::valueOf( nGraphics ) );
+            aStr = aStr.replaceAt( i, aImagePlaceholder.getLength(), OUString::number( nGraphics ) );
 
         sal_Int32 j = aStr.indexOf( aQualityPlaceholder, 0 );
         if ( j >= 0 )
-            aStr = aStr.replaceAt( j, aQualityPlaceholder.getLength(), OUString::valueOf( nJPEGQuality ) );
+            aStr = aStr.replaceAt( j, aQualityPlaceholder.getLength(), OUString::number( nJPEGQuality ) );
 
         sal_Int32 k = aStr.indexOf( aResolutionPlaceholder, 0 );
         if ( k >= 0 )
-            aStr = aStr.replaceAt( k, aResolutionPlaceholder.getLength(), OUString::valueOf( nImageResolution ) );
+            aStr = aStr.replaceAt( k, aResolutionPlaceholder.getLength(), OUString::number( nImageResolution ) );
 
         aSummaryStrings.push_back( aStr );
     }
@@ -792,7 +792,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
             OUString aPlaceholder( "%OLE"  );
             sal_Int32 i = aStr.indexOf( aPlaceholder, 0 );
             if ( i >= 0 )
-                aStr = aStr.replaceAt( i, aPlaceholder.getLength(), OUString::valueOf( nOLEReplacements ) );
+                aStr = aStr.replaceAt( i, aPlaceholder.getLength(), OUString::number( nOLEReplacements ) );
             aSummaryStrings.push_back( aStr );
         }
     }
@@ -899,7 +899,7 @@ void OptimizerDialog::InitPage4()
     const std::vector< OptimizerSettings >& rList( GetOptimizerSettings() );
     do
     {
-        OUString aTemp( aDefault.concat( OUString::valueOf( nSession++ ) ) );
+        OUString aTemp( aDefault.concat( OUString::number( nSession++ ) ) );
         for ( i = 1; i < rList.size(); i++ )
         {
             if ( rList[ i ].maName == aTemp )
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 0d58b07adef6..516c69a293af 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -143,9 +143,9 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL,
                 if ( nFileSizeSource && nFileSizeDest )
                 {
                     OUStringBuffer sBuf( OUString("Your Presentation has been minimized from:") );
-                    sBuf.append( OUString::valueOf( nFileSizeSource >> 10 ) );
+                    sBuf.append( OUString::number( nFileSizeSource >> 10 ) );
                     sBuf.append( OUString("KB to ") );
-                    sBuf.append( OUString::valueOf( nFileSizeDest >> 10 ) );
+                    sBuf.append( OUString::number( nFileSizeDest >> 10 ) );
                     sBuf.append( OUString("KB.") );
                     OUString sResult( sBuf.makeStringAndClear() );
                     SAL_INFO("sdext.minimizer", sResult );
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 90b4de6a4d1f..52117d3b6a00 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -967,13 +967,13 @@ bool PDFTrailer::emit( EmitContext& rWriteContext ) const
                 // write 20 char entry of form
                 // 0000offset 00gen n\r\n
                 aBuf.setLength( 0 );
-                OString aOffset( OString::valueOf( sal_Int64(section_begin->second.second ) ) );
+                OString aOffset( OString::number( section_begin->second.second ) );
                 int nPad = 10 - aOffset.getLength();
                 for( int i = 0; i < nPad; i++ )
                     aBuf.append( '0' );
                 aBuf.append( aOffset );
                 aBuf.append( ' ' );
-                OString aGeneration( OString::valueOf( sal_Int32(section_begin->second.first ) ) );
+                OString aGeneration( OString::number( section_begin->second.first ) );
                 nPad = 5 - aGeneration.getLength();
                 for( int i = 0; i < nPad; i++ )
                     aBuf.append( '0' );
@@ -991,7 +991,7 @@ bool PDFTrailer::emit( EmitContext& rWriteContext ) const
         return false;
     if( ! rWriteContext.write( "startxref\n", 10 ) )
         return false;
-    OString aOffset( OString::valueOf( sal_Int32(nXRefPos) ) );
+    OString aOffset( OString::number( nXRefPos ) );
     if( ! rWriteContext.write( aOffset.getStr(), aOffset.getLength() ) )
         return false;
     return rWriteContext.write( "\n%%EOF\n", 7 );
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index e4f1d6631ffe..a4d166e8e4df 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -191,7 +191,7 @@ void DrawXmlEmitter::fillFrameProps( DrawElement&       rElem,
 {
     double rel_x = rElem.x, rel_y = rElem.y;
 
-    rProps[ "draw:z-index" ] = OUString::valueOf( rElem.ZOrder );
+    rProps[ "draw:z-index" ] = OUString::number( rElem.ZOrder );
     rProps[ "draw:style-name"] = rEmitContext.rStyles.getStyleName( rElem.StyleId );
     rProps[ "svg:width" ]   = convertPixelToUnitString( rElem.w );
     rProps[ "svg:height" ]  = convertPixelToUnitString( rElem.h );
@@ -791,7 +791,7 @@ void DrawXmlFinalizer::visit( PolyPolyElement& elem, const std::list< Element* >
             aVec.setX ( convPx2mmPrec2( aVec.getX() )*100.0 );
             aVec.setY ( convPx2mmPrec2( aVec.getY() )*100.0 );
 
-            aGCProps[ "svg:stroke-width" ] = OUString::valueOf( aVec.getLength() );
+            aGCProps[ "svg:stroke-width" ] = OUString::number( aVec.getLength() );
         }
     }
     else
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index b36a39bf0242..04238149efe7 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -127,13 +127,13 @@ void WriterXmlEmitter::fillFrameProps( DrawElement&       rElem,
         {
             PageElement* pPage = dynamic_cast<PageElement*>(pAnchor);
             rProps[ "text:anchor-type" ] = "page";
-            rProps[ "text:anchor-page-number" ] = OUString::valueOf(pPage->PageNumber);
+            rProps[ "text:anchor-page-number" ] = OUString::number(pPage->PageNumber);
         }
         rel_x -= pAnchor->x;
         rel_y -= pAnchor->y;
     }
 
-    rProps[ "draw:z-index" ] = OUString::valueOf( rElem.ZOrder );
+    rProps[ "draw:z-index" ] = OUString::number( rElem.ZOrder );
     rProps[ "draw:style-name"] = rEmitContext.rStyles.getStyleName( rElem.StyleId );
     rProps[ "svg:width" ]   = convertPixelToUnitString( rElem.w );
     rProps[ "svg:height" ]  = convertPixelToUnitString( rElem.h );
@@ -856,7 +856,7 @@ void WriterXmlFinalizer::visit( PolyPolyElement& elem, const std::list< Element*
             aVec.setX ( convPx2mmPrec2( aVec.getX() )*100.0 );
             aVec.setY ( convPx2mmPrec2( aVec.getY() )*100.0 );
 
-            aGCProps[ "svg:stroke-width" ] = OUString::valueOf( aVec.getLength() );
+            aGCProps[ "svg:stroke-width" ] = OUString::number( aVec.getLength() );
         }
     }
     else
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index b442f76d3148..8b93a27fbe1c 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -1928,7 +1928,7 @@ void AccessibleNotes::SetTextView (
                 new PresenterAccessible::AccessibleParagraph(
                     css::lang::Locale(),
                     AccessibleRole::PARAGRAPH,
-                    "Paragraph"+OUString::valueOf(nIndex),
+                    "Paragraph"+OUString::number(nIndex),
                     rpTextView->GetParagraph(nIndex),
                     nIndex));
             pParagraph->LateInitialization();
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 6e419965c0e6..bf0b4c135df6 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -334,10 +334,10 @@ void PresenterController::UpdatePaneTitles (void)
     OUString sSlideCount ("---");
     Reference<container::XIndexAccess> xIndexAccess(mxSlideShowController, UNO_QUERY);
     if (xIndexAccess.is())
-        sSlideCount = OUString::valueOf(xIndexAccess->getCount());
+        sSlideCount = OUString::number(xIndexAccess->getCount());
 
     // Get string for current slide index.
-    OUString sCurrentSlideNumber (OUString::valueOf(mnCurrentSlideIndex + 1));
+    OUString sCurrentSlideNumber (OUString::number(mnCurrentSlideIndex + 1));
 
     // Get name of the current slide.
     OUString sCurrentSlideName;
@@ -1184,7 +1184,7 @@ void PresenterController::UpdatePendingSlideNumber (const sal_Int32 nPendingSlid
     if ( ! pFont->mxFont.is())
         return;
 
-    const OUString sText (OUString::valueOf(mnPendingSlideNumber));
+    const OUString sText (OUString::number(mnPendingSlideNumber));
     rendering::StringContext aContext (sText, 0, sText.getLength());
     Reference<rendering::XTextLayout> xLayout (
         pFont->mxFont->createTextLayout(
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 05caa7e80f1c..6e88fbef2d8a 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -565,7 +565,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId (
         Reference<XComponentContext>(mxContextWeak),
         PresenterHelper::msFullScreenPaneURL
                 + "?FullScreen=true&ScreenNumber="
-                + OUString::valueOf(nScreen));
+                + OUString::number(nScreen));
 }
 
 void PresenterScreen::RequestShutdownPresenterScreen (void)
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 01f886fdd2f1..0af04cfb70d9 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -1585,7 +1585,7 @@ void PresenterSlideSorter::MouseOverManager::SetSlide (
                 xSlideProperties->getPropertyValue("LinkDisplayName") >>= msText;
 
             if (msText.isEmpty())
-                msText = "Slide " + OUString::valueOf(nSlideIndex + 1);
+                msText = "Slide " + OUString::number(nSlideIndex + 1);
         }
     }
     else
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index e5d7efe98c37..6fcd6d280f0d 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -1812,15 +1812,15 @@ OUString TimeFormatter::FormatTime (const oslDateTime& rTime)
     const sal_Int32 nSeconds(sal::static_int_cast<sal_Int32>(rTime.Seconds));
     // Hours
     if (mbIs24HourFormat)
-        sText.append(OUString::valueOf(nHours));
+        sText.append(OUString::number(nHours));
     else
-        sText.append(OUString::valueOf(
+        sText.append(OUString::number(
             sal::static_int_cast<sal_Int32>(nHours>12 ? nHours-12 : nHours)));
 
     sText.append(":");
 
     // Minutes
-    const OUString sMinutes (OUString::valueOf(nMinutes));
+    const OUString sMinutes (OUString::number(nMinutes));
     if (sMinutes.getLength() == 1)
         sText.append("0");
     sText.append(sMinutes);
@@ -1829,7 +1829,7 @@ OUString TimeFormatter::FormatTime (const oslDateTime& rTime)
     if (mbIsShowSeconds)
     {
         sText.append(":");
-        const OUString sSeconds (OUString::valueOf(nSeconds));
+        const OUString sSeconds (OUString::number(nSeconds));
         if (sSeconds.getLength() == 1)
             sText.append("0");
         sText.append(sSeconds);
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index b07731e2042e..06f1cca1bf31 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -613,7 +613,7 @@ void SvFileObject::SendStateChg_Impl( sfx2::LinkManager::LinkState nState )
     if( !bStateChangeCalled && HasDataLinks() )
     {
         css::uno::Any aAny;
-        aAny <<= OUString::valueOf( (sal_Int32)nState );
+        aAny <<= OUString::number( nState );
         DataChanged( SotExchange::GetFormatName(
                         sfx2::LinkManager::RegisterStatusInfoId()), aAny );
         bStateChangeCalled = sal_True;
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index c09f3604f3fa..8e146cbd2481 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -80,12 +80,12 @@ void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, cons
     if ( nNo < 9 )
     {
         aPickEntry.append('~');
-        aPickEntry.append(OUString::valueOf(static_cast<sal_Int32>(nNo + 1)));
+        aPickEntry.append(OUString::number(nNo + 1));
     }
     else if ( nNo == 9 )
         aPickEntry.appendAscii(RTL_CONSTASCII_STRINGPARAM("1~0"));
     else
-        aPickEntry.append(OUString::valueOf(static_cast<sal_Int32>(nNo + 1)));
+        aPickEntry.append(OUString::number(nNo + 1));
     aPickEntry.appendAscii(RTL_CONSTASCII_STRINGPARAM(": "));
 
     INetURLObject   aURL( aURLString );
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 1e3b0e2ed03f..abfb482c2f85 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -152,7 +152,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd ,
 
     // create a resource URL from the nId provided by the sfx2
     OUString aResourceURL( aDockWindowResourceURL );
-    aResourceURL += OUString::valueOf(sal_Int32(nId));
+    aResourceURL += OUString::number(nId);
     aPropValue.Value = uno::makeAny( aResourceURL );
     aArgs[1] <<= aPropValue;
 
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 60de2670b61f..1a7d4669dbdb 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1834,9 +1834,9 @@ void FileDialogHelper_Impl::addFilters( const String& rFactory,
     sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":module="));
     sQuery.append(rFactory); // use long name here !
     sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":iflags="));
-    sQuery.append(OUString::valueOf((sal_Int32)m_nMustFlags));
+    sQuery.append(OUString::number(m_nMustFlags));
     sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":eflags="));
-    sQuery.append(OUString::valueOf((sal_Int32)m_nDontFlags));
+    sQuery.append(OUString::number(m_nDontFlags));
 
     uno::Reference< XEnumeration > xResult;
     try
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 0a9e4a2c59b5..d7528f63de40 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -403,7 +403,7 @@ template< typename T >
     {
         sal_Int32 n;
         rtl_random_getBytes(s_Pool, & n, sizeof(n));
-        id = prefix + OUString::valueOf(static_cast<sal_Int32>(abs(n)));
+        id = prefix + OUString::number(abs(n));
         iter = i_rXmlIdMap.find(id);
     }
     while (iter != i_rXmlIdMap.end());
diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx
index 172cfb7eeeaf..266d226338fe 100644
--- a/sfx2/source/doc/docinf.cxx
+++ b/sfx2/source/doc/docinf.cxx
@@ -230,7 +230,7 @@ bool SFX2_DLLPUBLIC SaveOlePropertySet(
     rGlobSect.SetFileTimeValue( PROPID_EDITTIME, aEditTime );
 
     rGlobSect.SetStringValue( PROPID_REVNUMBER,
-                OUString::valueOf( static_cast<sal_Int32>(i_xDocProps->getEditingCycles()) ) );
+                OUString::number( i_xDocProps->getEditingCycles() ) );
     if ( i_pThumb && i_pThumb->getLength() )
         rGlobSect.SetThumbnailValue( PROPID_THUMBNAIL, *i_pThumb );
 
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 136acac9b549..953f98bce23d 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -807,7 +807,7 @@ sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const OUString&
         {
             OUString aTryName = aPrefix;
             if ( nInd )
-                aTryName += OUString::valueOf( nInd );
+                aTryName += OUString::number( nInd );
 
             try
             {
@@ -870,7 +870,7 @@ OUString SfxDocTplService_Impl::CreateNewUniqueFileWithPrefix( const OUString& a
             sal_Bool bCreated = sal_False;
             OUString aTryName = aPrefix;
             if ( nInd )
-                aTryName += OUString::valueOf( nInd );
+                aTryName += OUString::number( nInd );
             if ( aExt.toChar() != '.' )
                 aTryName += OUString( "."  );
             aTryName += aExt;
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 1f8a7f1e5356..2bf194a16c0f 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -451,7 +451,7 @@ sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const un
         {
             uno::Reference< graphic::XGraphicProvider > xGraphProvider(graphic::GraphicProvider::create(xContext));
             OUString aURL("private:resource/sfx/bitmapex/");
-            aURL += OUString::valueOf( nResID );
+            aURL += OUString::number( nResID );
 
             uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
             aMediaProps[0].Name = "URL";
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 0e37c5d989d6..bc4b8e04469b 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -871,7 +871,7 @@ String SfxObjectShell::GetTitle
         if (pImp->bIsNamedVisible)
         {
             // Append number
-            aNoName += OUString::valueOf(static_cast<sal_Int32>(pImp->nVisualDocumentNumber));
+            aNoName += OUString::number(pImp->nVisualDocumentNumber);
         }
 
         // Document called "noname" for the time being
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 5efb2b44f95d..2c9eeb7af10d 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -237,7 +237,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument
         // increase global instance counter.
         ++g_nInstanceCounter;
         // set own Runtime UID
-        m_sRuntimeUID = OUString::valueOf( g_nInstanceCounter );
+        m_sRuntimeUID = OUString::number( g_nInstanceCounter );
     }
 
     virtual ~IMPL_SfxBaseModel_DataContainer()
@@ -3578,8 +3578,8 @@ Reference< ui::XUIConfigurationManager2 > SfxBaseModel::getUIConfigurationManage
                     OUString aTitle( "Toolbar " );
                     for ( sal_Int32 i = 0; i < rToolbars.getLength(); i++ )
                     {
-                        OUString aCustomTbxName = aNum + OUString::valueOf( i + 1 );
-                        OUString aCustomTbxTitle = aTitle + OUString::valueOf( i + 1 );
+                        OUString aCustomTbxName = aNum + OUString::number( i + 1 );
+                        OUString aCustomTbxTitle = aTitle + OUString::number( i + 1 );
 
                         Reference< container::XIndexContainer > xToolbar = rToolbars[i];
                         ConvertSlotsToCommands( pObjShell, xToolbar );
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index d58fc65a510e..0d04debf6e60 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -382,7 +382,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
                 if (  Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() )
                 {
                     OUString aSlotURL( "slot:" );
-                    aSlotURL += OUString::valueOf( sal_Int32( nSlotId ));
+                    aSlotURL += OUString::number( nSlotId);
                     Image aImage = GetImage( xFrame, aSlotURL, false );
                     pSVMenu->SetItemImage( nSlotId, aImage );
                 }
@@ -458,7 +458,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
                         else
                         {
                             OUString aSlotURL( "slot:" );
-                            aSlotURL += OUString::valueOf( sal_Int32( nSlotId ));
+                            aSlotURL += OUString::number( nSlotId);
                             aImage = GetImage( xFrame, aSlotURL, false );
                         }
 
@@ -531,7 +531,7 @@ IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged)
                 else
                 {
                     OUString aSlotURL( "slot:" );
-                    aSlotURL += OUString::valueOf( sal_Int32( nSlotId ));
+                    aSlotURL += OUString::number( nSlotId);
                     pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, false ));
                 }
             }
@@ -773,7 +773,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
         if ( Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() )
         {
                OUString aSlotURL( "slot:" );
-               aSlotURL += OUString::valueOf( sal_Int32( SID_ADDONS ));
+               aSlotURL += OUString::number( SID_ADDONS);
          pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, false ));
         }
     }
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 790d6e630564..de8eb29966e6 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -312,7 +312,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal
             sal_Bool bBooleanValue = false;
             uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue );
             aOriginalValue >>= bBooleanValue;
-            return uno::makeAny( OUString::valueOf( (sal_Bool) bBooleanValue ) );
+            return uno::makeAny( OUString::boolean( (sal_Bool) bBooleanValue ) );
         }
 
         case SETTING_WORK_DIRECTORY:
diff --git a/shell/source/backends/kde4be/kde4access.cxx b/shell/source/backends/kde4be/kde4access.cxx
index 6bd8f4a45bd0..4961d7047c49 100644
--- a/shell/source/backends/kde4be/kde4access.cxx
+++ b/shell/source/backends/kde4be/kde4access.cxx
@@ -88,7 +88,7 @@ css::beans::Optional< css::uno::Any > getValue(OUString const & id) {
         /* does not make much sense without an accessibility bridge */
         sal_Bool ATToolSupport = sal_False;
         return css::beans::Optional< css::uno::Any >(
-            true, uno::makeAny( OUString::valueOf( ATToolSupport ) ) );
+            true, uno::makeAny( OUString::boolean( ATToolSupport ) ) );
     } else if (id.equalsAsciiL(
                    RTL_CONSTASCII_STRINGPARAM("WorkPathVariable")))
     {
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index 92695077c2df..54f9a52b0869 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -122,7 +122,7 @@ namespace /* private */ {
             write_xml_tag(TAG_URI, uri_, file);
             write_xml_tag(TAG_MIME_TYPE, mime_type_, file);
 
-            OString ts = OString::valueOf((sal_sSize)timestamp_);
+            OString ts = OString::number(timestamp_);
             write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file);
 
             if (is_private_)
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 979ee4319ddd..3d12fc927aac 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -385,7 +385,7 @@ const OUString SmFontFormatList::GetNewFontFormatId() const
     sal_Int32 nCnt = GetCount();
     for (sal_Int32 i = 1;  i <= nCnt + 1;  ++i)
     {
-        OUString aTmpId =  aPrefix + OUString::valueOf(i);
+        OUString aTmpId =  aPrefix + OUString::number(i);
         if (!GetFontFormat(aTmpId))
             return aTmpId;
     }
@@ -444,7 +444,7 @@ void SmMathConfig::ReadSymbol( SmSym &rSymbol,
     Sequence< OUString > aNames = lcl_GetSymbolPropertyNames();
     sal_Int32 nProps = aNames.getLength();
 
-    OUString aDelim( OUString::valueOf( (sal_Unicode) '/' ) );
+    OUString aDelim( OUString( (sal_Unicode) '/' ) );
     OUString *pName = aNames.getArray();
     for (sal_Int32 i = 0;  i < nProps;  ++i)
     {
@@ -580,7 +580,7 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols )
     PropertyValue *pValues = aValues.getArray();
 
     PropertyValue *pVal = pValues;
-    OUString aDelim( OUString::valueOf( (sal_Unicode) '/' ) );
+    OUString aDelim( OUString( (sal_Unicode) '/' ) );
     std::vector< SmSym >::const_iterator aIt( rNewSymbols.begin() );
     std::vector< SmSym >::const_iterator aEnd( rNewSymbols.end() );
     while (aIt != aEnd)
@@ -670,7 +670,7 @@ void SmMathConfig::ReadFontFormat( SmFontFormat &rFontFormat,
     Sequence< OUString > aNames = lcl_GetFontPropertyNames();
     sal_Int32 nProps = aNames.getLength();
 
-    OUString aDelim( OUString::valueOf( (sal_Unicode) '/' ) );
+    OUString aDelim( OUString( (sal_Unicode) '/' ) );
     OUString *pName = aNames.getArray();
     for (sal_Int32 i = 0;  i < nProps;  ++i)
     {
@@ -746,7 +746,7 @@ void SmMathConfig::SaveFontFormatList()
     PropertyValue *pValues = aValues.getArray();
 
     PropertyValue *pVal = pValues;
-    OUString aDelim( OUString::valueOf( (sal_Unicode) '/' ) );
+    OUString aDelim( OUString( (sal_Unicode) '/' ) );
     for (size_t i = 0;  i < nCount;  ++i)
     {
         String aFntFmtId( rFntFmtList.GetFontFormatId( i ) );
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 1f1ef6b0dc70..b75c25da2c0c 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1824,7 +1824,7 @@ IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl)
     UpdateButtons();
 
     // display Unicode position as symbol name while iterating over characters
-    const OUString aHex(OUString::valueOf(static_cast<sal_Int64>(cChar), 16 ).toAsciiUpperCase());
+    const OUString aHex(OUString::number(cChar, 16 ).toAsciiUpperCase());
     const OUString aPattern( (aHex.getLength() > 4) ? OUString("Ux000000") : OUString("Ux0000") );
     OUString aUnicodePos( aPattern.copy( 0, aPattern.getLength() - aHex.getLength() ) );
     aUnicodePos += aHex;
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 5e7dd1b045e5..352ce8b4dc93 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -300,7 +300,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
             css::uno::Reference<css::registry::XRegistryKey> ftpProxy_port = xRegistryRootKey->openKey("Settings/ooInetFTPProxyPort");
             if(ftpProxy_port.is() && ftpProxy_port->getLongValue()) {
                 OUString ftpPort = OUString("ftp.proxyPort=");
-                ftpPort += OUString::valueOf(ftpProxy_port->getLongValue());
+                ftpPort += OUString::number(ftpProxy_port->getLongValue());
 
                 pjvm->pushProp(ftpHost);
                 pjvm->pushProp(ftpPort);
@@ -317,7 +317,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
             css::uno::Reference<css::registry::XRegistryKey> httpProxy_port = xRegistryRootKey->openKey("Settings/ooInetHTTPProxyPort");
             if(httpProxy_port.is() && httpProxy_port->getLongValue()) {
                 OUString httpPort = OUString("http.proxyPort=");
-                httpPort += OUString::valueOf(httpProxy_port->getLongValue());
+                httpPort += OUString::number(httpProxy_port->getLongValue());
 
                 pjvm->pushProp(httpHost);
                 pjvm->pushProp(httpPort);
@@ -334,7 +334,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
             css::uno::Reference<css::registry::XRegistryKey> httpsProxy_port = xRegistryRootKey->openKey("Settings/ooInetHTTPSProxyPort");
             if(httpsProxy_port.is() && httpsProxy_port->getLongValue()) {
                 OUString httpsPort = OUString("https.proxyPort=");
-                httpsPort += OUString::valueOf(httpsProxy_port->getLongValue());
+                httpsPort += OUString::number(httpsProxy_port->getLongValue());
 
                 pjvm->pushProp(httpsHost);
                 pjvm->pushProp(httpsPort);
@@ -1088,7 +1088,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced(
         aPropertyName = OUString("http.proxyPort");
         sal_Int32 n = 0;
         rEvent.Element >>= n;
-        aPropertyValue = OUString::valueOf(n);
+        aPropertyValue = OUString::number(n);
     }
     else if ( aAccessor == "ooInetHTTPSProxyName" )
     {
@@ -1100,7 +1100,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced(
         aPropertyName = OUString("https.proxyPort");
         sal_Int32 n = 0;
         rEvent.Element >>= n;
-        aPropertyValue = OUString::valueOf(n);
+        aPropertyValue = OUString::number(n);
     }
     else if ( aAccessor == "ooInetFTPProxyName" )
     {
@@ -1112,7 +1112,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced(
         aPropertyName = OUString("ftp.proxyPort");
         sal_Int32 n = 0;
         rEvent.Element >>= n;
-        aPropertyValue = OUString::valueOf(n);
+        aPropertyValue = OUString::number(n);
     }
     else if ( aAccessor == "ooInetNoProxy" )
     {
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index ec83601e5764..584b7e7f9948 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -867,22 +867,22 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
             break;
 
         case TypeClass_BYTE:
-            aRet <<= OUString::valueOf( (sal_Int32)*(sal_Int8 const *)rVal.getValue() );
+            aRet <<= OUString::number( *(sal_Int8 const *)rVal.getValue() );
             break;
         case TypeClass_SHORT:
-            aRet <<= OUString::valueOf( (sal_Int32)*(sal_Int16 const *)rVal.getValue() );
+            aRet <<= OUString::number( *(sal_Int16 const *)rVal.getValue() );
             break;
         case TypeClass_UNSIGNED_SHORT:
-            aRet <<= OUString::valueOf( (sal_Int32)*(sal_uInt16 const *)rVal.getValue() );
+            aRet <<= OUString::number( *(sal_uInt16 const *)rVal.getValue() );
             break;
         case TypeClass_LONG:
-            aRet <<= OUString::valueOf( *(sal_Int32 const *)rVal.getValue() );
+            aRet <<= OUString::number( *(sal_Int32 const *)rVal.getValue() );
             break;
         case TypeClass_UNSIGNED_LONG:
-            aRet <<= OUString::valueOf( (sal_Int64)*(sal_uInt32 const *)rVal.getValue() );
+            aRet <<= OUString::number( *(sal_uInt32 const *)rVal.getValue() );
             break;
         case TypeClass_HYPER:
-            aRet <<= OUString::valueOf( *(sal_Int64 const *)rVal.getValue() );
+            aRet <<= OUString::number( *(sal_Int64 const *)rVal.getValue() );
             break;
 //      case TypeClass_UNSIGNED_HYPER:
 //             aRet <<= OUString::valueOf( (sal_Int64)*(sal_uInt64 const *)rVal.getValue() );
@@ -890,7 +890,7 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
             // handle unsigned hyper like double
 
         default:
-            aRet <<= OUString::valueOf( toDouble( rVal ) );
+            aRet <<= OUString::number( toDouble( rVal ) );
         }
         break;
 
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index b62b88054c69..956a20330b39 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -75,7 +75,7 @@ SfxItemPresentation SfxPointItem::GetPresentation
 )   const
 {
     DBG_CHKTHIS(SfxPointItem, 0);
-    rText = OUString::valueOf(aVal.X()) + ", " + OUString::valueOf(aVal.Y()) + ", ";
+    rText = OUString::number(aVal.X()) + ", " + OUString::number(aVal.Y()) + ", ";
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index c1577a4c7b3f..aa933a126a89 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -348,7 +348,7 @@ namespace {
 
 OUString StylePool::nameOf( SfxItemSet_Pointer_t pSet )
 {
-    return OUString::valueOf( reinterpret_cast<sal_IntPtr>( pSet.get() ), 16 );
+    return OUString::number( reinterpret_cast<sal_IntPtr>( pSet.get() ), 16 );
 }
 
 // class StylePoolImpl organized a tree-structure where every node represents a SfxItemSet.
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index cf7249ab6603..78f1ada2059e 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
@@ -71,7 +71,7 @@ SfxItemPresentation SfxSizeItem::GetPresentation
 )   const
 {
     DBG_CHKTHIS(SfxSizeItem, 0);
-    rText = OUString::valueOf(aVal.Width()) + ", " + OUString::valueOf(aVal.Height()) + ", ";
+    rText = OUString::number(aVal.Width()) + ", " + OUString::number(aVal.Height()) + ", ";
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 0442261e35fb..6c731e7dabd4 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -975,7 +975,7 @@ sal_uInt32 SvNumberFormatter::ImpGenerateCL( LanguageType eLnge, bool bNoAdditio
                     {
                         if ( i != j && xSeq[i].formatIndex == nIdx )
                         {
-                            aDupes.append(OUString::valueOf( i ));
+                            aDupes.append(OUString::number( i ));
                             aDupes.append("(");
                             aDupes.append(xSeq[i].formatKey);
                             aDupes.append( ") ");
@@ -985,9 +985,9 @@ sal_uInt32 SvNumberFormatter::ImpGenerateCL( LanguageType eLnge, bool bNoAdditio
                     {
                         OUStringBuffer aMsg(aDupes.getLength() + xSeq[j].formatKey.getLength() + 100);
                         aMsg.append("XML locale data FormatElement formatindex dupe: ");
-                        aMsg.append(OUString::valueOf((sal_Int32)nIdx));
+                        aMsg.append(OUString::number(nIdx));
                         aMsg.append("\nFormatElements: ");
-                        aMsg.append(OUString::valueOf( j ));
+                        aMsg.append(OUString::number( j ));
                         aMsg.append("(");
                         aMsg.append( xSeq[j].formatKey );
                         aMsg.append( ") ");
@@ -1801,7 +1801,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n
                     rCode.Index != NF_CURRENCY_1000DEC2_CCC )
             {
                 OUString aMsg(OUString("SvNumberFormatter::ImpInsertFormat: no [$...] on currency format code, index ") +
-                              OUString::valueOf( sal_Int32(rCode.Index)) +
+                              OUString::number( rCode.Index) +
                               OUString(":\n") +
                               rCode.Code);
                 LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg));
@@ -1821,7 +1821,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n
         if (LocaleDataWrapper::areChecksEnabled())
         {
             OUString aMsg( OUString("SvNumberFormatter::ImpInsertFormat: bad format code, index " ) +
-                           OUString::valueOf( sal_Int32(rCode.Index) ) +
+                           OUString::number( rCode.Index ) +
                            OUString("\n") +
                            rCode.Code);
             LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg));
@@ -1851,7 +1851,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n
                 default:
                 {
                     OUString aMsg("SvNumberFormatter::ImpInsertFormat: dup format code, index ");
-                    aMsg += OUString::valueOf( sal_Int32(rCode.Index) );
+                    aMsg += OUString::number( rCode.Index );
                     aMsg += "\n";
                     aMsg += rCode.Code;
                     LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg));
@@ -1866,7 +1866,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n
             if (LocaleDataWrapper::areChecksEnabled())
             {
                 OUString aMsg( "SvNumberFormatter::ImpInsertFormat: too many format codes, index ");
-                aMsg += OUString::valueOf( sal_Int32(rCode.Index) );
+                aMsg += OUString::number( rCode.Index );
                 aMsg += "\n";
                 aMsg +=  rCode.Code;
                 LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg));
@@ -1880,9 +1880,9 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n
         if (LocaleDataWrapper::areChecksEnabled())
         {
             OUString aMsg( "ImpInsertFormat: can't insert number format key pos: ");
-            aMsg += OUString::valueOf( sal_Int32( nPos ) );
+            aMsg += OUString::number( nPos );
             aMsg += ", code index ";
-            aMsg += OUString::valueOf( sal_Int32(rCode.Index) );
+            aMsg += OUString::number( rCode.Index );
             aMsg += "\n";
             aMsg += rCode.Code;
             LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg));
@@ -2027,7 +2027,7 @@ sal_Int32 SvNumberFormatter::ImpGetFormatCodeIndex(
                 || nTabOff == NF_CURRENCY_1000DEC2_CCC))
     {   // currency entries with decimals might not exist, e.g. Italian Lira
         OUString aMsg( "SvNumberFormatter::ImpGetFormatCodeIndex: not found: " );
-        aMsg += OUString::valueOf( sal_Int32( nTabOff ) );
+        aMsg += OUString::number( nTabOff );
         LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo(aMsg));
     }
     if ( nLen )
@@ -3966,7 +3966,7 @@ OUString NfCurrencyEntry::BuildSymbolString(bool bBank,
         if ( !bWithoutExtension && eLanguage != LANGUAGE_DONTKNOW && eLanguage != LANGUAGE_SYSTEM )
         {
             sal_Int32 nLang = static_cast<sal_Int32>(eLanguage);
-            aBuf.append('-').append( OUString::valueOf(nLang, 16).toAsciiUpperCase());
+            aBuf.append('-').append( OUString::number(nLang, 16).toAsciiUpperCase());
         }
     }
     aBuf.append(']');
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index abaf36b068b5..909a1dbbda43 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -884,7 +884,7 @@ SvNumberformat::SvNumberformat(OUString& rString,
                         sStr = "NatNum";
                         //! eSymbolType is negative
                         sal_uInt8 nNum = (sal_uInt8)(0 - (eSymbolType - BRACKET_SYMBOLTYPE_NATNUM0));
-                        sStr += OUString::valueOf( (sal_Int32)nNum );
+                        sStr += OUString::number( nNum );
                         NumFor[nIndex].SetNatNumNum( nNum, false );
                     }
                     break;
@@ -1035,7 +1035,7 @@ SvNumberformat::SvNumberformat(OUString& rString,
                         // e.g. Thai T speciality
                         if (pSc->GetNatNumModifier() && !NumFor[nIndex].GetNatNum().IsSet())
                         {
-                            sStr = "[NatNum"  + OUString::valueOf( sal_Int32(pSc->GetNatNumModifier())) + "]" + sStr;
+                            sStr = "[NatNum"  + OUString::number( pSc->GetNatNumModifier()) + "]" + sStr;
                             NumFor[nIndex].SetNatNumNum( pSc->GetNatNumModifier(), false );
                         }
                         // #i53826# #i42727# For the Thai T speciality we need
@@ -1055,7 +1055,7 @@ SvNumberformat::SvNumberformat(OUString& rString,
                             ((eLanguage = MsLangId::getRealLanguage( eLan)) == LANGUAGE_THAI) &&
                             NumFor[nIndex].GetNatNum().GetLang() == LANGUAGE_DONTKNOW)
                         {
-                            sStr = "[$-" + OUString::valueOf( sal_Int32(eLanguage), 16 ).toAsciiUpperCase() + "]" + sStr;
+                            sStr = "[$-" + OUString::number( eLanguage, 16 ).toAsciiUpperCase() + "]" + sStr;
                             NumFor[nIndex].SetNatNumLang( eLanguage);
                         }
                         sBuff.remove(nPosOld, nPos - nPosOld);
@@ -2691,7 +2691,7 @@ bool SvNumberformat::ImpGetScientificOutput(double fNumber,
             {
                 nExpSign = 1;
             }
-            ExpStr = OUString::valueOf( nExp );
+            ExpStr = OUString::number( nExp );
         }
     }
 
@@ -5278,12 +5278,12 @@ OUString SvNumberformat::ImpGetNatNumString( const SvNumberNatNum& rNum,
             }
             else
             {
-                aStr = OUString::valueOf( nVal );
+                aStr = OUString::number( nVal );
             }
         }
         else
         {
-            OUString aValStr( OUString::valueOf( nVal ) );
+            OUString aValStr( OUString::number( nVal ) );
             if ( aValStr.getLength() >= nMinDigits )
             {
                 aStr = aValStr;
@@ -5302,7 +5302,7 @@ OUString SvNumberformat::ImpGetNatNumString( const SvNumberNatNum& rNum,
     }
     else
     {
-        aStr = OUString::valueOf( nVal );
+        aStr = OUString::number( nVal );
     }
     return impTransliterate(aStr, rNum);
 }
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index ce019296ed68..eea82fb4ec53 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1669,7 +1669,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
                     {
                         sDiv += sStrArray[j++];
                     }
-                    if (OUString::valueOf(sDiv.toInt32()) == sDiv)
+                    if (OUString::number(sDiv.toInt32()) == sDiv)
                     {
                         // Found a Divisor
                         while (i < j)
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index ddef32e9c020..cc739fb4657a 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -61,12 +61,12 @@ static OUString createIndex( vector< OUString > lines )
         {
             if (comphelper::string::isalnumAscii(*pLine))
             {
-                aResult += OString::valueOf( *pLine );
+                aResult += OString( *pLine );
             }
             else
             {
                 aResult += OString("_");
-                aResult += OString::valueOf( (sal_Int32) *pLine, 16 );
+                aResult += OString::number(  *pLine, 16 );
             }
 
             pLine++;
@@ -95,7 +95,7 @@ static vector< OUString > getInfoFromInd( OUString aInd )
         while( *pLine && !( pLine[0] == '_' && pLine[1] == '_' ))
             if( *pLine != '_' )
             {
-                newItem += OUString::valueOf( (sal_Unicode) *pLine );
+                newItem += OUString( (sal_Unicode) *pLine );
                 pLine++;
             }
             else
@@ -112,10 +112,10 @@ static vector< OUString > getInfoFromInd( OUString aInd )
                         return aResult;
                     }
 
-                    aNum += OUString::valueOf( (sal_Unicode) pLine[i] );
+                    aNum += OUString( (sal_Unicode) pLine[i] );
                 }
 
-                newItem += OUString::valueOf( (sal_Unicode) aNum.toUInt32( 16 ) );
+                newItem += OUString( (sal_Unicode) aNum.toUInt32( 16 ) );
                 pLine += 3;
             }
 
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index eb189e46fe01..d0c9399dc071 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -127,7 +127,7 @@ void SvtFontSubstConfig::Commit()
         {
             OUString sPrefix(sNode);
             sPrefix += "/_";
-            sPrefix += OUString::valueOf((sal_Int32)i);
+            sPrefix += OUString::number(i);
             sPrefix += "/";
 
             SubstitutionStruct& pSubst = pImpl->aSubstArr[i];
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 0955133a70e9..d058cea397e1 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -215,7 +215,7 @@ void Calendar::ImplInit( WinBits nWinStyle )
 
     // Tagestexte anlegen
     for (sal_Int32 i = 0; i < 31; ++i)
-        maDayTexts[i] = OUString::valueOf(i+1);
+        maDayTexts[i] = OUString::number(i+1);
 
     maDragScrollTimer.SetTimeoutHdl( STATIC_LINK( this, Calendar, ScrollHdl ) );
     maDragScrollTimer.SetTimeout( GetSettings().GetMouseSettings().GetScrollRepeat() );
@@ -957,7 +957,7 @@ void Calendar::ImplDraw( sal_Bool bPaint )
                 for ( sal_uInt16 nWeekCount = 0; nWeekCount < 6; nWeekCount++ )
                 {
                     sal_Int32 nWeek = maCalendarWrapper.getValue( i18n::CalendarFieldIndex::WEEK_OF_YEAR);
-                    OUString aWeekText(OUString::valueOf(nWeek));
+                    OUString aWeekText(OUString::number(nWeek));
                     long    nOffX = (mnWeekWidth-WEEKNUMBER_OFFX)-GetTextWidth( aWeekText );
                     long    nOffY = (mnDayHeight-GetTextHeight())/2;
                     DrawText( Point( nDayX+nOffX, nDayY+nOffY ), aWeekText );
@@ -1281,7 +1281,7 @@ void Calendar::ImplShowMenu( const Point& rPos, const Date& rDate )
             pYearPopupMenus[i]->InsertItem( nYearIdCount+j,
                     maCalendarWrapper.getDisplayName(
                         i18n::CalendarDisplayIndex::MONTH, j-1, 1));
-        aPopupMenu.InsertItem( 10+i, OUString::valueOf( static_cast<sal_Int32>(nYear+i) ) );
+        aPopupMenu.InsertItem( 10+i, OUString::number( nYear+i ) );
         aPopupMenu.SetPopupMenu( 10+i, pYearPopupMenus[i] );
         nYearIdCount += 1000;
     }
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index a07a1eacd5e6..d3542881633e 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -762,7 +762,7 @@ namespace svt
 
         if ( mpID )
         {
-            OUString aIDText = OUString::valueOf( (sal_Int32)( _nIndex + 1 ) ) +  OUString( "." );
+            OUString aIDText = OUString::number( ( _nIndex + 1 ) ) +  OUString( "." );
              mpID->SetText( aIDText );
         }
 
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 3ca7f3e95d54..369e7f86b13e 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -555,9 +555,9 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter )
                 if ( !(nTick % nTick3) )
                 {
                     if ( ( mnUnitIndex == RULER_UNIT_CHAR ) || ( mnUnitIndex == RULER_UNIT_LINE ) )
-                        aNumStr = OUString::valueOf( static_cast<sal_Int64>( nTick / nTickUnit ) );
+                        aNumStr = OUString::number( nTick / nTickUnit );
                     else
-                        aNumStr = OUString::valueOf( static_cast<sal_Int64>( nTick / aImplRulerUnitTab[mnUnitIndex].nTickUnit ) );
+                        aNumStr = OUString::number( nTick / aImplRulerUnitTab[mnUnitIndex].nTickUnit );
 
                     ImplVDrawText( nStart + n, nCenter, aNumStr, nMin, nMax );
                     ImplVDrawText( nStart - n, nCenter, aNumStr, nMin, nMax );
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index 07a2b0c268da..33803f10c0a0 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -103,7 +103,7 @@ INetURLObject HostDetailsContainer::getUrl( )
     {
         sUrl = m_sScheme + "://" + sHost;
         if ( nPort != m_nDefaultPort )
-            sUrl += ":" + OUString::valueOf( nPort );
+            sUrl += ":" + OUString::number( nPort );
         if ( !sPath.isEmpty( ) )
             if ( sPath.indexOf( '/' ) != 0 )
                 sUrl += "/";
diff --git a/svtools/source/filter/GraphicExportOptionsDialog.cxx b/svtools/source/filter/GraphicExportOptionsDialog.cxx
index ac9358f0a543..cf248da84c54 100644
--- a/svtools/source/filter/GraphicExportOptionsDialog.cxx
+++ b/svtools/source/filter/GraphicExportOptionsDialog.cxx
@@ -107,7 +107,7 @@ void GraphicExportOptionsDialog::updateHeight()
 
 void GraphicExportOptionsDialog::updateResolution()
 {
-    mpResolution->SetText( OUString::valueOf( (sal_Int32) mResolution ) );
+    mpResolution->SetText( OUString::number( (sal_Int32) mResolution ) );
 }
 
 Sequence<PropertyValue> GraphicExportOptionsDialog::getFilterData()
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index c9e648b75940..b4cfef9f162c 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -885,7 +885,7 @@ static OUString ImpValueOfInKB( const sal_Int64& rVal )
     double fVal( static_cast<double>( rVal ) );
     fVal /= ( 1 << 10 );
     fVal += 0.05;
-    OUStringBuffer aVal( OUString::valueOf( fVal ) );
+    OUStringBuffer aVal( OUString::number( fVal ) );
     sal_Int32 nX( OUString( aVal.getStr() ).indexOf( '.', 0 ) );
     if ( nX > 0 )
         aVal.setLength( nX + 2 );
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 72e30154ea09..463b99e92b1f 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -193,19 +193,19 @@ static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObj
     aParams += aChar;
 
     aParams += OUString( ";width=\"" );
-    aParams += OUString::valueOf( rObjDesc.maSize.Width() );
+    aParams += OUString::number( rObjDesc.maSize.Width() );
     aParams += aChar;
 
     aParams += OUString( ";height=\"" );
-    aParams += OUString::valueOf( rObjDesc.maSize.Height() );
+    aParams += OUString::number( rObjDesc.maSize.Height() );
     aParams += aChar;
 
     aParams += OUString( ";posx=\"" );
-    aParams += OUString::valueOf( rObjDesc.maDragStartPos.X() );
+    aParams += OUString::number( rObjDesc.maDragStartPos.X() );
     aParams += aChar;
 
     aParams += OUString( ";posy=\"" );
-    aParams += OUString::valueOf( rObjDesc.maDragStartPos.X() );
+    aParams += OUString::number( rObjDesc.maDragStartPos.X() );
     aParams += aChar;
 
     return aParams;
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index 8ed05f77e2b8..64f7e12921f1 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.cxx
@@ -131,11 +131,11 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c,
                             // #i47831# add an additional whitespace, so that
                             // "document whitespaces" are not ignored.;
                             rStream << "\\uc"
-                                << OString::valueOf(nLen).getStr() << " ";
+                                << OString::number(nLen).getStr() << " ";
                             *pUCMode = nLen;
                         }
                         rStream << "\\u"
-                            << OString::valueOf(
+                            << OString::number(
                                 static_cast<sal_Int32>(c)).getStr();
                     }
 
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 7130ffc9d6f8..3c52e8232578 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1147,7 +1147,7 @@ OUString TreeControlPeer::getEntryString( const Any& rValue )
             {
                 sal_Int32 nValue = 0;
                 if( rValue >>= nValue )
-                    sValue = OUString::valueOf( nValue );
+                    sValue = OUString::number( nValue );
                 break;
             }
         case TypeClass_BYTE:
@@ -1156,21 +1156,21 @@ OUString TreeControlPeer::getEntryString( const Any& rValue )
             {
                 sal_uInt32 nValue = 0;
                 if( rValue >>= nValue )
-                    sValue = OUString::valueOf( (sal_Int64)nValue );
+                    sValue = OUString::number( nValue );
                 break;
             }
         case TypeClass_HYPER:
             {
                 sal_Int64 nValue = 0;
                 if( rValue >>= nValue )
-                    sValue = OUString::valueOf( nValue );
+                    sValue = OUString::number( nValue );
                 break;
             }
         case TypeClass_UNSIGNED_HYPER:
             {
                 sal_uInt64 nValue = 0;
                 if( rValue >>= nValue )
-                    sValue = OUString::valueOf( (sal_Int64)nValue );
+                    sValue = OUString::number( nValue );
                 break;
             }
         case TypeClass_FLOAT:
@@ -1178,7 +1178,7 @@ OUString TreeControlPeer::getEntryString( const Any& rValue )
             {
                 double fValue = 0.0;
                 if( rValue >>= fValue )
-                    sValue = OUString::valueOf( fValue );
+                    sValue = OUString::number( fValue );
                 break;
             }
         case TypeClass_STRING:
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 49ca5cc19332..426ab51d4436 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -369,7 +369,7 @@ uno::Reference<XAccessible> SAL_CALL
     else
         throw lang::IndexOutOfBoundsException (
             OUString("shape has no child with index ")
-            + OUString::valueOf(nIndex),
+            + OUString::number(nIndex),
             static_cast<uno::XWeak*>(this));
 
     return xChild;
@@ -1003,7 +1003,7 @@ OUString
 
     // Put a space between name and index because of Gnopernicus othewise
     // spells the name.
-    sName += " " + OUString::valueOf (nIndex);
+    sName += " " + OUString::number (nIndex);
 
     return sName;
 }
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 1828ebf22dde..5a20a6808c5b 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -121,7 +121,7 @@ uno::Reference<XAccessible>
     // Check whether the given index is valid.
     if (nIndex < 0 || (unsigned long)nIndex >= maVisibleChildren.size())
         throw lang::IndexOutOfBoundsException (
-            "no accessible child with index " + OUString::valueOf(nIndex),
+            "no accessible child with index " + OUString::number(nIndex),
             mxParent);
 
     return GetChild (maVisibleChildren[nIndex],nIndex);
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index c6bc3971ec7f..6ec8a724cbb8 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -328,7 +328,7 @@ void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( OUString
         if ( nPara & 0x400 )
         {
             rParameter += "?";
-            rParameter += OUString::valueOf( (sal_Int32)( nPara & 0xff ) );
+            rParameter += OUString::number( ( nPara & 0xff ) );
             rParameter += " ";
         }
         else
@@ -347,7 +347,7 @@ void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( OUString
                 case DFF_Prop_adjust10Value :
                 {
                     rParameter += "$";
-                    rParameter += OUString::valueOf( (sal_Int32)( nPara - DFF_Prop_adjustValue ) );
+                    rParameter += OUString::number( ( nPara - DFF_Prop_adjustValue ) );
                     rParameter += " ";
                 }
                 break;
@@ -376,7 +376,7 @@ void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( OUString
     }
     else
     {
-        rParameter += OUString::valueOf( (sal_Int32)( nPara ) );
+        rParameter += OUString::number( ( nPara ) );
     }
 }
 
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index efc480ad4d1c..f719403643b2 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -160,8 +160,8 @@ void CompressGraphicsDialog::Update()
     OUString aHeightString = GetUnitString( aOriginalSize100mm.Height(), eFieldUnit, cSeparator );
     aBitmapSizeString = aBitmapSizeString.replaceAll("$(WIDTH)",  aWidthString);
     aBitmapSizeString = aBitmapSizeString.replaceAll("$(HEIGHT)", aHeightString);
-    aBitmapSizeString = aBitmapSizeString.replaceAll("$(WIDTH_IN_PX)",  OUString::valueOf(aPixelSize.Width()));
-    aBitmapSizeString = aBitmapSizeString.replaceAll("$(HEIGHT_IN_PX)", OUString::valueOf(aPixelSize.Height()));
+    aBitmapSizeString = aBitmapSizeString.replaceAll("$(WIDTH_IN_PX)",  OUString::number(aPixelSize.Width()));
+    aBitmapSizeString = aBitmapSizeString.replaceAll("$(HEIGHT_IN_PX)", OUString::number(aPixelSize.Height()));
     m_pFixedText2->SetText(aBitmapSizeString);
 
     int aValX = (int) (aPixelSize.Width() / GetViewWidthInch());
@@ -182,7 +182,7 @@ void CompressGraphicsDialog::Update()
     sal_Int32 aNativeSize = aMemStream.Tell();
 
     OUString aNativeSizeString = SVX_RESSTR(STR_IMAGE_CAPACITY);
-    aNativeSizeString = aNativeSizeString.replaceAll("$(CAPACITY)",  OUString::valueOf(aNativeSize / 1024));
+    aNativeSizeString = aNativeSizeString.replaceAll("$(CAPACITY)",  OUString::number(aNativeSize / 1024));
     m_pFixedText5->SetText(aNativeSizeString);
 
     m_pFixedText6->SetText(String("??"));
@@ -202,7 +202,7 @@ void CompressGraphicsDialog::UpdateNewHeightMF()
 
 void CompressGraphicsDialog::UpdateResolutionLB()
 {
-    m_pResolutionLB->SetText( OUString::valueOf( (sal_Int32) m_dResolution ) );
+    m_pResolutionLB->SetText( OUString::number( (sal_Int32) m_dResolution ) );
 }
 
 double CompressGraphicsDialog::GetViewWidthInch()
@@ -326,7 +326,7 @@ IMPL_LINK_NOARG( CompressGraphicsDialog, CalculateClickHdl )
 
     if ( aSize > 0 )
     {
-        OUString aSizeAsString = OUString::valueOf(aSize / 1024);
+        OUString aSizeAsString = OUString::number(aSize / 1024);
 
         OUString aNewSizeString = SVX_RESSTR(STR_IMAGE_CAPACITY);
         aNewSizeString = aNewSizeString.replaceAll("$(CAPACITY)", aSizeAsString);
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index b2683522a304..dc9454ac034d 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -562,7 +562,7 @@ namespace svx
             sal_Int32 nSelectedRow( 0 );
             OSL_VERIFY( *pSelRows >>= nSelectedRow );
 
-            m_sCompatibleObjectDescription += OUString::valueOf((sal_Int32)nSelectedRow);
+            m_sCompatibleObjectDescription += OUString::number(nSelectedRow);
             m_sCompatibleObjectDescription += sSeparator;
         }
     }
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index 32f58ced4229..1e9e096499c2 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -147,7 +147,7 @@ namespace svxform
 
         OSL_FAIL(
             (   OString( "lcl_implMapIntValue: could not convert the integer value " )
-            +=  OString::valueOf( (sal_Int32)_nValue )
+            +=  OString::number( _nValue )
             +=  OString( " !" )
             ).getStr()
         );
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 2c28bf6000d9..5d251b67fb4a 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -463,7 +463,7 @@ namespace svx
             {
                 OString sMessage( "lcl_getUnoSlotName: invalid slot id, or invalid slot, or no UNO name!\n" );
                 sMessage += "(slot id: ";
-                sMessage += OString::valueOf( (sal_Int32)_nSlotId );
+                sMessage += OString::number( _nSlotId );
                 sMessage += ")";
                 OSL_FAIL( sMessage.getStr() );
             }
@@ -743,8 +743,8 @@ namespace svx
                     else
                     {
                         OString sError( "FmTextControShell::executeAttributeDialog: Could not handle the following item:" );
-                        sError += "\n  SlotID: "; sError += OString::valueOf( (sal_Int32)nSlotForItemSet );
-                        sError += "\n  WhichID: "; sError += OString::valueOf( (sal_Int32)nWhich );
+                        sError += "\n  SlotID: "; sError += OString::number( nSlotForItemSet );
+                        sError += "\n  WhichID: "; sError += OString::number( nWhich );
                         sError += "\n  UNO name: ";
 
                         OUString sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotForItemSet );
@@ -1065,7 +1065,7 @@ namespace svx
     {
 #if OSL_DEBUG_LEVEL > 0
         OString sTrace( "FmTextControlShell::formActivated: 0x" );
-        sTrace += OString::valueOf( (sal_IntPtr)_rxController.get(), 16 );
+        sTrace += OString::number( (sal_IntPtr)_rxController.get(), 16 );
         OSL_TRACE( "%s", sTrace.getStr() );
 #endif
 
@@ -1093,7 +1093,7 @@ namespace svx
     {
 #if OSL_DEBUG_LEVEL > 0
         OString sTrace( "FmTextControlShell::formDeactivated: 0x" );
-        sTrace += OString::valueOf( (sal_IntPtr)_rxController.get(), 16 );
+        sTrace += OString::number( (sal_IntPtr)_rxController.get(), 16 );
         OSL_TRACE( "%s", sTrace.getStr() );
 #endif
         (void)_rxController;
@@ -1346,7 +1346,7 @@ namespace svx
 
 #if OSL_DEBUG_LEVEL > 0
         OString sTrace( "FmTextControlShell::focusGained: 0x" );
-        sTrace += OString::valueOf( (sal_IntPtr)xControl.get(), 16 );
+        sTrace += OString::number( (sal_IntPtr)xControl.get(), 16 );
         OSL_TRACE( "%s", sTrace.getStr() );
 #endif
 
@@ -1362,7 +1362,7 @@ namespace svx
 
 #if OSL_DEBUG_LEVEL > 0
         OString sTrace( "FmTextControlShell::focusLost: 0x" );
-        sTrace += OString::valueOf( (sal_IntPtr)xControl.get(), 16 );
+        sTrace += OString::number( (sal_IntPtr)xControl.get(), 16 );
         OSL_TRACE( "%s", sTrace.getStr() );
 #endif
 
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 4760d300409c..fe70ba209df9 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -4041,7 +4041,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th
     if ( nLength > 1 )
     {
         sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORDS );
-        sTitle.SearchAndReplace( OUString('#'), OUString::valueOf(nLength) );
+        sTitle.SearchAndReplace( OUString('#'), OUString::number(nLength) );
     }
     else
         sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORD );
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 57056505f16c..50b118c1d238 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1456,7 +1456,7 @@ namespace svxform
             if( i>0 )
             {
                 aNewName += OUString(" ");
-                aNewName += OUString::valueOf(i).getStr();
+                aNewName += OUString::number(i).getStr();
             }
 
             if( GetNavModel()->FindData(aNewName, pFormParentData,sal_False) == NULL )
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index a2628f497955..8407e8ef3267 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -192,7 +192,7 @@ void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const
             case SID_FM_SPINBUTTON:
             {   // set a new image, matching to this slot
                 OUString aSlotURL( "slot:" );
-                aSlotURL += OUString::valueOf( sal_Int32( nSlot ));
+                aSlotURL += OUString::number( nSlot);
                 Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() );
                 GetToolBox().SetItemImage( GetId(), aImage );
                 nLastSlot = nSlot;
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index f02739a951c6..ef305aa8f3e9 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -80,7 +80,7 @@ SfxItemPresentation SvxRotateModeItem::GetPresentation(
 //          break; // DURCHFALLEN!!!
 
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += OUString::valueOf( GetValue() );
+            rText += OUString( GetValue() );
             break;
         default: ;//prevent warning
     }
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 21d42773f19c..1dcd3e584beb 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -71,7 +71,7 @@ String SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal )
 
     if ( nConvVal < 0 && ( nConvVal / 100 == 0 ) )
         sMetric += '-';
-    sMetric += OUString::valueOf(nConvVal / 100);
+    sMetric += OUString::number(nConvVal / 100);
 
     if( FUNIT_NONE != eOutUnit )
     {
@@ -82,7 +82,7 @@ String SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal )
             nFract *= -1;
         if ( nFract < 10 )
             sMetric += '0';
-        sMetric += OUString::valueOf(nFract);
+        sMetric += OUString::number(nFract);
     }
 
     return sMetric;
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 5d50104572ac..68251fcd7e8c 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -667,11 +667,11 @@ SfxItemPresentation SdrFractionItem::GetPresentation(
     if(nValue.IsValid())
     {
         sal_Int32 nDiv = nValue.GetDenominator();
-        rText = OUString::valueOf(nValue.GetNumerator());
+        rText = OUString::number(nValue.GetNumerator());
 
         if(nDiv != 1)
         {
-            rText = rText + "/" + OUString::valueOf(nDiv);
+            rText = rText + "/" + OUString::number(nDiv);
         }
     }
     else
@@ -721,7 +721,7 @@ SfxItemPresentation SdrScaleItem::GetPresentation(
     {
         sal_Int32 nDiv = GetValue().GetDenominator();
 
-        rText = OUString::valueOf(GetValue().GetNumerator()) + ":" + OUString::valueOf(nDiv);
+        rText = OUString::number(GetValue().GetNumerator()) + ":" + OUString::number(nDiv);
     }
     else
     {
@@ -876,7 +876,7 @@ SfxItemPresentation SdrAngleItem::GetPresentation(
     if(bNeg)
         nValue = -nValue;
 
-    OUStringBuffer aText = OUString::valueOf(nValue);
+    OUStringBuffer aText = OUString::number(nValue);
 
     if(nValue)
     {
@@ -1360,7 +1360,7 @@ SfxItemPresentation SdrTextAniAmountItem::GetPresentation(
 
     if(nValue < 0)
     {
-        rText = OUString::valueOf(-nValue) + "pixel";
+        rText = OUString::number(-nValue) + "pixel";
     }
     else
     {
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 9679d72733fc..4118b8e825ec 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -317,7 +317,7 @@ OUString _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) con
                 switch (_nColId)
                 {
                     case ITEMBROWSER_WHICHCOL_ID:
-                        sRet = OUString::valueOf( static_cast<sal_Int32>(pEntry->nWhichId) ); break;
+                        sRet = OUString::number( pEntry->nWhichId ); break;
                     case ITEMBROWSER_STATECOL_ID:
                     {
                         switch (pEntry->eState)
@@ -514,9 +514,9 @@ bool _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos)
         aNeuNam += pEntry->GetItemTypeStr();
         if (pEntry->bCanNum) {
             aNeuNam.AppendAscii(": ");
-            aNeuNam += OUString::valueOf(pEntry->nMin);
+            aNeuNam += OUString::number(pEntry->nMin);
             aNeuNam.AppendAscii("..");
-            aNeuNam += OUString::valueOf(pEntry->nMax);
+            aNeuNam += OUString::number(pEntry->nMax);
         }
         aNeuNam.AppendAscii(" - Type 'del' to reset to default.");
         pParent->SetText(aNeuNam);
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index bcbcbf250eb2..e952af6c4a29 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1409,7 +1409,7 @@ void SdrModel::TakePercentStr(const Fraction& rVal, XubString& rStr, bool bNoPer
     nMul += nDiv/2;
     nMul /= nDiv;
 
-    rStr = OUString::valueOf(nMul);
+    rStr = OUString::number(nMul);
 
     if(bNeg)
         rStr.Insert(sal_Unicode('-'), 0);
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 60db7b97bb98..89a8ddc4499b 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -866,7 +866,7 @@ void SdrFormatter::TakeStr(long nVal, OUString& rStr) const
     if(nMul_ != nDiv_)
         nVal = BigMulDiv(nVal, nMul_, nDiv_);
 
-    OUStringBuffer aStr = OUString::valueOf(nVal);
+    OUStringBuffer aStr = OUString::number(nVal);
 
     if(nC > 0 && aStr.getLength() <= nC )
     {
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 89d07820b02d..fc97b305dfa3 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1253,13 +1253,13 @@ XubString SdrView::GetStatusText()
             if (nLen==0) bBrk=true; // to be sure
         }
 
-        aStr.SearchAndReplaceAscii("%1", OUString::valueOf(nPar + 1));
-        aStr.SearchAndReplaceAscii("%2", OUString::valueOf(nLin + 1));
-        aStr.SearchAndReplaceAscii("%3", OUString::valueOf(nCol + 1));
+        aStr.SearchAndReplaceAscii("%1", OUString::number(nPar + 1));
+        aStr.SearchAndReplaceAscii("%2", OUString::number(nLin + 1));
+        aStr.SearchAndReplaceAscii("%3", OUString::number(nCol + 1));
 
 #ifdef DBG_UTIL
         aStr += OUString( ", Level " );
-        aStr += OUString::valueOf( sal_Int32( pTextEditOutliner->GetDepth( aSel.nEndPara )) );
+        aStr += OUString::number( pTextEditOutliner->GetDepth( aSel.nEndPara ) );
 #endif
     }
 
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index c86662cb6b34..b2518d7ea3fd 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -1791,7 +1791,7 @@ static OUString getCellName( sal_Int32 nCol, sal_Int32 nRow )
                 static_cast<sal_uInt16>(nCol));
         aBuf.append(comphelper::string::reverseString(aStr));
     }
-    aBuf.append( OUString::valueOf(nRow+1) );
+    aBuf.append( OUString::number(nRow+1) );
     return aBuf.makeStringAndClear();
 }
 
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index 117715d71979..4a2d9647ffa2 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -135,7 +135,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa
     xRowSet->getPropertyValue( msSize ) >>= nRowHeight;
 
     mrStrm << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH << "30" << OOO_STRING_SVTOOLS_RTF_TRLEFT << "-30";
-    mrStrm << OOO_STRING_SVTOOLS_RTF_TRRH << OString::valueOf(nRowHeight).getStr();
+    mrStrm << OOO_STRING_SVTOOLS_RTF_TRRH << OString::number(nRowHeight).getStr();
 
     const sal_Int32 nColCount = mxTable->getColumnCount();
     for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ )
@@ -145,7 +145,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa
         if( !xCell.is() )
             continue;
 
-        mrStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::valueOf(aColumnStart[nCol]).getStr();
+        mrStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::number(aColumnStart[nCol]).getStr();
         if ( (nCol & 0x0F) == 0x0F )
             mrStrm << RTFOutFuncs::sNewLine;        // Zeilen nicht zu lang werden lassen
     }
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 5556dacf1ed8..e44371c31149 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -54,7 +54,7 @@ SwAccessibleFootnote::SwAccessibleFootnote(
 
     sal_uInt16 nResId = bIsEndnote ? STR_ACCESS_ENDNOTE_NAME
                                    : STR_ACCESS_FOOTNOTE_NAME;
-    OUString sArg( OUString::valueOf( nFootEndNote ) );
+    OUString sArg( OUString::number( nFootEndNote ) );
     SetName( GetResource( nResId, &sArg ) );
 }
 
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index 862a7a86e9e6..5e178241abc8 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -44,7 +44,7 @@ SwAccessibleHeaderFooter::SwAccessibleHeaderFooter(
 {
     SolarMutexGuard aGuard;
 
-    OUString sArg( OUString::valueOf( (sal_Int32)pHdFrm->GetPhyPageNum() ) );
+    OUString sArg( OUString::number( pHdFrm->GetPhyPageNum() ) );
     SetName( GetResource( STR_ACCESS_HEADER_NAME, &sArg ) );
 }
 
@@ -55,7 +55,7 @@ SwAccessibleHeaderFooter::SwAccessibleHeaderFooter(
 {
     SolarMutexGuard aGuard;
 
-    OUString sArg( OUString::valueOf( (sal_Int32)pFtFrm->GetPhyPageNum() ) );
+    OUString sArg( OUString::number( pFtFrm->GetPhyPageNum() ) );
     SetName( GetResource( STR_ACCESS_FOOTER_NAME, &sArg ) );
 }
 
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 287ba7be6423..72995a756459 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -121,9 +121,8 @@ SwAccessiblePage::SwAccessiblePage( SwAccessibleMap* pInitMap,
 
     SolarMutexGuard aGuard;
 
-    OUString sPage = OUString::valueOf(
-        static_cast<sal_Int32>(
-            static_cast<const SwPageFrm*>( GetFrm() )->GetPhyPageNum() ) );
+    OUString sPage = OUString::number(
+        static_cast<const SwPageFrm*>( GetFrm() )->GetPhyPageNum() );
     SetName( GetResource( STR_ACCESS_PAGE_NAME, &sPage ) );
 }
 
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 1bdf34f7efe1..f63df89aa8ff 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1351,9 +1351,9 @@ void SwDoc::CalculatePagesForPrinting(
     if (aPageRange.isEmpty())    // empty string -> print all
     {
         // set page range to print to 'all pages'
-        aPageRange = OUString::valueOf( (sal_Int32)1 );
-        aPageRange += OUString::valueOf( (sal_Unicode)'-');
-        aPageRange += OUString::valueOf( nDocPageCount );
+        aPageRange = OUString::number( 1 );
+        aPageRange += OUString( (sal_Unicode)'-');
+        aPageRange += OUString::number( nDocPageCount );
     }
     rData.SetPageRange( aPageRange );
 
@@ -1523,9 +1523,9 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
     if (aPageRange.isEmpty())    // empty string -> print all
     {
         // set page range to print to 'all pages'
-        aPageRange = OUString::valueOf( (sal_Int32)1 );
-        aPageRange += OUString::valueOf( (sal_Unicode)'-');
-        aPageRange += OUString::valueOf( nDocPageCount );
+        aPageRange = OUString::number( 1 );
+        aPageRange += OUString( (sal_Unicode)'-');
+        aPageRange += OUString::number( nDocPageCount );
     }
     StringRangeEnumerator aRange( aPageRange, 1, nDocPageCount, 0 );
 
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index dca77538ca44..4903d25fc57b 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2215,7 +2215,7 @@ OUString SwDoc::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoNum ) c
         static rtlRandomPool s_RandomPool( rtl_random_createPool() );
         sal_Int64 n;
         rtl_random_getBytes( s_RandomPool, &n, sizeof(n) );
-        aName = OUString::valueOf( (n < 0 ? -n : n) );
+        aName = OUString::number( (n < 0 ? -n : n) );
         if( pChkStr && pChkStr->isEmpty() )
             pChkStr = 0;
     }
@@ -2602,7 +2602,7 @@ namespace listfunc
         static rtlRandomPool s_RandomPool( rtl_random_createPool() );
         sal_Int64 n;
         rtl_random_getBytes( s_RandomPool, &n, sizeof(n) );
-        aNewListId += OUString::valueOf( (n < 0 ? -n : n) );
+        aNewListId += OUString::number( (n < 0 ? -n : n) );
 
         return MakeListIdUnique( rDoc, aNewListId );
     }
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 08d54716e911..83c90f64bd50 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1275,7 +1275,7 @@ void SwTOXBaseSection::UpdateSequence( const SwTxtNode* pOwnChapterNode )
             const SwSetExpField* pSeqField = dynamic_cast< const SwSetExpField* >( pFmtFld->GetFld() );
             OUString sName = GetSequenceName();
             sName += OUString( cSequenceMarkSeparator );
-            sName += OUString::valueOf( sal_Int32( pSeqField->GetSeqNumber() ) );
+            sName += OUString::number( pSeqField->GetSeqNumber() );
             SwTOXPara * pNew = new SwTOXPara( rTxtNode, nsSwTOXElement::TOX_SEQUENCE, 1, sName );
             // set indexes if the number or the reference text are to be displayed
             if( GetCaptionDisplay() == CAPTION_TEXT )
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 3d13d603301d..7312a22c7fc7 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -680,7 +680,7 @@ bool    SwAuthorityField::PutValue( const Any& rAny, sal_uInt16 /*nWhichId*/ )
             {
                 sal_Int16 nVal = 0;
                 pParam[i].Value >>= nVal;
-                sContent = OUString::valueOf((sal_Int32)nVal);
+                sContent = OUString::number(nVal);
             }
             else
                 pParam[i].Value >>= sContent;
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index aef0d122ab8d..397dd9674d4c 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -414,7 +414,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, OUString& rNewStr,
     {
         const SwTableBox *pRelLastBox = lcl_RelToBox( rTbl, pBox, *pLastBox );
         if ( pRelLastBox )
-            rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelLastBox));
+            rNewStr += OUString::number((sal_PtrDiff)pRelLastBox);
         else
             rNewStr += "0";
         rNewStr += ":";
@@ -423,7 +423,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, OUString& rNewStr,
 
     const SwTableBox *pRelFirstBox = lcl_RelToBox( rTbl, pBox, rFirstBox );
     if ( pRelFirstBox )
-        rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelFirstBox));
+        rNewStr += OUString::number((sal_PtrDiff)pRelFirstBox);
     else
         rNewStr += "0";
 
@@ -509,13 +509,13 @@ void SwTableFormula::BoxNmsToPtr( const SwTable& rTbl, OUString& rNewStr,
     if( pLastBox )
     {
         pBox = rTbl.GetTblBox( *pLastBox );
-        rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox))
+        rNewStr += OUString::number((sal_PtrDiff)pBox)
                 +  ":";
         rFirstBox = rFirstBox.copy( pLastBox->getLength()+1 );
     }
 
     pBox = rTbl.GetTblBox( rFirstBox );
-    rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox))
+    rNewStr += OUString::number((sal_PtrDiff)pBox)
             +  OUString(rFirstBox[ rFirstBox.getLength()-1 ]); // get label for the box
 }
 
@@ -1169,9 +1169,9 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, OUString& rNewStr,
     }
 
     if( pLastBox )
-        rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pEndBox)) + ":";
+        rNewStr += OUString::number((sal_PtrDiff)pEndBox) + ":";
 
-    rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pSttBox))
+    rNewStr += OUString::number((sal_PtrDiff)pSttBox)
             +  OUString(rFirstBox[ rFirstBox.getLength()-1] );
 }
 
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 34d276621234..2e1c0176462c 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -1321,7 +1321,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
     for (sal_Int32 i = 0;  i < nSortedRanges;  ++i)
     {
         if (!aSortedCellRanges.isEmpty())
-            aSortedCellRanges += OUString::valueOf( (sal_Unicode) ';');
+            aSortedCellRanges += OUString( (sal_Unicode) ';');
         aSortedCellRanges += pSortedRanges[i];
     }
 
@@ -1854,13 +1854,13 @@ OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const OUString& rXML
             throw lang::IllegalArgumentException();
 
         OUString aTmp( aCellRange.aTableName );
-        aTmp += OUString::valueOf((sal_Unicode) '.');
+        aTmp += OUString((sal_Unicode) '.');
         aTmp += sw_GetCellName( aCellRange.aUpperLeft.nColumn,
                                  aCellRange.aUpperLeft.nRow );
         // does cell range consist of more than a single cell?
         if (!aCellRange.aLowerRight.bIsEmpty)
         {
-            aTmp += OUString::valueOf((sal_Unicode) ':');
+            aTmp += OUString((sal_Unicode) ':');
             aTmp += sw_GetCellName( aCellRange.aLowerRight.nColumn,
                                      aCellRange.aLowerRight.nRow );
         }
diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index 4b0481e17494..a55184ab2f80 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -315,7 +315,7 @@ SwPrintUIOptions::SwPrintUIOptions(
     m_aUIProperties[nIdx++].Value = setEditControlOpt("pagerange", OUString(),
                                                       ".HelpID:vcl:PrintDialog:PageRange:Edit",
                                                       "PageRange",
-                                                      OUString::valueOf( sal_Int32( nCurrentPage ) ) /* set text box to current page number */,
+                                                      OUString::number( nCurrentPage ) /* set text box to current page number */,
                                                       aPageRangeOpt);
     // print content selection
     vcl::PrinterOptionsHelper::UIControlOptions aContentsOpt;
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 7928f2e18e5a..f0f8fba5c0b7 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2928,8 +2928,7 @@ static Writer& OutCSS1_SvxWidows( Writer& rWrt, const SfxPoolItem& rHt )
 {
     SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
 
-    OString aStr(OString::valueOf(static_cast<sal_Int32>(
-        ((const SvxWidowsItem&)rHt).GetValue())));
+    OString aStr(OString::number(((const SvxWidowsItem&)rHt).GetValue()));
     rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_widows, aStr );
 
     return rWrt;
@@ -2939,8 +2938,7 @@ static Writer& OutCSS1_SvxOrphans( Writer& rWrt, const SfxPoolItem& rHt )
 {
     SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
 
-    OString aStr(OString::valueOf(static_cast<sal_Int32>(
-       ((const SvxOrphansItem&)rHt).GetValue())));
+    OString aStr(OString::number(((const SvxOrphansItem&)rHt).GetValue()));
     rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_orphans, aStr );
 
     return rWrt;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 869db458efd0..521369a9daf0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -266,7 +266,7 @@ void lcl_TextFrameShadow(FSHelperPtr pSerializer, const SwFrmFmt& rFrmFmt)
     if (aShadowItem.GetLocation() == SVX_SHADOW_NONE)
         return;
 
-    OString aShadowWidth( OString::valueOf( double( aShadowItem.GetWidth() ) / 20) + "pt");
+    OString aShadowWidth( OString::number( double( aShadowItem.GetWidth() ) / 20) + "pt");
     OString aOffset;
     switch (aShadowItem.GetLocation())
     {
@@ -680,13 +680,13 @@ void DocxAttributeOutput::WriteCommentRanges()
     if (m_bPostitStart)
     {
         m_bPostitStart = false;
-        OString idstr = OString::valueOf( sal_Int32( m_postitFieldsMaxId ));
+        OString idstr = OString::number( m_postitFieldsMaxId);
         m_pSerializer->singleElementNS( XML_w, XML_commentRangeStart, FSNS( XML_w, XML_id ), idstr.getStr(), FSEND );
     }
     if (m_bPostitEnd)
     {
         m_bPostitEnd = false;
-        OString idstr = OString::valueOf( sal_Int32( m_postitFieldsMaxId ));
+        OString idstr = OString::number( m_postitFieldsMaxId);
         m_pSerializer->singleElementNS( XML_w, XML_commentRangeEnd, FSNS( XML_w, XML_id ), idstr.getStr(), FSEND );
     }
 }
@@ -703,7 +703,7 @@ void DocxAttributeOutput::DoWriteBookmarks()
         sal_uInt16 nId = m_nNextMarkId++;
         m_rOpenedMarksIds[rName] = nId;
         m_pSerializer->singleElementNS( XML_w, XML_bookmarkStart,
-            FSNS( XML_w, XML_id ), OString::valueOf( sal_Int32( nId ) ).getStr(  ),
+            FSNS( XML_w, XML_id ), OString::number( nId ).getStr(  ),
             FSNS( XML_w, XML_name ), rName.getStr(),
             FSEND );
     }
@@ -721,7 +721,7 @@ void DocxAttributeOutput::DoWriteBookmarks()
         {
             sal_uInt16 nId = ( *pPos ).second;
             m_pSerializer->singleElementNS( XML_w, XML_bookmarkEnd,
-                FSNS( XML_w, XML_id ), OString::valueOf( sal_Int32( nId ) ).getStr(  ),
+                FSNS( XML_w, XML_id ), OString::number( nId ).getStr(  ),
                 FSEND );
             m_rOpenedMarksIds.erase( rName );
         }
@@ -890,7 +890,7 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos )
     if ( !aBkmName.isEmpty() )
     {
         m_pSerializer->singleElementNS( XML_w, XML_bookmarkStart,
-               FSNS( XML_w, XML_id ), OString::valueOf( sal_Int32( m_nNextMarkId ) ).getStr( ),
+               FSNS( XML_w, XML_id ), OString::number( m_nNextMarkId ).getStr( ),
                FSNS( XML_w, XML_name ), OUStringToOString( aBkmName, RTL_TEXTENCODING_UTF8 ).getStr( ),
                FSEND );
     }
@@ -912,7 +912,7 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos )
     if ( !aBkmName.isEmpty() )
     {
         m_pSerializer->singleElementNS( XML_w, XML_bookmarkEnd,
-               FSNS( XML_w, XML_id ), OString::valueOf( sal_Int32( m_nNextMarkId ) ).getStr( ),
+               FSNS( XML_w, XML_id ), OString::number( m_nNextMarkId ).getStr( ),
                FSEND );
 
         m_nNextMarkId++;
@@ -1240,7 +1240,7 @@ void DocxAttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen nPos, co
     aAttrIt.OutAttr( nPos, true );
     sal_uInt16 nStyle = m_rExport.GetId( *rRuby.GetTxtRuby()->GetCharFmt() );
     OString aStyleId( "style" );
-    aStyleId += OString::valueOf( sal_Int32( nStyle ) );
+    aStyleId += OString::number( nStyle );
     m_pSerializer->singleElementNS( XML_w, XML_rStyle,
             FSNS( XML_w, XML_val ), aStyleId.getStr(), FSEND );
     EndRunProperties( NULL );
@@ -1354,7 +1354,7 @@ void DocxAttributeOutput::Redline( const SwRedlineData* pRedline)
     if ( !pRedline )
         return;
 
-    OString aId( OString::valueOf( sal_Int32(pRedline->GetSeqNo()) ) );
+    OString aId( OString::number( pRedline->GetSeqNo() ) );
     const String &rAuthor( SW_MOD()->GetRedlineAuthor( pRedline->GetAuthor() ) );
     OString aAuthor( OUStringToOString( rAuthor, RTL_TEXTENCODING_UTF8 ) );
     OString aDate( msfilter::util::DateTimeToOString( pRedline->GetTimeStamp() ) );
@@ -1413,7 +1413,7 @@ void DocxAttributeOutput::StartRedline()
 
     // FIXME check if it's necessary to travel over the Next()'s in pRedlineData
 
-    OString aId( OString::valueOf( m_nRedlineId++ ) );
+    OString aId( OString::number( m_nRedlineId++ ) );
 
     const String &rAuthor( SW_MOD()->GetRedlineAuthor( pRedlineData->GetAuthor() ) );
     OString aAuthor( OUStringToOString( rAuthor, RTL_TEXTENCODING_UTF8 ) );
@@ -1478,7 +1478,7 @@ void DocxAttributeOutput::FormatDrop( const SwTxtNode& /*rNode*/, const SwFmtDro
 void DocxAttributeOutput::ParagraphStyle( sal_uInt16 nStyle )
 {
     OString aStyleId( "style" );
-    aStyleId += OString::valueOf( sal_Int32( nStyle ) );
+    aStyleId += OString::number( nStyle );
 
     m_pSerializer->singleElementNS( XML_w, XML_pStyle, FSNS( XML_w, XML_val ), aStyleId.getStr(), FSEND );
 }
@@ -1569,10 +1569,10 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co
         else if ( nWidth < nMinWidth )
             nWidth = nMinWidth;
 
-        pAttr->add( FSNS( XML_w, XML_sz ), OString::valueOf( sal_Int32( nWidth ) ) );
+        pAttr->add( FSNS( XML_w, XML_sz ), OString::number( nWidth ) );
 
         // Get the distance (in pt)
-        pAttr->add( FSNS( XML_w, XML_space ), OString::valueOf( sal_Int32( nDist / 20 ) ) );
+        pAttr->add( FSNS( XML_w, XML_space ), OString::number( nDist / 20 ) );
 
         // Get the color code as an RRGGBB hex value
         OString sColor( msfilter::util::ConvertColor( pBorderLine->GetColor( ) ) );
@@ -1789,7 +1789,7 @@ static void impl_cellMargins( FSHelperPtr pSerializer, const SvxBoxItem& rBox, s
             tagWritten = true;
         }
         pSerializer->singleElementNS( XML_w, aXmlElements[i],
-               FSNS( XML_w, XML_w ), OString::valueOf( nDist ).getStr( ),
+               FSNS( XML_w, XML_w ), OString::number( nDist ).getStr( ),
                FSNS( XML_w, XML_type ), "dxa",
                FSEND );
     }
@@ -1811,7 +1811,7 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point
     if ( pTableTextNodeInfoInner->getCell() )
         nWidth = nWidth - GetGridCols( pTableTextNodeInfoInner )->at( pTableTextNodeInfoInner->getCell() - 1 );
     m_pSerializer->singleElementNS( XML_w, XML_tcW,
-           FSNS( XML_w, XML_w ), OString::valueOf( sal_Int32( nWidth ) ).getStr( ),
+           FSNS( XML_w, XML_w ), OString::number( nWidth ).getStr( ),
            FSNS( XML_w, XML_type ), "dxa",
            FSEND );
 
@@ -1823,7 +1823,7 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point
     sal_uInt16 nColSpan = pCell->GetColSpan();
     if ( nColSpan > 1 )
         m_pSerializer->singleElementNS( XML_w, XML_gridSpan,
-                FSNS( XML_w, XML_val ), OString::valueOf( sal_Int32( nColSpan ) ).getStr(),
+                FSNS( XML_w, XML_val ), OString::number( nColSpan ).getStr(),
                 FSEND );
 
     // Vertical merges
@@ -2006,7 +2006,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
     // Output the table prefered width
     if ( nPageSize != 0 )
         m_pSerializer->singleElementNS( XML_w, XML_tblW,
-                FSNS( XML_w, XML_w ), OString::valueOf( sal_Int32( nPageSize ) ).getStr( ),
+                FSNS( XML_w, XML_w ), OString::number( nPageSize ).getStr( ),
                 FSNS( XML_w, XML_type ), "dxa",
                 FSEND );
 
@@ -2062,7 +2062,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
 
     // Table indent (need to get written even if == 0)
     m_pSerializer->singleElementNS( XML_w, XML_tblInd,
-            FSNS( XML_w, XML_w ), OString::valueOf( nIndent ).getStr( ),
+            FSNS( XML_w, XML_w ), OString::number( nIndent ).getStr( ),
             FSNS( XML_w, XML_type ), "dxa",
             FSEND );
 
@@ -2079,7 +2079,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
     {
         sal_Int32 nWidth  =  sal_Int32( *it ) - nPrv;
         m_pSerializer->singleElementNS( XML_w, XML_gridCol,
-               FSNS( XML_w, XML_w ), OString::valueOf( nWidth ).getStr( ),
+               FSNS( XML_w, XML_w ), OString::number( nWidth ).getStr( ),
                FSEND );
         nPrv = sal_Int32( *it );
     }
@@ -2148,7 +2148,7 @@ void DocxAttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTa
 
         if ( pRule )
             m_pSerializer->singleElementNS( XML_w, XML_trHeight,
-                    FSNS( XML_w, XML_val ), OString::valueOf( nHeight ).getStr( ),
+                    FSNS( XML_w, XML_val ), OString::number( nHeight ).getStr( ),
                     FSNS( XML_w, XML_hRule ), pRule,
                     FSEND );
     }
@@ -2347,16 +2347,16 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size
     {
         ::sax_fastparser::FastAttributeList* attrList = m_pSerializer->createAttrList();
         attrList->add( XML_behindDoc, pFrmFmt->GetOpaque().GetValue() ? "0" : "1" );
-        attrList->add( XML_distT, OString::valueOf( TwipsToEMU( pULSpaceItem.GetUpper() ) ).getStr( ) );
-        attrList->add( XML_distB, OString::valueOf( TwipsToEMU( pULSpaceItem.GetLower() ) ).getStr( ) );
-        attrList->add( XML_distL, OString::valueOf( TwipsToEMU( pLRSpaceItem.GetLeft() ) ).getStr( ) );
-        attrList->add( XML_distR, OString::valueOf( TwipsToEMU( pLRSpaceItem.GetRight() ) ).getStr( ) );
+        attrList->add( XML_distT, OString::number( TwipsToEMU( pULSpaceItem.GetUpper() ) ).getStr( ) );
+        attrList->add( XML_distB, OString::number( TwipsToEMU( pULSpaceItem.GetLower() ) ).getStr( ) );
+        attrList->add( XML_distL, OString::number( TwipsToEMU( pLRSpaceItem.GetLeft() ) ).getStr( ) );
+        attrList->add( XML_distR, OString::number( TwipsToEMU( pLRSpaceItem.GetRight() ) ).getStr( ) );
         attrList->add( XML_simplePos, "0" );
         attrList->add( XML_locked, "0" );
         attrList->add( XML_layoutInCell, "1" );
         attrList->add( XML_allowOverlap, "1" ); // TODO
         if( const SdrObject* pObj = pFrmFmt->FindRealSdrObject())
-            attrList->add( XML_relativeHeight, OString::valueOf( sal_Int32( pObj->GetOrdNum())));
+            attrList->add( XML_relativeHeight, OString::number( pObj->GetOrdNum()));
         m_pSerializer->startElementNS( XML_wp, XML_anchor, XFastAttributeListRef( attrList ));
         m_pSerializer->singleElementNS( XML_wp, XML_simplePos, XML_x, "0", XML_y, "0", FSEND ); // required, unused
         const char* relativeFromH;
@@ -2473,16 +2473,16 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size
     else
     {
         m_pSerializer->startElementNS( XML_wp, XML_inline,
-                XML_distT, OString::valueOf( TwipsToEMU( pULSpaceItem.GetUpper() ) ).getStr( ),
-                XML_distB, OString::valueOf( TwipsToEMU( pULSpaceItem.GetLower() ) ).getStr( ),
-                XML_distL, OString::valueOf( TwipsToEMU( pLRSpaceItem.GetLeft() ) ).getStr( ),
-                XML_distR, OString::valueOf( TwipsToEMU( pLRSpaceItem.GetRight() ) ).getStr( ),
+                XML_distT, OString::number( TwipsToEMU( pULSpaceItem.GetUpper() ) ).getStr( ),
+                XML_distB, OString::number( TwipsToEMU( pULSpaceItem.GetLower() ) ).getStr( ),
+                XML_distL, OString::number( TwipsToEMU( pLRSpaceItem.GetLeft() ) ).getStr( ),
+                XML_distR, OString::number( TwipsToEMU( pLRSpaceItem.GetRight() ) ).getStr( ),
                 FSEND );
     }
     // now the common parts
     // extent of the image
-    OString aWidth( OString::valueOf( TwipsToEMU( rSize.Width() ) ) );
-    OString aHeight( OString::valueOf( TwipsToEMU( rSize.Height() ) ) );
+    OString aWidth( OString::number( TwipsToEMU( rSize.Width() ) ) );
+    OString aHeight( OString::number( TwipsToEMU( rSize.Height() ) ) );
     m_pSerializer->singleElementNS( XML_wp, XML_extent,
             XML_cx, aWidth.getStr(),
             XML_cy, aHeight.getStr(),
@@ -2493,7 +2493,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size
     OString aLeftExt("0"), aRightExt("0"), aTopExt("0"), aBottomExt("0");
     if ( aShadowItem.GetLocation() != SVX_SHADOW_NONE )
     {
-        OString aShadowWidth( OString::valueOf( TwipsToEMU( aShadowItem.GetWidth() ) ) );
+        OString aShadowWidth( OString::number( TwipsToEMU( aShadowItem.GetWidth() ) ) );
         switch ( aShadowItem.GetLocation() )
         {
             case SVX_SHADOW_TOPLEFT:
@@ -2541,7 +2541,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size
     }
     // picture description (used for pic:cNvPr later too)
     ::sax_fastparser::FastAttributeList* docPrattrList = m_pSerializer->createAttrList();
-    docPrattrList->add( XML_id, OString::valueOf( sal_Int32( m_anchorId++ )).getStr());
+    docPrattrList->add( XML_id, OString::number( m_anchorId++).getStr());
     docPrattrList->add( XML_name, "Picture" );
     docPrattrList->add( XML_descr, OUStringToOString( pGrfNode ? pGrfNode->GetDescription() : pOLEFrmFmt->GetObjDescription(), RTL_TEXTENCODING_UTF8 ).getStr());
     if( GetExport().GetFilter().getVersion( ) != oox::core::ECMA_DIALECT )
@@ -2651,7 +2651,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size
     {
         // Distance is measured diagonally from corner
         double nShadowDist = sqrt((aShadowItem.GetWidth()*aShadowItem.GetWidth())*2.0);
-        OString aShadowDist( OString::valueOf( TwipsToEMU( nShadowDist ) ) );
+        OString aShadowDist( OString::number( TwipsToEMU( nShadowDist ) ) );
         OString aShadowColor = msfilter::util::ConvertColor( aShadowItem.GetColor() );
         sal_uInt32 nShadowDir = 0;
         switch ( aShadowItem.GetLocation() )
@@ -2664,7 +2664,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size
             case SVX_SHADOW_END:
                 break;
         }
-        OString aShadowDir( OString::valueOf( long(nShadowDir) ) );
+        OString aShadowDir( OString::number( nShadowDir ) );
 
         m_pSerializer->startElementNS( XML_a, XML_effectLst, FSEND );
         m_pSerializer->startElementNS( XML_a, XML_outerShdw,
@@ -2717,8 +2717,8 @@ bool DocxAttributeOutput::WriteOLEChart( const SdrObject* pSdrObj, const Size& r
             XML_distT, "0", XML_distB, "0", XML_distL, "0", XML_distR, "0",
             FSEND );
 
-        OString aWidth( OString::valueOf( TwipsToEMU( rSize.Width() ) ) );
-        OString aHeight( OString::valueOf( TwipsToEMU( rSize.Height() ) ) );
+        OString aWidth( OString::number( TwipsToEMU( rSize.Width() ) ) );
+        OString aHeight( OString::number( TwipsToEMU( rSize.Height() ) ) );
         m_pSerializer->singleElementNS( XML_wp, XML_extent,
             XML_cx, aWidth.getStr(),
             XML_cy, aHeight.getStr(),
@@ -2957,7 +2957,7 @@ void DocxAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
 
     m_pSerializer->startElementNS( XML_w, XML_style,
             FSNS( XML_w, XML_type ), bPapFmt? "paragraph": "character", // FIXME is this correct?
-            FSNS( XML_w, XML_styleId ), OString( aStyle + OString::valueOf( sal_Int32( nId ) ) ).getStr(),
+            FSNS( XML_w, XML_styleId ), OString( aStyle + OString::number( nId ) ).getStr(),
             FSEND );
 
     m_pSerializer->singleElementNS( XML_w, XML_name,
@@ -2967,12 +2967,12 @@ void DocxAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
     if ( nBase != 0x0FFF )
     {
         m_pSerializer->singleElementNS( XML_w, XML_basedOn,
-                FSNS( XML_w, XML_val ), OString( aStyle + OString::valueOf( sal_Int32( nBase ) ) ).getStr(),
+                FSNS( XML_w, XML_val ), OString( aStyle + OString::number( nBase ) ).getStr(),
                 FSEND );
     }
 
     m_pSerializer->singleElementNS( XML_w, XML_next,
-            FSNS( XML_w, XML_val ), OString( aStyle + OString::valueOf( sal_Int32( nNext ) ) ).getStr(),
+            FSNS( XML_w, XML_val ), OString( aStyle + OString::number( nNext ) ).getStr(),
             FSEND );
 
     if ( bAutoUpdate )
@@ -3018,7 +3018,7 @@ void DocxAttributeOutput::OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt& /*rN
         nLvl = WW8ListManager::nMaxLevel - 1;
 
     m_pSerializer->singleElementNS( XML_w, XML_outlineLvl,
-            FSNS( XML_w, XML_val ), OString::valueOf( sal_Int32( nLvl ) ).getStr( ),
+            FSNS( XML_w, XML_val ), OString::number( nLvl ).getStr( ),
             FSEND );
 }
 
@@ -3152,7 +3152,7 @@ void DocxAttributeOutput::SectionLineNumbering( sal_uLong nRestartNo, const SwLi
     if( rLnNumInfo.GetPosFromLeft())
         pAttr->add( FSNS( XML_w, XML_distance ), OString::number(rLnNumInfo.GetPosFromLeft()).getStr());
     if( nRestartNo )
-        pAttr->add( FSNS( XML_w, XML_start ), OString::valueOf( long( nRestartNo )).getStr());
+        pAttr->add( FSNS( XML_w, XML_start ), OString::number( nRestartNo).getStr());
     XFastAttributeListRef xAttrs( pAttr );
     m_pSerializer->singleElementNS( XML_w, XML_lnNumType, xAttrs );
 }
@@ -3236,7 +3236,7 @@ void DocxAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, sal_uInt16
 
     // 0 means no restart: then don't output that attribute if 0
     if ( nPageRestartNumber > 0 )
-       pAttr->add( FSNS( XML_w, XML_start ), OString::valueOf( sal_Int32( nPageRestartNumber ) ) );
+       pAttr->add( FSNS( XML_w, XML_start ), OString::number( nPageRestartNumber ) );
 
     // nNumType corresponds to w:fmt. See WW8Export::GetNumId() for more precisions
     OString aFmt( impl_NumberingType( nNumType ) );
@@ -3294,7 +3294,7 @@ void DocxAttributeOutput::FontCharset( sal_uInt8 nCharSet, rtl_TextEncoding nEnc
 {
     FastAttributeList* pAttr = m_pSerializer->createAttrList();
 
-    OString aCharSet( OString::valueOf( sal_Int32( nCharSet ), 16 ) );
+    OString aCharSet( OString::number( nCharSet, 16 ) );
     if ( aCharSet.getLength() == 1 )
         aCharSet = OString( "0" ) + aCharSet;
     pAttr->add( FSNS( XML_w, XML_val ), aCharSet.getStr());
@@ -3443,7 +3443,7 @@ void DocxAttributeOutput::NumberingDefinition( sal_uInt16 nId, const SwNumRule &
     // nId is the same both for abstract numbering definition as well as the
     // numbering definition itself
     // TODO check that this is actually true & fix if not ;-)
-    OString aId( OString::valueOf( sal_Int32( nId ) ) );
+    OString aId( OString::number( nId ) );
 
     m_pSerializer->startElementNS( XML_w, XML_num,
             FSNS( XML_w, XML_numId ), aId.getStr(),
@@ -3467,7 +3467,7 @@ void DocxAttributeOutput::NumberingDefinition( sal_uInt16 nId, const SwNumRule &
 void DocxAttributeOutput::StartAbstractNumbering( sal_uInt16 nId )
 {
     m_pSerializer->startElementNS( XML_w, XML_abstractNum,
-            FSNS( XML_w, XML_abstractNumId ), OString::valueOf( sal_Int32( nId ) ).getStr(),
+            FSNS( XML_w, XML_abstractNumId ), OString::number( nId ).getStr(),
             FSEND );
 }
 
@@ -3491,12 +3491,12 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
         const SvxBrushItem* pBrush)
 {
     m_pSerializer->startElementNS( XML_w, XML_lvl,
-            FSNS( XML_w, XML_ilvl ), OString::valueOf( sal_Int32( nLevel ) ).getStr(),
+            FSNS( XML_w, XML_ilvl ), OString::number( nLevel ).getStr(),
             FSEND );
 
     // start with the nStart value
     m_pSerializer->singleElementNS( XML_w, XML_start,
-            FSNS( XML_w, XML_val ), OString::valueOf( sal_Int32( nStart ) ).getStr(),
+            FSNS( XML_w, XML_val ), OString::number( nStart ).getStr(),
             FSEND );
 
     // format
@@ -3535,7 +3535,7 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
         {
             aBuffer.append( pPrev, pIt - pPrev );
             aBuffer.append( '%' );
-            aBuffer.append( OUString::valueOf( sal_Int32( *pIt ) + 1 ) );
+            aBuffer.append( OUString::number( sal_Int32( *pIt ) + 1 ) );
 
             pPrev = pIt + 1;
         }
@@ -3593,8 +3593,8 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
 
     sal_Int32 nToken = ecmaDialect ? XML_left : XML_start;
     m_pSerializer->singleElementNS( XML_w, XML_ind,
-            FSNS( XML_w, nToken ), OString::valueOf( sal_Int32( nIndentAt ) ).getStr(),
-            FSNS( XML_w, XML_hanging ), OString::valueOf( sal_Int32( -nFirstLineIndex ) ).getStr(),
+            FSNS( XML_w, nToken ), OString::number( nIndentAt ).getStr(),
+            FSNS( XML_w, XML_hanging ), OString::number( -nFirstLineIndex ).getStr(),
             FSEND );
     m_pSerializer->endElementNS( XML_w, XML_pPr );
 
@@ -3703,13 +3703,13 @@ void DocxAttributeOutput::CharEscapement( const SvxEscapementItem& rEscapement )
     {
         long nHeight = ((SvxFontHeightItem&)m_rExport.GetItem(
                                     RES_CHRATR_FONTSIZE )).GetHeight();
-        OString sPos = OString::valueOf( ( nHeight * nEsc + 500 ) / 1000 );
+        OString sPos = OString::number( ( nHeight * nEsc + 500 ) / 1000 );
         m_pSerializer->singleElementNS( XML_w, XML_position,
                 FSNS( XML_w, XML_val ), sPos.getStr( ), FSEND );
 
         if( 100 != nProp || sIss.match( OString( "baseline" ) ) )
         {
-            OString sSize = OString::valueOf( ( nHeight * nProp + 500 ) / 1000 );
+            OString sSize = OString::number( ( nHeight * nProp + 500 ) / 1000 );
                 m_pSerializer->singleElementNS( XML_w, XML_sz,
                     FSNS( XML_w, XML_val ), sSize.getStr( ), FSEND );
         }
@@ -3729,7 +3729,7 @@ void DocxAttributeOutput::CharFont( const SvxFontItem& rFont)
 
 void DocxAttributeOutput::CharFontSize( const SvxFontHeightItem& rFontSize)
 {
-    OString fontSize = OString::valueOf( sal_Int32( ( rFontSize.GetHeight() + 5 ) / 10 ) );
+    OString fontSize = OString::number( ( rFontSize.GetHeight() + 5 ) / 10 );
 
     switch ( rFontSize.Which() )
     {
@@ -3745,7 +3745,7 @@ void DocxAttributeOutput::CharFontSize( const SvxFontHeightItem& rFontSize)
 
 void DocxAttributeOutput::CharKerning( const SvxKerningItem& rKerning )
 {
-    OString aKerning = OString::valueOf( ( sal_Int32 ) rKerning.GetValue() );
+    OString aKerning = OString::number(  rKerning.GetValue() );
     m_pSerializer->singleElementNS( XML_w, XML_spacing, FSNS(XML_w, XML_val), aKerning.getStr(), FSEND );
 }
 
@@ -3989,7 +3989,7 @@ void DocxAttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines )
 void DocxAttributeOutput::CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth )
 {
     m_pSerializer->singleElementNS( XML_w, XML_w,
-            FSNS( XML_w, XML_val ), OString::valueOf( sal_Int32( rScaleWidth.GetValue() ) ).getStr(), FSEND );
+            FSNS( XML_w, XML_val ), OString::number( rScaleWidth.GetValue() ).getStr(), FSEND );
 }
 
 void DocxAttributeOutput::CharRelief( const SvxCharReliefItem& rRelief )
@@ -4023,7 +4023,7 @@ void DocxAttributeOutput::TextINetFormat( const SwFmtINetFmt& rLink )
     const SwCharFmt* pCharFmt = pINetFmt->GetCharFmt();
 
     OString aStyleId( "style" );
-    aStyleId += OString::valueOf( sal_Int32( m_rExport.GetId( *pCharFmt ) ) );
+    aStyleId += OString::number( m_rExport.GetId( *pCharFmt ) );
 
     m_pSerializer->singleElementNS( XML_w, XML_rStyle, FSNS( XML_w, XML_val ), aStyleId.getStr(), FSEND );
 }
@@ -4031,7 +4031,7 @@ void DocxAttributeOutput::TextINetFormat( const SwFmtINetFmt& rLink )
 void DocxAttributeOutput::TextCharFormat( const SwFmtCharFmt& rCharFmt )
 {
     OString aStyleId( "style" );
-    aStyleId += OString::valueOf( sal_Int32( m_rExport.GetId( *rCharFmt.GetCharFmt() ) ) );
+    aStyleId += OString::number( m_rExport.GetId( *rCharFmt.GetCharFmt() ) );
 
     m_pSerializer->singleElementNS( XML_w, XML_rStyle, FSNS( XML_w, XML_val ), aStyleId.getStr(), FSEND );
 }
@@ -4067,7 +4067,7 @@ void DocxAttributeOutput::WritePostitFieldReference()
 {
     while( m_postitFieldsMaxId < m_postitFields.size())
     {
-        OString idstr = OString::valueOf( sal_Int32( m_postitFieldsMaxId ));
+        OString idstr = OString::number( m_postitFieldsMaxId);
         m_pSerializer->singleElementNS( XML_w, XML_commentReference, FSNS( XML_w, XML_id ), idstr.getStr(), FSEND );
         ++m_postitFieldsMaxId;
     }
@@ -4089,7 +4089,7 @@ void DocxAttributeOutput::WritePostitFields()
          i < m_postitFields.size();
          ++i )
     {
-        OString idstr = OString::valueOf( sal_Int32( i ));
+        OString idstr = OString::number( i);
         const SwPostItField* f = m_postitFields[ i ];
         m_pSerializer->startElementNS( XML_w, XML_comment, FSNS( XML_w, XML_id ), idstr.getStr(),
             FSNS( XML_w, XML_author ), OUStringToOString( f->GetPar1(), RTL_TEXTENCODING_UTF8 ).getStr(),
@@ -4221,7 +4221,7 @@ void DocxAttributeOutput::TextFootnote_Impl( const SwFmtFtn& rFootnote )
     const SwCharFmt* pCharFmt = rInfo.GetAnchorCharFmt( *m_rExport.pDoc );
 
     OString aStyleId( "style" );
-    aStyleId += OString::valueOf( sal_Int32( m_rExport.GetId( *pCharFmt ) ) );
+    aStyleId += OString::number( m_rExport.GetId( *pCharFmt ) );
 
     m_pSerializer->singleElementNS( XML_w, XML_rStyle, FSNS( XML_w, XML_val ), aStyleId.getStr(), FSEND );
 
@@ -4253,7 +4253,7 @@ void DocxAttributeOutput::FootnoteEndnoteReference()
     {
         // autonumbered
         m_pSerializer->singleElementNS( XML_w, nToken,
-                FSNS( XML_w, XML_id ), OString::valueOf( nId ).getStr(),
+                FSNS( XML_w, XML_id ), OString::number( nId ).getStr(),
                 FSEND );
     }
     else
@@ -4261,7 +4261,7 @@ void DocxAttributeOutput::FootnoteEndnoteReference()
         // not autonumbered
         m_pSerializer->singleElementNS( XML_w, nToken,
                 FSNS( XML_w, XML_customMarkFollows ), "1",
-                FSNS( XML_w, XML_id ), OString::valueOf( nId ).getStr(),
+                FSNS( XML_w, XML_id ), OString::number( nId ).getStr(),
                 FSEND );
 
         RunText( pFootnote->GetNumStr() );
@@ -4284,7 +4284,7 @@ void DocxAttributeOutput::FootnotesEndnotes( bool bFootnotes )
 
     // separator
     m_pSerializer->startElementNS( XML_w, nItem,
-            FSNS( XML_w, XML_id ), OString::valueOf( nIndex++ ).getStr(),
+            FSNS( XML_w, XML_id ), OString::number( nIndex++ ).getStr(),
             FSNS( XML_w, XML_type ), "separator",
             FSEND );
     m_pSerializer->startElementNS( XML_w, XML_p, FSEND );
@@ -4296,7 +4296,7 @@ void DocxAttributeOutput::FootnotesEndnotes( bool bFootnotes )
 
     // separator
     m_pSerializer->startElementNS( XML_w, nItem,
-            FSNS( XML_w, XML_id ), OString::valueOf( nIndex++ ).getStr(),
+            FSNS( XML_w, XML_id ), OString::number( nIndex++ ).getStr(),
             FSNS( XML_w, XML_type ), "continuationSeparator",
             FSEND );
     m_pSerializer->startElementNS( XML_w, XML_p, FSEND );
@@ -4312,7 +4312,7 @@ void DocxAttributeOutput::FootnotesEndnotes( bool bFootnotes )
     for ( FootnotesVector::const_iterator i = rVector.begin(); i != rVector.end(); ++i, ++nIndex )
     {
         m_pSerializer->startElementNS( XML_w, nItem,
-                FSNS( XML_w, XML_id ), OString::valueOf( nIndex ).getStr(),
+                FSNS( XML_w, XML_id ), OString::number( nIndex ).getStr(),
                 FSEND );
 
         const SwNodeIndex* pIndex = (*i)->GetTxtFtn()->GetStartNode();
@@ -4369,7 +4369,7 @@ void DocxAttributeOutput::WriteFootnoteEndnotePr( ::sax_fastparser::FSHelperPtr
         fs->singleElementNS( XML_w, XML_numFmt, FSNS( XML_w, XML_val ), fmt, FSEND );
     if( info.nFtnOffset != 0 )
         fs->singleElementNS( XML_w, XML_numStart, FSNS( XML_w, XML_val ),
-            OString::valueOf( sal_Int32( info.nFtnOffset + 1 )).getStr(), FSEND );
+            OString::number( info.nFtnOffset + 1).getStr(), FSEND );
     if( listtag != 0 ) // we are writing to settings.xml, write also special footnote/endnote list
     { // there are currently only two hardcoded ones ( see FootnotesEndnotes())
         fs->singleElementNS( XML_w, listtag, FSNS( XML_w, XML_id ), "0", FSEND );
@@ -4394,17 +4394,17 @@ void DocxAttributeOutput::ParaLineSpacing_Impl( short nSpace, short nMulti )
     if ( nSpace < 0 )
     {
         m_pParagraphSpacingAttrList->add( FSNS( XML_w, XML_lineRule ), "exact" );
-        m_pParagraphSpacingAttrList->add( FSNS( XML_w, XML_line ), OString::valueOf( sal_Int32( -nSpace ) ) );
+        m_pParagraphSpacingAttrList->add( FSNS( XML_w, XML_line ), OString::number( -nSpace ) );
     }
     else if( nMulti )
     {
         m_pParagraphSpacingAttrList->add( FSNS( XML_w, XML_lineRule ), "auto" );
-        m_pParagraphSpacingAttrList->add( FSNS( XML_w, XML_line ), OString::valueOf( sal_Int32( nSpace ) ) );
+        m_pParagraphSpacingAttrList->add( FSNS( XML_w, XML_line ), OString::number( nSpace ) );
     }
     else if ( nSpace > 0 )
     {
         m_pParagraphSpacingAttrList->add( FSNS( XML_w, XML_lineRule ), "atLeast" );
-        m_pParagraphSpacingAttrList->add( FSNS( XML_w, XML_line ), OString::valueOf( sal_Int32( nSpace ) ) );
+        m_pParagraphSpacingAttrList->add( FSNS( XML_w, XML_line ), OString::number( nSpace ) );
     }
     else
         m_pParagraphSpacingAttrList->add( FSNS( XML_w, XML_lineRule ), "auto" );
@@ -4504,7 +4504,7 @@ static void impl_WriteTabElement( FSHelperPtr pSerializer,
 
     // Because GetTabPos already includes indent, we don't need to add nCurrentLeft (CurrentLeft is indentation information)
     //pTabElementAttrList->add( FSNS( XML_w, XML_pos ), OString::valueOf( rTab.GetTabPos() + nCurrentLeft ) );
-    pTabElementAttrList->add( FSNS( XML_w, XML_pos ), OString::valueOf( rTab.GetTabPos()                ) );
+    pTabElementAttrList->add( FSNS( XML_w, XML_pos ), OString::number( rTab.GetTabPos()                ) );
 
     sal_Unicode cFillChar = rTab.GetFill();
 
@@ -4563,8 +4563,8 @@ void DocxAttributeOutput::ParaNumRule_Impl( const SwTxtNode* /*pTxtNd*/, sal_Int
     if ( USHRT_MAX != nNumId && 0 != nNumId )
     {
         m_pSerializer->startElementNS( XML_w, XML_numPr, FSEND );
-        m_pSerializer->singleElementNS( XML_w, XML_ilvl, FSNS( XML_w, XML_val ), OString::valueOf( sal_Int32( nLvl )).getStr(), FSEND );
-        m_pSerializer->singleElementNS( XML_w, XML_numId, FSNS( XML_w, XML_val ), OString::valueOf( sal_Int32( nNumId )).getStr(), FSEND );
+        m_pSerializer->singleElementNS( XML_w, XML_ilvl, FSNS( XML_w, XML_val ), OString::number( nLvl).getStr(), FSEND );
+        m_pSerializer->singleElementNS( XML_w, XML_numId, FSNS( XML_w, XML_val ), OString::number( nNumId).getStr(), FSEND );
         m_pSerializer->endElementNS( XML_w, XML_numPr );
     }
 }
@@ -4642,7 +4642,7 @@ void DocxAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
 
         if ( rSize.GetWidth() && rSize.GetWidthSizeType() == ATT_FIX_SIZE )
         {
-            m_pFlyAttrList->add( FSNS( XML_w, XML_w ), OString::valueOf( rSize.GetWidth( ) ) );
+            m_pFlyAttrList->add( FSNS( XML_w, XML_w ), OString::number( rSize.GetWidth( ) ) );
         }
 
         if ( rSize.GetHeight() )
@@ -4651,7 +4651,7 @@ void DocxAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
             if ( rSize.GetHeightSizeType() == ATT_MIN_SIZE )
                 sRule = OString( "atLeast" );
             m_pFlyAttrList->add( FSNS( XML_w, XML_hRule ), sRule );
-            m_pFlyAttrList->add( FSNS( XML_w, XML_h ), OString::valueOf( rSize.GetHeight( ) ) );
+            m_pFlyAttrList->add( FSNS( XML_w, XML_h ), OString::number( rSize.GetHeight( ) ) );
         }
     }
     else if ( m_rExport.bOutPageDescs )
@@ -4660,8 +4660,8 @@ void DocxAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
         if ( m_rExport.pAktPageDesc->GetLandscape( ) )
             attrList->add( FSNS( XML_w, XML_orient ), "landscape" );
 
-        attrList->add( FSNS( XML_w, XML_w ), OString::valueOf( rSize.GetWidth( ) ) );
-        attrList->add( FSNS( XML_w, XML_h ), OString::valueOf( rSize.GetHeight( ) ) );
+        attrList->add( FSNS( XML_w, XML_w ), OString::number( rSize.GetWidth( ) ) );
+        attrList->add( FSNS( XML_w, XML_h ), OString::number( rSize.GetHeight( ) ) );
 
         XFastAttributeListRef xAttrList( attrList );
         attrList = NULL;
@@ -4690,8 +4690,8 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
             m_pFlyAttrList = m_pSerializer->createAttrList();
 
         m_pFlyAttrList->add( FSNS( XML_w, XML_hSpace ),
-                OString::valueOf(
-                    sal_Int32( ( rLRSpace.GetLeft() + rLRSpace.GetRight() ) / 2 ) ) );
+                OString::number(
+                    ( rLRSpace.GetLeft() + rLRSpace.GetRight() ) / 2 ) );
     }
     else if ( m_rExport.bOutPageDescs )
     {
@@ -4713,21 +4713,21 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
         m_pageMargins.nPageMarginLeft = m_pageMargins.nPageMarginLeft + (sal_uInt16)rLRSpace.GetLeft();
         m_pageMargins.nPageMarginRight = m_pageMargins.nPageMarginRight + (sal_uInt16)rLRSpace.GetRight();
 
-        m_pSectionSpacingAttrList->add( FSNS( XML_w, XML_left ), OString::valueOf( sal_Int32( m_pageMargins.nPageMarginLeft ) ) );
-        m_pSectionSpacingAttrList->add( FSNS( XML_w, XML_right ), OString::valueOf( sal_Int32( m_pageMargins.nPageMarginRight ) ) );
+        m_pSectionSpacingAttrList->add( FSNS( XML_w, XML_left ), OString::number( m_pageMargins.nPageMarginLeft ) );
+        m_pSectionSpacingAttrList->add( FSNS( XML_w, XML_right ), OString::number( m_pageMargins.nPageMarginRight ) );
     }
     else
     {
         FastAttributeList *pLRSpaceAttrList = m_pSerializer->createAttrList();
 
-        pLRSpaceAttrList->add( FSNS( XML_w, ( bEcma ? XML_left : XML_start ) ), OString::valueOf( (sal_Int32) rLRSpace.GetTxtLeft() ) );
-        pLRSpaceAttrList->add( FSNS( XML_w, ( bEcma ? XML_right : XML_end ) ), OString::valueOf( (sal_Int32) rLRSpace.GetRight() ) );
+        pLRSpaceAttrList->add( FSNS( XML_w, ( bEcma ? XML_left : XML_start ) ), OString::number(  rLRSpace.GetTxtLeft() ) );
+        pLRSpaceAttrList->add( FSNS( XML_w, ( bEcma ? XML_right : XML_end ) ), OString::number(  rLRSpace.GetRight() ) );
 
         sal_Int32 nFirstLineAdjustment = rLRSpace.GetTxtFirstLineOfst();
         if (nFirstLineAdjustment > 0)
-            pLRSpaceAttrList->add( FSNS( XML_w, XML_firstLine ), OString::valueOf( nFirstLineAdjustment ) );
+            pLRSpaceAttrList->add( FSNS( XML_w, XML_firstLine ), OString::number( nFirstLineAdjustment ) );
         else
-            pLRSpaceAttrList->add( FSNS( XML_w, XML_hanging ), OString::valueOf( - nFirstLineAdjustment ) );
+            pLRSpaceAttrList->add( FSNS( XML_w, XML_hanging ), OString::number( - nFirstLineAdjustment ) );
         m_pSerializer->singleElementNS( XML_w, XML_ind, pLRSpaceAttrList );
     }
 }
@@ -4746,8 +4746,8 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
             m_pFlyAttrList = m_pSerializer->createAttrList();
 
         m_pFlyAttrList->add( FSNS( XML_w, XML_vSpace ),
-                OString::valueOf(
-                    sal_Int32( ( rULSpace.GetLower() + rULSpace.GetUpper() ) / 2 ) ) );
+                OString::number(
+                    ( rULSpace.GetLower() + rULSpace.GetUpper() ) / 2 ) );
     }
     else if (m_rExport.bOutPageDescs )
     {
@@ -4763,35 +4763,35 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
         sal_Int32 nHeader = 0;
         if ( aDistances.HasHeader() )
             nHeader = sal_Int32( aDistances.dyaHdrTop );
-        m_pSectionSpacingAttrList->add( FSNS( XML_w, XML_header ), OString::valueOf( nHeader ) );
+        m_pSectionSpacingAttrList->add( FSNS( XML_w, XML_header ), OString::number( nHeader ) );
 
         // Page top
         m_pageMargins.nPageMarginTop = aDistances.dyaTop;
         m_pSectionSpacingAttrList->add( FSNS( XML_w, XML_top ),
-                OString::valueOf( sal_Int32( m_pageMargins.nPageMarginTop ) ) );
+                OString::number( m_pageMargins.nPageMarginTop ) );
 
         sal_Int32 nFooter = 0;
         if ( aDistances.HasFooter() )
             nFooter = sal_Int32( aDistances.dyaHdrBottom );
-        m_pSectionSpacingAttrList->add( FSNS( XML_w, XML_footer ), OString::valueOf( nFooter ) );
+        m_pSectionSpacingAttrList->add( FSNS( XML_w, XML_footer ), OString::number( nFooter ) );
 
         // Page Bottom
         m_pageMargins.nPageMarginBottom = aDistances.dyaBottom;
         m_pSectionSpacingAttrList->add( FSNS( XML_w, XML_bottom ),
-                OString::valueOf( sal_Int32( m_pageMargins.nPageMarginBottom ) ) );
+                OString::number( m_pageMargins.nPageMarginBottom ) );
 
         // FIXME Page Gutter is not handled ATM, setting to 0 as it's mandatory for OOXML
         m_pSectionSpacingAttrList->add( FSNS( XML_w, XML_gutter ),
-                OString::valueOf( sal_Int32( 0 ) ) );
+                OString::number( 0 ) );
     }
     else
     {
         if ( !m_pParagraphSpacingAttrList )
             m_pParagraphSpacingAttrList = m_pSerializer->createAttrList();
         m_pParagraphSpacingAttrList->add( FSNS( XML_w, XML_before ),
-                OString::valueOf( (sal_Int32)rULSpace.GetUpper() ) );
+                OString::number( rULSpace.GetUpper() ) );
         m_pParagraphSpacingAttrList->add( FSNS( XML_w, XML_after ),
-                OString::valueOf( (sal_Int32)rULSpace.GetLower() ) );
+                OString::number( rULSpace.GetLower() ) );
         if (rULSpace.GetContext())
             m_pSerializer->singleElementNS( XML_w, XML_contextualSpacing, FSEND );
         else
@@ -4899,7 +4899,7 @@ void DocxAttributeOutput::FormatVertOrientation( const SwFmtVertOrient& rFlyVert
             m_pFlyAttrList->add( FSNS( XML_w, XML_yAlign ), sAlign );
         else
             m_pFlyAttrList->add( FSNS( XML_w, XML_y ),
-                OString::valueOf( sal_Int32( rFlyVert.GetPos() ) ) );
+                OString::number( rFlyVert.GetPos() ) );
 
         OString sVAnchor( "page" );
         switch ( rFlyVert.GetRelationOrient( ) )
@@ -4959,7 +4959,7 @@ void DocxAttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHor
             m_pFlyAttrList->add( FSNS( XML_w, XML_xAlign ), sAlign );
         else
             m_pFlyAttrList->add( FSNS( XML_w, XML_x ),
-                OString::valueOf( sal_Int32( rFlyHori.GetPos() ) ) );
+                OString::number( rFlyHori.GetPos() ) );
 
         OString sHAnchor( "page" );
         switch ( rFlyHori.GetRelationOrient( ) )
@@ -5009,7 +5009,7 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
             // Calculate opacity value
             // Consider oox/source/vml/vmlformatting.cxx : decodeColor() function.
             double fOpacity = (double)nAlpha * 65535 / ::oox::drawingml::MAX_PERCENT;
-            OUString sOpacity = OUString::valueOf(fOpacity);
+            OUString sOpacity = OUString::number(fOpacity);
 
             if ( !m_pFlyFillAttrList )
                 m_pFlyFillAttrList = m_pSerializer->createAttrList();
@@ -5089,7 +5089,7 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox )
 
                 double const fConverted(editeng::ConvertBorderWidthToWord(pTop->GetBorderLineStyle(), pTop->GetWidth()));
                 sal_Int32 nWidth = sal_Int32(fConverted / 20);
-                m_pFlyAttrList->add(XML_strokeweight, OString::valueOf(nWidth) + "pt");
+                m_pFlyAttrList->add(XML_strokeweight, OString::number(nWidth) + "pt");
             }
         }
 
@@ -5172,14 +5172,14 @@ void DocxAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol&
     FastAttributeList *pColsAttrList = m_pSerializer->createAttrList();
 
     pColsAttrList->add( FSNS( XML_w, XML_num ),
-            OString::valueOf( sal_Int32( nCols ) ). getStr( ) );
+            OString::number( nCols ). getStr( ) );
 
     const char* pEquals = "false";
     if ( bEven )
     {
         sal_uInt16 nWidth = rCol.GetGutterWidth( true );
         pColsAttrList->add( FSNS( XML_w, XML_space ),
-               OString::valueOf( sal_Int32( nWidth ) ).getStr( ) );
+               OString::number( nWidth ).getStr( ) );
 
         pEquals = "true";
     }
@@ -5201,13 +5201,13 @@ void DocxAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol&
             FastAttributeList *pColAttrList = m_pSerializer->createAttrList();
             sal_uInt16 nWidth = rCol.CalcPrtColWidth( n, ( sal_uInt16 ) nPageSize );
             pColAttrList->add( FSNS( XML_w, XML_w ),
-                    OString::valueOf( sal_Int32( nWidth ) ).getStr( ) );
+                    OString::number( nWidth ).getStr( ) );
 
             if ( n + 1 != nCols )
             {
                 sal_uInt16 nSpacing = rColumns[n].GetRight( ) + rColumns[n + 1].GetLeft( );
                 pColAttrList->add( FSNS( XML_w, XML_space ),
-                    OString::valueOf( sal_Int32( nSpacing ) ).getStr( ) );
+                    OString::number( nSpacing ).getStr( ) );
             }
 
             m_pSerializer->singleElementNS( XML_w, XML_col, pColAttrList );
@@ -5247,10 +5247,10 @@ void DocxAttributeOutput::FormatTextGrid( const SwTextGridItem& rGrid )
 
     sal_uInt16 nHeight = rGrid.GetBaseHeight() + rGrid.GetRubyHeight();
     pGridAttrList->add( FSNS( XML_w, XML_linePitch ),
-            OString::valueOf( sal_Int32( nHeight ) ).getStr( ) );
+            OString::number( nHeight ).getStr( ) );
 
     pGridAttrList->add( FSNS( XML_w, XML_charSpace ),
-            OString::valueOf( sal_Int32( GridCharacterPitch( rGrid ) ) ).getStr( ) );
+            OString::number( GridCharacterPitch( rGrid ) ).getStr( ) );
 
     m_pSerializer->singleElementNS( XML_w, XML_docGrid, pGridAttrList );
 }
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 24c573bf43c3..6af8c6b92e63 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -284,7 +284,7 @@ void DocxExport::DoComboBox(const OUString& rName,
     }
 
     m_pDocumentFS->singleElementNS( XML_w, XML_result,
-            FSNS( XML_w, XML_val ), OString::valueOf( nId ).getStr( ),
+            FSNS( XML_w, XML_val ), OString::number( nId ).getStr( ),
             FSEND );
 
     // Loop over the entries
@@ -308,12 +308,12 @@ void DocxExport::DoFormText(const SwInputField* /*pFld*/)
 
 OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount )
 {
-    OUString aFileName = "charts/chart" + OUString::valueOf(nCount) + ".xml";
+    OUString aFileName = "charts/chart" + OUString::number(nCount) + ".xml";
     OUString sId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(),
                     "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart",
                     aFileName );
 
-    aFileName = "word/charts/chart" + OUString::valueOf(nCount) + ".xml";
+    aFileName = "word/charts/chart" + OUString::number(nCount) + ".xml";
     ::sax_fastparser::FSHelperPtr pChartFS =
         m_pFilter->openFragmentStreamWithSerializer( aFileName,
             "application/vnd.openxmlformats-officedocument.drawingml.chart" );
@@ -696,7 +696,7 @@ void DocxExport::WriteSettings()
             FSEND );
 
     // Zoom
-    OString aZoom(OString::valueOf(sal_Int32(pViewShell->GetViewOptions()->GetZoom())));
+    OString aZoom(OString::number(pViewShell->GetViewOptions()->GetZoom()));
     pFS->singleElementNS(XML_w, XML_zoom, FSNS(XML_w, XML_percent), aZoom.getStr(), FSEND);
 
     // Display Background Shape
@@ -721,7 +721,7 @@ void DocxExport::WriteSettings()
     // Default Tab Stop
     if( settings.defaultTabStop != 0 )
         pFS->singleElementNS( XML_w, XML_defaultTabStop, FSNS( XML_w, XML_val ),
-            OString::valueOf( sal_Int32( settings.defaultTabStop )).getStr(), FSEND );
+            OString::number( settings.defaultTabStop).getStr(), FSEND );
 
     // Even and Odd Headers
     if( settings.evenAndOddHeaders )
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index c5a13708ac80..065278c807f0 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3379,7 +3379,7 @@ OString RtfAttributeOutput::WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, S
     sal_uInt32 nBreak = 0;
     for (sal_uInt32 i = 0; i < nSize; i++)
     {
-        OString sNo = OString::valueOf(sal_Int32(pData[i]), 16);
+        OString sNo = OString::number(pData[i], 16);
         if (sNo.getLength() < 2)
         {
             if (pStream)
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index cb2f88540e8a..21a8b32cf7d8 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -172,31 +172,31 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
                 }
                 break;
             case ESCHER_Prop_fillColor:
-                m_aShapeProps.insert(std::pair<OString,OString>("fillColor", OString::valueOf(sal_Int32(it->nPropValue))));
+                m_aShapeProps.insert(std::pair<OString,OString>("fillColor", OString::number(it->nPropValue)));
                 break;
             case ESCHER_Prop_fillBackColor:
-                m_aShapeProps.insert(std::pair<OString,OString>("fillBackColor", OString::valueOf(sal_Int32(it->nPropValue))));
+                m_aShapeProps.insert(std::pair<OString,OString>("fillBackColor", OString::number(it->nPropValue)));
                 break;
             case ESCHER_Prop_AnchorText:
-                m_aShapeProps.insert(std::pair<OString,OString>("anchorText", OString::valueOf(sal_Int32(it->nPropValue))));
+                m_aShapeProps.insert(std::pair<OString,OString>("anchorText", OString::number(it->nPropValue)));
                 break;
             case ESCHER_Prop_fNoFillHitTest:
                 if (it->nPropValue)
-                    m_aShapeProps.insert(std::pair<OString,OString>("fNoFillHitTest", OString::valueOf(sal_Int32(1))));
+                    m_aShapeProps.insert(std::pair<OString,OString>("fNoFillHitTest", OString::number(1)));
                 break;
             case ESCHER_Prop_fNoLineDrawDash:
                 // for some reason the value is set to 0x90000 if lines are switched off
                 if( it->nPropValue == 0x90000 )
-                    m_aShapeProps.insert(std::pair<OString,OString>("fLine", OString::valueOf(sal_Int32(0))));
+                    m_aShapeProps.insert(std::pair<OString,OString>("fLine", OString::number(0)));
                 break;
             case ESCHER_Prop_lineColor:
-                m_aShapeProps.insert(std::pair<OString,OString>("lineColor", OString::valueOf(sal_Int32(it->nPropValue))));
+                m_aShapeProps.insert(std::pair<OString,OString>("lineColor", OString::number(it->nPropValue)));
                 break;
             case ESCHER_Prop_lineBackColor:
-                m_aShapeProps.insert(std::pair<OString,OString>("lineBackColor", OString::valueOf(sal_Int32(it->nPropValue))));
+                m_aShapeProps.insert(std::pair<OString,OString>("lineBackColor", OString::number(it->nPropValue)));
                 break;
             case ESCHER_Prop_lineJoinStyle:
-                m_aShapeProps.insert(std::pair<OString,OString>("lineJoinStyle", OString::valueOf(sal_Int32(it->nPropValue))));
+                m_aShapeProps.insert(std::pair<OString,OString>("lineJoinStyle", OString::number(it->nPropValue)));
                 break;
             case ESCHER_Prop_fshadowObscured:
                 if (it->nPropValue)
@@ -219,9 +219,9 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
                     }
 
                     m_aShapeProps.insert(std::pair<OString,OString>("geoLeft",
-                                OString::valueOf(sal_Int32(sal_Int32( nLeft )))));
+                                OString::number(sal_Int32( nLeft ))));
                     m_aShapeProps.insert(std::pair<OString,OString>("geoTop",
-                                OString::valueOf(sal_Int32(sal_Int32( nTop )))));
+                                OString::number(sal_Int32( nTop ))));
                 }
                 break;
 
@@ -244,9 +244,9 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
                     }
 
                     m_aShapeProps.insert(std::pair<OString,OString>("geoRight",
-                                OString::valueOf(sal_Int32(sal_Int32( nRight ) - sal_Int32( nLeft )))));
+                                OString::number(sal_Int32( nRight ) - sal_Int32( nLeft ))));
                     m_aShapeProps.insert(std::pair<OString,OString>("geoBottom",
-                                OString::valueOf(sal_Int32(sal_Int32( nBottom ) - sal_Int32( nTop )))));
+                                OString::number(sal_Int32( nBottom ) - sal_Int32( nTop ))));
                 }
                 break;
             case ESCHER_Prop_pVertices:
@@ -341,31 +341,31 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
                     m_aShapeProps.insert(std::pair<OString,OString>("fFillOK", "0"));
                 break;
             case ESCHER_Prop_dxTextLeft:
-                m_aShapeProps.insert(std::pair<OString,OString>("dxTextLeft", OString::valueOf(sal_Int32(it->nPropValue))));
+                m_aShapeProps.insert(std::pair<OString,OString>("dxTextLeft", OString::number(it->nPropValue)));
                 break;
             case ESCHER_Prop_dyTextTop:
-                m_aShapeProps.insert(std::pair<OString,OString>("dyTextTop", OString::valueOf(sal_Int32(it->nPropValue))));
+                m_aShapeProps.insert(std::pair<OString,OString>("dyTextTop", OString::number(it->nPropValue)));
                 break;
             case ESCHER_Prop_dxTextRight:
-                m_aShapeProps.insert(std::pair<OString,OString>("dxTextRight", OString::valueOf(sal_Int32(it->nPropValue))));
+                m_aShapeProps.insert(std::pair<OString,OString>("dxTextRight", OString::number(it->nPropValue)));
                 break;
             case ESCHER_Prop_dyTextBottom:
-                m_aShapeProps.insert(std::pair<OString,OString>("dyTextBottom", OString::valueOf(sal_Int32(it->nPropValue))));
+                m_aShapeProps.insert(std::pair<OString,OString>("dyTextBottom", OString::number(it->nPropValue)));
                 break;
             case ESCHER_Prop_FitTextToShape:
                 // Size text to fit shape size: not supported by RTF
                 break;
             case ESCHER_Prop_adjustValue:
-                m_aShapeProps.insert(std::pair<OString,OString>("adjustValue", OString::valueOf(sal_Int32(it->nPropValue))));
+                m_aShapeProps.insert(std::pair<OString,OString>("adjustValue", OString::number(it->nPropValue)));
                 break;
             case ESCHER_Prop_txflTextFlow:
-                m_aShapeProps.insert(std::pair<OString,OString>("txflTextFlow", OString::valueOf(sal_Int32(it->nPropValue))));
+                m_aShapeProps.insert(std::pair<OString,OString>("txflTextFlow", OString::number(it->nPropValue)));
                 break;
             case ESCHER_Prop_fillType:
-                m_aShapeProps.insert(std::pair<OString,OString>("fillType", OString::valueOf(sal_Int32(it->nPropValue))));
+                m_aShapeProps.insert(std::pair<OString,OString>("fillType", OString::number(it->nPropValue)));
                 break;
             case ESCHER_Prop_fillOpacity:
-                m_aShapeProps.insert(std::pair<OString,OString>("fillOpacity", OString::valueOf(sal_Int32(it->nPropValue))));
+                m_aShapeProps.insert(std::pair<OString,OString>("fillOpacity", OString::number(it->nPropValue)));
                 break;
             case ESCHER_Prop_fillBlip:
                 {
@@ -472,7 +472,7 @@ sal_Int32 RtfSdrExport::StartShape()
     if ( m_nShapeType == ESCHER_ShpInst_Nil )
         return -1;
 
-    m_aShapeProps.insert(std::pair<OString,OString>("shapeType", OString::valueOf(sal_Int32(m_nShapeType))));
+    m_aShapeProps.insert(std::pair<OString,OString>("shapeType", OString::number(m_nShapeType)));
     if (ESCHER_ShpInst_PictureFrame == m_nShapeType)
         impl_writeGraphic();
 
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index b40813e274cc..07210dc1829b 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -158,7 +158,7 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks,
                 while( (sal_uInt16)-1 != nCurPos )
                 {
                     sShortcut.Erase( nLen ) +=
-                        OUString::valueOf(++nStart);    // add an Number to it
+                        OUString::number(++nStart);    // add an Number to it
                     nCurPos = rBlocks.GetIndex( sShortcut );
                 }
 
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index ae00e2eea852..a74e9f5ba981 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -155,7 +155,7 @@ void wwFrameNamer::SetUniqueGraphName(SwFrmFmt *pFrmFmt, const OUString &rFixed)
     if (mbIsDisabled || rFixed.isEmpty())
         return;
 
-    pFrmFmt->SetName(msSeed+OUString::valueOf(++mnImportedGraphicsCount) + ": " + rFixed);
+    pFrmFmt->SetName(msSeed+OUString::number(++mnImportedGraphicsCount) + ": " + rFixed);
 }
 
 // ReadGrafStart liest die ObjektDaten ein und erzeugt falls noetig einen Anker
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 65fe6c460bc9..4cb36f651284 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1829,7 +1829,7 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
         sal_uInt32 nTagBkmk = SVBT32ToUInt32(pDescri->ITagBkmk);
         if (nTagBkmk != 0xFFFFFFFF)
         {
-            sName = OUString::valueOf(sal_Int32(nTagBkmk));
+            sName = OUString::number(nTagBkmk);
             int nAtnIndex = GetAnnotationIndex(nTagBkmk);
             if (nAtnIndex != -1)
             {
@@ -5860,7 +5860,7 @@ sal_Bool SwMSDffManager::GetOLEStorageName(long nOLEId, OUString& rStorageName,
     if( bRet )
     {
         rStorageName = OUString('_');
-        rStorageName += OUString::valueOf(nPictureId);
+        rStorageName += OUString::number(nPictureId);
         rSrcStorage = rReader.pStg->OpenSotStorage(OUString(
             SL::aObjectPool));
         if (!rReader.mpDocShell)
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index cd3c7d901da3..a7ef7363d1ba 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -742,7 +742,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
                     {
                         const IFieldmark::parameter_map_t& pParametersToAdd = maFieldStack.back().getParameters();
                         pFieldmark->GetParameters()->insert(pParametersToAdd.begin(), pParametersToAdd.end());
-                        OUString sFieldId = OUString::valueOf( sal_Int32( maFieldStack.back().mnFieldId ) );
+                        OUString sFieldId = OUString::number( maFieldStack.back().mnFieldId );
                         pFieldmark->GetParameters()->insert(
                                 std::pair< OUString, uno::Any > (
                                     ODF_ID_PARAM,
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 2c150cf7fd6d..f92ae6e37b77 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -4119,7 +4119,7 @@ OUString WW8PLCFx_Book::GetUniqueBookmarkName(const OUString &rSuggestedName)
             sal_Int32 p = len - 1;
             while (p > 0 && aRet[p] >= '0' && aRet[p] <= '9')
                 --p;
-            aRet = aRet.copy(0, p+1) + OUString::valueOf(nBookmarkId++);
+            aRet = aRet.copy(0, p+1) + OUString::number(nBookmarkId++);
             i = 0; // start search from beginning
         }
         else
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index d71990ef61d7..593404647038 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -363,7 +363,7 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton)
             while(m_xDBContext->hasByName(sFind))
             {
                 sFind = sNewName;
-                sFind += OUString::valueOf(++nIndex);
+                sFind += OUString::number(++nIndex);
             }
             uno::Reference<XPropertySet> xDataProperties(xNewInstance, UNO_QUERY);
 
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index b59a1994c258..34d385b2dd0a 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1507,7 +1507,7 @@ static OUString lcl_CreateUniqueName(const Sequence<OUString>& aNames)
     OUString sRet;
     while(true)
     {
-        sRet = sTest; sRet += OUString::valueOf(nIdx++);
+        sRet = sTest; sRet += OUString::number(nIdx++);
         bool bFound = false;
         for(sal_Int32 i = 0; i < aNames.getLength(); i++)
         {
diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx
index 6fd70e59176b..187ee36dec41 100644
--- a/sw/source/ui/dbui/mmconfigitem.cxx
+++ b/sw/source/ui/dbui/mmconfigitem.cxx
@@ -368,7 +368,7 @@ static OUString lcl_CreateNodeName(Sequence<OUString>& rAssignments )
     {
         bFound = false;
         sNewName = "_";
-        sNewName += OUString::valueOf(nStart);
+        sNewName += OUString::number(nStart);
         //search if the name exists
         for(sal_Int32 nAssign = 0; nAssign < rAssignments.getLength(); ++nAssign)
         {
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 7d239ae21a02..2a7f742a7904 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -906,9 +906,9 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl)
     SwDocMergeInfo& rStartInfo = rConfigItem.GetDocumentMergeInfo(nBegin);
     SwDocMergeInfo& rEndInfo = rConfigItem.GetDocumentMergeInfo(nEnd - 1);
 
-    OUString sPages(OUString::valueOf( rStartInfo.nStartPageInTarget ));
+    OUString sPages(OUString::number( rStartInfo.nStartPageInTarget ));
     sPages += OUString(" - ");
-    sPages += OUString::valueOf(  rEndInfo.nEndPageInTarget );
+    sPages += OUString::number(  rEndInfo.nEndPageInTarget );
 
     SwWrtShell& rSh = pTargetView->GetWrtShell();
     pTargetView->SetMailMergeConfigItem(&rConfigItem, 0, sal_False);
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx
index 9d7f8443b8dc..559aa1478507 100644
--- a/sw/source/ui/docvw/edtwin2.cxx
+++ b/sw/source/ui/docvw/edtwin2.cxx
@@ -146,7 +146,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
 #ifdef DBG_UTIL
             case SwContentAtPos::SW_TABLEBOXVALUE:
             {
-                sTxt = OStringToOUString(OString::valueOf(
+                sTxt = OStringToOUString(OString::number(
                             ((SwTblBoxValue*)aCntntAtPos.aFnd.pAttr)->GetValue()),
                             osl_getThreadTextEncoding());
             }
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx
index d7b9f8a0d4a6..6b5d7cac4698 100644
--- a/sw/source/ui/envelp/labelcfg.cxx
+++ b/sw/source/ui/envelp/labelcfg.cxx
@@ -231,16 +231,16 @@ static Sequence<PropertyValue> lcl_CreateProperties(
             {
                 rMeasure = "";
                 rMeasure += rRec.bCont ? OUString( "C" ) : OUString( "S" );      rMeasure += sColon;
-                rMeasure += OUString::valueOf( TWIP_TO_MM100( rRec.lHDist ) );   rMeasure += sColon;
-                rMeasure += OUString::valueOf( TWIP_TO_MM100( rRec.lVDist ) );   rMeasure += sColon;
-                rMeasure += OUString::valueOf( TWIP_TO_MM100( rRec.lWidth ) );   rMeasure += sColon;
-                rMeasure += OUString::valueOf( TWIP_TO_MM100( rRec.lHeight ) );  rMeasure += sColon;
-                rMeasure += OUString::valueOf( TWIP_TO_MM100( rRec.lLeft ) );    rMeasure += sColon;
-                rMeasure += OUString::valueOf( TWIP_TO_MM100( rRec.lUpper ) );   rMeasure += sColon;
-                rMeasure += OUString::valueOf( rRec.nCols );                     rMeasure += sColon;
-                rMeasure += OUString::valueOf( rRec.nRows );                     rMeasure += sColon;
-                rMeasure += OUString::valueOf( TWIP_TO_MM100( rRec.lPWidth ) );  rMeasure += sColon;
-                rMeasure += OUString::valueOf( TWIP_TO_MM100( rRec.lPHeight ) );
+                rMeasure += OUString::number( TWIP_TO_MM100( rRec.lHDist ) );   rMeasure += sColon;
+                rMeasure += OUString::number( TWIP_TO_MM100( rRec.lVDist ) );   rMeasure += sColon;
+                rMeasure += OUString::number( TWIP_TO_MM100( rRec.lWidth ) );   rMeasure += sColon;
+                rMeasure += OUString::number( TWIP_TO_MM100( rRec.lHeight ) );  rMeasure += sColon;
+                rMeasure += OUString::number( TWIP_TO_MM100( rRec.lLeft ) );    rMeasure += sColon;
+                rMeasure += OUString::number( TWIP_TO_MM100( rRec.lUpper ) );   rMeasure += sColon;
+                rMeasure += OUString::number( rRec.nCols );                     rMeasure += sColon;
+                rMeasure += OUString::number( rRec.nRows );                     rMeasure += sColon;
+                rMeasure += OUString::number( TWIP_TO_MM100( rRec.lPWidth ) );  rMeasure += sColon;
+                rMeasure += OUString::number( TWIP_TO_MM100( rRec.lPHeight ) );
                 pValues[nProp].Value <<= rMeasure;
             }
             break;
@@ -304,11 +304,11 @@ void SwLabelConfig::SaveLabel( const OUString& rManufacturer,
         sal_Int32 nIndex = aLabels.getLength();
         OUString sPrefix( "Label" );
         sFoundNode = sPrefix;
-        sFoundNode += OUString::valueOf( nIndex );
+        sFoundNode += OUString::number( nIndex );
         while ( lcl_Exists( sFoundNode, aLabels ) )
         {
             sFoundNode = sPrefix;
-            sFoundNode += OUString::valueOf(nIndex++);
+            sFoundNode += OUString::number(nIndex++);
         }
     }
     else
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index de19bd221248..0e8c8ce87158 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -240,7 +240,7 @@ IMPL_LINK( SwOutlineTabDialog, FormHdl, Button *, pBtn )
     for (sal_Int32 i = 2; i <= 9; ++i)
     {
         OString sForm("form");
-        pFormMenu->SetHelpId(pFormMenu->GetItemId(sForm + OString::valueOf(i)), sHelpId);
+        pFormMenu->SetHelpId(pFormMenu->GetItemId(sForm + OString::number(i)), sHelpId);
     }
 
     pFormMenu->SetSelectHdl(LINK(this, SwOutlineTabDialog, MenuSelectHdl));
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 69cded27639b..91d8f59b86bc 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -78,7 +78,7 @@ void SAL_CALL SwTbxInsertCtrl::update() throw (uno::RuntimeException)
 {
     ToolBox& rTbx = GetToolBox();
     OUString aSlotURL( "slot:" );
-    aSlotURL += OUString::valueOf( sal_Int32( nLastSlotId ));
+    aSlotURL += OUString::number( nLastSlotId);
     Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() );
 
     rTbx.SetItemImage(GetId(), aImage);
@@ -104,7 +104,7 @@ void SwTbxInsertCtrl::StateChanged( sal_uInt16 /*nSID*/,
                 nId = nLastSlotId;
 
             OUString aSlotURL( "slot:" );
-            aSlotURL += OUString::valueOf( sal_Int32( nId ));
+            aSlotURL += OUString::number( nId);
             ToolBox& rBox = GetToolBox();
             Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() );
             rBox.SetItemImage(GetId(), aImage);
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index abf9becf8226..487110f74a23 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -405,7 +405,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
                 {
                     SwFrmFmt* pTblFmt = GetShell().GetTableFmt();
                     aRangeString = pTblFmt->GetName();
-                    aRangeString += OUString::valueOf( sal_Unicode('.') );
+                    aRangeString += OUString( sal_Unicode('.') );
                     aRangeString += GetShell().GetBoxNms();
 
                     // get table data provider
diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx
index f4b01eead839..19fd3b99ce17 100644
--- a/sw/source/ui/table/chartins.cxx
+++ b/sw/source/ui/table/chartins.cxx
@@ -158,7 +158,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings )
         {
             SwFrmFmt* pTblFmt = rWrtShell.GetTableFmt();
             aRangeString = pTblFmt->GetName();
-            aRangeString += OUString::valueOf( sal_Unicode('.') );
+            aRangeString += OUString( sal_Unicode('.') );
             aRangeString += rWrtShell.GetBoxNms();
 
             // get table data provider
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index 344e18047813..17bbe74be71d 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -213,12 +213,12 @@ SfxItemPresentation SwFmtDrop::GetPresentation
             {
                 if ( GetChars() > 1 )
                 {
-                    rText = OUString::valueOf( GetChars() ) + " ";
+                    rText = OUString::boolean( GetChars() ) + " ";
                 }
                 rText = rText +
                         OUString( SW_RESSTR( STR_DROP_OVER ) ) +
                         " " +
-                        OUString::valueOf( GetLines() ) +
+                        OUString::boolean( GetLines() ) +
                         " " +
                         OUString( SW_RESSTR( STR_DROP_LINES ) );
             }
@@ -336,7 +336,7 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation
             rText = SW_RESSTR( STR_FRM_WIDTH ) + " ";
             if ( GetWidthPercent() )
             {
-                rText = rText + OUString::valueOf(GetWidthPercent()) + "%";
+                rText = rText + OUString::boolean(GetWidthPercent()) + "%";
             }
             else
             {
@@ -349,7 +349,7 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation
                 rText = rText + ", " + SW_RESSTR( nId ) + " ";
                 if ( GetHeightPercent() )
                 {
-                    rText = rText + OUString::valueOf(GetHeightPercent()) + "%";
+                    rText = rText + OUString::boolean(GetHeightPercent()) + "%";
                 }
                 else
                 {
@@ -685,7 +685,7 @@ SfxItemPresentation SwFmtCol::GetPresentation
             sal_uInt16 nCnt = GetNumCols();
             if ( nCnt > 1 )
             {
-                rText = OUString::valueOf(nCnt) + " " + SW_RESSTR( STR_COLUMNS );
+                rText = OUString(nCnt) + " " + SW_RESSTR( STR_COLUMNS );
                 if ( COLADJ_NONE != GetLineAdj() )
                 {
                     sal_uInt16 nWdth = sal_uInt16(GetLineWidth());
diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx
index 837397eb6aea..a25cb89bf5e1 100644
--- a/sw/source/ui/vba/vbalisthelper.cxx
+++ b/sw/source/ui/vba/vbalisthelper.cxx
@@ -78,7 +78,7 @@ void SwVbaListHelper::Init() throw( css::uno::RuntimeException )
             throw uno::RuntimeException();
         }
     }
-    msStyleName += OUString::valueOf( mnTemplateType );
+    msStyleName += OUString::number( mnTemplateType );
 
     // get the numbering style
     uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxTextDocument, uno::UNO_QUERY_THROW );
@@ -204,43 +204,43 @@ void SwVbaListHelper::CreateNumberListTemplate() throw( css::uno::RuntimeExcepti
         case 1:
         {
             nNumberingType = style::NumberingType::ARABIC;
-            sSuffix = OUString::valueOf( sal_Unicode('.') );
+            sSuffix = OUString( sal_Unicode('.') );
             break;
         }
         case 2:
         {
             nNumberingType = style::NumberingType::ARABIC;
-            sSuffix = OUString::valueOf( sal_Unicode(')') );
+            sSuffix = OUString( sal_Unicode(')') );
             break;
         }
         case 3:
         {
             nNumberingType = style::NumberingType::ROMAN_UPPER;
-            sSuffix = OUString::valueOf( sal_Unicode('.') );
+            sSuffix = OUString( sal_Unicode('.') );
             break;
         }
         case 4:
         {
             nNumberingType = style::NumberingType::CHARS_UPPER_LETTER;
-            sSuffix = OUString::valueOf( sal_Unicode('.') );
+            sSuffix = OUString( sal_Unicode('.') );
             break;
         }
         case 5:
         {
             nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
-            sSuffix = OUString::valueOf( sal_Unicode(')') );
+            sSuffix = OUString( sal_Unicode(')') );
             break;
         }
         case 6:
         {
             nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
-            sSuffix = OUString::valueOf( sal_Unicode('.') );
+            sSuffix = OUString( sal_Unicode('.') );
             break;
         }
         case 7:
         {
             nNumberingType = style::NumberingType::ROMAN_LOWER;
-            sSuffix = OUString::valueOf( sal_Unicode('.') );
+            sSuffix = OUString( sal_Unicode('.') );
             break;
         }
         default:
@@ -319,56 +319,56 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce
             {
                 nNumberingType = style::NumberingType::ARABIC;
                 sPrefix = OUString();
-                sSuffix = OUString::valueOf( sal_Unicode(')') );
+                sSuffix = OUString( sal_Unicode(')') );
                 break;
             }
             case 2:
             {
                 nNumberingType = style::NumberingType::ROMAN_LOWER;
                 sPrefix = OUString();
-                sSuffix = OUString::valueOf( sal_Unicode(')') );
+                sSuffix = OUString( sal_Unicode(')') );
                 break;
             }
             case 3:
             {
                 nNumberingType = style::NumberingType::ARABIC;
-                sPrefix = OUString::valueOf( sal_Unicode('(') );
-                sSuffix = OUString::valueOf( sal_Unicode(')') );
+                sPrefix = OUString( sal_Unicode('(') );
+                sSuffix = OUString( sal_Unicode(')') );
                 break;
             }
             case 4:
             {
                 nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
-                sPrefix = OUString::valueOf( sal_Unicode('(') );
-                sSuffix = OUString::valueOf( sal_Unicode(')') );
+                sPrefix = OUString( sal_Unicode('(') );
+                sSuffix = OUString( sal_Unicode(')') );
                 break;
             }
             case 5:
             {
                 nNumberingType = style::NumberingType::ROMAN_LOWER;
-                sPrefix = OUString::valueOf( sal_Unicode('(') );
-                sSuffix = OUString::valueOf( sal_Unicode(')') );
+                sPrefix = OUString( sal_Unicode('(') );
+                sSuffix = OUString( sal_Unicode(')') );
                 break;
             }
             case 6:
             {
                 nNumberingType = style::NumberingType::ARABIC;
                 sPrefix = OUString();
-                sSuffix = OUString::valueOf( sal_Unicode('.') );
+                sSuffix = OUString( sal_Unicode('.') );
                 break;
             }
             case 7:
             {
                 nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
                 sPrefix = OUString();
-                sSuffix = OUString::valueOf( sal_Unicode('.') );
+                sSuffix = OUString( sal_Unicode('.') );
                 break;
             }
             case 8:
             {
                 nNumberingType = style::NumberingType::ROMAN_LOWER;
                 sPrefix = OUString();
-                sSuffix = OUString::valueOf( sal_Unicode('.') );
+                sSuffix = OUString( sal_Unicode('.') );
                 break;
             }
             default:
@@ -387,7 +387,7 @@ void SwVbaListHelper::CreateOutlineNumberForType2() throw( css::uno::RuntimeExce
 {
     sal_Int16 nNumberingType = style::NumberingType::ARABIC;
     sal_Int16 nParentNumbering = 0;
-    OUString sSuffix = OUString::valueOf( sal_Unicode('.') );
+    OUString sSuffix = OUString( sal_Unicode('.') );
     uno::Sequence< beans::PropertyValue > aPropertyValues;
 
     for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ )
@@ -473,14 +473,14 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce
             {
                 nNumberingType = style::NumberingType::ROMAN_UPPER;
                 sPrefix = OUString();
-                sSuffix = OUString::valueOf( sal_Unicode('.') );
+                sSuffix = OUString( sal_Unicode('.') );
                 break;
             }
             case 1:
             {
                 nNumberingType = style::NumberingType::ARABIC;
                 sPrefix = OUString();
-                sSuffix = OUString::valueOf( sal_Unicode('.') );
+                sSuffix = OUString( sal_Unicode('.') );
                 sal_Int16 nParentNumbering = 0;
                 setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) );
                 break;
@@ -488,50 +488,50 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce
             case 2:
             {
                 nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
-                sPrefix = OUString::valueOf( sal_Unicode('(') );
-                sSuffix = OUString::valueOf( sal_Unicode(')') );
+                sPrefix = OUString( sal_Unicode('(') );
+                sSuffix = OUString( sal_Unicode(')') );
                 break;
             }
             case 3:
             {
                 nNumberingType = style::NumberingType::ROMAN_LOWER;
-                sPrefix = OUString::valueOf( sal_Unicode('(') );
-                sSuffix = OUString::valueOf( sal_Unicode(')') );
+                sPrefix = OUString( sal_Unicode('(') );
+                sSuffix = OUString( sal_Unicode(')') );
                 break;
             }
             case 4:
             {
                 nNumberingType = style::NumberingType::ARABIC;
                 sPrefix = OUString();
-                sSuffix = OUString::valueOf( sal_Unicode(')') );
+                sSuffix = OUString( sal_Unicode(')') );
                 break;
             }
             case 5:
             {
                 nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
                 sPrefix = OUString();
-                sSuffix = OUString::valueOf( sal_Unicode(')') );
+                sSuffix = OUString( sal_Unicode(')') );
                 break;
             }
             case 6:
             {
                 nNumberingType = style::NumberingType::ROMAN_LOWER;
                 sPrefix = OUString();
-                sSuffix = OUString::valueOf( sal_Unicode(')') );
+                sSuffix = OUString( sal_Unicode(')') );
                 break;
             }
             case 7:
             {
                 nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
                 sPrefix = OUString();
-                sSuffix = OUString::valueOf( sal_Unicode('.') );
+                sSuffix = OUString( sal_Unicode('.') );
                 break;
             }
             case 8:
             {
                 nNumberingType = style::NumberingType::ROMAN_LOWER;
                 sPrefix = OUString();
-                sSuffix = OUString::valueOf( sal_Unicode('.') );
+                sSuffix = OUString( sal_Unicode('.') );
                 break;
             }
             default:
@@ -581,63 +581,63 @@ void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeExce
             {
                 nNumberingType = style::NumberingType::ROMAN_UPPER;
                 sPrefix = OUString();
-                sSuffix = OUString::valueOf( sal_Unicode('.') );
+                sSuffix = OUString( sal_Unicode('.') );
                 break;
             }
             case 1:
             {
                 nNumberingType = style::NumberingType::CHARS_UPPER_LETTER;
                 sPrefix = OUString();
-                sSuffix = OUString::valueOf( sal_Unicode('.') );
+                sSuffix = OUString( sal_Unicode('.') );
                 break;
             }
             case 2:
             {
                 nNumberingType = style::NumberingType::ARABIC;
                 sPrefix = OUString();
-                sSuffix = OUString::valueOf( sal_Unicode(')') );
+                sSuffix = OUString( sal_Unicode(')') );
                 break;
             }
             case 3:
             {
                 nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
                 sPrefix = OUString();
-                sSuffix = OUString::valueOf( sal_Unicode(')') );
+                sSuffix = OUString( sal_Unicode(')') );
                 break;
             }
             case 4:
             {
                 nNumberingType = style::NumberingType::ARABIC;
-                sPrefix = OUString::valueOf( sal_Unicode('(') );
-                sSuffix = OUString::valueOf( sal_Unicode(')') );
+                sPrefix = OUString( sal_Unicode('(') );
+                sSuffix = OUString( sal_Unicode(')') );
                 break;
             }
             case 5:
             {
                 nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
-                sPrefix = OUString::valueOf( sal_Unicode('(') );
-                sSuffix = OUString::valueOf( sal_Unicode(')') );
+                sPrefix = OUString( sal_Unicode('(') );
+                sSuffix = OUString( sal_Unicode(')') );
                 break;
             }
             case 6:
             {
                 nNumberingType = style::NumberingType::ROMAN_LOWER;
-                sPrefix = OUString::valueOf( sal_Unicode('(') );
-                sSuffix = OUString::valueOf( sal_Unicode(')') );
+                sPrefix = OUString( sal_Unicode('(') );
+                sSuffix = OUString( sal_Unicode(')') );
                 break;
             }
             case 7:
             {
                 nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
-                sPrefix = OUString::valueOf( sal_Unicode('(') );
-                sSuffix = OUString::valueOf( sal_Unicode('.') );
+                sPrefix = OUString( sal_Unicode('(') );
+                sSuffix = OUString( sal_Unicode('.') );
                 break;
             }
             case 8:
             {
                 nNumberingType = style::NumberingType::ROMAN_LOWER;
-                sPrefix = OUString::valueOf( sal_Unicode('(') );
-                sSuffix = OUString::valueOf( sal_Unicode('.') );
+                sPrefix = OUString( sal_Unicode('(') );
+                sSuffix = OUString( sal_Unicode('.') );
                 break;
             }
             default:
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 1b14d4c70665..0d7ba626f0f4 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -882,7 +882,7 @@ void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence<
         // copy the models
         ::std::copy( aGroupPos->begin(), aGroupPos->end(), _rGroup.getArray() );
         // give the group a name
-        _rName = OUString::valueOf( _nGroup );
+        _rName = OUString::number( _nGroup );
     }
 }
 
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index 7d2e1dc6f3eb..cdb038ceff69 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -162,7 +162,7 @@ void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex
         ContainerEvent aEvent;
         aEvent.Source = *this;
         aEvent.Element <<= aElement;
-        aEvent.Accessor <<= OUString::valueOf(nIndex);
+        aEvent.Accessor <<= OUString::number(nIndex);
         maContainerListeners.elementInserted( aEvent );
     }
     else
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 685c92394ca8..60c72390faec 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -298,7 +298,7 @@ OUString UnoControlHolderList::impl_getFreeName_throw()
     OUString name( "control_" );
     for ( ControlIdentifier candidateId = 0; candidateId < ::std::numeric_limits< ControlIdentifier >::max(); ++candidateId )
     {
-        OUString candidateName( name + OUString::valueOf( candidateId ) );
+        OUString candidateName( name + OUString::number( candidateId ) );
         ControlMap::const_iterator loop = maControls.begin();
         for ( ; loop != maControls.end(); ++loop )
         {
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 70230cebee52..a9a713b6e81c 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -1624,7 +1624,7 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const c
             if ( caught >>= specialized )
             {
                 sMessage += "\ndetails: ";
-                sMessage += OString::valueOf( specialized.ErrCode );
+                sMessage += OString::number( specialized.ErrCode );
             }
         }
         sMessage += "\n";
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index fe719f568091..136bfb10f63b 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -2467,7 +2467,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p
                     if (nOctets < 4)
                     {
                         aTheCanonic.append(
-                            OUString::valueOf(sal_Int32(nNumber)));
+                            OUString::number(nNumber));
                         aTheCanonic.append(sal_Unicode('.'));
                         ++nOctets;
                         eState = STATE_IP4_DOT;
@@ -2566,13 +2566,13 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p
                 if (*p == ']')
                 {
                     aTheCanonic.append(
-                        OUString::valueOf(sal_Int32(nNumber), 16));
+                        OUString::number(nNumber, 16));
                     eState = STATE_IP6_DONE;
                 }
                 else if (*p == ':')
                 {
                     aTheCanonic.append(
-                        OUString::valueOf(sal_Int32(nNumber), 16));
+                        OUString::number(nNumber, 16));
                     aTheCanonic.append(sal_Unicode(':'));
                     eState = STATE_IP6_HEXSEQ1_COLON;
                 }
@@ -2611,13 +2611,13 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p
                 if (*p == ']')
                 {
                     aTheCanonic.append(
-                        OUString::valueOf(sal_Int32(nNumber), 16));
+                        OUString::number(nNumber, 16));
                     eState = STATE_IP6_DONE;
                 }
                 else if (*p == ':')
                 {
                     aTheCanonic.append(
-                        OUString::valueOf(sal_Int32(nNumber), 16));
+                        OUString::number(nNumber, 16));
                     aTheCanonic.append(sal_Unicode(':'));
                     eState = STATE_IP6_HEXSEQ1_COLON;
                 }
@@ -2626,7 +2626,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p
                     nNumber = 100 * (nNumber >> 8) + 10 * (nNumber >> 4 & 15)
                                   + (nNumber & 15);
                     aTheCanonic.append(
-                        OUString::valueOf(sal_Int32(nNumber)));
+                        OUString::number(nNumber));
                     aTheCanonic.append(sal_Unicode('.'));
                     nOctets = 2;
                     eState = STATE_IP6_IP4_DOT;
@@ -2650,13 +2650,13 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p
                 if (*p == ']')
                 {
                     aTheCanonic.append(
-                        OUString::valueOf(sal_Int32(nNumber), 16));
+                        OUString::number(nNumber, 16));
                     eState = STATE_IP6_DONE;
                 }
                 else if (*p == ':')
                 {
                     aTheCanonic.append(
-                        OUString::valueOf(sal_Int32(nNumber), 16));
+                        OUString::number(nNumber, 16));
                     aTheCanonic.append(sal_Unicode(':'));
                     eState = STATE_IP6_HEXSEQ2_COLON;
                 }
@@ -2690,13 +2690,13 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p
                 if (*p == ']')
                 {
                     aTheCanonic.append(
-                        OUString::valueOf(sal_Int32(nNumber), 16));
+                        OUString::number(nNumber, 16));
                     eState = STATE_IP6_DONE;
                 }
                 else if (*p == ':')
                 {
                     aTheCanonic.append(
-                        OUString::valueOf(sal_Int32(nNumber), 16));
+                        OUString::number(nNumber, 16));
                     aTheCanonic.append(sal_Unicode(':'));
                     eState = STATE_IP6_HEXSEQ2_COLON;
                 }
@@ -2705,7 +2705,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p
                     nNumber = 100 * (nNumber >> 8) + 10 * (nNumber >> 4 & 15)
                                   + (nNumber & 15);
                     aTheCanonic.append(
-                        OUString::valueOf(sal_Int32(nNumber)));
+                        OUString::number(nNumber));
                     aTheCanonic.append(sal_Unicode('.'));
                     nOctets = 2;
                     eState = STATE_IP6_IP4_DOT;
@@ -2730,7 +2730,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p
                     if (nOctets == 4)
                     {
                         aTheCanonic.append(
-                            OUString::valueOf(sal_Int32(nNumber)));
+                            OUString::number(nNumber));
                         eState = STATE_IP6_DONE;
                     }
                     else
@@ -2739,7 +2739,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p
                     if (nOctets < 4)
                     {
                         aTheCanonic.append(
-                            OUString::valueOf(sal_Int32(nNumber)));
+                            OUString::number(nNumber));
                         aTheCanonic.append(sal_Unicode('.'));
                         ++nOctets;
                         eState = STATE_IP6_IP4_DOT;
@@ -2785,7 +2785,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p
             if (nOctets == 4)
             {
                 aTheCanonic.append(
-                    OUString::valueOf(sal_Int32(nNumber)));
+                    OUString::number(nNumber));
                 rBegin = p;
                 rCanonic = aTheCanonic.makeStringAndClear();
                 return true;
@@ -4118,7 +4118,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme,
                 {
                     m_aAbsURIRef.append(sal_Unicode(':'));
                     m_aPort.set(m_aAbsURIRef,
-                                OUString::valueOf(sal_Int64(nThePort)),
+                                OUString::number(nThePort),
                                 m_aAbsURIRef.getLength());
                 }
                 else
@@ -4241,7 +4241,7 @@ bool INetURLObject::SetPort(sal_uInt32 nThePort)
 {
     if (getSchemeInfo().m_bPort && m_aHost.isPresent())
     {
-        OUString aNewPort(OUString::valueOf(sal_Int64(nThePort)));
+        OUString aNewPort(OUString::number(nThePort));
         sal_Int32 nDelta;
         if (m_aPort.isPresent())
             nDelta = m_aPort.set(m_aAbsURIRef, aNewPort);
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index b1f9e26bc04e..8702ac6bf52b 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -1119,7 +1119,7 @@ void handleNameClashRename(
         nTry++;
 
         OUString aNewTitle = aOldTitlePre;
-        aNewTitle += OUString::valueOf( nTry );
+        aNewTitle += OUString::number( nTry );
         aNewTitle += aOldTitlePost;
 
         // Set new title
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 726d2287dc30..2f8da9ef13a9 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -247,7 +247,7 @@ namespace cmis
                 INetURLObject::GetScheme( aBindingUrl.GetProtocol( ) ), aBindingUrl.GetHost(), aBindingUrl.GetPort() );
         OUString sProxy = rProxy.aName;
         if ( rProxy.nPort > 0 )
-            sProxy += ":" + OUString::valueOf( rProxy.nPort );
+            sProxy += ":" + OUString::number( rProxy.nPort );
         libcmis::SessionFactory::setProxySettings( OUSTR_TO_STDSTR( sProxy ), string(), string(), string() );
 
         // Look for a cached session, key is binding url + repo id
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index dec135afbb73..e7c8977f4ccc 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -127,7 +127,7 @@ namespace cmis
                 INetURLObject::GetScheme( aBindingUrl.GetProtocol( ) ), aBindingUrl.GetHost(), aBindingUrl.GetPort() );
         OUString sProxy = rProxy.aName;
         if ( rProxy.nPort > 0 )
-            sProxy += ":" + OUString::valueOf( rProxy.nPort );
+            sProxy += ":" + OUString::number( rProxy.nPort );
         libcmis::SessionFactory::setProxySettings( OUSTR_TO_STDSTR( sProxy ), string(), string(), string() );
 
         if ( m_aRepositories.empty() )
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index ec7bce87f18a..b9c0390551ed 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -1187,7 +1187,7 @@ shell::move( sal_Int32 CommandId,
                     newDstUnqPath = dstUnqPath;
 
                     OUString aPostFix( "_" );
-                    aPostFix += OUString::valueOf( ++nTry );
+                    aPostFix += OUString::number( ++nTry );
 
                     newDstUnqPath = newDstUnqPath.replaceAt( nPos, 0, aPostFix );
 
@@ -1414,7 +1414,7 @@ shell::copy(
                     newDstUnqPath = dstUnqPath;
 
                     OUString aPostFix( "_" );
-                    aPostFix += OUString::valueOf( ++nTry );
+                    aPostFix += OUString::number( ++nTry );
 
                     newDstUnqPath = newDstUnqPath.replaceAt( nPos, 0, aPostFix );
 
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index c71de2339420..f86f1825b5eb 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -1450,7 +1450,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve,
                 {
                     OUString aNewId = xId->getContentIdentifier();
                     aNewId += OUString("_");
-                    aNewId += OUString::valueOf( ++nTry );
+                    aNewId += OUString::number( ++nTry );
                     xId = new ::ucbhelper::ContentIdentifier( aNewId );
                 }
                 while ( hasData( xId ) && ( nTry < 1000 ) );
@@ -1470,7 +1470,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve,
                 {
                     OUString aNewTitle( m_aProps.getTitle() );
                     aNewTitle += OUString("_");
-                    aNewTitle += OUString::valueOf( nTry );
+                    aNewTitle += OUString::number( nTry );
                     m_aProps.setTitle( aNewTitle );
                 }
             }
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index be6cdbe5cafa..c6578482843b 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -1671,7 +1671,7 @@ void Content::insert(
                 {
                     OUString aNew = aNewUri.getUri();
                     aNew += OUString("_");
-                    aNew += OUString::valueOf( ++nTry );
+                    aNew += OUString::number( ++nTry );
                     aNewUri.setUri( aNew );
                 }
                 while ( hasData( aNewUri ) && ( nTry < 1000 ) );
@@ -1690,7 +1690,7 @@ void Content::insert(
                 else
                 {
                     m_aProps.aTitle += OUString("_");
-                    m_aProps.aTitle += OUString::valueOf( nTry );
+                    m_aProps.aTitle += OUString::number( nTry );
                 }
             }
             break;
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index c08faf683959..a445ccd5ef2d 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -1678,7 +1678,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData,
                 {
                     OUStringBuffer aNew = aNewUri.getUri();
                     aNew.appendAscii( "_" );
-                    aNew.append( OUString::valueOf( ++nTry ) );
+                    aNew.append( OUString::number( ++nTry ) );
                     aNewUri.setUri( aNew.makeStringAndClear() );
                 }
                 while ( hasData( aNewUri ) && ( nTry < 1000 ) );
@@ -1698,7 +1698,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData,
                 {
                     OUStringBuffer aNewTitle = m_aProps.getTitle();
                     aNewTitle.appendAscii( "_" );
-                    aNewTitle.append( OUString::valueOf( ++nTry ) );
+                    aNewTitle.append( OUString::number( ++nTry ) );
                     m_aProps.setTitle( aNewTitle.makeStringAndClear() );
                 }
             }
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
index 621e34f2c1bc..92b7cad3684d 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
@@ -167,7 +167,7 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc )
         // different IDs
         uno::Reference< uno::XInterface > xNormalizedIFace( xDoc, uno::UNO_QUERY );
         sal_Int64 nId = reinterpret_cast< sal_Int64 >( xNormalizedIFace.get() );
-        aId = OUString::valueOf( nId );
+        aId = OUString::number( nId );
     }
 
     OSL_ENSURE( !aId.isEmpty(), "getDocumentId - Empty id!" );
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx
index 5dba6a2fd7fb..899b2275c3ea 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx
@@ -206,7 +206,7 @@ void NeonUri::calculateURI ()
     if ( bAppendPort )
     {
         aBuf.appendAscii( ":" );
-        aBuf.append( OUString::valueOf( mPort ) );
+        aBuf.append( OUString::number( mPort ) );
     }
     aBuf.append( mPath );
 
@@ -300,7 +300,7 @@ OUString NeonUri::makeConnectionEndPointString(
     if ( ( nPort != DEFAULT_HTTP_PORT ) && ( nPort != DEFAULT_HTTPS_PORT ) )
     {
         aBuf.appendAscii( ":" );
-        aBuf.append( OUString::valueOf( sal_Int32( nPort ) ) );
+        aBuf.append( OUString::number( nPort ) );
     }
     return aBuf.makeStringAndClear();
 }
diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
index 49124127ba12..d2313dd14854 100644
--- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
@@ -441,7 +441,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
         // long
         sal_Int32 nValue = 0;
         rInData >>= nValue;
-        aStringValue = OUString::valueOf( nValue );
+        aStringValue = OUString::number( nValue );
         aStringType = aTypeLong;
     }
     else if ( rType == getCppuType( static_cast< const sal_Int16 * >( 0 ) ) )
@@ -449,7 +449,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
         // short
         sal_Int32 nValue = 0;
         rInData >>= nValue;
-        aStringValue = OUString::valueOf( nValue );
+        aStringValue = OUString::number( nValue );
         aStringType = aTypeShort;
     }
     else if ( rType == getCppuBooleanType() )
@@ -457,7 +457,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
         // boolean
         sal_Bool bValue = false;
         rInData >>= bValue;
-        aStringValue = OUString::valueOf( bValue );
+        aStringValue = OUString::boolean( bValue );
         aStringType = aTypeBoolean;
     }
     else if ( rType == getCppuCharType() )
@@ -465,7 +465,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
         // char
         sal_Unicode cValue = 0;
         rInData >>= cValue;
-        aStringValue = OUString::valueOf( cValue );
+        aStringValue = OUString( cValue );
         aStringType = aTypeChar;
     }
     else if ( rType == getCppuType( static_cast< const sal_Int8 * >( 0 ) ) )
@@ -473,7 +473,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
         // byte
         sal_Int8 nValue = 0;
         rInData >>= nValue;
-        aStringValue = OUString::valueOf( sal_Unicode( nValue ) );
+        aStringValue = OUString( sal_Unicode( nValue ) );
         aStringType = aTypeByte;
     }
     else if ( rType == getCppuType( static_cast< const sal_Int64 * >( 0 ) ) )
@@ -481,7 +481,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
         // hyper
         sal_Int64 nValue = 0;
         rInData >>= nValue;
-        aStringValue = OUString::valueOf( nValue );
+        aStringValue = OUString::number( nValue );
         aStringType = aTypeHyper;
     }
     else if ( rType == getCppuType( static_cast< const float * >( 0 ) ) )
@@ -489,7 +489,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
         // float
         float nValue = 0;
         rInData >>= nValue;
-        aStringValue = OUString::valueOf( nValue );
+        aStringValue = OUString::number( nValue );
         aStringType = aTypeFloat;
     }
     else if ( rType == getCppuType( static_cast< const double * >( 0 ) ) )
@@ -497,7 +497,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
         // double
         double nValue = 0;
         rInData >>= nValue;
-        aStringValue = OUString::valueOf( nValue );
+        aStringValue = OUString::number( nValue );
         aStringType = aTypeDouble;
     }
     else
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index f449ff9b4f92..f8271b579d8d 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -441,7 +441,7 @@ bool InternetProxyDecider_Impl::shouldUseProxy( const OUString & rHost,
     }
 
     aBuffer.append( sal_Unicode( ':' ) );
-    aBuffer.append( OUString::valueOf( nPort ) );
+    aBuffer.append( OUString::number( nPort ) );
     const OUString aHostAndPort( aBuffer.makeStringAndClear() );
 
     std::vector< NoProxyListEntry >::const_iterator it
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 3403140c7bbb..d82af6781f57 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -1111,7 +1111,7 @@ sal_Bool ConfigItem::getUniqueSetElementName( const OUString& _rSetNode, OUStrin
                 for (; 1 != nFieldElement; nFieldElement = (nFieldElement * nEngendering) % nPrime)
                 {
                     OUString sThisRoundTrial = _rName;
-                    sThisRoundTrial += OUString::valueOf((sal_Int32)nFieldElement);
+                    sThisRoundTrial += OUString::number(nFieldElement);
 
                     if (!xSetNode->hasByName(sThisRoundTrial))
                     {
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index acd93acaf800..8677c39cf257 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -120,7 +120,7 @@ class SvtDynMenu
               )
             {
                 rEntry.sName  = PATHPREFIX_USER;
-                rEntry.sName += OUString::valueOf( (sal_Int32)impl_getNextUserEntryNr() );
+                rEntry.sName += OUString::number( impl_getNextUserEntryNr() );
                 lUserEntries.push_back( rEntry );
             }
         }
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 5fc3b2a49ddc..e552d8118407 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -241,7 +241,7 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt
             for (sal_uInt32 i=nLength-1; i>=nSize; --i)
             {
                 OUString sTmp;
-                const OUString sRemove = OUString::valueOf((sal_Int32)i);
+                const OUString sRemove = OUString::number(i);
                 xOrderList->getByName(sRemove) >>= xSet;
                 xSet->getPropertyValue(OUString(s_sHistoryItemRef)) >>= sTmp;
                 xItemList->removeByName(sTmp);
@@ -379,7 +379,7 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT
                 try
                 {
                     OUString sUrl;
-                    xOrderList->getByName(OUString::valueOf(nItem)) >>= xSet;
+                    xOrderList->getByName(OUString::number(nItem)) >>= xSet;
                     xSet->getPropertyValue(OUString(s_sHistoryItemRef)) >>= sUrl;
 
                     xItemList->getByName(sUrl) >>= xSet;
@@ -473,26 +473,26 @@ void SvtHistoryOptions_Impl::AppendItem(       EHistoryType eHistory ,
             for (sal_Int32 i=0; i<nLength; ++i)
             {
                 OUString sTmp;
-                xOrderList->getByName(OUString::valueOf(i)) >>= xSet;
+                xOrderList->getByName(OUString::number(i)) >>= xSet;
                 xSet->getPropertyValue(sHistoryItemRef) >>= sTmp;
 
                 if(sURL == sTmp)
                 {
                     OUString sFind;
-                    xOrderList->getByName( OUString::valueOf(i) ) >>= xSet;
+                    xOrderList->getByName( OUString::number(i) ) >>= xSet;
                     xSet->getPropertyValue(sHistoryItemRef) >>= sFind;
                     for (sal_Int32 j=i-1; j>=0; --j)
                     {
                         css::uno::Reference< css::beans::XPropertySet > xPrevSet;
                         css::uno::Reference< css::beans::XPropertySet > xNextSet;
-                        xOrderList->getByName( OUString::valueOf(j+1) )   >>= xPrevSet;
-                        xOrderList->getByName( OUString::valueOf(j) )     >>= xNextSet;
+                        xOrderList->getByName( OUString::number(j+1) )   >>= xPrevSet;
+                        xOrderList->getByName( OUString::number(j) )     >>= xNextSet;
 
                         OUString sTemp;
                         xNextSet->getPropertyValue(sHistoryItemRef) >>= sTemp;
                         xPrevSet->setPropertyValue(sHistoryItemRef, css::uno::makeAny(sTemp));
                     }
-                    xOrderList->getByName( OUString::valueOf((sal_Int32)0) ) >>= xSet;
+                    xOrderList->getByName( OUString::number(0) ) >>= xSet;
                     xSet->setPropertyValue(sHistoryItemRef, css::uno::makeAny(sFind));
 
                     ::comphelper::ConfigurationHelper::flush(m_xCfg);
@@ -513,7 +513,7 @@ void SvtHistoryOptions_Impl::AppendItem(       EHistoryType eHistory ,
             if ( nLength == nMaxSize )
             {
                 OUString sRemove;
-                xOrderList->getByName(OUString::valueOf(nLength-1)) >>= xSet;
+                xOrderList->getByName(OUString::number(nLength-1)) >>= xSet;
                 xSet->getPropertyValue(sHistoryItemRef) >>= sRemove;
                 try
                 {
@@ -537,18 +537,18 @@ void SvtHistoryOptions_Impl::AppendItem(       EHistoryType eHistory ,
             {
                 xFac = css::uno::Reference< css::lang::XSingleServiceFactory >(xOrderList, css::uno::UNO_QUERY);
                 xInst = xFac->createInstance();
-                OUString sPush = OUString::valueOf(nLength++);
+                OUString sPush = OUString::number(nLength++);
                 xOrderList->insertByName(sPush, css::uno::makeAny(xInst));
             }
             for (sal_Int32 j=nLength-1; j>0; --j)
             {
-                xOrderList->getByName( OUString::valueOf(j) )   >>= xPrevSet;
-                xOrderList->getByName( OUString::valueOf(j-1) ) >>= xNextSet;
+                xOrderList->getByName( OUString::number(j) )   >>= xPrevSet;
+                xOrderList->getByName( OUString::number(j-1) ) >>= xNextSet;
                 OUString sTemp;
                 xNextSet->getPropertyValue(sHistoryItemRef) >>= sTemp;
                 xPrevSet->setPropertyValue(sHistoryItemRef, css::uno::makeAny(sTemp));
             }
-            xOrderList->getByName( OUString::valueOf((sal_Int32)0) ) >>= xSet;
+            xOrderList->getByName( OUString::number(0) ) >>= xSet;
             xSet->setPropertyValue(sHistoryItemRef, css::uno::makeAny(sURL));
 
             // Append the item to ItemList.
diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx
index 4c5fd9422098..c0143d4f0a24 100644
--- a/unotools/source/config/xmlaccelcfg.cxx
+++ b/unotools/source/config/xmlaccelcfg.cxx
@@ -375,12 +375,12 @@ void OWriteAccelatorDocumentHandler::WriteAcceleratorItem(
     pAcceleratorAttributes->addAttribute(
         OUString( ATTRIBUTE_KEYCODE ),
         m_aAttributeType,
-        OUString::valueOf( aAcceleratorItem.nCode ));
+        OUString( aAcceleratorItem.nCode ));
 
     pAcceleratorAttributes->addAttribute(
         OUString( ATTRIBUTE_MODIFIER ),
         m_aAttributeType,
-        OUString::valueOf( aAcceleratorItem.nModifier ));
+        OUString( aAcceleratorItem.nModifier ));
 
     pAcceleratorAttributes->addAttribute(
         OUString( ATTRIBUTE_URL ),
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index f1156cbe16e2..516a05a48baa 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1362,8 +1362,8 @@ sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar ) const
                 {
                     cRetVal = 0xE12C;
                     SAL_WARN( "unotools.misc", "Forcing a bullet substition from 0x" <<
-                        OString::valueOf((sal_Int32)cChar, 16) << " to 0x" <<
-                        OString::valueOf((sal_Int32)cRetVal, 16));
+                        OString::number(cChar, 16) << " to 0x" <<
+                        OString::number(cRetVal, 16));
                 }
             }
         }
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index bbfe67f9254d..13128b6880bd 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -193,7 +193,7 @@ void CreateTempName_Impl( OUString& rName, bool bKeep, bool bDir = true )
     {
         u %= nMax;
         OUString aTmp( aName );
-        aTmp += OUString::valueOf(static_cast<sal_Int64>(u), nRadix);
+        aTmp += OUString::number(u, nRadix);
         aTmp += ".tmp" ;
 
         if ( bDir )
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index c32eed007962..742ae970d6bd 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -604,7 +604,7 @@ UUIInteractionHelper::handleRequest_impl(
             sal_Int32 nMedium = 0;
             aWrongMediumException.Medium >>= nMedium;
             std::vector< OUString > aArguments;
-            aArguments.push_back(OUString::valueOf(nMedium + 1));
+            aArguments.push_back(OUString::number(nMedium + 1));
             handleErrorHandlerRequest(aWrongMediumException.Classification,
                                       ERRCODE_UUI_WRONGMEDIUM,
                                       aArguments,
diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx
index e9710859d2d7..7e9ded29e2dd 100644
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@@ -289,7 +289,7 @@ uno::Any SAL_CALL ScVbaControls::Add( const uno::Any& Object, const uno::Any& St
             while( xDialogContainer->hasByName( aNewName ) && (nInd < SAL_MAX_INT32) )
             {
                 aNewName = aComServiceName;
-                aNewName += OUString::valueOf( nInd++ );
+                aNewName += OUString::number( nInd++ );
             }
         }
 
diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
index 0273548892c2..57a35c053c9c 100644
--- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
@@ -263,7 +263,7 @@ OUString VbaCommandBarHelper::generateCustomURL()
 
     // use a random number to minimize possible clash with existing custom toolbars
     srand( unsigned( time( NULL ) ));
-    url += OUString::valueOf( sal_Int64( rand() ), 16 );
+    url += OUString::number( rand(), 16 );
     return url;
 }
 
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index d12bfdd425b7..98e439bf73cb 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -362,9 +362,9 @@ void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno::
     if (( nFrom || nTo ) )
     {
         if ( nFrom )
-            sRange = ( OUString::valueOf( nFrom ) + sRange );
+            sRange = ( OUString::number( nFrom ) + sRange );
         if ( nTo )
-            sRange += OUString::valueOf( nTo );
+            sRange += OUString::number( nTo );
     }
 
     if (  PrToFileName.getValue() )
@@ -479,17 +479,17 @@ OUString extractStringFromAny( const uno::Any& rAny, bool bUppercaseBool ) throw
         case uno::TypeClass_BOOLEAN:
             return bUppercaseBool ?
                 (rAny.get< bool >() ? OUString(  "TRUE"  ) : OUString(  "FALSE"  )) :
-                OUString::valueOf( (sal_Bool)rAny.get< bool >() );
+                OUString::boolean( (sal_Bool)rAny.get< bool >() );
         case uno::TypeClass_FLOAT:
-            return OUString::valueOf( rAny.get< float >() );
+            return OUString::number( rAny.get< float >() );
         case uno::TypeClass_DOUBLE:
-            return OUString::valueOf( rAny.get< double >() );
+            return OUString::number( rAny.get< double >() );
         case uno::TypeClass_BYTE:
         case uno::TypeClass_SHORT:
         case uno::TypeClass_LONG:
-            return OUString::valueOf( rAny.get< sal_Int32 >() );
+            return OUString::number( rAny.get< sal_Int32 >() );
         case uno::TypeClass_HYPER:
-            return OUString::valueOf( rAny.get< sal_Int64 >() );
+            return OUString::number( rAny.get< sal_Int64 >() );
         default:;
     }
     throw uno::RuntimeException( "Invalid type, cannot convert to string." , 0 );
@@ -531,7 +531,7 @@ ContainerUtilities::getUniqueName( const uno::Sequence< OUString >& _slist, cons
                 return scompname;
             }
         }
-        scompname = _sElementName + _sSuffixSeparator + OUString::valueOf( a++ );
+        scompname = _sElementName + _sSuffixSeparator + OUString::number( a++ );
     }
     return OUString();
 }
diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx
index 9ecd72064bb2..1303eac17b2f 100644
--- a/vbahelper/source/vbahelper/vbashapes.cxx
+++ b/vbahelper/source/vbahelper/vbashapes.cxx
@@ -436,7 +436,7 @@ ScVbaShapes::createName( OUString sName )
 {
     sal_Int32 nActNumber = 1 + m_nNewShapeCount;
     m_nNewShapeCount++;
-    sName += OUString::valueOf( nActNumber );
+    sName += OUString::number( nActNumber );
     return sName;
 }
 
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index d22d2c89e56d..94730be8d385 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -395,7 +395,7 @@ GlyphSet::GetGlyphSetEncodingName (rtl_TextEncoding nEnc, const OString &rFontNa
     {
         return  rFontName
                 + OString("Enc")
-                + OString::valueOf ((sal_Int32)(nEnc - RTL_TEXTENCODING_USER_START));
+                + OString::number ((nEnc - RTL_TEXTENCODING_USER_START));
     }
     else
     {
@@ -448,7 +448,7 @@ GlyphSet::GetReencodedFontName (rtl_TextEncoding nEnc, const OString &rFontName)
     {
         return rFontName
                + OString("-enc")
-               + OString::valueOf ((sal_Int32)(nEnc - RTL_TEXTENCODING_USER_START));
+               + OString::number ((nEnc - RTL_TEXTENCODING_USER_START));
     }
     else
     {
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 2af8923af271..7c1b359cd836 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -586,7 +586,7 @@ PrinterJob::StartPage (const JobData& rJobSetup)
 {
     InitPaperSize (rJobSetup);
 
-    OUString aPageNo = OUString::valueOf ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1
+    OUString aPageNo = OUString::number ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1
     OUString aExt    = aPageNo + OUString(".ps");
 
     osl::File* pPageHeader = CreateSpoolFile ( OUString("psp_pghead"), aExt);
@@ -862,7 +862,7 @@ void PrinterJob::writeJobPatch( osl::File* pFile, const JobData& rJobData )
     {
         // note: this discards patch files not adhering to the "int" scheme
         // as there won't be a value for them
-        writeFeature( pFile, pKey, pKey->getValue( OUString::valueOf( patch_order.front() ) ), false );
+        writeFeature( pFile, pKey, pKey->getValue( OUString::number( patch_order.front() ) ), false );
         patch_order.pop_front();
     }
 }
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index 321438a5dba6..a8c4eb60a6ca 100644
--- a/vcl/headless/svpdummies.cxx
+++ b/vcl/headless/svpdummies.cxx
@@ -66,7 +66,7 @@ Rectangle SvpSalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen )
 
 OUString SvpSalSystem::GetDisplayScreenName( unsigned int nScreen )
 {
-   return "VirtualScreen " + OUString::valueOf(sal_Int32(nScreen));
+   return "VirtualScreen " + OUString::number(nScreen);
 }
 
 int SvpSalSystem::ShowNativeDialog( const OUString&, const OUString&,
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 27367d770dae..e0c7558ade9f 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -945,12 +945,12 @@ namespace
         OUStringBuffer aBuf;
         sal_Int32 nTextLen;
 
-        nTextLen = OUString::valueOf(rFormatter.GetMin()).getLength();
+        nTextLen = OUString::number(rFormatter.GetMin()).getLength();
         string::padToLength(aBuf, nTextLen, '9');
         Size aMinTextSize = rSpinField.CalcMinimumSizeForText(
             rFormatter.CreateFieldText(aBuf.makeStringAndClear().toInt64()));
 
-        nTextLen = OUString::valueOf(rFormatter.GetMax()).getLength();
+        nTextLen = OUString::number(rFormatter.GetMax()).getLength();
         string::padToLength(aBuf, nTextLen, '9');
         Size aMaxTextSize = rSpinField.CalcMinimumSizeForText(
             rFormatter.CreateFieldText(aBuf.makeStringAndClear().toInt64()));
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 328289b12506..e6d46e7cd578 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -394,7 +394,7 @@ uno::Reference< graphic::XGraphic > Graphic::GetXGraphic() const
         OUString                                aURL( "private:memorygraphic/" );
 
         aLoadProps[ 0 ].Name = OUString( "URL" );
-        aLoadProps[ 0 ].Value <<= ( aURL += OUString::valueOf( reinterpret_cast< sal_Int64 >( this ) ) );
+        aLoadProps[ 0 ].Value <<= ( aURL += OUString::number( reinterpret_cast< sal_Int64 >( this ) ) );
 
         xRet = xProv->queryGraphic( aLoadProps );
     }
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 252cd5d2b550..482929d883ba 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -773,7 +773,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
         if( i_rControl.getType() == PDFWriter::RadioButton )
         {
             aPartialName  = "RadioGroup";
-            aPartialName += OString::valueOf( static_cast<const PDFWriter::RadioButtonWidget&>(i_rControl).RadioGroup );
+            aPartialName += OString::number( static_cast<const PDFWriter::RadioButtonWidget&>(i_rControl).RadioGroup );
         }
         else
             aPartialName = OString( "Widget" );
@@ -6634,7 +6634,7 @@ bool PDFWriterImpl::emitTrailer()
     for( sal_Int32 i = 0; i < nObjects; i++ )
     {
         aLine.setLength( 0 );
-        OString aOffset = OString::valueOf( (sal_Int64)m_aObjects[i] );
+        OString aOffset = OString::number( m_aObjects[i] );
         for( sal_Int32 j = 0; j < (10-aOffset.getLength()); j++ )
             aLine.append( '0' );
         aLine.append( aOffset );
@@ -11649,7 +11649,7 @@ void PDFWriterImpl::ensureUniqueRadioOnValues()
             {
                 int nKidIndex = rGroupWidget.m_aKidsIndex[nKid];
                 PDFWidget& rKid = m_aWidgets[nKidIndex];
-                rKid.m_aOnValue = OUString::valueOf( sal_Int32(nKid+1) );
+                rKid.m_aOnValue = OUString::number( nKid+1 );
                 if( rKid.m_aValue != "Off" )
                     rKid.m_aValue = rKid.m_aOnValue;
             }
@@ -11895,7 +11895,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
             rNewWidget.m_aRect = Rectangle(0, 0, 0, 0);
 
         m_nSignatureObject = createObject();
-        rNewWidget.m_aValue = OUString::valueOf( m_nSignatureObject );
+        rNewWidget.m_aValue = OUString::number( m_nSignatureObject );
         rNewWidget.m_aValue += " 0 R";
         //createDefaultSignatureAppearance( rNewWidget, rSig );
         // let's add a fake appearance
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 21d45b6431cf..6cc9800aa138 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1051,9 +1051,9 @@ void VclBuilder::cleanupWidgetOwnScrolling(Window *pScrollParent, Window *pWindo
 {
     //remove the redundant scrolling parent
     sal_Int32 nWidthReq = pScrollParent->get_width_request();
-    rMap[OString("width-request")] = OString::valueOf(nWidthReq);
+    rMap[OString("width-request")] = OString::number(nWidthReq);
     sal_Int32 nHeightReq = pScrollParent->get_height_request();
-    rMap[OString("height-request")] = OString::valueOf(nHeightReq);
+    rMap[OString("height-request")] = OString::number(nHeightReq);
 
     m_pParserState->m_aRedundantParentWidgets[pScrollParent] = pWindow;
 }
@@ -2000,7 +2000,7 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal
                     }
                     else if (nId == 0 && name.equals("translatable") && reader.getAttributeValue(false).equals("yes"))
                     {
-                        sValue = getTranslation(rID, OString::valueOf(nRowIndex));
+                        sValue = getTranslation(rID, OString::number(nRowIndex));
                         bTranslated = !sValue.isEmpty();
                     }
                 }
@@ -2140,7 +2140,7 @@ std::vector<OString> VclBuilder::handleItems(xmlreader::XmlReader &reader, const
                 {
                     if (name.equals("translatable") && reader.getAttributeValue(false).equals("yes"))
                     {
-                        sValue = getTranslation(rID, OString::valueOf(nItemIndex));
+                        sValue = getTranslation(rID, OString::number(nItemIndex));
                         bTranslated = !sValue.isEmpty();
                     }
                 }
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 594fb4442450..42c04113d0a2 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -325,7 +325,7 @@ void PrintDialog::ShowNupOrderWindow::Paint( const Rectangle& i_rRect )
     Font aFont( GetSettings().GetStyleSettings().GetFieldFont() );
     aFont.SetSize( Size( 0, 24 ) );
     SetFont( aFont );
-    Size aSampleTextSize( GetTextWidth( OUString::valueOf( sal_Int32(nPages+1) ) ), GetTextHeight() );
+    Size aSampleTextSize( GetTextWidth( OUString::number( nPages+1 ) ), GetTextHeight() );
 
     Size aOutSize( GetOutputSizePixel() );
     Size aSubSize( aOutSize.Width() / mnColumns, aOutSize.Height() / mnRows );
@@ -341,7 +341,7 @@ void PrintDialog::ShowNupOrderWindow::Paint( const Rectangle& i_rRect )
     long nTextHeight = GetTextHeight();
     for( int i = 0; i < nPages; i++ )
     {
-        OUString aPageText( OUString::valueOf( sal_Int32(i+1) ) );
+        OUString aPageText( OUString::number( i+1 ) );
         int nX = 0, nY = 0;
         switch( mnOrderMode )
         {
@@ -1269,7 +1269,7 @@ void PrintDialog::updatePrinterText()
 
 void PrintDialog::setPreviewText( sal_Int32 )
 {
-    OUString aNewText( searchAndReplace( maPageStr, "%n", 2, OUString::valueOf( mnCachedPages )  ) );
+    OUString aNewText( searchAndReplace( maPageStr, "%n", 2, OUString::number( mnCachedPages )  ) );
     mpNumPagesText->SetText( aNewText );
 }
 
@@ -1904,8 +1904,8 @@ void PrintProgressDialog::setProgress( int i_nCurrent, int i_nMax )
     if( mnMax < 1 )
         mnMax = 1;
 
-    OUString aNewText( searchAndReplace( maStr, "%p", 2, OUString::valueOf( mnCur ) ) );
-    aNewText = searchAndReplace( aNewText, "%n", 2, OUString::valueOf( mnMax ) );
+    OUString aNewText( searchAndReplace( maStr, "%p", 2, OUString::number( mnCur ) ) );
+    aNewText = searchAndReplace( aNewText, "%n", 2, OUString::number( mnMax ) );
     maText.SetText( aNewText );
 
     // update progress
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index e386d3dfc293..a5705c31bd30 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -629,7 +629,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner
 
     if( rJob.m_nPDFDevice > 0 && rJob.m_nCopies > 1 )
     {
-        OString aVal( OString::valueOf( sal_Int32( rJob.m_nCopies ) ) );
+        OString aVal( OString::number( rJob.m_nCopies ) );
         rNumOptions = cupsAddOption( "copies", aVal.getStr(), rNumOptions, (cups_option_t**)rOptions );
     }
     if( ! bBanner )
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 4e53c82891a2..9f4dfa2870d7 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -772,12 +772,12 @@ bool PrinterInfoManager::writePrinterConfig()
             pConfig->WriteKey( "Command", OUStringToOString(it->second.m_aInfo.m_aCommand, RTL_TEXTENCODING_UTF8) );
             pConfig->WriteKey( "QuickCommand", OUStringToOString(it->second.m_aInfo.m_aQuickCommand, RTL_TEXTENCODING_UTF8) );
             pConfig->WriteKey( "Features", OUStringToOString(it->second.m_aInfo.m_aFeatures, RTL_TEXTENCODING_UTF8) );
-            pConfig->WriteKey("Copies", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nCopies)));
+            pConfig->WriteKey("Copies", OString::number(it->second.m_aInfo.m_nCopies));
             pConfig->WriteKey( "Orientation", it->second.m_aInfo.m_eOrientation == orientation::Landscape ? "Landscape" : "Portrait" );
-            pConfig->WriteKey("PSLevel", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nPSLevel)));
-            pConfig->WriteKey("PDFDevice", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nPDFDevice)));
-            pConfig->WriteKey("ColorDevice", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nColorDevice)));
-            pConfig->WriteKey("ColorDepth", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nColorDepth)));
+            pConfig->WriteKey("PSLevel", OString::number(it->second.m_aInfo.m_nPSLevel));
+            pConfig->WriteKey("PDFDevice", OString::number(it->second.m_aInfo.m_nPDFDevice));
+            pConfig->WriteKey("ColorDevice", OString::number(it->second.m_aInfo.m_nColorDevice));
+            pConfig->WriteKey("ColorDepth", OString::number(it->second.m_aInfo.m_nColorDepth));
             aValue.append(static_cast<sal_Int32>(it->second.m_aInfo.m_nLeftMarginAdjust));
             aValue.append(',');
             aValue.append(static_cast<sal_Int32>(it->second.m_aInfo.m_nRightMarginAdjust));
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index b50fae1b1815..18af29460b82 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -635,7 +635,7 @@ GtkPrintDialog::impl_initCustomTab()
                     GtkWidget* const pRow = gtk_hbox_new(FALSE, 12);
                     gtk_box_pack_start(GTK_BOX(pVbox), pRow, FALSE, FALSE, 0);
                     gtk_box_pack_start(GTK_BOX(pRow), pWidget, FALSE, FALSE, 0);
-                    aPropertyToDependencyRowMap[aPropertyName + OUString::valueOf(m)] = pRow;
+                    aPropertyToDependencyRowMap[aPropertyName + OUString::number(m)] = pRow;
                     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pWidget), m == nSelectVal);
                     gtk_widget_set_sensitive(pWidget,
                         m_rController.isUIOptionEnabled(aPropertyName) && pVal != NULL);
@@ -722,7 +722,7 @@ GtkPrintDialog::impl_initCustomTab()
             {
                 if (bUseDependencyRow && !aDependsOnName.isEmpty())
                 {
-                    pRow = aPropertyToDependencyRowMap[aDependsOnName + OUString::valueOf(nDependsOnValue)];
+                    pRow = aPropertyToDependencyRowMap[aDependsOnName + OUString::number(nDependsOnValue)];
                     if (!pRow)
                     {
                         gtk_widget_destroy(pWidget);
@@ -738,7 +738,7 @@ GtkPrintDialog::impl_initCustomTab()
                     gtk_box_pack_start(GTK_BOX(pCurParent), pRow, FALSE, FALSE, 0);
                 }
                 if (!pGroup)
-                    aPropertyToDependencyRowMap[aPropertyName + OUString::valueOf(sal_Int32(0))] = pRow;
+                    aPropertyToDependencyRowMap[aPropertyName + OUString::number(0)] = pRow;
                 gtk_box_pack_start(GTK_BOX(pRow), pWidget, FALSE, FALSE, 0);
             }
         }
@@ -1153,7 +1153,7 @@ const
     const OUString aPrintDialogStr("PrintDialog");
     pItem->setValue(aPrintDialogStr,
             OUString("CopyCount"),
-            OUString::valueOf(sal_Int32(m_pWrapper->print_settings_get_n_copies(pSettings))));
+            OUString::number(m_pWrapper->print_settings_get_n_copies(pSettings)));
     pItem->setValue(aPrintDialogStr,
             OUString("Collate"),
             m_pWrapper->print_settings_get_collate(pSettings)
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 51f43c75c067..e5726901abdd 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -300,13 +300,13 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
             //as CharStyleName or ParaStyleName
             //if the style is a user defined style then it must have an ISTD - built-in styles might not have it
             StyleSheetTablePtr pStyleSheets = m_pImpl->GetStyleSheetTable();
-            OUString sValue = OUString::valueOf(nIntValue, 16);
+            OUString sValue = OUString::number(nIntValue, 16);
             const StyleSheetEntryPtr pEntry = pStyleSheets->FindStyleSheetByISTD(sValue);
             if( pEntry.get( ) )
             {
                 bool bParaStyle = (pEntry->nStyleTypeCode == STYLE_TYPE_PARA);
                 if(bParaStyle)
-                    m_pImpl->SetCurrentParaStyleId(OUString::valueOf(static_cast<sal_Int32>(nIntValue), 16));
+                    m_pImpl->SetCurrentParaStyleId(OUString::number(nIntValue, 16));
                 if (m_pImpl->GetTopContext() && m_pImpl->GetTopContextType() != CONTEXT_SECTION)
                     m_pImpl->GetTopContext()->Insert(
                                                  bParaStyle ?
@@ -1464,13 +1464,13 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
             {
 #if OSL_DEBUG_LEVEL > 0
             OString sMessage("DomainMapper::attribute() - Id: ");
-            sMessage += OString::valueOf( sal_Int32( nName ), 10 );
+            sMessage += OString::number( nName, 10 );
             sMessage += " / 0x";
-            sMessage += OString::valueOf( sal_Int32( nName ), 16 );
+            sMessage += OString::number( nName, 16 );
             sMessage += " value: ";
-            sMessage += OString::valueOf( sal_Int32( nIntValue ), 10 );
+            sMessage += OString::number( nIntValue, 10 );
             sMessage += " / 0x";
-            sMessage += OString::valueOf( sal_Int32( nIntValue ), 16 );
+            sMessage += OString::number( nIntValue, 16 );
             SAL_WARN("writerfilter", sMessage.getStr());
 #endif
             }
diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx
index 38edf6f9f6ba..851cdf4991d9 100644
--- a/writerfilter/source/dmapper/FormControlHelper.cxx
+++ b/writerfilter/source/dmapper/FormControlHelper.cxx
@@ -99,7 +99,7 @@ uno::Reference<form::XForm> FormControlHelper::FormControlHelper_Impl::getForm()
             {
                 ++nUnique;
                 sFormName = sDOCXForm;
-                sFormName += OUString::valueOf(nUnique);
+                sFormName += OUString(nUnique);
             }
 
             uno::Reference<uno::XInterface> xForm(getServiceFactory()->createInstance("com.sun.star.form.component.Form"));
@@ -280,7 +280,7 @@ bool FormControlHelper::insertControl(uno::Reference<text::XTextRange> xTextRang
     do
     {
         OUString sTmp(sControl);
-        sTmp += OUString::valueOf(nControl);
+        sTmp += OUString::number(nControl);
 
         nControl++;
         if (! xFormCompsByName->hasByName(sTmp))
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 951b01ec7ba9..3ff217603b59 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1293,9 +1293,9 @@ void GraphicImport::lcl_sprm(Sprm & rSprm)
         default:
 #if OSL_DEBUG_LEVEL > 0
             OString sMessage( "GraphicImport::sprm() - Id: ");
-            sMessage += OString::valueOf( sal_Int32( nSprmId ), 10 );
+            sMessage += OString::number( nSprmId, 10 );
             sMessage += " / 0x";
-            sMessage += OString::valueOf( sal_Int32( nSprmId ), 16 );
+            sMessage += OString::number( nSprmId, 16 );
             SAL_WARN("writerfilter", sMessage.getStr());
 #endif
             ;
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index ecd70b59fda9..e5b924c474da 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -60,7 +60,7 @@ void lcl_printProperties( uno::Sequence< beans::PropertyValue > aProps )
         OUString sValue;
 
         if ( !( aValue >>= sValue ) && ( aValue >>= nValue ) )
-            sValue = OUString::valueOf( nValue );
+            sValue = OUString::number( nValue );
 
         SAL_INFO("writerfilter", "Property " << aProps[i].Name << ": " << sValue);
     }
@@ -524,7 +524,7 @@ ListDef::~ListDef( )
 OUString ListDef::GetStyleName( sal_Int32 nId )
 {
     OUString sStyleName( "WWNum" );
-    sStyleName += OUString::valueOf( nId );
+    sStyleName += OUString::number( nId );
 
     return sStyleName;
 }
@@ -852,13 +852,13 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal )
         {
 #if OSL_DEBUG_LEVEL > 0
             OString sMessage( "ListTable::attribute() - Id: ");
-            sMessage += OString::valueOf( sal_Int32( nName ), 10 );
+            sMessage += OString::number( nName, 10 );
             sMessage += " / 0x";
-            sMessage += OString::valueOf( sal_Int32( nName ), 16 );
+            sMessage += OString::number( nName, 16 );
             sMessage += " value: ";
-            sMessage += OString::valueOf( sal_Int32( nIntValue ), 10 );
+            sMessage += OString::number( nIntValue, 10 );
             sMessage += " / 0x";
-            sMessage += OString::valueOf( sal_Int32( nIntValue ), 16 );
+            sMessage += OString::number( nIntValue, 16 );
             SAL_WARN("writerfilter", sMessage.getStr());
 #endif
         }
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index e2a333535ecb..44e4f4baf875 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -185,7 +185,7 @@ OUString OLEHandler::copyOLEOStream( uno::Reference< text::XTextDocument > xText
         static sal_Int32 nObjectCount = 100;
         uno::Reference< container::XNameAccess > xNA( xEmbeddedResolver, uno::UNO_QUERY_THROW );
         OUString aURL("Obj");
-        aURL += OUString::valueOf( nObjectCount++ );
+        aURL += OUString::number( nObjectCount++ );
         uno::Reference < io::XOutputStream > xOLEStream;
         if( (xNA->getByName( aURL ) >>= xOLEStream) && xOLEStream.is() )
         {
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index ccb0506c0d15..5507109e1913 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -373,7 +373,7 @@ OUString lcl_FindUnusedPageStyleName(const uno::Sequence< OUString >& rPageStyle
         }
     }
     OUString sRet( sDefaultStyle );
-    sRet += OUString::valueOf( nMaxIndex + 1);
+    sRet += OUString::number( nMaxIndex + 1);
     return sRet;
 }
 
@@ -997,7 +997,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
 
         sal_Int32 nCharWidth = 423; //240 twip/ 12 pt
         //todo: is '0' the right index here?
-        const StyleSheetEntryPtr pEntry = rDM_Impl.GetStyleSheetTable()->FindStyleSheetByISTD(OUString::valueOf(static_cast<sal_Int32>(0), 16));
+        const StyleSheetEntryPtr pEntry = rDM_Impl.GetStyleSheetTable()->FindStyleSheetByISTD(OUString::number(0, 16));
         if( pEntry.get( ) )
         {
             PropertyMap::iterator aElement_ = pEntry->pProperties->find(PropertyDefinition( PROP_CHAR_HEIGHT_ASIAN ));
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 0f9218388e8e..481a35bd3f01 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -382,7 +382,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
     switch(Name)
     {
         case NS_rtf::LN_ISTD:
-            m_pImpl->m_pCurrentEntry->sStyleIdentifierD = OUString::valueOf(static_cast<sal_Int32>(nIntValue), 16);
+            m_pImpl->m_pCurrentEntry->sStyleIdentifierD = OUString::number(nIntValue, 16);
         break;
         case NS_rtf::LN_STI:
         {
@@ -400,11 +400,11 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
         break;
         case NS_rtf::LN_ISTDBASE:
             if (static_cast<sal_uInt32>(nIntValue) != 0xfff)
-                m_pImpl->m_pCurrentEntry->sBaseStyleIdentifier = OUString::valueOf(static_cast<sal_Int32>(nIntValue), 16);
+                m_pImpl->m_pCurrentEntry->sBaseStyleIdentifier = OUString::number(nIntValue, 16);
         break;
         case NS_rtf::LN_ISTDNEXT:
             if (static_cast<sal_uInt32>(nIntValue) != 0xfff)
-                m_pImpl->m_pCurrentEntry->sNextStyleIdentifier = OUString::valueOf(static_cast<sal_Int32>(nIntValue), 16);
+                m_pImpl->m_pCurrentEntry->sNextStyleIdentifier = OUString::number(nIntValue, 16);
         break;
         case NS_rtf::LN_FSCRATCH:
         case NS_rtf::LN_FINVALHEIGHT:
@@ -1275,7 +1275,7 @@ OUString StyleSheetTable::getOrCreateCharStyle( PropertyValueVector_t& rCharProp
         }
     }
     sListLabel = OUString::createFromAscii( cListLabel );
-    sListLabel += OUString::valueOf( ++nStyleFound );
+    sListLabel += OUString::number( ++nStyleFound );
     //create a new one otherwise
     uno::Reference< lang::XMultiServiceFactory > xDocFactory( m_pImpl->m_xTextDocument, uno::UNO_QUERY_THROW );
     PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index da7a81cb0229..f4afe8a98c91 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2610,7 +2610,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
                     if (nType)
                     {
                             uno::Reference<drawing::XEnhancedCustomShapeDefaulter> xDefaulter(m_aStates.top().aDrawingObject.xShape, uno::UNO_QUERY);
-                            xDefaulter->createCustomShapeDefaults(OUString::valueOf(nType));
+                            xDefaulter->createCustomShapeDefaults(OUString::number(nType));
                     }
                     m_aStates.top().aDrawingObject.xPropertySet.set(m_aStates.top().aDrawingObject.xShape, uno::UNO_QUERY);
                     std::vector<beans::PropertyValue>& rPendingProperties = m_aStates.top().aDrawingObject.aPendingProperties;
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index b51ba64d821b..23f2820c0fed 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -580,7 +580,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose)
     if (bCustom && xShape.is())
     {
         uno::Reference<drawing::XEnhancedCustomShapeDefaulter> xDefaulter(xShape, uno::UNO_QUERY);
-        xDefaulter->createCustomShapeDefaults(OUString::valueOf(sal_Int32(nType)));
+        xDefaulter->createCustomShapeDefaults(OUString::number(nType));
     }
 
     // Creating Path property
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx
index b786b093b9a9..7af638ff8219 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/writerfilter/source/rtftok/rtfvalue.cxx
@@ -148,7 +148,7 @@ OUString RTFValue::getString() const
     if (!m_sValue.isEmpty() || m_bForceString)
         return m_sValue;
     else
-        return OUString::valueOf(sal_Int32(m_nValue));
+        return OUString::number(m_nValue);
 }
 
 void RTFValue::setString(OUString sValue)
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index 54814dddfdfa..0066281fd4ca 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -591,7 +591,7 @@ TVChildTarget::getElementNames( )
 {
     Sequence< OUString > seq( Elements.size() );
     for( unsigned i = 0; i < Elements.size(); ++i )
-        seq[i] = OUString::valueOf( sal_Int32( 1+i ) );
+        seq[i] = OUString::number( 1+i );
 
     return seq;
 }
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 15b7278e019a..710a72fd06a9 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -1630,7 +1630,7 @@ void SchXMLExportHelper_Impl::exportTable()
                 sal_Int64 nRepeat = static_cast< sal_Int64 >( nHiddenIndex - nNextIndex );
                 if(nRepeat>1)
                     mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED,
-                                   OUString::valueOf( nRepeat ));
+                                   OUString::number( nRepeat ));
                 SvXMLElementExport aColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True );
             }
             mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_VISIBILITY, GetXMLToken( XML_COLLAPSE ) );
@@ -1644,7 +1644,7 @@ void SchXMLExportHelper_Impl::exportTable()
             sal_Int64 nRepeat = static_cast< sal_Int64 >( nEndIndex - nNextIndex + 1 );
             if(nRepeat>1)
                 mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED,
-                               OUString::valueOf( nRepeat ));
+                               OUString::number( nRepeat ));
             SvXMLElementExport aColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True );
         }
     }
@@ -3413,7 +3413,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
 
                     if( aLastPoint.mnRepeat > 1 )
                         mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_REPEATED,
-                                            OUString::valueOf( (sal_Int64)( aLastPoint.mnRepeat ) ));
+                                            OUString::number( ( aLastPoint.mnRepeat ) ));
 
                     SvXMLElementExport aPointElem( mrExport, XML_NAMESPACE_CHART, XML_DATA_POINT, sal_True, sal_True );
                 }
@@ -3427,7 +3427,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
 
                 if( aLastPoint.mnRepeat > 1 )
                     mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_REPEATED,
-                                        OUString::valueOf( (sal_Int64)( aLastPoint.mnRepeat ) ));
+                                        OUString::number( ( aLastPoint.mnRepeat ) ));
 
                 SvXMLElementExport aPointElem( mrExport, XML_NAMESPACE_CHART, XML_DATA_POINT, sal_True, sal_True );
             }
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index 902dad163ca5..c5377e39a83a 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -130,7 +130,7 @@ void lcl_fillRangeMapping(
                     }
                     else
                     {
-                        OUString aColNumStr = OUString::valueOf( static_cast< sal_Int32 >( nCol - nColOffset ));
+                        OUString aColNumStr = OUString::number( nCol - nColOffset);
                         if( nRow == 0 && rTable.bHasHeaderRow )
                             rOutRangeMap.insert( lcl_tOriginalRangeToInternalRangeMap::value_type(
                                                      aRangeId, lcl_aLabelPrefix + aColNumStr ));
@@ -149,7 +149,7 @@ void lcl_fillRangeMapping(
                     }
                     else
                     {
-                        OUString aRowNumStr = OUString::valueOf( static_cast< sal_Int32 >( nRow - nRowOffset ));
+                        OUString aRowNumStr = OUString::number( nRow - nRowOffset);
                         if( nCol == 0 && rTable.bHasHeaderColumn )
                             rOutRangeMap.insert( lcl_tOriginalRangeToInternalRangeMap::value_type(
                                                      aRangeId, lcl_aLabelPrefix + aRowNumStr ));
@@ -935,7 +935,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
                         else
                         {
                             Reference< beans::XPropertySet > xOldSequenceProp( aLSeqIt->second->getValues(), uno::UNO_QUERY );
-                            OUString aRep( OUString::valueOf( aLSeqIt->first.first ));
+                            OUString aRep( OUString::number( aLSeqIt->first.first ));
                             Reference< chart2::data::XDataSequence > xNewSequence(
                                 xDataProv->createDataSequenceByRangeRepresentation( aRep ));
                             SchXMLTools::copyProperties(
@@ -967,7 +967,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
                 else if( ! lcl_tableOfRangeMatches( aRange, rTable.aTableNameOfFile ))
                 {
                     OUString aRep("label ");
-                    aRep += OUString::valueOf( aLSeqIt->first.first );
+                    aRep += OUString::number( aLSeqIt->first.first );
 
                     Reference< chart2::data::XDataSequence > xNewSeq(
                         xDataProv->createDataSequenceByRangeRepresentation( aRep ));
diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx
index 29047f8be210..3b3097b60033 100644
--- a/xmloff/source/core/RDFaExportHelper.cxx
+++ b/xmloff/source/core/RDFaExportHelper.cxx
@@ -121,7 +121,7 @@ RDFaExportHelper::LookupBlankNode(
         m_BlankNodeMap[ i_xBlankNode->getStringValue() ] );
     if (rEntry.isEmpty())
     {
-        rEntry = "_:b" + OUString::valueOf(++m_Counter);
+        rEntry = "_:b" + OUString::number(++m_Counter);
     }
     return rEntry;
 }
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index a2ff42abfe07..9f8968033ea4 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -233,7 +233,7 @@ void XMLSettingsExportHelper::exportLong(const sal_Int64 nValue, const OUString&
     m_rContext.AddAttribute( XML_NAME, rName );
     m_rContext.AddAttribute( XML_TYPE, XML_LONG );
     m_rContext.StartElement( XML_CONFIG_ITEM, sal_True );
-    OUString sValue(OUString::valueOf(nValue));
+    OUString sValue(OUString::number(nValue));
     m_rContext.Characters( sValue );
     m_rContext.EndElement( sal_False );
 }
diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
index 5ef2156acc60..be14e0eeeba6 100644
--- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
+++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
@@ -45,7 +45,7 @@ const OUString& UnoInterfaceToUniqueIdentifierMapper::registerReference( const R
     else
     {
         OUString aId( "id" );
-        aId += OUString::valueOf( mnNextId++ );
+        aId += OUString::number( mnNextId++ );
         return (*maEntries.insert( IdMap_t::value_type( aId, xRef ) ).first).first;
     }
 }
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 3ccb7e1ec95c..2672ad72f5ac 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -954,7 +954,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
                 {
                     sal_Int32 nGroupId = 0;
                     if( pValue->Value >>= nGroupId )
-                        mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_GROUP_ID, OUString::valueOf( nGroupId ) );
+                        mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_GROUP_ID, OUString::number( nGroupId ) );
                 }
                 else
                 {
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index 2ea06e1b9695..2bc55ba92815 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -496,7 +496,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport )
 
                 if( rEffect.mnPathShapeId != -1 )
                 {
-                    rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PATH_ID, OUString::valueOf( rEffect.mnPathShapeId ) );
+                    rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PATH_ID, OUString::number( rEffect.mnPathShapeId ) );
                 }
 
                 enum XMLTokenEnum eLocalName;
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 2174743fe8b4..092c5a0b8956 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -800,9 +800,9 @@ sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, O
                 {
                     mpAutoLayoutInfoList->push_back( pNew );
                     OUString sNewName = "AL";
-                    sNewName += OUString::valueOf(sal_Int32( mpAutoLayoutInfoList->size() - 1 ));
+                    sNewName += OUString::number(mpAutoLayoutInfoList->size() - 1);
                     sNewName += "T";
-                    sNewName += OUString::valueOf(sal_Int32(nType));
+                    sNewName += OUString::number(nType);
                     pNew->SetLayoutName(sNewName);
                 }
 
@@ -1334,7 +1334,7 @@ void SdXMLExport::ImpWritePageMasterInfos()
             // create name
             OUString sNewName("PM");
 
-            sNewName += OUString::valueOf((sal_Int32)nCnt);
+            sNewName += OUString::number(nCnt);
             pInfo->SetName(sNewName);
 
             // prepare page-master attributes
@@ -1450,7 +1450,7 @@ static OUString findOrAppendImpl( std::vector< OUString >& rVector, const OUStri
     // create a reference string with pPrefix and the index of the
     // found or created rText
     OUString aStr( OUString::createFromAscii( pPrefix ) );
-    aStr += OUString::valueOf( nIndex );
+    aStr += OUString::number( nIndex );
     return aStr;
 }
 
@@ -1481,7 +1481,7 @@ static OUString findOrAppendImpl( std::vector< DateTimeDeclImpl >& rVector, cons
     // create a reference string with pPrefix and the index of the
     // found or created DateTimeDeclImpl
     OUString aStr( OUString::createFromAscii( pPrefix ) );
-    aStr += OUString::valueOf( nIndex );
+    aStr += OUString::number( nIndex );
     return aStr;
 
 }
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index d56dea2cc547..6274da4c7f30 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1133,7 +1133,7 @@ void XMLShapeExport::ImpExportGluePoints( const uno::Reference< drawing::XShape
         {
             // export only user defined glue points
 
-            const OUString sId( OUString::valueOf( nIdentifier ) );
+            const OUString sId( OUString::number( nIdentifier ) );
             mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_ID, sId );
 
             mrExport.GetMM100UnitConverter().convertMeasureToXML(msBuffer,
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index 70593e608879..8cac9a7d1532 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -1362,7 +1362,7 @@ void XMLShapeExport::ImpExportConnectorShape(
         {
             if( nGluePointId != -1 )
             {
-                mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_START_GLUE_POINT, OUString::valueOf( nGluePointId ));
+                mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_START_GLUE_POINT, OUString::number( nGluePointId ));
             }
         }
     }
@@ -1380,7 +1380,7 @@ void XMLShapeExport::ImpExportConnectorShape(
         {
             if( nGluePointId != -1 )
             {
-                mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_END_GLUE_POINT, OUString::valueOf( nGluePointId ));
+                mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_END_GLUE_POINT, OUString::number( nGluePointId ));
             }
         }
     }
@@ -1724,7 +1724,7 @@ void XMLShapeExport::ImpExportPageShape(
             sal_Int32 nPageNumber = 0;
             xPropSet->getPropertyValue(aPageNumberStr) >>= nPageNumber;
             if( nPageNumber )
-                mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_PAGE_NUMBER, OUString::valueOf(nPageNumber));
+                mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_PAGE_NUMBER, OUString::number(nPageNumber));
         }
 
         // a presentation page shape, normally used on notes pages only. If
diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx
index a3b1cc437bcd..b2d6cbb7e864 100644
--- a/xmloff/source/draw/shapeexport3.cxx
+++ b/xmloff/source/draw/shapeexport3.cxx
@@ -437,7 +437,7 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s
     sal_Bool bLightOnOff = false;
     for(sal_Int32 nLamp = 1; nLamp <= 8; nLamp++)
     {
-        aIndexStr = OUString::valueOf( nLamp );
+        aIndexStr = OUString::number( nLamp );
 
         // lightcolor
         aPropName = aColorPropName;
diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx
index 111f0151a222..472d6ae732cd 100644
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -99,7 +99,7 @@ void ExportParameter( OUStringBuffer& rStrBuffer, const com::sun::star::drawing:
             case com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT :
             {
                 rStrBuffer.append( (sal_Unicode)'$' );
-                rStrBuffer.append( OUString::valueOf( nValue ) );
+                rStrBuffer.append( OUString::number( nValue ) );
             }
             break;
 
@@ -128,7 +128,7 @@ void ExportParameter( OUStringBuffer& rStrBuffer, const com::sun::star::drawing:
             case com::sun::star::drawing::EnhancedCustomShapeParameterType::LOGHEIGHT :
                 rStrBuffer.append( GetXMLToken( XML_LOGHEIGHT ) ); break;
             default :
-                rStrBuffer.append( OUString::valueOf( nValue ) );
+                rStrBuffer.append( OUString::number( nValue ) );
         }
     }
 }
@@ -139,7 +139,7 @@ void ImpExportEquations( SvXMLExport& rExport, const uno::Sequence< OUString >&
     for ( i = 0; i < rEquations.getLength(); i++ )
     {
         OUString aStr(static_cast<sal_Unicode>('f'));
-        aStr += OUString::valueOf( i );
+        aStr += OUString::number( i );
         rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aStr );
 
         aStr = rEquations[ i ];
@@ -619,7 +619,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean
                                     {
                                         sal_Int32 nExtrusionNumberOfLineSegments = 0;
                                         if ( rProp.Value >>= nExtrusionNumberOfLineSegments )
-                                            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_NUMBER_OF_LINE_SEGMENTS, OUString::valueOf( nExtrusionNumberOfLineSegments ) );
+                                            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_NUMBER_OF_LINE_SEGMENTS, OUString::number( nExtrusionNumberOfLineSegments ) );
                                     }
                                     break;
                                     case EAS_LightFace :
@@ -1020,14 +1020,14 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean
                                     {
                                         sal_Int32 nStretchPoint = 0;
                                         if ( rProp.Value >>= nStretchPoint )
-                                            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_PATH_STRETCHPOINT_X, OUString::valueOf( nStretchPoint ) );
+                                            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_PATH_STRETCHPOINT_X, OUString::number( nStretchPoint ) );
                                     }
                                     break;
                                     case EAS_StretchY :
                                     {
                                         sal_Int32 nStretchPoint = 0;
                                         if ( rProp.Value >>= nStretchPoint )
-                                            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_PATH_STRETCHPOINT_Y, OUString::valueOf( nStretchPoint ) );
+                                            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_PATH_STRETCHPOINT_Y, OUString::number( nStretchPoint ) );
                                     }
                                     break;
                                     case EAS_TextFrames :
@@ -1251,7 +1251,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape
                     do
                     {
                         sPictureName = sPrefix;
-                        sPictureName += OUString::valueOf( ++nIndex );
+                        sPictureName += OUString::number( ++nIndex );
                         sPictureName += sSuffix;
                     }
                     while( xPictureStorage->hasByName( sPictureName ) );
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 64ac91b9c881..d4ae9adb1975 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -1284,7 +1284,7 @@ void XMLEnhancedCustomShapeContext::EndElement()
                         EquationHashMap::iterator aHashIter( pH->find( aEquationName ) );
                         if ( aHashIter != pH->end() )
                             nIndex = (*aHashIter).second;
-                        aNew += OUString::valueOf( nIndex );
+                        aNew += OUString::number( nIndex );
                         aNew += aEquationIter->copy( nIndexOf + aEquationName.getLength() + 1 );
                         *aEquationIter = aNew;
                     }
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 2981f74d6cda..4aa64f3d6dcd 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -475,7 +475,7 @@ namespace xmloff
         {
             // assemble the new name (suggestion)
             sReturn = sUnnamedName;
-            sReturn += OUString::valueOf(i);
+            sReturn += OUString::number(i);
             // check the existence (this is the bad performance part ....)
             for (pNames = aNames.getConstArray(); pNames<pNamesEnd; ++pNames)
             {
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index 5bf3b982a364..88fc19d395e6 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -480,7 +480,7 @@ namespace xmloff
             OUString sControlId = sControlIdBase;
 
             size_t nKnownControlCount = ::std::accumulate( _rAllPagesControlIds.begin(), _rAllPagesControlIds.end(), (size_t)0, AccumulateSize() );
-            sControlId += OUString::valueOf( (sal_Int32)nKnownControlCount + 1 );
+            sControlId += OUString::number( (sal_Int32)nKnownControlCount + 1 );
 
         #ifdef DBG_UTIL
             // Check if the id is already used. It shouldn't, as we currently have no mechanism for removing entries
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index e48ac2054228..90f4e9c94e37 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -155,8 +155,8 @@ void SvXMLMetaExport::_MExport()
         SvXMLElementExport aElem( mrExport,
                                   XML_NAMESPACE_META, XML_EDITING_CYCLES,
                                   sal_True, sal_False );
-        mrExport.Characters( OUString::valueOf(
-            static_cast<sal_Int32>(mxDocProps->getEditingCycles()) ) );
+        mrExport.Characters( OUString::number(
+            mxDocProps->getEditingCycles() ) );
     }
 
     //  editing duration
@@ -259,7 +259,7 @@ void SvXMLMetaExport::_MExport()
             sal_Int32 nValue = 0;
             if ( aDocStatistic[nInd].Value >>= nValue )
             {
-                OUString aValue = OUString::valueOf( nValue );
+                OUString aValue = OUString::number( nValue );
                 if ( aDocStatistic[nInd].Name == "TableCount" )
                     mrExport.AddAttribute(
                         XML_NAMESPACE_META, XML_TABLE_COUNT, aValue );
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index fc4137dc9a1c..ecf8efab18a4 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -254,7 +254,7 @@ sal_Bool XMLDashStyleExport::exportXML(
             // dots
             if( aLineDash.Dots )
             {
-                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DOTS1, OUString::valueOf( (sal_Int32)aLineDash.Dots ) );
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DOTS1, OUString::number( aLineDash.Dots ) );
 
                 if( aLineDash.DotLen )
                 {
@@ -276,7 +276,7 @@ sal_Bool XMLDashStyleExport::exportXML(
             // dashes
             if( aLineDash.Dashes )
             {
-                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DOTS2, OUString::valueOf( (sal_Int32)aLineDash.Dashes ) );
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DOTS2, OUString::number( aLineDash.Dashes ) );
 
                 if( aLineDash.DashLen )
                 {
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index e02d62f94603..7886b84fae71 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -174,17 +174,17 @@ OUString XMLFontAutoStylePool::Add(
         }
 
         if( sName.isEmpty() )
-            sName = OUString::valueOf( sal_Unicode( 'F' ) );
+            sName = OUString( sal_Unicode( 'F' ) );
 
         if( m_aNames.find(sName) != m_aNames.end() )
         {
             sal_Int32 nCount = 1;
             OUString sPrefix( sName );
-            sName += OUString::valueOf( nCount );
+            sName += OUString::number( nCount );
             while( m_aNames.find(sName) != m_aNames.end() )
             {
                 sName = sPrefix;
-                sName += OUString::valueOf( ++nCount );
+                sName += OUString::number( ++nCount );
             }
         }
 
diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx
index e248491d5452..154505af43fb 100644
--- a/xmloff/source/style/cdouthdl.cxx
+++ b/xmloff/source/style/cdouthdl.cxx
@@ -294,7 +294,7 @@ sal_Bool XMLCrossedOutTextPropHdl::exportXML( OUString& rStrExpValue, const uno:
     if( (rValue >>= nValue) &&
         (awt::FontStrikeout::SLASH == nValue || awt::FontStrikeout::X == nValue) )
     {
-        rStrExpValue = OUString::valueOf(
+        rStrExpValue = OUString(
             static_cast< sal_Unicode>( awt::FontStrikeout::SLASH == nValue ? '/'
                                                                       : 'X' ) );
         bRet = sal_True;
diff --git a/xmloff/source/style/impastp2.cxx b/xmloff/source/style/impastp2.cxx
index 8c6b50d1bd97..74a591da2aaf 100644
--- a/xmloff/source/style/impastp2.cxx
+++ b/xmloff/source/style/impastp2.cxx
@@ -36,7 +36,7 @@ XMLAutoStylePoolProperties::XMLAutoStylePoolProperties( XMLAutoStyleFamily& rFam
     {
         rFamilyData.mnName++;
         sBuffer.append( rFamilyData.maStrPrefix );
-        sBuffer.append( OUString::valueOf( (sal_Int32)rFamilyData.mnName ) );
+        sBuffer.append( OUString::number( rFamilyData.mnName ) );
         msName = sBuffer.makeStringAndClear();
     }
     while (rFamilyData.maNameList.find(msName) != rFamilyData.maNameList.end());
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 61d36b1b9040..466331671809 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -505,7 +505,7 @@ void SvXMLNumFmtExport::WriteRepeatedElement_Impl( sal_Unicode nChar )
     FinishTextElement_Impl();
     SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_FILL_CHARACTER,
                                   sal_True, sal_False );
-    rExport.Characters( OUString::valueOf( nChar ) );
+    rExport.Characters( OUString( nChar ) );
 }
 
 void SvXMLNumFmtExport::WriteSecondsElement_Impl( sal_Bool bLong, sal_uInt16 nDecimals )
@@ -516,7 +516,7 @@ void SvXMLNumFmtExport::WriteSecondsElement_Impl( sal_Bool bLong, sal_uInt16 nDe
     if ( nDecimals > 0 )
     {
         rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_DECIMAL_PLACES,
-                              OUString::valueOf( (sal_Int32) nDecimals ) );
+                              OUString::number(  nDecimals ) );
     }
 
     SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_SECONDS,
@@ -545,14 +545,14 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl(
     if ( nDecimals >= 0 )   // negative = automatic
     {
         rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_DECIMAL_PLACES,
-                              OUString::valueOf( nDecimals ) );
+                              OUString::number( nDecimals ) );
     }
 
     //  integer digits
     if ( nInteger >= 0 )    // negative = automatic
     {
         rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_MIN_INTEGER_DIGITS,
-                              OUString::valueOf( nInteger ) );
+                              OUString::number( nInteger ) );
     }
 
     //  decimal replacement (dashes) or variable decimals (#)
@@ -592,7 +592,7 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl(
 
         //  position attribute
         rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_POSITION,
-                                OUString::valueOf( pObj->nFormatPos ) );
+                                OUString::number( pObj->nFormatPos ) );
         SvXMLElementExport aChildElem( rExport, XML_NAMESPACE_NUMBER, XML_EMBEDDED_TEXT,
                                           sal_True, sal_False );
 
@@ -620,14 +620,14 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl(
     if ( nDecimals >= 0 )   // negative = automatic
     {
         rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_DECIMAL_PLACES,
-                              OUString::valueOf( nDecimals ) );
+                              OUString::number( nDecimals ) );
     }
 
     //  integer digits
     if ( nInteger >= 0 )    // negative = automatic
     {
         rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_MIN_INTEGER_DIGITS,
-                              OUString::valueOf( nInteger ) );
+                              OUString::number( nInteger ) );
     }
 
     //  (automatic) grouping separator
@@ -640,7 +640,7 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl(
     if ( nExp >= 0 )
     {
         rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_MIN_EXPONENT_DIGITS,
-                              OUString::valueOf( nExp ) );
+                              OUString::number( nExp ) );
     }
 
     SvXMLElementExport aElem( rExport,
@@ -658,7 +658,7 @@ void SvXMLNumFmtExport::WriteFractionElement_Impl(
     if ( nInteger >= 0 )        // negative = default (no integer part)
     {
         rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_MIN_INTEGER_DIGITS,
-                              OUString::valueOf( nInteger ) );
+                              OUString::number( nInteger ) );
     }
 
     //  (automatic) grouping separator
@@ -671,20 +671,20 @@ void SvXMLNumFmtExport::WriteFractionElement_Impl(
     if ( nNumeratorDigits >= 0 )
     {
         rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_MIN_NUMERATOR_DIGITS,
-                                 OUString::valueOf( nNumeratorDigits ) );
+                                 OUString::number( nNumeratorDigits ) );
     }
 
     if ( nDenominator )
     {
         rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_DENOMINATOR_VALUE,
-                              OUString::valueOf( nDenominator) );
+                              OUString::number( nDenominator) );
     }
     //  I guess it's not necessary to export nDenominatorDigits
     //  if we have a forced denominator ( remove ? )
     if ( nDenominatorDigits >= 0 )
     {
         rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_MIN_DENOMINATOR_DIGITS,
-                              OUString::valueOf( nDenominatorDigits ) );
+                              OUString::number( nDenominatorDigits ) );
     }
 
     SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_FRACTION,
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 601771e020f8..99a7ecc7df3a 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -1203,7 +1203,7 @@ void SvXMLNumFmtElementContext::EndElement()
                 rParent.AddToCode( (sal_Unicode)'/' );
                 if ( aNumInfo.nFracDenominator > 0 )
                 {
-                    rParent.AddToCode(  OUString::valueOf( aNumInfo.nFracDenominator ) );
+                    rParent.AddToCode(  OUString::number( aNumInfo.nFracDenominator ) );
                 }
                 else
                 {
@@ -1394,7 +1394,7 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
             {
                 aFormatCode.append( "][$-" );
                 // language code in upper hex:
-                aFormatCode.append(OUString::valueOf(sal_Int32(eLang), 16).toAsciiUpperCase());
+                aFormatCode.append(OUString::number(eLang, 16).toAsciiUpperCase());
             }
             aFormatCode.append( sal_Unicode(']') );
         }
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 84792c7e536d..9f1d64a7cd15 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -418,11 +418,11 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates )
 
     // table:number-columns-spanned
     if( nColSpan > 1 )
-        mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED, OUString::valueOf( nColSpan ) );
+        mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED, OUString::number( nColSpan ) );
 
     // table:number-rows-spanned
     if( nRowSpan > 1 )
-        mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED, OUString::valueOf( nRowSpan ) );
+        mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED, OUString::number( nRowSpan ) );
 
      // <table:table-cell> or <table:covered-table-cell>
     SvXMLElementExport tableCellElement( mrExport, XML_NAMESPACE_TABLE, bIsMerged ? XML_COVERED_TABLE_CELL : XML_TABLE_CELL, sal_True, sal_True );
diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx
index f5f763dfe752..236f0f7951b1 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -1521,7 +1521,7 @@ void XMLSectionExport::ExportIndexTemplateElement(
 //---> i53420
             if (bLevelOK)
                 GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL,
-                                     OUString::valueOf((sal_Int32)nLevel));
+                                     OUString::number(nLevel));
         }
 
 //--->i53420
@@ -1534,7 +1534,7 @@ void XMLSectionExport::ExportIndexTemplateElement(
 
             if (bLevelOK)
                 GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL,
-                                     OUString::valueOf((sal_Int32)nLevel));
+                                     OUString::number(nLevel));
         }
         // export template
         SvXMLElementExport aTemplateElement(GetExport(), XML_NAMESPACE_TEXT,
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index dfaa7c2f6410..4888f07881c1 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -571,7 +571,7 @@ void XMLTextFrameContext_Impl::Create( sal_Bool /*bHRefOrBase64*/ )
             while( xTextImportHelper->HasFrameByName( sName ) )
             {
                 sName = sOldName;
-                sName += OUString::valueOf( ++i );
+                sName += OUString::number( ++i );
             }
             xNamed->setName( sName );
             if( sName != sOldName )
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 2adbfafc9953..a1e080bf3615 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -2560,7 +2560,7 @@ void XMLTextFieldExport::ProcessInteger(enum XMLTokenEnum eName,
         return;
 
     GetExport().AddAttribute(XML_NAMESPACE_TEXT, eName,
-                             OUString::valueOf(nNum));
+                             OUString::number(nNum));
 }
 
 /// export an integer attribute, omit if default
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index bba2e717be45..1c35a54fcfaa 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
@@ -234,7 +234,7 @@ OUString XMLTextListsHelper::GenerateNewListId() const
     n += Date( Date::SYSTEM ).GetDate();
     n += rand();
     // Value of xml:id in element <text:list> has to be a valid ID type (#i92478#)
-    sTmpStr += OUString::valueOf( n );
+    sTmpStr += OUString::number( n );
 
     OUString sNewListId( sTmpStr );
     if ( mpProcessedLists != 0 )
@@ -244,7 +244,7 @@ OUString XMLTextListsHelper::GenerateNewListId() const
         {
             ++nHitCount;
             sNewListId = sTmpStr;
-            sNewListId += OUString::valueOf( nHitCount );
+            sNewListId += OUString::number( nHitCount );
         }
     }
 
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 7dc6bd6558a3..eac056cf22e0 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2323,7 +2323,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
                         if (sName.isEmpty())
                         {   // name attribute is mandatory, so have to pull a
                             // rabbit out of the hat here
-                            sName = sFieldMarkName + OUString::valueOf(
+                            sName = sFieldMarkName + OUString::number(
                                     m_pImpl->AddFieldMarkStart(xFormField));
                         }
                         GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME,
@@ -2382,7 +2382,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
                         if (sName.isEmpty())
                         {   // name attribute is mandatory, so have to pull a
                             // rabbit out of the hat here
-                            sName = sFieldMarkName + OUString::valueOf(
+                            sName = sFieldMarkName + OUString::number(
                                 m_pImpl->GetFieldMarkIndex(xFormField));
                         }
                         GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME,
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index f837a561ffff..c000917e4262 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -395,7 +395,7 @@ XMLSequenceFieldImportContext::XMLSequenceFieldImportContext(
 
         sPropertyNumberFormat(sAPI_number_format),
         sPropertySequenceValue(sAPI_sequence_value),
-        sNumFormat(OUString::valueOf(sal_Unicode('1'))),
+        sNumFormat(OUString(sal_Unicode('1'))),
         sNumFormatSync(GetXMLToken(XML_FALSE)),
         bRefNameOK(sal_False)
 {
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index 333b5d174b03..628b223fd25f 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -1422,7 +1422,7 @@ void XMLTabStopOASISTContext_Impl::StartElement(
                             XML_NAMESPACE_STYLE,
                             ::xmloff::token::GetXMLToken( XML_LEADER_CHAR ) ) );
             pMutableAttrList->AddAttribute( aNewAttrQName,
-                                    OUString::valueOf( cStyleLeaderChar ) );
+                                    OUString( cStyleLeaderChar ) );
         }
     }
     else
@@ -1521,7 +1521,7 @@ void XMLConfigItemTContext_Impl::Characters( const OUString& rChars )
         else if (m_bIsCursorY && nPos > 31999)
             nPos = 31999;
 
-        sChars = OUString::valueOf(nPos);
+        sChars = OUString::number(nPos);
     }
 
     XMLTransformerContext::Characters( sChars );
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index db8fbe3a3853..a8d817f577ae 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -322,7 +322,7 @@ void XMLPropertiesTContext_Impl::StartElement(
                             GetTransformer().GetNamespaceMap().GetQNameByKey(
                                 XML_NAMESPACE_CHART,
                                 GetXMLToken( XML_SPLINES )),
-                            OUString::valueOf( nSplineType ));
+                            OUString::number( nSplineType ));
                     }
                     break;
                 case XML_OPTACTION_INTERVAL_MAJOR:
@@ -350,7 +350,7 @@ void XMLPropertiesTContext_Impl::StartElement(
                                 GetTransformer().GetNamespaceMap().GetQNameByKey(
                                     XML_NAMESPACE_CHART,
                                     GetXMLToken( XML_SYMBOL )),
-                                OUString::valueOf( nSymbolType ));
+                                OUString::number( nSymbolType ));
                     }
                     break;
                 case XML_OPTACTION_SYMBOL_NAME:
@@ -394,7 +394,7 @@ void XMLPropertiesTContext_Impl::StartElement(
                                 GetTransformer().GetNamespaceMap().GetQNameByKey(
                                     XML_NAMESPACE_CHART,
                                     GetXMLToken( XML_SYMBOL )),
-                                OUString::valueOf( nSymbolType ));
+                                OUString::number( nSymbolType ));
                     }
                     break;
                 // #i25616#
@@ -532,7 +532,7 @@ void XMLPropertiesTContext_Impl::StartElement(
                         sal_Int32 nValue;
                         ::sax::Converter::convertPercent( nValue, rAttrValue );
                         const double fValue = ((double)nValue) / 100.0;
-                        pAttrList->AddAttribute( rAttrName, OUString::valueOf( fValue ) );
+                        pAttrList->AddAttribute( rAttrName, OUString::number( fValue ) );
                     }
                     break;
                 case XML_ATACTION_OPACITY_FIX:
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index 26f30cf27fbb..4f39cc3e93d2 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -341,7 +341,7 @@ XMLTypedPropertiesOOoTContext_Impl
             GetTransformer().GetNamespaceMap().GetPrefixByKey( nPrefix );
         aTmp += OString( rPrefix.getStr(), rPrefix.getLength(),
                                 RTL_TEXTENCODING_ASCII_US );
-        aTmp += OString::valueOf( ':' );
+        aTmp += OString( ':' );
         aTmp += OString( rLocalName.getStr(), rLocalName.getLength(),
                                 RTL_TEXTENCODING_ASCII_US );
         aTmp += OString(", assuming <style:");
@@ -349,7 +349,7 @@ XMLTypedPropertiesOOoTContext_Impl
             ::xmloff::token::GetXMLToken( aPropTokens[m_aPropTypes[0]] );
         aTmp += OString( rName.getStr(), rName.getLength(),
                                 RTL_TEXTENCODING_ASCII_US );
-        aTmp += OString::valueOf( '>' );
+        aTmp += OString( '>' );
 
         OSL_FAIL(aTmp.getStr());
     }
@@ -667,7 +667,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
                             GetTransformer().GetNamespaceMap().GetQNameByKey(
                                 XML_NAMESPACE_STYLE,
                                 GetXMLToken( XML_TEXT_LINE_THROUGH_TEXT ) ),
-                            OUString::valueOf( c ) );
+                            OUString( c ) );
             }
             break;
         case XML_PTACTION_SPLINES:
@@ -990,7 +990,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
         if( bMoveProtect && -1 == aProtectAttrValue.indexOf( rPosition ) )
         {
             if( !aProtectAttrValue.isEmpty() )
-                aProtectAttrValue += OUString::valueOf( sal_Unicode( ' ' ) );
+                aProtectAttrValue += OUString( sal_Unicode( ' ' ) );
             aProtectAttrValue += rPosition;
         }
 
@@ -998,7 +998,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
         if( bSizeProtect && -1 == aProtectAttrValue.indexOf( rSize ) )
         {
             if( !aProtectAttrValue.isEmpty() )
-                aProtectAttrValue += OUString::valueOf( sal_Unicode( ' ' ) );
+                aProtectAttrValue += OUString( sal_Unicode( ' ' ) );
             aProtectAttrValue += rSize;
         }
 
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 6863a5ea70dd..e93d04adc560 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -1376,7 +1376,7 @@ sal_Bool XMLTransformerBase::ConvertURIToOOo( OUString& rURI,
 
         if( bPackage && bSupportPackage )
         {
-            OUString sTmp( OUString::valueOf( sal_Unicode( '#' ) ) );
+            OUString sTmp( OUString( sal_Unicode( '#' ) ) );
             if( rURI.startsWith( "./" ) )
                 rURI = rURI.copy( 2 );
             sTmp += rURI;
diff --git a/xmlscript/source/xmldlg_imexp/exp_share.hxx b/xmlscript/source/xmldlg_imexp/exp_share.hxx
index eb94eff82b72..bd3aacc13f1f 100644
--- a/xmlscript/source/xmldlg_imexp/exp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/exp_share.hxx
@@ -124,8 +124,7 @@ public:
         OUString const & rPropName, OUString const & rAttrName )
         { read<sal_Int32>( rPropName, rAttrName ); }
     inline void readBoolAttr(
-        OUString const & rPropName, OUString const & rAttrName )
-        { read<sal_Bool>( rPropName, rAttrName ); }
+        OUString const & rPropName, OUString const & rAttrName );
 
     void readAlignAttr(
         OUString const & rPropName, OUString const & rAttrName );
@@ -157,7 +156,7 @@ public:
         OUString const & rAttrName );
     inline void addBoolAttr(
         OUString const & rAttrName, sal_Bool bValue )
-        { addAttribute( rAttrName, OUString::valueOf(bValue) ); }
+        { addAttribute( rAttrName, OUString::boolean(bValue) ); }
     void addNumberFormatAttr(
         css::uno::Reference< css::beans::XPropertySet >
         const & xFormatProperties );
@@ -231,12 +230,36 @@ inline void ElementDescriptor::read(
         css::uno::Any a( _xProps->getPropertyValue( propName ) );
         T v = T();
         if (a >>= v)
-            addAttribute( attrName, OUString::valueOf(v) );
+            addAttribute( attrName, OUString::number(v) );
         else
             OSL_FAIL( "### unexpected property type!" );
     }
 }
 
+template<>
+inline void ElementDescriptor::read<sal_Bool>(
+    OUString const & propName, OUString const & attrName,
+    bool forceAttribute )
+{
+    if (forceAttribute ||
+        css::beans::PropertyState_DEFAULT_VALUE !=
+        _xPropState->getPropertyState( propName ))
+    {
+        css::uno::Any a( _xProps->getPropertyValue( propName ) );
+        sal_Bool v = sal_Bool();
+        if (a >>= v)
+            addAttribute( attrName, OUString::boolean(v) );
+        else
+            OSL_FAIL( "### unexpected property type!" );
+    }
+}
+
+inline void ElementDescriptor::readBoolAttr(
+    OUString const & rPropName, OUString const & rAttrName )
+{
+    read<sal_Bool>( rPropName, rAttrName );
+}
+
 template<typename T>
 inline bool ElementDescriptor::readProp(
     T * ret, OUString const & rPropName )
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index fecf2a1b0d69..00d575ef8075 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -893,7 +893,7 @@ void ElementDescriptor::readFormattedFieldModel( StyleBag * all_styles )
     switch (a.getValueTypeClass())
     {
     case TypeClass_DOUBLE:
-        addAttribute( XMLNS_DIALOGS_PREFIX ":value-default", OUString::valueOf( *(double const *)a.getValue() ) );
+        addAttribute( XMLNS_DIALOGS_PREFIX ":value-default", OUString::number( *(double const *)a.getValue() ) );
         break;
     case TypeClass_STRING:
         addAttribute( XMLNS_DIALOGS_PREFIX ":value-default", *(OUString const *)a.getValue() );
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index 0f7c5b02b01e..5eef0f3465e3 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -158,12 +158,12 @@ Reference< xml::sax::XAttributeList > Style::createElement()
         // dialog:font-height %numeric; #IMPLIED
         if (def_descr.Height != _descr.Height)
         {
-            pStyle->addAttribute( XMLNS_DIALOGS_PREFIX ":font-height", OUString::valueOf( (sal_Int32)_descr.Height ) );
+            pStyle->addAttribute( XMLNS_DIALOGS_PREFIX ":font-height", OUString::number( _descr.Height ) );
         }
         // dialog:font-width %numeric; #IMPLIED
         if (def_descr.Width != _descr.Width)
         {
-            pStyle->addAttribute( XMLNS_DIALOGS_PREFIX ":font-width", OUString::valueOf( (sal_Int32)_descr.Width ) );
+            pStyle->addAttribute( XMLNS_DIALOGS_PREFIX ":font-width", OUString::number( _descr.Width ) );
         }
         // dialog:font-stylename CDATA #IMPLIED
         if (def_descr.StyleName != _descr.StyleName)
@@ -257,12 +257,12 @@ Reference< xml::sax::XAttributeList > Style::createElement()
         // dialog:font-charwidth CDATA #IMPLIED
         if (def_descr.CharacterWidth != _descr.CharacterWidth)
         {
-            pStyle->addAttribute( XMLNS_DIALOGS_PREFIX ":font-charwidth", OUString::valueOf( (float)_descr.CharacterWidth ) );
+            pStyle->addAttribute( XMLNS_DIALOGS_PREFIX ":font-charwidth", OUString::number( (float)_descr.CharacterWidth ) );
         }
         // dialog:font-weight CDATA #IMPLIED
         if (def_descr.Weight != _descr.Weight)
         {
-            pStyle->addAttribute( XMLNS_DIALOGS_PREFIX ":font-weight", OUString::valueOf( (float)_descr.Weight ) );
+            pStyle->addAttribute( XMLNS_DIALOGS_PREFIX ":font-weight", OUString::number( (float)_descr.Weight ) );
         }
         // dialog:font-slant "(oblique|italic|reverse_oblique|reverse_italic)" #IMPLIED
         if (def_descr.Slant != _descr.Slant)
@@ -375,7 +375,7 @@ Reference< xml::sax::XAttributeList > Style::createElement()
         // dialog:font-orientation CDATA #IMPLIED
         if (def_descr.Orientation != _descr.Orientation)
         {
-            pStyle->addAttribute( XMLNS_DIALOGS_PREFIX ":font-orientation", OUString::valueOf( (float)_descr.Orientation ) );
+            pStyle->addAttribute( XMLNS_DIALOGS_PREFIX ":font-orientation", OUString::number( (float)_descr.Orientation ) );
         }
         // dialog:font-kerning %boolean; #IMPLIED
         if ((def_descr.Kerning != sal_False) != (_descr.Kerning != sal_False))
@@ -587,7 +587,7 @@ void ElementDescriptor::readDateAttr( OUString const & rPropName, OUString const
             if (a >>= aUDate)
             {
                 ::Date aTDate(aUDate);
-                addAttribute( rAttrName, OUString::valueOf( static_cast<sal_Int32>(aTDate.GetDate()) ) );
+                addAttribute( rAttrName, OUString::number( aTDate.GetDate() ) );
             }
             else
                 OSL_FAIL( "### internal error" );
@@ -608,7 +608,7 @@ void ElementDescriptor::readTimeAttr( OUString const & rPropName, OUString const
             if (a >>= aUTime)
             {
                 ::Time aTTime(aUTime);
-                addAttribute( rAttrName, OUString::valueOf( aTTime.GetTime() / ::Time::nanoPerCenti ) );
+                addAttribute( rAttrName, OUString::number( aTTime.GetTime() / ::Time::nanoPerCenti ) );
             }
             else
                 OSL_FAIL( "### internal error" );
@@ -1071,22 +1071,22 @@ void ElementDescriptor::readDefaults( bool supportPrintable, bool supportVisible
     a = _xProps->getPropertyValue( "PositionX" );
     if (a.getValueTypeClass() == TypeClass_LONG)
     {
-        addAttribute( XMLNS_DIALOGS_PREFIX ":left", OUString::valueOf( *(sal_Int32 const *)a.getValue() ) );
+        addAttribute( XMLNS_DIALOGS_PREFIX ":left", OUString::number( *(sal_Int32 const *)a.getValue() ) );
     }
     a = _xProps->getPropertyValue( "PositionY" );
     if (a.getValueTypeClass() == TypeClass_LONG)
     {
-        addAttribute( XMLNS_DIALOGS_PREFIX ":top", OUString::valueOf( *(sal_Int32 const *)a.getValue() ) );
+        addAttribute( XMLNS_DIALOGS_PREFIX ":top", OUString::number( *(sal_Int32 const *)a.getValue() ) );
     }
     a = _xProps->getPropertyValue( "Width" );
     if (a.getValueTypeClass() == TypeClass_LONG)
     {
-        addAttribute( XMLNS_DIALOGS_PREFIX ":width", OUString::valueOf( *(sal_Int32 const *)a.getValue() ) );
+        addAttribute( XMLNS_DIALOGS_PREFIX ":width", OUString::number( *(sal_Int32 const *)a.getValue() ) );
     }
     a = _xProps->getPropertyValue( "Height" );
     if (a.getValueTypeClass() == TypeClass_LONG)
     {
-        addAttribute( XMLNS_DIALOGS_PREFIX ":height", OUString::valueOf( *(sal_Int32 const *)a.getValue() ) );
+        addAttribute( XMLNS_DIALOGS_PREFIX ":height", OUString::number( *(sal_Int32 const *)a.getValue() ) );
     }
 
     if (supportPrintable)
@@ -1303,7 +1303,7 @@ OUString StyleBag::getStyleId( Style const & rStyle )
 
     // no appr style found, append new
     Style * pStyle = new Style( rStyle );
-    pStyle->_id = OUString::valueOf( (sal_Int32)_styles.size() );
+    pStyle->_id = OUString::number( _styles.size() );
     _styles.push_back( pStyle );
     return pStyle->_id;
 }
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index a667cad7ef77..1f7c4f754394 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -267,7 +267,7 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif
     OUString                aDetails;
     // Certificate Versions are reported wrong (#i35107#) - 0 == "V1", 1 == "V2", ..., n = "V(n+1)"
     aLBEntry = OUString( "V" );
-    aLBEntry += OUString::valueOf( sal_Int32( xCert->getVersion() + 1 ) );
+    aLBEntry += OUString::number( xCert->getVersion() + 1 );
     InsertElement( XMLSEC_RES( STR_VERSION ), aLBEntry, aLBEntry );
     Sequence< sal_Int8 >    aSeq = xCert->getSerialNumber();
     aLBEntry = XmlSec::GetHexString( aSeq, pHexSep );
diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx
index bfdedf1b2ffe..64a5a516a5bf 100644
--- a/xmlsecurity/source/framework/buffernode.cxx
+++ b/xmlsecurity/source/framework/buffernode.cxx
@@ -252,7 +252,7 @@ OUString BufferNode::printChildren() const
     for( ; ii != m_vElementCollectors.end() ; ++ii )
     {
         rc += OUString( "BufID=" );
-        rc += OUString::valueOf((*ii)->getBufferId());
+        rc += OUString::number((*ii)->getBufferId());
 
         if (((ElementCollector*)(*ii))->getModify())
         {
@@ -276,7 +276,7 @@ OUString BufferNode::printChildren() const
 
         rc += OUString( "(" );
         rc += OUString( "SecID=" );
-        rc += OUString::valueOf(((ElementCollector*)(*ii))->getSecurityId());
+        rc += OUString::number(((ElementCollector*)(*ii))->getSecurityId());
         rc += OUString( ")" );
         rc += OUString( " " );
     }
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index 4ff3b0f9dc53..afe98c50715f 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -379,9 +379,9 @@ OUString SAXEventKeeperImpl::printBufferNode(
     ElementMark * pBlocker = pBufferNode->getBlocker();
     if (pBlocker != NULL)
     {
-        rc += OUString::valueOf( pBlocker->getBufferId() );
+        rc += OUString::number( pBlocker->getBufferId() );
         rc += OUString( "(SecId=" );
-        rc += OUString::valueOf( pBlocker->getSecurityId() );
+        rc += OUString::number( pBlocker->getSecurityId() );
         rc += OUString( ")" );
         rc += OUString( " " );
     }
@@ -1057,7 +1057,7 @@ OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree()
     OUString rc;
 
     rc += OUString( "ElementMarkBuffers: size = " );
-    rc += OUString::valueOf((sal_Int32)m_vElementMarkBuffers.size());
+    rc += OUString::number(m_vElementMarkBuffers.size());
     rc += OUString( "\nCurrentBufferNode: " );
     rc += m_xXMLDocument->getNodeName(m_pCurrentBufferNode->getXMLElement());
     rc += OUString( "\n" );
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index 4fbfb40b2864..b7660d9347c0 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -82,9 +82,9 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
     cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY);
 
     cssu::Sequence<cssu::Any> args(5);
-    args[0] = cssu::makeAny(OUString::valueOf(nSecurityId));
+    args[0] = cssu::makeAny(OUString::number(nSecurityId));
     args[1] = cssu::makeAny(m_xSAXEventKeeper);
-    args[2] = cssu::makeAny(OUString::valueOf(nIdOfSignatureElementCollector));
+    args[2] = cssu::makeAny(OUString::number(nIdOfSignatureElementCollector));
 
     //i39448 : for nss, the internal module is used for signing, which needs to be improved later
     sal_Int32 nEnvIndex = internalSignatureInfor.signatureInfor.nSecurityEnvironmentIndex;
diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx
index 67d5b2fd6b42..10fdd16bf0a5 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -68,9 +68,9 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
     cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY);
 
     cssu::Sequence<cssu::Any> args(5);
-    args[0] = cssu::makeAny(OUString::valueOf(nSecurityId));
+    args[0] = cssu::makeAny(OUString::number(nSecurityId));
     args[1] = cssu::makeAny(m_xSAXEventKeeper);
-    args[2] = cssu::makeAny(OUString::valueOf(nIdOfSignatureElementCollector));
+    args[2] = cssu::makeAny(OUString::number(nIdOfSignatureElementCollector));
     args[3] = cssu::makeAny(m_xSecurityContext);
     args[4] = cssu::makeAny(m_xXMLSignature);
     xInitialization->initialize(args);
author	Luboš Luňák <l.lunak@suse.cz>	2013-08-21 15:07:31 +0200
committer	Luboš Luňák <l.lunak@suse.cz>	2013-08-21 15:10:35 +0200
commit	64b993e046f23baaacaff1572b7d2a816588b5ef (patch)
tree	237dce36a1d4787d168a0520839f6aab22500487
parent	75f41baab6ce75786a91fe461835ee16a23ec18e (diff)