summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-08-21 15:07:31 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-08-21 15:10:35 +0200
commit64b993e046f23baaacaff1572b7d2a816588b5ef (patch)
tree237dce36a1d4787d168a0520839f6aab22500487 /extensions
parent75f41baab6ce75786a91fe461835ee16a23ec18e (diff)
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
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/abpilot/datasourcehandling.cxx2
-rw-r--r--extensions/source/bibliography/bibconfig.cxx4
-rw-r--r--extensions/source/bibliography/general.cxx2
-rw-r--r--extensions/source/dbpilots/dbptools.cxx2
-rw-r--r--extensions/source/dbpilots/groupboxwiz.cxx2
-rw-r--r--extensions/source/logging/loggerconfig.cxx2
-rw-r--r--extensions/source/logging/logrecord.cxx2
-rw-r--r--extensions/source/nsplugin/source/so_main.cxx2
-rw-r--r--extensions/source/propctrlr/eformshelper.cxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx2
-rw-r--r--extensions/source/propctrlr/newdatatype.cxx2
-rw-r--r--extensions/source/propctrlr/stringrepresentation.cxx2
-rw-r--r--extensions/source/update/feed/updatefeed.cxx4
13 files changed, 15 insertions, 15 deletions
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 68ba6fe5e5f0..f9b0415b7d79 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -219,7 +219,7 @@ namespace abp
while ( ( m_pImpl->aDataSourceNames.end() != aPos ) && ( nPostFix < 65535 ) )
{ // there already is a data source with this name
sCheck = _rDataSourceName;
- sCheck += OUString::valueOf( nPostFix++ );
+ sCheck += OUString::number( nPostFix++ );
aPos = m_pImpl->aDataSourceNames.find( sCheck );
}
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index ada5cc721c89..efb197269824 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -253,7 +253,7 @@ void BibConfig::Commit()
const Mapping* pMapping = &(*pMappingsArr)[i];
OUString sPrefix(cDataSourceHistory);
sPrefix += "/_";
- sPrefix += OUString::valueOf(i);
+ sPrefix += OUString::number(i);
sPrefix += "/";
pNodeValues[nIndex].Name = sPrefix;
pNodeValues[nIndex].Name += sName;
@@ -277,7 +277,7 @@ void BibConfig::Commit()
{
OUString sSubPrefix(sPrefix);
sSubPrefix += "/_";
- sSubPrefix += OUString::valueOf(nFieldAssignment);
+ sSubPrefix += OUString::number(nFieldAssignment);
Sequence< PropertyValue > aAssignmentValues(2);
PropertyValue* pAssignmentValues = aAssignmentValues.getArray();
pAssignmentValues[0].Name = sSubPrefix;
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 4b226f5604df..44bcb19b52a6 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -497,7 +497,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
OUString* pListSourceArr = aListSource.getArray();
//pListSourceArr[0] = "select TypeName, TypeIndex from TypeNms";
for(sal_Int32 i = 0; i < TYPE_COUNT; ++i)
- pListSourceArr[i] = OUString::valueOf(i);
+ pListSourceArr[i] = OUString::number(i);
aAny.setValue(&aListSource, ::getCppuType((uno::Sequence<OUString>*)0));
xPropSet->setPropertyValue("ListSource", aAny);
diff --git a/extensions/source/dbpilots/dbptools.cxx b/extensions/source/dbpilots/dbptools.cxx
index 947b50865846..c6dafd944dd1 100644
--- a/extensions/source/dbpilots/dbptools.cxx
+++ b/extensions/source/dbpilots/dbptools.cxx
@@ -41,7 +41,7 @@ namespace dbp
for (sal_Int32 i=1; i<0x7FFFFFFF; ++i)
{
_rElementsName = sBase;
- _rElementsName += OUString::valueOf((sal_Int32)i);
+ _rElementsName += OUString::number(i);
if (!_rxContainer->hasByName(_rElementsName))
return;
}
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 3097b8eba621..0754ffe4eb9a 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -263,7 +263,7 @@ namespace dbp
for (::svt::WizardTypes::WizardState i=0; i<m_aExistingRadios.GetEntryCount(); ++i)
{
rSettings.aLabels.push_back(m_aExistingRadios.GetEntry(i));
- rSettings.aValues.push_back(OUString::valueOf((sal_Int32)(i + 1)));
+ rSettings.aValues.push_back(OUString::number((i + 1)));
}
return sal_True;
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index 91c6fa92ca33..e00a38668c60 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -130,7 +130,7 @@ namespace logging
info.Size = sizeof (oslProcessInfo);
if ( osl_getProcessInfo ( 0, osl_Process_IDENTIFIER, &info ) == osl_Process_E_None)
aProcessId = info.Ident;
- rtl::OUString aPID = rtl::OUString::valueOf( sal_Int64( aProcessId ) );
+ rtl::OUString aPID = OUString::number( aProcessId );
Variable aVariables[] =
{
diff --git a/extensions/source/logging/logrecord.cxx b/extensions/source/logging/logrecord.cxx
index eba865bf6d23..a4a95ced4d08 100644
--- a/extensions/source/logging/logrecord.cxx
+++ b/extensions/source/logging/logrecord.cxx
@@ -47,7 +47,7 @@ namespace logging
OUString getCurrentThreadID()
{
oslThreadIdentifier nThreadID( osl::Thread::getCurrentIdentifier() );
- return OUString::valueOf( (sal_Int64)nThreadID );
+ return OUString::number( (sal_Int64)nThreadID );
}
}
diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx
index 35af67f3e30d..8678f625878b 100644
--- a/extensions/source/nsplugin/source/so_main.cxx
+++ b/extensions/source/nsplugin/source/so_main.cxx
@@ -309,7 +309,7 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f
return Reference< lang::XMultiServiceFactory >(NULL);
}
- aPluginPipeName = OUString::valueOf( aPath.hashCode() );
+ aPluginPipeName = OUString::number( aPath.hashCode() );
// accept string
OSL_ASSERT( buf.isEmpty() );
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index bdd203cbc8a4..50dbebb419d4 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -554,7 +554,7 @@ namespace pcr
sal_Int32 nNumber = 1;
do
{
- sNewName = sBaseName + OUString::valueOf( nNumber++ );
+ sNewName = sBaseName + OUString::number( nNumber++ );
}
while ( xBindingNames->hasByName( sNewName ) );
Reference< XNamed > xName( xBinding, UNO_QUERY_THROW );
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index fd3f6ce99e5e..672ab9b3e285 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -397,7 +397,7 @@ namespace pcr
for ( i = 0; i < nNewCount; ++i )
{
sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId();
- OUString aPureIdStr = OUString::valueOf( nUniqueId );
+ OUString aPureIdStr = OUString::number( nUniqueId );
aPureIdStr += aIdStrBase;
pNewPureIds[i] = aPureIdStr;
// Force usage of next Unique Id
diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx
index 0da7a156f6fc..a61dba03d233 100644
--- a/extensions/source/propctrlr/newdatatype.cxx
+++ b/extensions/source/propctrlr/newdatatype.cxx
@@ -64,7 +64,7 @@ namespace pcr
sal_Int32 nPostfixNumber = 1;
do
{
- ( sInitialName = sNameBase ) += OUString::valueOf(nPostfixNumber++);
+ ( sInitialName = sNameBase ) += OUString::number(nPostfixNumber++);
}
while ( m_aProhibitedNames.find( sInitialName ) != m_aProhibitedNames.end() );
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index e39fb9c616cc..998aade8f033 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -315,7 +315,7 @@ namespace
{
OUString operator()( sal_Int32 _rIntValue ) const
{
- return OUString::valueOf( (sal_Int32)_rIntValue );
+ return OUString::number( _rIntValue );
}
sal_Int32 operator()( const OUString& _rStringValue ) const
{
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 961893055ec3..555edb6093a6 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -244,7 +244,7 @@ public:
OSL_ASSERT( m_xUpdateInformationProvider.is() );
if( !(m_nCount < m_nNodes ) )
- throw container::NoSuchElementException(OUString::valueOf(m_nCount), *this);
+ throw container::NoSuchElementException(OUString::number(m_nCount), *this);
try
{
@@ -301,7 +301,7 @@ public:
uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
if( m_nCount > 0 )
- throw container::NoSuchElementException(OUString::valueOf(m_nCount), *this);
+ throw container::NoSuchElementException(OUString::boolean(m_nCount), *this);
++m_nCount;
return uno::makeAny(m_aEntry);