diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-08-21 15:07:31 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-08-21 15:10:35 +0200 |
commit | 64b993e046f23baaacaff1572b7d2a816588b5ef (patch) | |
tree | 237dce36a1d4787d168a0520839f6aab22500487 /desktop | |
parent | 75f41baab6ce75786a91fe461835ee16a23ec18e (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 'desktop')
-rw-r--r-- | desktop/source/app/app.cxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/manager/dp_activepackages.hxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/manager/dp_manager.cxx | 4 | ||||
-rw-r--r-- | desktop/source/deployment/registry/component/dp_compbackenddb.cxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/registry/help/dp_help.cxx | 2 | ||||
-rw-r--r-- | desktop/source/splash/splash.cxx | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index d75b35238b49..47024cb8b91c 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1566,7 +1566,7 @@ int Desktop::Main() osl::File::remove( pidfileURL ); if ( (rc = pidfile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ) ) == osl::File::E_None ) { - OString pid( OString::valueOf( static_cast<sal_Int32>( GETPID() ) ) ); + OString pid( OString::number( GETPID() ) ); sal_uInt64 written = 0; if ( pidfile.write(pid.getStr(), pid.getLength(), written) != osl::File::E_None ) { diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx index 81466aba63f9..d64a54116fbd 100644 --- a/desktop/source/deployment/manager/dp_activepackages.hxx +++ b/desktop/source/deployment/manager/dp_activepackages.hxx @@ -37,7 +37,7 @@ namespace dp_manager { class ActivePackages { public: struct Data { - Data(): failedPrerequisites(OUString::valueOf((sal_Int32)0)) + Data(): failedPrerequisites("0") {} /* name of the temporary file (shared, user extension) or the name of the folder of the bundled extension. diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 51fd817b2aac..05ff8df3033e 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -1399,7 +1399,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions( //could have declined the license. Then the next time the //extension folder is investigated we do not want to //try to install the extension again. - dbData.failedPrerequisites = OUString::valueOf(failedPrereq); + dbData.failedPrerequisites = OUString::number(failedPrereq); insertToActivationLayerDB(id, dbData); bModified |= true; } @@ -1524,7 +1524,7 @@ sal_Int32 PackageManagerImpl::checkPrerequisites( sal_Int32 failedPrereq = extension->checkPrerequisites( xAbortChannel, _xCmdEnv, false); - dbData.failedPrerequisites = OUString::valueOf(failedPrereq); + dbData.failedPrerequisites = OUString::number(failedPrereq); insertToActivationLayerDB(id, dbData); } else diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx index d6fdfc4a4251..a12e8fa6b719 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx @@ -74,7 +74,7 @@ void ComponentBackendDb::addEntry(OUString const & url, Data const & data) { Reference<css::xml::dom::XNode> componentNode = writeKeyElement(url); writeSimpleElement("java-type-library", - OUString::valueOf((sal_Bool) data.javaTypeLibrary), + OUString::boolean((sal_Bool) data.javaTypeLibrary), componentNode); writeSimpleList( diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 00e3ebaced42..8908e6521f5d 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -542,7 +542,7 @@ void BackendImpl::implProcessHelp( if( aErrorInfo.m_nXMLParsingLine != -1 ) { aErrStr += OUString(", line " ); - aErrStr += OUString::valueOf( aErrorInfo.m_nXMLParsingLine ); + aErrStr += OUString::number( aErrorInfo.m_nXMLParsingLine ); } } } diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index 3f63fbe6a3b9..ad06ead76938 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -475,9 +475,9 @@ void SplashScreen::SetScreenBitmap(BitmapEx &rBitmap) aStrBuf.append( OUStringToOString(_sAppName, RTL_TEXTENCODING_UTF8) ); aStrBuf.append( "_" ); } - aResBuf.append( OString::valueOf( nWidth )); + aResBuf.append( OString::number( nWidth )); aResBuf.append( "x" ); - aResBuf.append( OString::valueOf( nHeight )); + aResBuf.append( OString::number( nHeight )); aStrBuf.append( aResBuf.getStr() ); if (Application::LoadBrandBitmap (aStrBuf.makeStringAndClear().getStr(), rBitmap)) |