diff options
| author | Gergő Mocsi <gmocsi91@gmail.com> | 2013-02-22 03:56:22 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-15 01:25:12 +0000 |
| commit | bdc374eadf3c5b2a752eb5ce3cb346939b0fb77a (patch) | |
| tree | f2f0a09cdeed1ce498e1aa37479194256c03375f /dbaccess/source/ui/app/AppController.cxx | |
| parent | 59bc10eb4609c5729f46308becc5a3de893ac77e (diff) | |
fdo#38838, String to OUString in dbaccess
Replaced String with OUString in module dbaccess/ui/app , and also removed RTL_CONSTASCII_USTRINGPARAM deprecated macro.
Conflicts:
dbaccess/source/ui/app/AppControllerDnD.cxx
dbaccess/source/ui/app/AppControllerGen.cxx
dbaccess/source/ui/app/AppDetailPageHelper.cxx
dbaccess/source/ui/browser/unodatbr.cxx
Change-Id: Ie385d44c328fb3f919d53a604d51640a334a1013
Reviewed-on: https://gerrit.libreoffice.org/2386
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'dbaccess/source/ui/app/AppController.cxx')
| -rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index b44772634da7..a08ac0b23b82 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -2437,7 +2437,7 @@ Any OApplicationController::getCurrentSelection( Control& _rControl ) const } // ----------------------------------------------------------------------------- -sal_Bool OApplicationController::requestQuickHelp( const SvTreeListEntry* /*_pEntry*/, String& /*_rText*/ ) const +sal_Bool OApplicationController::requestQuickHelp( const SvTreeListEntry* /*_pEntry*/, OUString& /*_rText*/ ) const { return sal_False; } @@ -2930,7 +2930,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer case DatabaseObjectContainer::REPORTS: if ( eSelectedCategory != E_NONE ) throw IllegalArgumentException( - String(ModuleRes(RID_STR_NO_DIFF_CAT)), + OUString(ModuleRes(RID_STR_NO_DIFF_CAT)), *this, sal_Int16( pObject - aSelectedObjects.getConstArray() ) ); eSelectedCategory = ( pObject->Type == DatabaseObjectContainer::TABLES ) ? E_TABLE @@ -2945,7 +2945,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer { OUString sMessage( OUString( - String(ModuleRes(RID_STR_UNSUPPORTED_OBJECT_TYPE))). + OUString(ModuleRes(RID_STR_UNSUPPORTED_OBJECT_TYPE))). replaceFirst("$type$", OUString::valueOf(sal_Int32(pObject->Type)))); throw IllegalArgumentException(sMessage, *this, sal_Int16( pObject - aSelectedObjects.getConstArray() )); } |