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, 23 insertions, 23 deletions

diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index a8d32fa66f05..15d80947b54d 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -2942,7 +2942,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
                 OUString sMessage(
                     OUString(
                         OUString(ModuleRes(RID_STR_UNSUPPORTED_OBJECT_TYPE))).
-                    replaceFirst("$type$", OUString::valueOf(sal_Int32(pObject->Type))));
+                    replaceFirst("$type$", OUString::number(pObject->Type)));
                 throw IllegalArgumentException(sMessage, *this, sal_Int16( pObject - aSelectedObjects.getConstArray() ));
             }
         }
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 67bd3736b2e7..2b2a9f77dbb0 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -602,7 +602,7 @@ void OGenericUnoController::InvalidateFeature_Impl()
             if ( m_aSupportedFeatures.end() == aFeaturePos )
             {
                 OString sMessage( "OGenericUnoController::InvalidateFeature_Impl: feature id " );
-                sMessage += OString::valueOf( aNextFeature.nId );
+                sMessage += OString::number( aNextFeature.nId );
                 sMessage += OString( " has been invalidated, but is not supported!" );
                 SAL_WARN("dbaccess.ui", sMessage.getStr() );
             }
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index aee6df61a43b..b318b97b7d8e 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -526,7 +526,7 @@ String OFieldDescControl::GetControlText( sal_uInt16 nControlId )
             break;
         case FIELD_PROPERTY_TEXTLEN:
             if (pTextLen)
-                return OUString::valueOf(static_cast<sal_Int64>(pTextLen->GetValue()));
+                return OUString::number(pTextLen->GetValue());
         case FIELD_PROPERTY_NUMTYPE:
             if (pNumType)
                 return pNumType->GetSelectEntry();
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 3b52da5bd7ab..ed8c3e29fdaf 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -894,7 +894,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             if (bFolderExists == sal_True)
             {
                 i++;
-                pURL->setName(sLastSegmentName.concat(OUString::valueOf(i)));
+                pURL->setName(sLastSegmentName.concat(OUString::number(i)));
             }
         }
     }
@@ -913,7 +913,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             bElementExists = xSimpleFileAccess->exists( aExistenceCheck.GetMainURL( INetURLObject::NO_DECODE ) );
             if ( bElementExists )
             {
-                aExistenceCheck.setBase( BaseName.concat( OUString::valueOf( i ) ) );
+                aExistenceCheck.setBase( BaseName.concat( OUString::number( i ) ) );
                 ++i;
             }
         }
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 8d2cd7defcc6..58799dee088a 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -656,12 +656,12 @@ void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName)
         while(m_aDestColumns.find(sName) != m_aDestColumns.end())
         {
             sName = aAlias;
-            sName += OUString::valueOf(++nPos);
+            sName += OUString::number(++nPos);
             if(nMaxNameLen && sName.getLength() > nMaxNameLen)
             {
                 aAlias = aAlias.copy(0,::std::min<sal_Int32>( nMaxNameLen-nCount, aAlias.getLength() ));
                 sName = aAlias;
-                sName += OUString::valueOf(nPos);
+                sName += OUString::number(nPos);
                 ++nCount;
             }
         }
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index b3d88ae23915..53d45f81adcc 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -810,11 +810,11 @@ void OHTMLImportExport::WriteTables()
     aStrOut = aStrOut + " ";
     aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cellspacing;
     aStrOut = aStrOut + "=";
-    aStrOut = aStrOut + OString::valueOf((sal_Int32)nCellSpacing);
+    aStrOut = aStrOut + OString::number(nCellSpacing);
     aStrOut = aStrOut + " ";
     aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cols;
     aStrOut = aStrOut + "=";
-    aStrOut = aStrOut + OString::valueOf(aNames.getLength());
+    aStrOut = aStrOut + OString::number(aNames.getLength());
     aStrOut = aStrOut + " ";
     aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_border;
     aStrOut = aStrOut + "=1";
@@ -964,12 +964,12 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I
     aStrTD = aStrTD + " ";
     aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_width;
     aStrTD = aStrTD + "=";
-    aStrTD = aStrTD + OString::valueOf((sal_Int32)nWidthPixel);
+    aStrTD = aStrTD + OString::number(nWidthPixel);
     // line height
     aStrTD = aStrTD + " ";
     aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_height;
     aStrTD = aStrTD + "=";
-    aStrTD = aStrTD + OString::valueOf((sal_Int32)nHeightPixel);
+    aStrTD = aStrTD + OString::number(nHeightPixel);
 
     aStrTD = aStrTD + " ";
     aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_align;
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index f27844576089..81e3fb2a13ec 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -1485,12 +1485,12 @@ OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor&   _rCmpFu
 
             OUString sName(sAlias);
             sal_Int32 nPos = 1;
-            sName += OUString::valueOf(nPos);
+            sName += OUString::number(nPos);
 
             while(_rCmpFunctor(sName))
             {
                 sName = sAlias;
-                sName += OUString::valueOf(++nPos);
+                sName += OUString::number(++nPos);
             }
             sAlias = sName;
             // we have to check again, it could happen that the name is already to long
@@ -1634,7 +1634,7 @@ OUString OCopyTableWizard::createUniqueName(const OUString& _sName)
             while(m_vSourceColumns.find(sName) != m_vSourceColumns.end())
             {
                 sName = _sName;
-                sName += OUString::valueOf(++nPos);
+                sName += OUString::number(++nPos);
             }
         }
     }
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 31c939058c26..20e976d70197 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -440,7 +440,7 @@ void OJoinController::saveTableWindows( ::comphelper::NamedValueCollection& o_rV
             aWindowData.put( "WindowHeight", static_cast<sal_Int32>((*aIter)->GetSize().Height()) );
             aWindowData.put( "ShowAll", (*aIter)->IsShowAll() );
 
-            const OUString sTableName( OUString( "Table" ) + OUString::valueOf( i ) );
+            const OUString sTableName( OUString( "Table" ) + OUString::number( i ) );
             aAllTablesData.put( sTableName, aWindowData.getPropertyValues() );
         }
 
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 3e890c8550cf..928245ab9c73 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -103,7 +103,7 @@ sal_Bool OQueryTableWindow::Init()
     if (pContainer->CountTableAlias(sAliasName, m_nAliasNum))
     {
         sAliasName += OUString('_');
-        sAliasName += OUString::valueOf(m_nAliasNum);
+        sAliasName += OUString::number(m_nAliasNum);
     }
 
 
diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
index 020e5d07eb0f..a36b9f777731 100644
--- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
+++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
@@ -216,7 +216,7 @@ void OTableFieldDesc::Save( ::comphelper::NamedValueCollection& o_rSettings, con
                     ++crit, ++c
                 )
             {
-                aCriteria[c].Name = OUString( "Criterion_" ) + OUString::valueOf( c );
+                aCriteria[c].Name = OUString( "Criterion_" ) + OUString::number( c );
                 aCriteria[c].Value <<= *crit;
             }
 
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 82c1422c12ae..fdeac5a1f35a 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -1106,7 +1106,7 @@ OUString OQueryController::getPrivateTitle( ) const
             ::osl::MutexGuard aGuard( getMutex() );
             String aDefaultName = String( ModuleRes( editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE ) );
             sName = aDefaultName.GetToken(0,' ');
-            sName += OUString::valueOf(getCurrentStartNumber());
+            sName += OUString::number(getCurrentStartNumber());
         }
     }
     return sName;
@@ -1243,7 +1243,7 @@ void OQueryController::saveViewSettings( ::comphelper::NamedValueCollection& o_r
             aFieldData.clear();
             (*field)->Save( aFieldData, i_includingCriteria );
 
-            const OUString sFieldSettingName = "Field" + OUString::valueOf( i );
+            const OUString sFieldSettingName = "Field" + OUString::number( i );
             aAllFieldsData.put( sFieldSettingName, aFieldData.getPropertyValues() );
         }
     }
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index f75b3e8b8ffe..2b53bef2d5d7 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -1511,7 +1511,7 @@ OUString OTableController::createUniqueName(const OUString& _rName)
         OFieldDescription* pFieldDesc = (*aIter)->GetActFieldDescr();
         if (pFieldDesc && !pFieldDesc->GetName().isEmpty() && bCase(sName,pFieldDesc->GetName()))
         { // found a second name of _rName so we need another
-            sName = _rName + OUString::valueOf(++i);
+            sName = _rName + OUString::number(++i);
             aIter = m_vRowList.begin(); // and retry
         }
     }
@@ -1535,7 +1535,7 @@ OUString OTableController::getPrivateTitle() const
         {
             String aName = String(ModuleRes(STR_TBL_TITLE));
             sTitle = aName.GetToken(0,' ');
-            sTitle += OUString::valueOf(getCurrentStartNumber());
+            sTitle += OUString::number(getCurrentStartNumber());
         }
     }
     catch( const Exception& )
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index cf71cbd28647..4aaf66d14709 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1342,8 +1342,8 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou
                     {
                         OUString aMessage( String( ModuleRes( STR_CTW_UNSUPPORTED_COLUMN_TYPE ) ) );
 
-                        aMessage = aMessage.replaceAt( aMessage.indexOfAsciiL( "$type$", 6 ), 6, OUString::valueOf( aSourceColTypes[ nSourceColumn ] ) );
-                        aMessage = aMessage.replaceAt( aMessage.indexOfAsciiL( "$pos$", 5 ), 5, OUString::valueOf( nSourceColumn ) );
+                        aMessage = aMessage.replaceAt( aMessage.indexOfAsciiL( "$type$", 6 ), 6, OUString::number( aSourceColTypes[ nSourceColumn ] ) );
+                        aMessage = aMessage.replaceAt( aMessage.indexOfAsciiL( "$pos$", 5 ), 5, OUString::number( nSourceColumn ) );
 
                         ::dbtools::throwSQLException(
                             aMessage,