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

13 files changed, 70 insertions, 70 deletions

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(