diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-29 23:36:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-30 11:22:09 +0100 |
| commit | 8a0685d49f679d6f98de2f357f1ec74590573852 (patch) | |
| tree | 97eb05105a45186049c1c3dad20233c29747ed9c /dbaccess | |
| parent | b18cfdc7cd3755c147970f86d23973f337be01a7 (diff) | |
make ResId::toString a non-static member
Change-Id: I756c0a19bea7b1cc0e290d9f382a04d655819bfb
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ext/macromigration/migrationengine.cxx | 9 | ||||
| -rw-r--r-- | dbaccess/source/ui/browser/brwctrlr.cxx | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index 1013551b167f..16126b154e4a 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -254,9 +254,8 @@ namespace dbmm ::rtl::OUString lcl_getSubDocumentDescription( const SubDocument& _rDocument ) { ::rtl::OUString sObjectName( - ResId::toString( MacroMigrationResId( - _rDocument.eType == eForm ? STR_FORM : STR_REPORT)). + _rDocument.eType == eForm ? STR_FORM : STR_REPORT).toString(). replaceFirst("$name$", _rDocument.sHierarchicalName)); return sObjectName; } @@ -1028,7 +1027,7 @@ namespace dbmm // initialize global progress sal_Int32 nOverallRange( m_aSubDocs.size() ); rtl::OUString sProgressSkeleton( - ResId::toString(MacroMigrationResId( STR_OVERALL_PROGRESS)). + MacroMigrationResId( STR_OVERALL_PROGRESS).toString(). replaceFirst("$overall$", rtl::OUString::valueOf(nOverallRange))); m_rProgress.start( nOverallRange ); @@ -1157,7 +1156,7 @@ namespace dbmm // ----------------- // migrate the libraries - ProgressDelegator aDelegator(m_rProgress, sObjectName, ResId::toString(MacroMigrationResId(STR_MIGRATING_LIBS))); + ProgressDelegator aDelegator(m_rProgress, sObjectName, MacroMigrationResId(STR_MIGRATING_LIBS).toString()); ProgressMixer aProgressMixer( aDelegator ); aProgressMixer.registerPhase( PHASE_JAVASCRIPT, 1 ); aProgressMixer.registerPhase( PHASE_BEANSHELL, 1 ); @@ -1930,7 +1929,7 @@ namespace dbmm { // a human-readable description of the affected library ::rtl::OUString sLibraryDescription( - ResId::toString(MacroMigrationResId(STR_LIBRARY_TYPE_AND_NAME)). + MacroMigrationResId(STR_LIBRARY_TYPE_AND_NAME).toString(). replaceFirst("$type$", getScriptTypeDisplayName(_eScriptType)). replaceFirst("$library$", _rLibraryName)); diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index bd30c2b78ba3..58c01e42577f 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2179,7 +2179,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property HANDLE_SQL_ERRORS( xParser->setOrder(::rtl::OUString()); xParser->appendOrderByColumn(xField, bSortUp), bParserSuccess, - ResId::toString(ModuleRes(SBA_BROWSER_SETTING_ORDER)), + ModuleRes(SBA_BROWSER_SETTING_ORDER).toString(), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" ) @@ -2251,7 +2251,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property HANDLE_SQL_ERRORS( xParser->appendHavingClauseByColumn(xField,sal_True,nOp), bParserSuccess, - ResId::toString(ModuleRes(SBA_BROWSER_SETTING_FILTER)), + ModuleRes(SBA_BROWSER_SETTING_FILTER).toString(), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" ) } @@ -2260,7 +2260,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property HANDLE_SQL_ERRORS( xParser->appendFilterByColumn(xField,sal_True,nOp), bParserSuccess, - ResId::toString(ModuleRes(SBA_BROWSER_SETTING_FILTER)), + ModuleRes(SBA_BROWSER_SETTING_FILTER).toString(), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" ) } |