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

16 files changed, 186 insertions, 186 deletions

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;