summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-03-19 09:22:44 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-03-19 09:00:26 +0000
commit8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch)
tree2dbddceebf0f96492adc5652697e8efce8a8ba06
parentfe8eba5faa59ddf9ee82f3eb009daac72a0ec846 (diff)
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex: s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec Reviewed-on: https://gerrit.libreoffice.org/2832 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
-rw-r--r--bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_ios_arm/except.cxx8
-rw-r--r--bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_arm/except.cxx8
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx8
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_intel/except.cxx8
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx8
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_mips/except.cxx8
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx8
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx8
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx5
-rw-r--r--bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx8
-rw-r--r--bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx8
-rw-r--r--bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx5
-rw-r--r--bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx8
-rw-r--r--bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx8
-rw-r--r--bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/mingw_intel/except.cxx8
-rw-r--r--bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx8
-rw-r--r--bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx8
-rw-r--r--bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx4
-rw-r--r--bridges/test/java_uno/acquire/testacquire.cxx6
-rw-r--r--bridges/test/java_uno/equals/testequals.cxx6
-rw-r--r--bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx18
-rw-r--r--bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx12
-rw-r--r--bridges/test/testclient.cxx16
-rw-r--r--bridges/test/testcomp.cxx24
-rw-r--r--bridges/test/testoffice.cxx16
-rw-r--r--bridges/test/testsameprocess.cxx20
-rw-r--r--bridges/test/testserver.cxx14
-rw-r--r--configmgr/qa/unit/test.cxx110
-rw-r--r--configmgr/source/access.cxx2
-rw-r--r--configmgr/source/writemodfile.cxx3
-rw-r--r--connectivity/source/commontools/ConnectionWrapper.cxx2
-rw-r--r--connectivity/source/commontools/DateConversion.cxx4
-rw-r--r--connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx22
-rw-r--r--connectivity/source/commontools/FValue.cxx2
-rw-r--r--connectivity/source/commontools/ParamterSubstitution.cxx6
-rw-r--r--connectivity/source/commontools/TColumnsHelper.cxx6
-rw-r--r--connectivity/source/commontools/TDatabaseMetaDataBase.cxx2
-rw-r--r--connectivity/source/commontools/TIndexes.cxx4
-rw-r--r--connectivity/source/commontools/TKeys.cxx2
-rw-r--r--connectivity/source/commontools/TPrivilegesResultSet.cxx10
-rw-r--r--connectivity/source/commontools/TTableHelper.cxx10
-rw-r--r--connectivity/source/commontools/dbmetadata.cxx2
-rw-r--r--connectivity/source/commontools/dbtools.cxx54
-rw-r--r--connectivity/source/commontools/dbtools2.cxx50
-rw-r--r--connectivity/source/commontools/formattedcolumnvalue.cxx6
-rw-r--r--connectivity/source/commontools/parameters.cxx6
-rw-r--r--connectivity/source/commontools/paramwrapper.cxx8
-rw-r--r--connectivity/source/commontools/predicateinput.cxx12
-rw-r--r--connectivity/source/commontools/statementcomposer.cxx14
-rw-r--r--connectivity/source/drivers/ado/AColumn.cxx10
-rw-r--r--connectivity/source/drivers/ado/AColumns.cxx2
-rw-r--r--connectivity/source/drivers/ado/AConnection.cxx6
-rw-r--r--connectivity/source/drivers/ado/ADatabaseMetaData.cxx136
-rw-r--r--connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx52
-rw-r--r--connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx22
-rw-r--r--connectivity/source/drivers/ado/ADriver.cxx26
-rw-r--r--connectivity/source/drivers/ado/AKeys.cxx2
-rw-r--r--connectivity/source/drivers/ado/APreparedStatement.cxx2
-rw-r--r--connectivity/source/drivers/ado/AResultSet.cxx8
-rw-r--r--connectivity/source/drivers/ado/AResultSetMetaData.cxx6
-rw-r--r--connectivity/source/drivers/ado/AStatement.cxx2
-rw-r--r--connectivity/source/drivers/ado/ATable.cxx2
-rw-r--r--connectivity/source/drivers/ado/Aolevariant.cxx2
-rw-r--r--connectivity/source/drivers/ado/adoimp.cxx2
-rw-r--r--connectivity/source/drivers/evoab2/NTable.cxx2
-rw-r--r--connectivity/source/drivers/file/FDateFunctions.cxx38
-rw-r--r--connectivity/source/drivers/hsqldb/HCatalog.cxx8
-rw-r--r--connectivity/source/drivers/hsqldb/HConnection.cxx4
-rw-r--r--connectivity/source/drivers/hsqldb/accesslog.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/DatabaseMetaData.cxx20
-rw-r--r--connectivity/source/drivers/kab/KCatalog.cxx6
-rw-r--r--connectivity/source/drivers/kab/KTable.cxx2
-rw-r--r--connectivity/source/drivers/kab/KTables.cxx4
-rw-r--r--connectivity/source/drivers/macab/MacabCatalog.cxx8
-rw-r--r--connectivity/source/drivers/macab/MacabTable.cxx2
-rw-r--r--connectivity/source/drivers/macab/MacabTables.cxx4
-rw-r--r--connectivity/source/drivers/mork/MCatalog.cxx4
-rw-r--r--connectivity/source/drivers/mork/MDatabaseMetaData.cxx26
-rw-r--r--connectivity/source/drivers/mork/MResultSet.cxx14
-rw-r--r--connectivity/source/drivers/mork/MTables.cxx4
-rw-r--r--connectivity/source/drivers/mozab/MCatalog.cxx4
-rw-r--r--connectivity/source/drivers/mozab/MColumnAlias.cxx2
-rw-r--r--connectivity/source/drivers/mozab/MConfigAccess.cxx18
-rw-r--r--connectivity/source/drivers/mozab/MDatabaseMetaData.cxx26
-rw-r--r--connectivity/source/drivers/mozab/MResultSet.cxx22
-rw-r--r--connectivity/source/drivers/mozab/MTables.cxx4
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx2
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx14
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx2
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx2
-rw-r--r--connectivity/source/drivers/mysql/YCatalog.cxx8
-rw-r--r--connectivity/source/drivers/postgresql/pq_array.cxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_baseresultset.cxx14
-rw-r--r--connectivity/source/drivers/postgresql/pq_connection.cxx13
-rw-r--r--connectivity/source/drivers/postgresql/pq_driver.cxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_preparedstatement.cxx18
-rw-r--r--connectivity/source/drivers/postgresql/pq_statement.cxx18
-rw-r--r--connectivity/source/drivers/postgresql/pq_tools.cxx4
-rw-r--r--connectivity/source/drivers/postgresql/pq_xbase.cxx3
-rw-r--r--cppu/qa/cppumaker/test_cppumaker.cxx7
-rw-r--r--cppu/qa/test_any.cxx42
-rw-r--r--cppu/qa/test_unotype.cxx66
-rw-r--r--cppu/source/AffineBridge/AffineBridge.cxx6
-rw-r--r--cppu/source/LogBridge/LogBridge.cxx6
-rw-r--r--cppu/source/UnsafeBridge/UnsafeBridge.cxx6
-rw-r--r--cppu/source/typelib/typelib.cxx2
-rw-r--r--cppu/source/uno/lbenv.cxx2
-rw-r--r--cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx20
-rw-r--r--cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx114
-rw-r--r--cppuhelper/source/component.cxx4
-rw-r--r--cppuhelper/source/factory.cxx16
-rw-r--r--cppuhelper/source/implbase.cxx8
-rw-r--r--cppuhelper/source/propertysetmixin.cxx66
-rw-r--r--cppuhelper/source/shlib.cxx2
-rw-r--r--cppuhelper/source/unourl.cxx35
-rw-r--r--cppuhelper/test/bootstrap/TestEnv.cxx4
-rw-r--r--cppuhelper/test/bootstrap/bootstrap.test.cxx50
-rw-r--r--cppuhelper/test/cfg_test.cxx4
-rw-r--r--cppuhelper/test/loader/loader.test.cxx16
-rw-r--r--cppuhelper/test/testcmp/TestComponent.cxx4
-rw-r--r--cppuhelper/test/testhelper.cxx12
-rw-r--r--cppuhelper/test/testimplhelper.cxx86
-rw-r--r--cppuhelper/test/testpropshlp.cxx158
-rw-r--r--cppuhelper/test/testproptyphlp.cxx2
-rw-r--r--cpputools/source/unoexe/unoexe.cxx20
-rw-r--r--crashrep/source/win32/soreport.cxx2
-rw-r--r--cui/source/dialogs/colorpicker.cxx4
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx4
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx4
-rw-r--r--cui/source/options/cfgchart.cxx4
-rw-r--r--cui/source/options/optsave.cxx7
-rw-r--r--cui/source/options/webconninfo.cxx2
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx4
-rw-r--r--dbaccess/source/ui/control/opendoccontrols.cxx4
-rw-r--r--dbaccess/source/ui/control/sqledit.cxx4
-rw-r--r--dbaccess/source/ui/control/toolboxcontroller.cxx22
-rw-r--r--dbaccess/source/ui/dlg/CollectionView.cxx6
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.cxx6
-rw-r--r--dbaccess/source/ui/dlg/DriverSettings.cxx44
-rw-r--r--dbaccess/source/ui/dlg/UserAdminDlg.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx26
-rw-r--r--dbaccess/source/ui/dlg/directsql.cxx4
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.cxx2
-rw-r--r--dbaccess/source/ui/dlg/queryorder.cxx6
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx2
-rw-r--r--dbaccess/source/ui/dlg/tablespage.cxx4
-rw-r--r--dbaccess/source/ui/misc/DExport.cxx6
-rw-r--r--dbaccess/source/ui/misc/RowSetDrop.cxx2
-rw-r--r--dbaccess/source/ui/misc/TableCopyHelper.cxx6
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx26
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx12
-rw-r--r--dbaccess/source/ui/misc/controllerframe.cxx2
-rw-r--r--dbaccess/source/ui/misc/databaseobjectview.cxx6
-rw-r--r--dbaccess/source/ui/misc/indexcollection.cxx14
-rw-r--r--dbaccess/source/ui/misc/linkeddocuments.cxx10
-rw-r--r--dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/JAccess.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/JoinController.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx40
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx8
-rw-r--r--dbaccess/source/ui/querydesign/TableFieldDescription.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/TableWindow.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowAccess.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/querycontainerwindow.cxx2
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx4
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableController.cxx8
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignControl.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldControl.cxx2
-rw-r--r--dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx4
-rw-r--r--dbaccess/source/ui/uno/ColumnControl.cxx2
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlg.cxx4
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx8
-rw-r--r--dbaccess/source/ui/uno/TableFilterDlg.cxx4
-rw-r--r--dbaccess/source/ui/uno/UserSettingsDlg.cxx4
-rw-r--r--dbaccess/source/ui/uno/admindlg.cxx4
-rw-r--r--desktop/qa/deployment_misc/test_dp_version.cxx14
-rw-r--r--desktop/unx/source/officeloader/officeloader.cxx2
-rw-r--r--drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx2
-rw-r--r--dtrans/source/win32/clipb/wcbentry.cxx2
-rw-r--r--editeng/source/misc/acorrcfg.cxx4
-rw-r--r--editeng/source/misc/svxacorr.cxx2
-rw-r--r--editeng/source/uno/unonrule.cxx10
-rw-r--r--editeng/source/uno/unopracc.cxx2
-rw-r--r--editeng/source/uno/unotext.cxx10
-rw-r--r--editeng/source/uno/unotext2.cxx4
-rw-r--r--embeddedobj/source/commonembedding/embedobj.cxx32
-rw-r--r--embeddedobj/source/commonembedding/inplaceobj.cxx2
-rw-r--r--embeddedobj/source/commonembedding/miscobj.cxx2
-rw-r--r--embeddedobj/source/commonembedding/persistence.cxx92
-rw-r--r--embeddedobj/source/commonembedding/specialobject.cxx14
-rw-r--r--embeddedobj/source/commonembedding/visobj.cxx16
-rw-r--r--embeddedobj/source/commonembedding/xfactory.cxx38
-rw-r--r--embeddedobj/source/general/docholder.cxx40
-rw-r--r--embeddedobj/source/general/dummyobject.cxx26
-rw-r--r--embeddedobj/source/general/intercept.cxx31
-rw-r--r--embeddedobj/source/general/xcreator.cxx36
-rw-r--r--embeddedobj/source/inc/docholder.hxx2
-rw-r--r--embeddedobj/source/msole/graphconvert.cxx6
-rw-r--r--embeddedobj/source/msole/olecomponent.cxx30
-rw-r--r--embeddedobj/source/msole/oleembed.cxx52
-rw-r--r--embeddedobj/source/msole/olemisc.cxx2
-rw-r--r--embeddedobj/source/msole/olepersist.cxx72
-rw-r--r--embeddedobj/source/msole/olevisual.cxx32
-rw-r--r--embeddedobj/source/msole/ownview.cxx32
-rw-r--r--embeddedobj/source/msole/xdialogcreator.cxx26
-rw-r--r--embeddedobj/source/msole/xolefactory.cxx26
-rw-r--r--embeddedobj/test/MainThreadExecutor/register.cxx4
-rw-r--r--embeddedobj/test/mtexecutor/mteregister.cxx8
-rw-r--r--embedserv/source/embed/docholder.cxx52
-rw-r--r--embedserv/source/embed/ed_idataobj.cxx4
-rw-r--r--embedserv/source/embed/ed_ipersiststr.cxx18
-rw-r--r--embedserv/source/embed/guid.cxx70
-rw-r--r--embedserv/source/embed/intercept.cxx40
-rw-r--r--embedserv/source/embed/register.cxx4
-rw-r--r--extensions/qa/update/test_update.cxx24
-rw-r--r--extensions/source/abpilot/admininvokationimpl.cxx10
-rw-r--r--extensions/source/abpilot/datasourcehandling.cxx2
-rw-r--r--extensions/source/abpilot/fieldmappingimpl.cxx14
-rw-r--r--extensions/source/abpilot/typeselectionpage.cxx6
-rw-r--r--extensions/source/abpilot/unodialogabp.cxx8
-rw-r--r--extensions/source/bibliography/bibload.cxx4
-rw-r--r--extensions/source/bibliography/datman.cxx8
-rw-r--r--extensions/source/bibliography/framectr.cxx4
-rw-r--r--extensions/source/config/ldap/ldapaccess.cxx3
-rw-r--r--extensions/source/config/ldap/ldapuserprofilebe.cxx11
-rw-r--r--extensions/source/logging/consolehandler.cxx4
-rw-r--r--extensions/source/logging/csvformatter.cxx10
-rw-r--r--extensions/source/logging/filehandler.cxx4
-rw-r--r--extensions/source/logging/logger.cxx10
-rw-r--r--extensions/source/logging/loggerconfig.cxx8
-rw-r--r--extensions/source/logging/loghandler.cxx4
-rw-r--r--extensions/source/logging/plaintextformatter.cxx4
-rw-r--r--extensions/source/nsplugin/source/so_instance.cxx28
-rw-r--r--extensions/source/ole/oleobjw.cxx26
-rw-r--r--extensions/source/ole/servreg.cxx8
-rw-r--r--extensions/source/plugin/inc/plugin/impl.hxx2
-rw-r--r--extensions/source/plugin/inc/plugin/model.hxx2
-rw-r--r--extensions/source/propctrlr/browserline.cxx2
-rw-r--r--extensions/source/propctrlr/buttonnavigationhandler.cxx6
-rw-r--r--extensions/source/propctrlr/cellbindinghandler.cxx4
-rw-r--r--extensions/source/propctrlr/editpropertyhandler.cxx6
-rw-r--r--extensions/source/propctrlr/eformspropertyhandler.cxx14
-rw-r--r--extensions/source/propctrlr/formgeometryhandler.cxx6
-rw-r--r--extensions/source/propctrlr/formlinkdialog.cxx4
-rw-r--r--extensions/source/propctrlr/genericpropertyhandler.cxx14
-rw-r--r--extensions/source/propctrlr/inspectormodelbase.cxx8
-rw-r--r--extensions/source/propctrlr/objectinspectormodel.cxx4
-rw-r--r--extensions/source/propctrlr/propertyhandler.cxx24
-rw-r--r--extensions/source/propctrlr/sqlcommanddesign.cxx12
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx2
-rw-r--r--extensions/source/propctrlr/stringrepresentation.cxx10
-rw-r--r--extensions/source/propctrlr/submissionhandler.cxx6
-rw-r--r--extensions/source/propctrlr/taborder.cxx2
-rw-r--r--extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx10
-rw-r--r--extensions/source/resource/ResourceIndexAccess.cxx14
-rw-r--r--extensions/source/resource/oooresourceloader.cxx2
-rw-r--r--extensions/source/scanner/scanner.cxx4
-rw-r--r--extensions/test/ole/cpnt/cpnt.cxx12
-rw-r--r--extensions/test/ole/unloading/unloadTest.cxx8
-rw-r--r--filter/source/msfilter/mscodec.cxx20
-rw-r--r--filter/source/msfilter/mstoolbar.cxx28
-rw-r--r--filter/source/odfflatxml/OdfFlatXml.cxx6
-rw-r--r--filter/source/placeware/exporter.cxx18
-rw-r--r--filter/source/placeware/filter.cxx2
-rw-r--r--filter/source/placeware/tempfile.cxx4
-rw-r--r--filter/source/svg/svgfilter.cxx4
-rw-r--r--filter/source/svg/svgwriter.cxx4
-rw-r--r--filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx30
-rw-r--r--filter/source/xmlfilterdetect/filterdetect.cxx2
-rw-r--r--filter/source/xsltdialog/typedetectionexport.cxx22
-rw-r--r--filter/source/xsltdialog/xmlfilterdialogcomponent.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfilterjar.cxx16
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.cxx36
-rw-r--r--filter/source/xsltfilter/OleHandler.cxx3
-rw-r--r--forms/source/component/Columns.cxx22
-rw-r--r--forms/source/component/ComboBox.cxx2
-rw-r--r--forms/source/component/Currency.cxx4
-rw-r--r--forms/source/component/DatabaseForm.cxx18
-rw-r--r--forms/source/component/Edit.cxx2
-rw-r--r--forms/source/component/Filter.cxx20
-rw-r--r--forms/source/component/FormComponent.cxx4
-rw-r--r--forms/source/component/FormattedField.cxx4
-rw-r--r--forms/source/component/FormattedFieldWrapper.cxx2
-rw-r--r--forms/source/component/FormsCollection.cxx4
-rw-r--r--forms/source/component/Grid.cxx2
-rw-r--r--forms/source/component/GroupManager.cxx2
-rw-r--r--forms/source/component/ImageControl.cxx6
-rw-r--r--forms/source/component/ListBox.cxx10
-rw-r--r--forms/source/component/clickableimage.cxx10
-rw-r--r--forms/source/component/navigationbar.cxx6
-rw-r--r--forms/source/component/scrollbar.cxx4
-rw-r--r--forms/source/component/spinbutton.cxx4
-rw-r--r--forms/source/inc/FormComponent.hxx2
-rw-r--r--forms/source/misc/InterfaceContainer.cxx10
-rw-r--r--forms/source/misc/limitedformats.cxx4
-rw-r--r--forms/source/misc/services.cxx4
-rw-r--r--forms/source/richtext/clipboarddispatcher.cxx6
-rw-r--r--forms/source/richtext/richtextcontrol.cxx6
-rw-r--r--forms/source/richtext/richtextmodel.cxx16
-rw-r--r--forms/source/runtime/formoperations.cxx8
-rw-r--r--forms/source/solar/component/navbarcontrol.cxx6
-rw-r--r--forms/source/solar/control/navtoolbar.cxx2
-rw-r--r--forms/source/xforms/datatyperepository.cxx2
-rw-r--r--forms/source/xforms/datatypes.cxx4
-rw-r--r--forms/source/xforms/submission.cxx2
-rw-r--r--forms/source/xforms/submission/replace.cxx6
-rw-r--r--forms/source/xforms/submission/submission_post.cxx2
-rw-r--r--forms/source/xforms/xpathlib/extension.cxx4
-rw-r--r--formula/source/core/api/FormulaOpCodeMapperObj.cxx4
-rw-r--r--formula/source/ui/dlg/formula.cxx6
-rw-r--r--fpicker/source/generic/fpicker.cxx20
-rw-r--r--fpicker/source/win32/filepicker/FilePicker.cxx16
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePicker.cxx6
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx2
-rw-r--r--fpicker/source/win32/filepicker/WinFileOpenImpl.cxx8
-rw-r--r--fpicker/source/win32/filepicker/asynceventnotifier.cxx6
-rw-r--r--fpicker/source/win32/filepicker/previewbase.cxx4
-rw-r--r--fpicker/source/win32/filepicker/workbench/Test_fps.cxx4
-rw-r--r--fpicker/source/win32/folderpicker/FolderPicker.cxx2
-rw-r--r--fpicker/source/win32/folderpicker/WinFOPImpl.cxx2
-rw-r--r--fpicker/source/win32/misc/WinImplHelper.cxx16
-rw-r--r--fpicker/test/svdem.cxx2
-rw-r--r--framework/source/services/autorecovery.cxx14
-rw-r--r--framework/source/services/backingwindow.hxx2
-rw-r--r--helpcompiler/source/HelpIndexer.cxx14
-rw-r--r--hwpfilter/qa/cppunit/test_hwpfilter.cxx6
-rw-r--r--i18npool/qa/cppunit/test_breakiterator.cxx56
-rw-r--r--i18npool/qa/cppunit/test_characterclassification.cxx4
-rw-r--r--idlc/source/astdump.cxx4
-rw-r--r--idlc/source/astoperation.cxx2
-rw-r--r--idlc/source/idlccompile.cxx6
-rw-r--r--io/test/stm/pipetest.cxx4
-rw-r--r--io/test/stm/testfactreg.cxx36
-rw-r--r--javaunohelper/source/vm.cxx12
-rw-r--r--jvmaccess/source/classpath.cxx3
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx6
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx4
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.hxx2
-rw-r--r--jvmfwk/source/framework.cxx10
-rw-r--r--l10ntools/source/helpmerge.cxx4
-rw-r--r--linguistic/workben/sspellimp.hxx2
-rw-r--r--mysqlc/source/mysqlc_databasemetadata.cxx32
-rw-r--r--mysqlc/source/mysqlc_general.cxx8
-rw-r--r--mysqlc/source/mysqlc_resultset.cxx6
-rw-r--r--odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx14
-rw-r--r--odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx4
-rw-r--r--odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx10
-rw-r--r--odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx18
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx2
-rw-r--r--odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx4
-rw-r--r--odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx2
-rw-r--r--oox/source/drawingml/customshapepresets5.cxx70
-rw-r--r--padmin/source/adddlg.hxx2
-rw-r--r--pyuno/source/loader/pyuno_loader.cxx8
-rw-r--r--pyuno/source/module/pyuno.cxx2
-rw-r--r--pyuno/source/module/pyuno_adapter.cxx3
-rw-r--r--pyuno/source/module/pyuno_module.cxx2
-rw-r--r--remotebridges/source/unourl_resolver/unourl_resolver.cxx4
-rw-r--r--reportdesign/source/core/api/FixedLine.cxx4
-rw-r--r--reportdesign/source/core/api/FixedText.cxx4
-rw-r--r--reportdesign/source/core/api/FormatCondition.cxx2
-rw-r--r--reportdesign/source/core/api/FormattedField.cxx8
-rw-r--r--reportdesign/source/core/api/Function.cxx2
-rw-r--r--reportdesign/source/core/api/Group.cxx6
-rw-r--r--reportdesign/source/core/api/ImageControl.cxx4
-rw-r--r--reportdesign/source/core/api/ReportComponent.cxx6
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx142
-rw-r--r--reportdesign/source/core/api/ReportEngineJFree.cxx12
-rw-r--r--reportdesign/source/core/api/Section.cxx26
-rw-r--r--reportdesign/source/core/api/Shape.cxx4
-rw-r--r--reportdesign/source/core/sdr/ReportDrawPage.cxx2
-rw-r--r--reportdesign/source/core/sdr/RptObject.cxx24
-rw-r--r--reportdesign/source/core/sdr/formatnormalizer.cxx8
-rw-r--r--reportdesign/source/filter/xml/dbloader2.cxx10
-rw-r--r--reportdesign/source/filter/xml/dbloader2.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlCell.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlExport.cxx72
-rw-r--r--reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx14
-rw-r--r--reportdesign/source/filter/xml/xmlFixedContent.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlGroup.cxx20
-rw-r--r--reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx12
-rw-r--r--reportdesign/source/filter/xml/xmlStyleImport.cxx10
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx22
-rw-r--r--reportdesign/source/ui/dlg/Condition.cxx2
-rw-r--r--reportdesign/source/ui/dlg/DateTime.cxx2
-rw-r--r--reportdesign/source/ui/dlg/Formula.cxx6
-rw-r--r--reportdesign/source/ui/dlg/Navigator.cxx4
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx44
-rw-r--r--reportdesign/source/ui/inspection/DefaultInspection.cxx6
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx62
-rw-r--r--reportdesign/source/ui/inspection/ReportComponentHandler.cxx6
-rw-r--r--reportdesign/source/ui/inspection/metadata.cxx56
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx10
-rw-r--r--reportdesign/source/ui/misc/statusbarcontroller.cxx4
-rw-r--r--reportdesign/source/ui/misc/toolboxcontroller.cxx24
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx60
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx6
-rw-r--r--reportdesign/source/ui/report/ViewsWindow.cxx2
-rw-r--r--reportdesign/source/ui/report/dlgedfac.cxx10
-rw-r--r--reportdesign/source/ui/report/dlgedfunc.cxx2
-rw-r--r--reportdesign/source/ui/report/propbrw.cxx26
-rw-r--r--rsc/source/rsc/rsc.cxx2
-rw-r--r--sal/inc/osl/socket_decl.hxx2
-rw-r--r--sal/osl/unx/file_path_helper.cxx2
-rw-r--r--sal/qa/rtl/math/test-rtl-math.cxx4
-rw-r--r--sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx2
-rw-r--r--sal/qa/rtl/strings/test_oustring_compare.cxx10
-rw-r--r--sal/qa/rtl/strings/test_oustring_stringliterals.cxx8
-rw-r--r--sal/qa/rtl/uri/rtl_testuri.cxx31
-rw-r--r--sal/rtl/bootstrap.cxx8
-rw-r--r--sal/rtl/uri.cxx6
-rw-r--r--sal/test/testbootstrap.cxx10
-rw-r--r--sal/test/unloading/unloadTest.cxx34
-rw-r--r--sax/source/tools/converter.cxx4
-rw-r--r--sax/source/tools/fshelper.cxx2
-rw-r--r--sc/qa/extras/macros-test.cxx76
-rw-r--r--sc/qa/extras/regression-test.cxx3
-rw-r--r--sc/qa/extras/scannotationobj.cxx2
-rw-r--r--sc/qa/extras/scannotationsobj.cxx2
-rw-r--r--sc/qa/extras/sccellrangeobj.cxx4
-rw-r--r--sc/qa/extras/scdatabaserangeobj.cxx2
-rw-r--r--sc/qa/extras/scdatapilotfieldobj.cxx4
-rw-r--r--sc/qa/extras/scdatapilottableobj.cxx8
-rw-r--r--sc/qa/extras/scmodelobj.cxx2
-rw-r--r--sc/qa/extras/scnamedrangeobj.cxx6
-rw-r--r--sc/qa/extras/scnamedrangesobj.cxx2
-rw-r--r--sc/qa/extras/scoutlineobj.cxx2
-rw-r--r--sc/qa/extras/sctablesheetobj.cxx6
-rw-r--r--sc/qa/extras/sctablesheetsobj.cxx4
-rw-r--r--sc/qa/unit/filters-test.cxx19
-rw-r--r--sc/qa/unit/helper/qahelper.hxx2
-rw-r--r--sc/qa/unit/subsequent_export-test.cxx5
-rw-r--r--sc/qa/unit/subsequent_filters-test.cxx57
-rw-r--r--sc/source/filter/excel/xechart.cxx2
-rw-r--r--sc/source/filter/excel/xecontent.cxx4
-rw-r--r--sc/source/filter/excel/xestyle.cxx4
-rw-r--r--sc/source/filter/excel/xiescher.cxx2
-rw-r--r--sc/source/filter/excel/xipivot.cxx2
-rw-r--r--sc/source/filter/excel/xltoolbar.cxx14
-rw-r--r--sc/source/filter/html/htmlpars.cxx2
-rw-r--r--sc/source/filter/oox/formulabuffer.cxx2
-rw-r--r--sc/source/filter/xcl97/XclExpChangeTrack.cxx8
-rw-r--r--sc/source/filter/xml/XMLExportDataPilot.cxx14
-rw-r--r--sc/source/filter/xml/XMLExportDatabaseRanges.cxx16
-rw-r--r--sc/source/filter/xml/XMLStylesExportHelper.cxx26
-rw-r--r--sc/source/filter/xml/xmlcoli.cxx2
-rw-r--r--sc/source/filter/xml/xmlcvali.cxx2
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx88
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx18
-rw-r--r--sc/source/filter/xml/xmlstyle.cxx20
-rw-r--r--sc/source/filter/xml/xmlstyli.cxx12
-rw-r--r--sc/source/filter/xml/xmlwrap.cxx60
-rw-r--r--sc/source/ui/Accessibility/AccessibleCell.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessibleCellBase.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleContextBase.cxx6
-rw-r--r--sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocument.cxx6
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessibleEditObject.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleFilterMenu.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeader.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewCell.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx6
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewTable.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessibleTableBase.cxx2
-rw-r--r--sc/source/ui/app/inputhdl.cxx4
-rw-r--r--sc/source/ui/app/inputwin.cxx4
-rw-r--r--sc/source/ui/app/scdll.cxx2
-rw-r--r--sc/source/ui/app/scmod.cxx2
-rw-r--r--sc/source/ui/attrdlg/scabstdlg.cxx2
-rw-r--r--sc/source/ui/cctrl/checklistmenu.cxx2
-rw-r--r--sc/source/ui/cctrl/tbzoomsliderctrl.cxx4
-rw-r--r--sc/source/ui/docshell/dbdocimp.cxx2
-rw-r--r--sc/source/ui/docshell/docfunc.cxx6
-rw-r--r--sc/source/ui/docshell/docsh.cxx22
-rw-r--r--sc/source/ui/docshell/docsh4.cxx4
-rw-r--r--sc/source/ui/docshell/docsh8.cxx4
-rw-r--r--sc/source/ui/docshell/externalrefmgr.cxx4
-rw-r--r--sc/source/ui/docshell/impex.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx22
-rw-r--r--sc/source/ui/drawfunc/fusel.cxx2
-rw-r--r--sc/source/ui/navipi/content.cxx2
-rw-r--r--sc/source/ui/undo/undoblk3.cxx4
-rw-r--r--sc/source/ui/undo/undocell.cxx4
-rw-r--r--sc/source/ui/unoobj/afmtuno.cxx6
-rw-r--r--sc/source/ui/unoobj/appluno.cxx8
-rw-r--r--sc/source/ui/unoobj/celllistsource.cxx8
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx12
-rw-r--r--sc/source/ui/unoobj/cellvaluebinding.cxx16
-rw-r--r--sc/source/ui/unoobj/chart2uno.cxx16
-rw-r--r--sc/source/ui/unoobj/chartuno.cxx12
-rw-r--r--sc/source/ui/unoobj/confuno.cxx6
-rw-r--r--sc/source/ui/unoobj/cursuno.cxx2
-rw-r--r--sc/source/ui/unoobj/dapiuno.cxx10
-rw-r--r--sc/source/ui/unoobj/datauno.cxx6
-rw-r--r--sc/source/ui/unoobj/docuno.cxx26
-rw-r--r--sc/source/ui/unoobj/eventuno.cxx6
-rw-r--r--sc/source/ui/unoobj/fielduno.cxx4
-rw-r--r--sc/source/ui/unoobj/fmtuno.cxx2
-rw-r--r--sc/source/ui/unoobj/funcuno.cxx4
-rw-r--r--sc/source/ui/unoobj/linkuno.cxx26
-rw-r--r--sc/source/ui/unoobj/miscuno.cxx2
-rw-r--r--sc/source/ui/unoobj/nameuno.cxx6
-rw-r--r--sc/source/ui/unoobj/pageuno.cxx4
-rw-r--r--sc/source/ui/unoobj/servuno.cxx4
-rw-r--r--sc/source/ui/unoobj/shapeuno.cxx16
-rw-r--r--sc/source/ui/unoobj/srchuno.cxx2
-rw-r--r--sc/source/ui/unoobj/unodoc.cxx4
-rw-r--r--sc/source/ui/unoobj/viewuno.cxx4
-rw-r--r--sc/source/ui/vba/excelvbahelper.cxx16
-rw-r--r--sc/source/ui/vba/excelvbahelper.hxx2
-rw-r--r--sc/source/ui/vba/testvba/testvba.cxx28
-rw-r--r--sc/source/ui/vba/vbaapplication.cxx61
-rw-r--r--sc/source/ui/vba/vbaassistant.cxx4
-rw-r--r--sc/source/ui/vba/vbaaxes.cxx16
-rw-r--r--sc/source/ui/vba/vbaaxis.cxx56
-rw-r--r--sc/source/ui/vba/vbaaxistitle.cxx4
-rw-r--r--sc/source/ui/vba/vbaborders.cxx22
-rw-r--r--sc/source/ui/vba/vbacharacters.cxx6
-rw-r--r--sc/source/ui/vba/vbachart.cxx22
-rw-r--r--sc/source/ui/vba/vbachartobject.cxx8
-rw-r--r--sc/source/ui/vba/vbachartobjects.cxx10
-rw-r--r--sc/source/ui/vba/vbacharttitle.cxx4
-rw-r--r--sc/source/ui/vba/vbacomment.cxx8
-rw-r--r--sc/source/ui/vba/vbacomments.cxx4
-rw-r--r--sc/source/ui/vba/vbacondition.cxx2
-rw-r--r--sc/source/ui/vba/vbadialog.cxx4
-rw-r--r--sc/source/ui/vba/vbadialogs.cxx4
-rw-r--r--sc/source/ui/vba/vbafont.cxx40
-rw-r--r--sc/source/ui/vba/vbaformat.cxx10
-rw-r--r--sc/source/ui/vba/vbaformatcondition.cxx6
-rw-r--r--sc/source/ui/vba/vbaformatconditions.cxx8
-rw-r--r--sc/source/ui/vba/vbaglobals.cxx2
-rw-r--r--sc/source/ui/vba/vbahyperlink.cxx12
-rw-r--r--sc/source/ui/vba/vbahyperlinks.cxx2
-rw-r--r--sc/source/ui/vba/vbainterior.cxx18
-rw-r--r--sc/source/ui/vba/vbamenu.cxx4
-rw-r--r--sc/source/ui/vba/vbamenubar.cxx4
-rw-r--r--sc/source/ui/vba/vbamenubars.cxx8
-rw-r--r--sc/source/ui/vba/vbamenuitem.cxx4
-rw-r--r--sc/source/ui/vba/vbamenuitems.cxx4
-rw-r--r--sc/source/ui/vba/vbamenus.cxx4
-rw-r--r--sc/source/ui/vba/vbaoleobject.cxx6
-rw-r--r--sc/source/ui/vba/vbaoleobjects.cxx4
-rw-r--r--sc/source/ui/vba/vbaoutline.cxx4
-rw-r--r--sc/source/ui/vba/vbapagebreak.cxx20
-rw-r--r--sc/source/ui/vba/vbapagebreaks.cxx10
-rw-r--r--sc/source/ui/vba/vbapalette.cxx4
-rw-r--r--sc/source/ui/vba/vbapane.cxx20
-rw-r--r--sc/source/ui/vba/vbapivotcache.cxx4
-rw-r--r--sc/source/ui/vba/vbapivottable.cxx4
-rw-r--r--sc/source/ui/vba/vbapivottables.cxx4
-rw-r--r--sc/source/ui/vba/vbarange.cxx8
-rw-r--r--sc/source/ui/vba/vbarange.hxx2
-rw-r--r--sc/source/ui/vba/vbastyle.cxx10
-rw-r--r--sc/source/ui/vba/vbastyles.cxx6
-rw-r--r--sc/source/ui/vba/vbatextboxshape.cxx2
-rw-r--r--sc/source/ui/vba/vbatextframe.cxx4
-rw-r--r--sc/source/ui/vba/vbatitle.hxx12
-rw-r--r--sc/source/ui/vba/vbavalidation.cxx12
-rw-r--r--sc/source/ui/vba/vbawindow.cxx14
-rw-r--r--sc/source/ui/vba/vbawindows.cxx4
-rw-r--r--sc/source/ui/vba/vbaworkbook.cxx12
-rw-r--r--sc/source/ui/vba/vbaworkbooks.cxx30
-rw-r--r--sc/source/ui/vba/vbaworksheet.cxx22
-rw-r--r--sc/source/ui/vba/vbaworksheets.cxx9
-rw-r--r--sc/source/ui/vba/vbawsfunction.cxx8
-rw-r--r--sc/source/ui/view/gridwin.cxx4
-rw-r--r--sc/source/ui/view/viewfun2.cxx4
-rw-r--r--sc/source/ui/view/viewfun3.cxx2
-rw-r--r--sc/source/ui/view/viewfun4.cxx2
-rw-r--r--sc/source/ui/view/viewfun5.cxx5
-rw-r--r--sc/source/ui/view/viewfunc.cxx18
-rw-r--r--scaddins/source/datefunc/datefunc.cxx2
-rw-r--r--scripting/source/basprov/basscript.cxx8
-rw-r--r--scripting/source/inc/util/MiscUtils.hxx3
-rw-r--r--scripting/source/stringresource/stringresource.cxx6
-rw-r--r--sd/qa/unit/regression-test.cxx5
-rw-r--r--sd/source/core/sdpage2.cxx2
-rw-r--r--sd/source/ui/remotecontrol/ImagePreparer.cxx2
-rw-r--r--sd/workben/custompanel/ctp_panel.cxx2
-rw-r--r--sdext/source/minimizer/configurationaccess.cxx12
-rw-r--r--sdext/source/minimizer/fileopendialog.cxx4
-rw-r--r--sdext/source/minimizer/pppoptimizer.cxx2
-rw-r--r--sdext/source/minimizer/pppoptimizerdialog.cxx2
-rw-r--r--sdext/source/minimizer/unodialog.cxx40
-rw-r--r--sdext/source/pdfimport/filterdet.cxx54
-rw-r--r--sdext/source/pdfimport/pdfiadaptor.cxx5
-rw-r--r--sdext/source/pdfimport/tree/pdfiprocessor.cxx6
-rw-r--r--sdext/source/pdfimport/tree/writertreevisiting.cxx2
-rw-r--r--sdext/source/presenter/PresenterProtocolHandler.cxx8
-rw-r--r--sdext/source/presenter/PresenterViewFactory.cxx4
-rw-r--r--sfx2/source/appl/imagemgr.cxx2
-rw-r--r--sfx2/source/appl/imestatuswindow.cxx23
-rw-r--r--sfx2/source/appl/openuriexternally.cxx3
-rw-r--r--sfx2/source/appl/shutdowniconunx.cxx2
-rw-r--r--sfx2/source/appl/workwin.cxx2
-rw-r--r--sfx2/source/control/thumbnailviewacc.cxx2
-rw-r--r--sfx2/source/dialog/dockwin.cxx4
-rw-r--r--sfx2/source/doc/docfile.cxx2
-rw-r--r--sfx2/source/doc/doctemplateslocal.cxx6
-rw-r--r--sfx2/source/doc/guisaveas.cxx106
-rw-r--r--sfx2/source/doc/objserv.cxx2
-rw-r--r--sfx2/source/view/frame2.cxx6
-rw-r--r--sfx2/workben/custompanel/ctp_factory.cxx6
-rw-r--r--sfx2/workben/custompanel/ctp_panel.cxx2
-rw-r--r--shell/source/backends/desktopbe/desktopbackend.cxx18
-rw-r--r--shell/source/backends/gconfbe/gconfaccess.cxx3
-rw-r--r--shell/source/backends/gconfbe/gconfbackend.cxx9
-rw-r--r--shell/source/backends/kde4be/kde4backend.cxx9
-rw-r--r--shell/source/backends/kdebe/kdebackend.cxx9
-rw-r--r--slideshow/source/engine/animationnodes/animationtransformnode.cxx9
-rw-r--r--slideshow/source/engine/animationnodes/basenode.cxx4
-rw-r--r--slideshow/source/engine/shapes/backgroundshape.cxx4
-rw-r--r--slideshow/source/engine/slide/slideimpl.cxx10
-rw-r--r--slideshow/source/engine/soundplayer.cxx4
-rw-r--r--slideshow/source/engine/tools.cxx4
-rw-r--r--slideshow/source/engine/transitions/shapetransitionfactory.cxx3
-rw-r--r--smoketest/smoketest.cxx12
-rw-r--r--stoc/source/corereflection/crarray.cxx16
-rw-r--r--stoc/source/corereflection/crcomp.cxx10
-rw-r--r--stoc/source/corereflection/crefl.cxx10
-rw-r--r--stoc/source/corereflection/crenum.cxx4
-rw-r--r--stoc/source/corereflection/criface.cxx16
-rw-r--r--stoc/source/implementationregistration/implreg.cxx2
-rw-r--r--stoc/source/implementationregistration/mergekeys.cxx4
-rw-r--r--stoc/source/inspect/introspection.cxx28
-rw-r--r--stoc/source/invocation/invocation.cxx27
-rw-r--r--stoc/source/invocation_adapterfactory/iafactory.cxx3
-rw-r--r--stoc/source/javaloader/javaloader.cxx61
-rw-r--r--stoc/source/javavm/javavm.cxx269
-rw-r--r--stoc/source/loader/dllcomponentloader.cxx4
-rw-r--r--stoc/source/registry_tdprovider/functiondescription.cxx6
-rw-r--r--stoc/source/registry_tdprovider/methoddescription.cxx3
-rw-r--r--stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx3
-rw-r--r--stoc/source/registry_tdprovider/structtypedescription.cxx2
-rw-r--r--stoc/source/registry_tdprovider/tdiface.cxx9
-rw-r--r--stoc/source/registry_tdprovider/tdprovider.cxx2
-rw-r--r--stoc/source/registry_tdprovider/tdservice.cxx15
-rw-r--r--stoc/source/registry_tdprovider/tdsingleton.cxx6
-rw-r--r--stoc/source/servicemanager/servicemanager.cxx52
-rw-r--r--stoc/source/simpleregistry/simpleregistry.cxx9
-rw-r--r--stoc/source/tdmanager/tdmgr.cxx10
-rw-r--r--stoc/source/tdmanager/tdmgr_tdenumeration.cxx6
-rw-r--r--stoc/source/typeconv/convert.cxx47
-rw-r--r--stoc/source/uriproc/ExternalUriReferenceTranslator.cxx8
-rw-r--r--stoc/source/uriproc/UriReferenceFactory.cxx12
-rw-r--r--stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx10
-rw-r--r--stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx10
-rw-r--r--stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx8
-rw-r--r--stoc/test/javavm/jvm_interaction/interactionhandler.cxx2
-rw-r--r--stoc/test/javavm/testjavavm.cxx2
-rw-r--r--stoc/test/testconv.cxx104
-rw-r--r--stoc/test/testsmgr2.cxx8
-rw-r--r--svgio/source/svguno/xsvgparser.cxx2
-rw-r--r--svtools/source/brwbox/brwbox3.cxx46
-rw-r--r--svtools/source/config/apearcfg.cxx2
-rw-r--r--svtools/source/config/extcolorcfg.cxx8
-rw-r--r--svtools/source/config/fontsubstconfig.cxx6
-rw-r--r--svtools/source/config/helpopt.cxx2
-rw-r--r--svtools/source/config/menuoptions.cxx10
-rw-r--r--svtools/source/config/optionsdrawinglayer.cxx56
-rw-r--r--svtools/source/config/printoptions.cxx32
-rw-r--r--svtools/source/contnr/contentenumeration.cxx28
-rw-r--r--svtools/source/contnr/fileview.cxx8
-rw-r--r--svtools/source/contnr/svtabbx.cxx2
-rw-r--r--svtools/source/contnr/templwin.cxx4
-rw-r--r--svtools/source/control/inettbc.cxx4
-rw-r--r--svtools/source/control/roadmap.cxx4
-rw-r--r--svtools/source/control/toolbarmenuacc.cxx4
-rw-r--r--svtools/source/control/valueacc.cxx2
-rw-r--r--svtools/source/dialogs/ServerDetailsControls.cxx2
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx14
-rw-r--r--svtools/source/dialogs/colrdlg.cxx2
-rw-r--r--svtools/source/dialogs/insdlg.cxx8
-rw-r--r--svtools/source/filter/SvFilterOptionsDialog.cxx6
-rw-r--r--svtools/source/graphic/graphic.cxx4
-rw-r--r--svtools/source/graphic/provider.cxx4
-rw-r--r--svtools/source/graphic/renderer.cxx4
-rw-r--r--svtools/source/hatchwindow/documentcloser.cxx8
-rw-r--r--svtools/source/hatchwindow/hatchwindowfactory.cxx6
-rw-r--r--svtools/source/misc/acceleratorexecute.cxx58
-rw-r--r--svtools/source/misc/imageresourceaccess.cxx8
-rw-r--r--svtools/source/misc/sampletext.cxx2
-rw-r--r--svtools/source/misc/templatefoldercache.cxx8
-rw-r--r--svtools/source/misc/transfer.cxx22
-rw-r--r--svtools/source/table/tablecontrol.cxx24
-rw-r--r--svtools/source/uno/miscservices.cxx4
-rw-r--r--svtools/source/uno/svtxgridcontrol.cxx4
-rw-r--r--svtools/source/uno/toolboxcontroller.cxx4
-rw-r--r--svtools/source/uno/treecontrolpeer.cxx2
-rw-r--r--svtools/source/uno/unoiface.cxx8
-rw-r--r--svtools/source/uno/unoimap.cxx16
-rw-r--r--svtools/source/uno/wizard/unowizard.cxx6
-rw-r--r--svx/source/fmcomp/dbaexchange.cxx2
-rw-r--r--svx/source/fmcomp/dbaobjectex.cxx2
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx2
-rw-r--r--svx/source/form/databaselocationinput.cxx4
-rw-r--r--svx/source/form/datanavi.cxx52
-rw-r--r--svx/source/form/fmPropBrw.cxx20
-rw-r--r--svx/source/form/fmcontrollayout.cxx36
-rw-r--r--svx/source/form/fmobj.cxx4
-rw-r--r--svx/source/form/fmscriptingenv.cxx8
-rw-r--r--svx/source/form/fmservs.cxx2
-rw-r--r--svx/source/form/fmshell.cxx2
-rw-r--r--svx/source/form/fmsrcimp.cxx4
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx8
-rw-r--r--svx/source/form/fmundo.cxx2
-rw-r--r--svx/source/form/formcontrolfactory.cxx4
-rw-r--r--svx/source/form/formtoolbars.cxx2
-rw-r--r--svx/source/form/legacyformcontroller.cxx6
-rw-r--r--svx/source/form/tbxform.cxx4
-rw-r--r--svx/source/gallery2/galbrws1.cxx2
-rw-r--r--svx/source/inc/docrecovery.hxx58
-rw-r--r--svx/source/inc/fmservs.hxx98
-rw-r--r--svx/source/inc/fmurl.hxx54
-rw-r--r--svx/source/inc/gridcols.hxx20
-rw-r--r--svx/source/mnuctrls/clipboardctl.cxx6
-rw-r--r--svx/source/sdr/overlay/overlaymanager.cxx2
-rw-r--r--svx/source/sdr/primitive2d/primitivefactory2d.cxx2
-rw-r--r--svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx2
-rw-r--r--svx/source/stbctrls/insctrl.cxx2
-rw-r--r--svx/source/stbctrls/pszctrl.cxx4
-rw-r--r--svx/source/stbctrls/zoomsliderctrl.cxx4
-rw-r--r--svx/source/svdraw/sdrpagewindow.cxx4
-rw-r--r--svx/source/svdraw/svdograf.cxx2
-rw-r--r--svx/source/svdraw/svdotxln.cxx2
-rw-r--r--svx/source/table/accessiblecell.cxx4
-rw-r--r--svx/source/table/accessibletableshape.cxx4
-rw-r--r--svx/source/table/cell.cxx6
-rw-r--r--svx/source/table/tablecolumn.cxx12
-rw-r--r--svx/source/table/tabledesign.cxx28
-rw-r--r--svx/source/table/tablerow.cxx12
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx30
-rw-r--r--svx/source/tbxctrls/fillctrl.cxx38
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx14
-rw-r--r--svx/source/tbxctrls/formatpaintbrushctrl.cxx4
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx6
-rw-r--r--svx/source/tbxctrls/itemwin.cxx12
-rw-r--r--svx/source/tbxctrls/lboxctrl.cxx4
-rw-r--r--svx/source/tbxctrls/linectrl.cxx16
-rw-r--r--svx/source/tbxctrls/tbunocontroller.cxx10
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.cxx12
-rw-r--r--svx/source/tbxctrls/verttexttbxctrl.cxx4
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx6
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx8
-rw-r--r--svx/source/unodraw/UnoNamespaceMap.cxx4
-rw-r--r--svx/source/unodraw/XPropertyTable.cxx12
-rw-r--r--svx/source/unodraw/tableshape.cxx2
-rw-r--r--svx/source/unodraw/unobtabl.cxx4
-rw-r--r--svx/source/unodraw/unoctabl.cxx6
-rw-r--r--svx/source/unodraw/unodtabl.cxx4
-rw-r--r--svx/source/unodraw/unogtabl.cxx4
-rw-r--r--svx/source/unodraw/unohtabl.cxx4
-rw-r--r--svx/source/unodraw/unomod.cxx58
-rw-r--r--svx/source/unodraw/unomtabl.cxx4
-rw-r--r--svx/source/unodraw/unopage.cxx4
-rw-r--r--svx/source/unodraw/unopool.cxx4
-rw-r--r--svx/source/unodraw/unoshape.cxx3
-rw-r--r--svx/source/unodraw/unoshcol.cxx6
-rw-r--r--svx/source/unodraw/unottabl.cxx4
-rw-r--r--svx/source/unogallery/unogalitem.cxx4
-rw-r--r--svx/source/unogallery/unogaltheme.cxx4
-rw-r--r--svx/source/unogallery/unogalthemeprovider.cxx4
-rw-r--r--svx/source/xml/xmleohlp.cxx12
-rw-r--r--svx/source/xml/xmlxtexp.cxx10
-rw-r--r--svx/source/xoutdev/xattr.cxx12
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx6
-rw-r--r--sw/inc/PostItMgr.hxx4
-rw-r--r--sw/source/core/unocore/swunohelper.cxx4
-rw-r--r--sw/source/core/unocore/unobkm.cxx7
-rw-r--r--sw/source/core/unocore/unocoll.cxx10
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx6
-rw-r--r--sw/source/core/unocore/unodraw.cxx24
-rw-r--r--sw/source/core/unocore/unofield.cxx14
-rw-r--r--sw/source/core/unocore/unoframe.cxx24
-rw-r--r--sw/source/core/unocore/unoftn.cxx4
-rw-r--r--sw/source/core/unocore/unoidx.cxx34
-rw-r--r--sw/source/core/unocore/unoobj.cxx26
-rw-r--r--sw/source/core/unocore/unoobj2.cxx4
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx28
-rw-r--r--sw/source/core/unocore/unoport.cxx10
-rw-r--r--sw/source/core/unocore/unorefmk.cxx2
-rw-r--r--sw/source/core/unocore/unosect.cxx26
-rw-r--r--sw/source/core/unocore/unosett.cxx24
-rw-r--r--sw/source/core/unocore/unosrch.cxx6
-rw-r--r--sw/source/core/unocore/unostyle.cxx54
-rw-r--r--sw/source/core/unocore/unotbl.cxx26
-rw-r--r--sw/source/core/unocore/unotext.cxx6
-rw-r--r--sw/source/core/view/printdata.cxx32
-rw-r--r--sw/source/filter/basflt/iodetect.cxx2
-rw-r--r--sw/source/filter/html/SwAppletImpl.cxx14
-rw-r--r--sw/source/filter/html/htmlbas.cxx2
-rw-r--r--sw/source/filter/html/htmlforw.cxx70
-rw-r--r--sw/source/filter/html/htmlplug.cxx36
-rw-r--r--sw/source/filter/xml/swxml.cxx22
-rw-r--r--sw/source/filter/xml/wrtxml.cxx6
-rw-r--r--sw/source/filter/xml/xmlexp.cxx60
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx69
-rw-r--r--sw/source/filter/xml/xmltexte.cxx40
-rw-r--r--sw/source/filter/xml/xmltexti.cxx26
-rw-r--r--sw/source/ui/app/appopt.cxx6
-rw-r--r--sw/source/ui/app/docsh2.cxx4
-rw-r--r--sw/source/ui/app/docst.cxx2
-rw-r--r--sw/source/ui/app/swmodule.cxx4
-rw-r--r--sw/source/ui/config/optload.cxx2
-rw-r--r--sw/source/ui/dbui/dbmgr.cxx6
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.cxx2
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx12
-rw-r--r--sw/source/ui/dialog/swabstdlg.cxx2
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx9
-rw-r--r--sw/source/ui/docvw/AnnotationMenuButton.cxx2
-rw-r--r--sw/source/ui/docvw/srcedtw.cxx4
-rw-r--r--sw/source/ui/envelp/labprt.cxx2
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx5
-rw-r--r--sw/source/ui/ribbar/workctrl.cxx8
-rw-r--r--sw/source/ui/shells/annotsh.cxx6
-rw-r--r--sw/source/ui/shells/drawsh.cxx2
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx2
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx4
-rw-r--r--sw/source/ui/shells/frmsh.cxx2
-rw-r--r--sw/source/ui/shells/textdrw.cxx2
-rw-r--r--sw/source/ui/shells/textsh.cxx20
-rw-r--r--sw/source/ui/shells/textsh1.cxx2
-rw-r--r--sw/source/ui/table/chartins.cxx10
-rw-r--r--sw/source/ui/table/tablemgr.cxx8
-rw-r--r--sw/source/ui/uiview/view.cxx28
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.cxx14
-rw-r--r--sw/source/ui/uno/unoatxt.cxx2
-rw-r--r--sw/source/ui/uno/unodoc.cxx12
-rw-r--r--sw/source/ui/uno/unomailmerge.cxx36
-rw-r--r--sw/source/ui/uno/unomodule.cxx4
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx32
-rw-r--r--sw/source/ui/uno/unotxvw.cxx38
-rw-r--r--sw/source/ui/utlui/viewlayoutctrl.cxx2
-rw-r--r--sw/source/ui/vba/vbaaddin.cxx7
-rw-r--r--sw/source/ui/vba/vbaaddins.cxx4
-rw-r--r--sw/source/ui/vba/vbaapplication.cxx4
-rw-r--r--sw/source/ui/vba/vbaautotextentry.cxx20
-rw-r--r--sw/source/ui/vba/vbabookmark.cxx6
-rw-r--r--sw/source/ui/vba/vbabookmarks.cxx6
-rw-r--r--sw/source/ui/vba/vbaborders.cxx12
-rw-r--r--sw/source/ui/vba/vbacell.cxx4
-rw-r--r--sw/source/ui/vba/vbacells.cxx4
-rw-r--r--sw/source/ui/vba/vbacolumn.cxx4
-rw-r--r--sw/source/ui/vba/vbacolumns.cxx8
-rw-r--r--sw/source/ui/vba/vbadialog.cxx4
-rw-r--r--sw/source/ui/vba/vbadialogs.cxx4
-rw-r--r--sw/source/ui/vba/vbadocument.cxx18
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx14
-rw-r--r--sw/source/ui/vba/vbadocuments.cxx4
-rw-r--r--sw/source/ui/vba/vbafield.cxx20
-rw-r--r--sw/source/ui/vba/vbafind.cxx38
-rw-r--r--sw/source/ui/vba/vbafont.cxx4
-rw-r--r--sw/source/ui/vba/vbaformfield.cxx8
-rw-r--r--sw/source/ui/vba/vbaformfields.cxx4
-rw-r--r--sw/source/ui/vba/vbaframe.cxx4
-rw-r--r--sw/source/ui/vba/vbaframes.cxx4
-rw-r--r--sw/source/ui/vba/vbaglobals.cxx10
-rw-r--r--sw/source/ui/vba/vbaheaderfooter.cxx10
-rw-r--r--sw/source/ui/vba/vbaheaderfooterhelper.cxx20
-rw-r--r--sw/source/ui/vba/vbaheadersfooters.cxx4
-rw-r--r--sw/source/ui/vba/vbalistformat.cxx12
-rw-r--r--sw/source/ui/vba/vbalistgalleries.cxx6
-rw-r--r--sw/source/ui/vba/vbalistgallery.cxx4
-rw-r--r--sw/source/ui/vba/vbalistlevel.cxx50
-rw-r--r--sw/source/ui/vba/vbalistlevels.cxx6
-rw-r--r--sw/source/ui/vba/vbalisttemplate.cxx6
-rw-r--r--sw/source/ui/vba/vbalisttemplates.cxx6
-rw-r--r--sw/source/ui/vba/vbaoptions.cxx22
-rw-r--r--sw/source/ui/vba/vbapagesetup.cxx86
-rw-r--r--sw/source/ui/vba/vbapane.cxx6
-rw-r--r--sw/source/ui/vba/vbapanes.cxx4
-rw-r--r--sw/source/ui/vba/vbaparagraph.cxx12
-rw-r--r--sw/source/ui/vba/vbaparagraphformat.cxx76
-rw-r--r--sw/source/ui/vba/vbarange.cxx24
-rw-r--r--sw/source/ui/vba/vbareplacement.cxx4
-rw-r--r--sw/source/ui/vba/vbarevision.cxx4
-rw-r--r--sw/source/ui/vba/vbarevisions.cxx4
-rw-r--r--sw/source/ui/vba/vbarow.cxx12
-rw-r--r--sw/source/ui/vba/vbarows.cxx36
-rw-r--r--sw/source/ui/vba/vbasection.cxx4
-rw-r--r--sw/source/ui/vba/vbasections.cxx8
-rw-r--r--sw/source/ui/vba/vbaselection.cxx62
-rw-r--r--sw/source/ui/vba/vbastyle.cxx32
-rw-r--r--sw/source/ui/vba/vbastyle.hxx2
-rw-r--r--sw/source/ui/vba/vbastyles.cxx18
-rw-r--r--sw/source/ui/vba/vbasystem.cxx13
-rw-r--r--sw/source/ui/vba/vbatable.cxx4
-rw-r--r--sw/source/ui/vba/vbatablehelper.cxx6
-rw-r--r--sw/source/ui/vba/vbatableofcontents.cxx16
-rw-r--r--sw/source/ui/vba/vbatables.cxx6
-rw-r--r--sw/source/ui/vba/vbatablesofcontents.cxx8
-rw-r--r--sw/source/ui/vba/vbatabstop.cxx4
-rw-r--r--sw/source/ui/vba/vbatabstops.cxx8
-rw-r--r--sw/source/ui/vba/vbatemplate.cxx8
-rw-r--r--sw/source/ui/vba/vbavariable.cxx7
-rw-r--r--sw/source/ui/vba/vbavariables.cxx4
-rw-r--r--sw/source/ui/vba/vbaview.cxx40
-rw-r--r--sw/source/ui/vba/vbawindow.cxx6
-rw-r--r--sw/source/ui/vba/vbawrapformat.cxx32
-rw-r--r--sw/source/ui/vba/wordvbahelper.cxx14
-rw-r--r--sw/source/ui/wrtsh/navmgr.cxx2
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx8
-rw-r--r--test/source/sheet/datapilotfield.cxx6
-rw-r--r--test/source/sheet/tableautoformatfield.cxx2
-rw-r--r--test/source/sheet/xdatabaserange.cxx30
-rw-r--r--test/source/sheet/xdatapilottable2.cxx2
-rw-r--r--test/source/sheet/xnamedrange.cxx8
-rw-r--r--test/source/unoapi_test.cxx3
-rw-r--r--testtools/source/bridgetest/bridgetest.cxx19
-rw-r--r--testtools/source/bridgetest/constructors.cxx14
-rw-r--r--testtools/source/bridgetest/cppobj.cxx20
-rw-r--r--testtools/source/bridgetest/multi.hxx10
-rw-r--r--testtools/source/performance/ubtest.cxx79
-rw-r--r--toolkit/source/awt/vclxwindows.cxx2
-rw-r--r--toolkit/source/controls/tabpagemodel.cxx12
-rw-r--r--toolkit/source/controls/unocontrolcontainer.cxx12
-rw-r--r--toolkit/source/helper/formpdfexport.cxx12
-rw-r--r--ucb/source/ucp/ext/ucpext_datasupplier.cxx2
-rw-r--r--ucb/source/ucp/ftp/ftpcontentcaps.cxx37
-rw-r--r--ucb/source/ucp/gio/gio_inputstream.cxx2
-rw-r--r--ucb/source/ucp/gio/gio_seekable.cxx6
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx170
-rw-r--r--ucb/source/ucp/package/pkgcontent.cxx114
-rw-r--r--ucb/source/ucp/package/pkgcontentcaps.cxx119
-rw-r--r--ucb/source/ucp/package/pkguri.cxx22
-rw-r--r--ucb/source/ucp/tdoc/tdoc_contentcaps.cxx148
-rw-r--r--ucb/source/ucp/tdoc/tdoc_docmgr.cxx6
-rw-r--r--ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx16
-rw-r--r--ucb/source/ucp/tdoc/tdoc_provider.cxx18
-rw-r--r--ucb/source/ucp/tdoc/tdoc_storage.cxx55
-rw-r--r--ucb/source/ucp/webdav-neon/NeonUri.cxx4
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx78
-rw-r--r--ucb/source/ucp/webdav/ContentProperties.cxx15
-rw-r--r--ucb/source/ucp/webdav/DAVProperties.cxx2
-rw-r--r--ucb/source/ucp/webdav/SerfSession.cxx2
-rw-r--r--ucb/source/ucp/webdav/webdavcontent.cxx23
-rw-r--r--ucb/source/ucp/webdav/webdavcontentcaps.cxx78
-rw-r--r--ucb/source/ucp/webdav/webdavdatasupplier.cxx6
-rw-r--r--vcl/aqua/source/app/salsys.cxx12
-rw-r--r--vcl/aqua/source/dtrans/DragSource.cxx12
-rw-r--r--vcl/aqua/source/dtrans/DropTarget.cxx6
-rw-r--r--vcl/aqua/source/dtrans/OSXTransferable.cxx6
-rw-r--r--vcl/aqua/source/dtrans/aqua_clipboard.cxx13
-rw-r--r--vcl/aqua/source/gdi/salprn.cxx4
-rw-r--r--vcl/aqua/source/window/salframe.cxx2
-rw-r--r--vcl/aqua/source/window/salmenu.cxx4
-rw-r--r--vcl/ios/source/app/salsys.cxx12
-rw-r--r--vcl/ios/source/dtrans/iOSTransferable.cxx6
-rw-r--r--vcl/ios/source/dtrans/ios_clipboard.cxx13
-rw-r--r--vcl/ios/source/window/salframe.cxx2
-rw-r--r--vcl/source/gdi/print3.cxx2
-rw-r--r--vcl/unx/generic/app/saldisp.cxx2
-rw-r--r--vcl/unx/generic/app/wmadaptor.cxx6
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx6
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx4
-rw-r--r--vcl/unx/generic/window/salframe.cxx2
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx12
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkPicker.cxx4
-rw-r--r--vcl/unx/gtk/gdi/gtkprintwrapper.cxx4
-rw-r--r--vcl/unx/gtk/gdi/salprn-gtk.cxx36
-rw-r--r--vcl/unx/kde/UnxFilePicker.cxx54
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.cxx12
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx2
-rw-r--r--vcl/workben/svptest.cxx2
-rw-r--r--vcl/workben/vcldemo.cxx2
-rw-r--r--xmlreader/source/span.cxx3
-rw-r--r--xmlreader/source/xmlreader.cxx55
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.cxx4
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx8
-rw-r--r--xmlsecurity/source/framework/buffernode.cxx18
-rw-r--r--xmlsecurity/source/framework/saxeventkeeperimpl.cxx28
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper2.cxx10
-rw-r--r--xmlsecurity/source/helper/xsecparser.cxx16
-rw-r--r--xmlsecurity/source/xmlsec/diagnose.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/ciphercontext.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/nssinitializer.cxx12
1024 files changed, 6344 insertions, 6673 deletions
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
index dc2151409ddb..5c0db33946b8 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
@@ -471,7 +471,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index 2441d6dfd024..41af149ebcc2 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -223,7 +223,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! pTypeDescr)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
+ OUString("cannot get typedescription for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -255,7 +255,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! rtti)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
+ OUString("no rtti for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -270,7 +270,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (! header)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
+ OUString("no exception header!"),
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
@@ -290,7 +290,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (0 == pExcTypeDescr)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
+ OUString("exception type not found: ") + unoName,
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
index 3a20ed84fd91..7d85b1a3746a 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
@@ -661,7 +661,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
index 0ef3a6362dfc..366c18eab6f4 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
@@ -467,7 +467,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
index 765a9efe64db..be610bbd2a4d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
@@ -385,7 +385,7 @@ static typelib_TypeClass cpp_mediate(
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
+ rtl::OUString( "illegal vtable index!" ),
(XInterface *)pCppI );
}
@@ -479,7 +479,7 @@ static typelib_TypeClass cpp_mediate(
default:
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
+ rtl::OUString( "no member description found!" ),
(XInterface *)pCppI );
}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
index e902036317e5..fa9eccbc70ba 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
@@ -508,7 +508,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index f42ab848a8aa..61d0fe5795a8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -317,7 +317,7 @@ namespace
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
+ OUString( "illegal vtable index!" ),
(XInterface *)pCppI );
}
@@ -416,7 +416,7 @@ namespace
default:
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
+ OUString( "no member description found!" ),
(XInterface *)pCppI );
}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index f09e43df7334..1e8917e0fba5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -256,7 +256,7 @@ namespace CPPU_CURRENT_NAMESPACE
if (! pTypeDescr)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
+ OUString("cannot get typedescription for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -287,7 +287,7 @@ namespace CPPU_CURRENT_NAMESPACE
if (! rtti)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
+ OUString("no rtti for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -314,7 +314,7 @@ namespace CPPU_CURRENT_NAMESPACE
if (! header)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
+ OUString("no exception header!"),
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
@@ -335,7 +335,7 @@ namespace CPPU_CURRENT_NAMESPACE
if (0 == pExcTypeDescr)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
+ OUString("exception type not found: ") + unoName,
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index b8b7d84961a5..66d43bbd8704 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -720,7 +720,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
index b9cdedf7591f..0befa137b699 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
@@ -423,7 +423,7 @@ namespace
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
+ OUString( "illegal vtable index!" ),
(XInterface *)pCppI );
}
@@ -522,7 +522,7 @@ namespace
default:
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
+ OUString( "no member description found!" ),
(XInterface *)pCppI );
}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 5d20e79e6939..73124c4afe63 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -232,7 +232,7 @@ namespace CPPU_CURRENT_NAMESPACE
if (! pTypeDescr)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
+ OUString("cannot get typedescription for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -263,7 +263,7 @@ namespace CPPU_CURRENT_NAMESPACE
if (! rtti)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
+ OUString("no rtti for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -284,7 +284,7 @@ namespace CPPU_CURRENT_NAMESPACE
if (! header)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
+ OUString("no exception header!"),
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
@@ -305,7 +305,7 @@ namespace CPPU_CURRENT_NAMESPACE
if (0 == pExcTypeDescr)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
+ OUString("exception type not found: ") + unoName,
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
index c0aa204a925a..4efc23488fad 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
@@ -498,7 +498,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
index 55cff3530184..635c7e74c53b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
@@ -361,7 +361,7 @@ static typelib_TypeClass cpp_mediate(
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
+ rtl::OUString( "illegal vtable index!" ),
(XInterface *)pThis );
}
@@ -462,7 +462,7 @@ static typelib_TypeClass cpp_mediate(
#endif
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
+ rtl::OUString( "no member description found!" ),
(XInterface *)pThis );
}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
index 7b3dd8407d71..a0212286ad6d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
@@ -666,7 +666,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
index e9958f56a5b4..0bf81064a588 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
@@ -242,7 +242,7 @@ extern "C" void cpp_vtable_call(
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
+ rtl::OUString( "illegal vtable index!" ),
(XInterface *)pThis );
}
@@ -331,7 +331,7 @@ extern "C" void cpp_vtable_call(
default:
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
+ rtl::OUString( "no member description found!" ),
(XInterface *)pThis );
}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index c945c1a0ff43..95259f9dcb32 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -243,7 +243,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! pTypeDescr)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
+ OUString("cannot get typedescription for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -274,7 +274,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! rtti)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
+ OUString("no rtti for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -289,7 +289,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (! header)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
+ OUString("no exception header!"),
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
@@ -310,7 +310,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (0 == pExcTypeDescr)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
+ OUString("exception type not found: ") + unoName,
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
index ade3a0be45b8..4e3f7db4c811 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
@@ -365,7 +365,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
index e4c5be1e46ce..8d0ee8cfd10b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
@@ -291,7 +291,7 @@ namespace
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
+ OUString( "illegal vtable index!" ),
(XInterface *)pCppI );
}
@@ -390,7 +390,7 @@ namespace
default:
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
+ OUString( "no member description found!" ),
(XInterface *)pCppI );
}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
index 5d20e79e6939..73124c4afe63 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
@@ -232,7 +232,7 @@ namespace CPPU_CURRENT_NAMESPACE
if (! pTypeDescr)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
+ OUString("cannot get typedescription for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -263,7 +263,7 @@ namespace CPPU_CURRENT_NAMESPACE
if (! rtti)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
+ OUString("no rtti for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -284,7 +284,7 @@ namespace CPPU_CURRENT_NAMESPACE
if (! header)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
+ OUString("no exception header!"),
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
@@ -305,7 +305,7 @@ namespace CPPU_CURRENT_NAMESPACE
if (0 == pExcTypeDescr)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
+ OUString("exception type not found: ") + unoName,
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx
index 47b22ad0541f..312744065023 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx
@@ -470,7 +470,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
index 18430dd623b5..335e05fad1fc 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
@@ -425,7 +425,7 @@ namespace
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
+ rtl::OUString( "illegal vtable index!" ),
(XInterface *)pThis );
}
@@ -538,7 +538,7 @@ namespace
fprintf(stderr,"cpp_mediate6\n");
#endif
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
+ rtl::OUString( "no member description found!" ),
(XInterface *)pThis );
}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
index dc698eacae77..3014c1306c41 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
@@ -229,7 +229,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! pTypeDescr)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
+ OUString("cannot get typedescription for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -260,7 +260,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! rtti)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
+ OUString("no rtti for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -275,7 +275,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (! header)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
+ OUString("no exception header!"),
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
@@ -296,7 +296,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (0 == pExcTypeDescr)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
+ OUString("exception type not found: ") + unoName,
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
index 6b1f930e8551..e14e86f09d6e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
@@ -576,7 +576,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
index 6c10b0c96a16..6d57c134f63a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
@@ -384,7 +384,7 @@ static typelib_TypeClass cpp_mediate(
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
+ rtl::OUString( "illegal vtable index!" ),
(XInterface *)pThis );
}
@@ -477,7 +477,7 @@ static typelib_TypeClass cpp_mediate(
default:
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
+ rtl::OUString( "no member description found!" ),
(XInterface *)pThis );
}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
index 70d170fd5261..5d1c47ca6d6d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
@@ -659,7 +659,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index 9b292b7e406d..9404471a1474 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -381,7 +381,7 @@ static typelib_TypeClass cpp_mediate(
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
+ rtl::OUString( "illegal vtable index!" ),
(XInterface *)pThis );
}
@@ -482,7 +482,7 @@ static typelib_TypeClass cpp_mediate(
#endif
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
+ rtl::OUString( "no member description found!" ),
(XInterface *)pThis );
}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
index a5f44250608c..03dbd00c2184 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
@@ -576,7 +576,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
index 3fe5adea020e..ba384f74472d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
@@ -349,7 +349,7 @@ static typelib_TypeClass cpp_mediate(
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
+ rtl::OUString( "illegal vtable index!" ),
(XInterface *)pCppI );
}
@@ -443,7 +443,7 @@ static typelib_TypeClass cpp_mediate(
default:
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
+ rtl::OUString( "no member description found!" ),
(XInterface *)pCppI );
}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
index 240a9825f866..7b5c99e7268b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
@@ -610,7 +610,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
index f9b05ab12aa1..e571bd2a555c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
@@ -370,7 +370,7 @@ static typelib_TypeClass cpp_mediate(
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
+ rtl::OUString( "illegal vtable index!" ),
(XInterface *)pCppI );
}
@@ -464,7 +464,7 @@ static typelib_TypeClass cpp_mediate(
default:
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
+ rtl::OUString( "no member description found!" ),
(XInterface *)pCppI );
}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
index 6cb75b6b995a..ac7607ad8b3f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
@@ -513,7 +513,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
index 1ee71c7e405f..2870b38aca14 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -230,7 +230,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! pTypeDescr)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
+ OUString("cannot get typedescription for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -261,7 +261,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! rtti)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
+ OUString("no rtti for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -276,7 +276,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (! header)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
+ OUString("no exception header!"),
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
@@ -297,7 +297,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (0 == pExcTypeDescr)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
+ OUString("exception type not found: ") + unoName,
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
index b16dfc41a30a..fc92e3922e70 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
@@ -576,7 +576,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index f069fdf307f3..be946383d975 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -281,7 +281,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" );
if ( nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex )
{
- throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("illegal vtable index!")),
+ throw RuntimeException( OUString("illegal vtable index!"),
reinterpret_cast<XInterface *>( pCppI ) );
}
@@ -378,7 +378,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
}
default:
{
- throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("no member description found!")),
+ throw RuntimeException( OUString("no member description found!"),
reinterpret_cast<XInterface *>( pCppI ) );
}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index 1468267c3f63..6991d5becfc1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -250,7 +250,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! pTypeDescr)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
+ OUString("cannot get typedescription for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -268,7 +268,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! rtti)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
+ OUString("no rtti for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -283,7 +283,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (! header)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
+ OUString("no exception header!"),
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
@@ -304,7 +304,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (0 == pExcTypeDescr)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
+ OUString("exception type not found: ") + unoName,
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index 1872f31bfed2..7be37bbe18c0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -248,8 +248,7 @@ static void cpp_call(
} catch (...) {
throw RuntimeException(
OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "C++ code threw unknown exception")),
+ "C++ code threw unknown exception"),
Reference< XInterface >());
}
@@ -435,7 +434,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
index 2b55304ae1c5..c5dd24630ff3 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
@@ -298,7 +298,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! pTypeDescr)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
+ OUString("cannot get typedescription for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -329,7 +329,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! rtti)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
+ OUString("no rtti for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -344,7 +344,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (! header)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
+ OUString("no exception header!"),
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
@@ -365,7 +365,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (0 == pExcTypeDescr)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
+ OUString("exception type not found: ") + unoName,
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx
index 3d327c66adec..0bef4f8f1182 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx
@@ -470,7 +470,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
index 47175358931d..7fb88fe723be 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
@@ -333,7 +333,7 @@ static typelib_TypeClass cpp_mediate(
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
+ rtl::OUString( "illegal vtable index!" ),
(XInterface *)pThis );
}
@@ -425,7 +425,7 @@ static typelib_TypeClass cpp_mediate(
default:
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
+ rtl::OUString( "no member description found!" ),
(XInterface *)pThis );
}
}
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx
index 7a4856ac045f..8e63487af658 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx
@@ -621,7 +621,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
index 89faee199c54..ffdf38f92084 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
@@ -281,7 +281,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" );
if ( nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex )
{
- throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("illegal vtable index!")),
+ throw RuntimeException( OUString("illegal vtable index!"),
reinterpret_cast<XInterface *>( pCppI ) );
}
@@ -378,7 +378,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
}
default:
{
- throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("no member description found!")),
+ throw RuntimeException( OUString("no member description found!"),
reinterpret_cast<XInterface *>( pCppI ) );
}
}
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index cd2d69805a0d..1c2c54c69a8e 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -309,7 +309,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! pTypeDescr)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
+ OUString("cannot get typedescription for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -341,7 +341,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! rtti)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
+ OUString("no rtti for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -356,7 +356,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (! header)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
+ OUString("no exception header!"),
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
@@ -377,7 +377,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (0 == pExcTypeDescr)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
+ OUString("exception type not found: ") + unoName,
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
index 1872f31bfed2..7be37bbe18c0 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
@@ -248,8 +248,7 @@ static void cpp_call(
} catch (...) {
throw RuntimeException(
OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "C++ code threw unknown exception")),
+ "C++ code threw unknown exception"),
Reference< XInterface >());
}
@@ -435,7 +434,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
index 5e0d19025da4..ea0d05a50c92 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
@@ -250,7 +250,7 @@ static typelib_TypeClass cpp_mediate(
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
+ rtl::OUString( "illegal vtable index!" ),
(XInterface *)pThis );
}
@@ -343,7 +343,7 @@ static typelib_TypeClass cpp_mediate(
default:
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
+ rtl::OUString( "no member description found!" ),
(XInterface *)pThis );
}
}
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
index 7fba31a03018..d3058e4b3e49 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
@@ -232,7 +232,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! pTypeDescr)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
+ OUString("cannot get typedescription for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -263,7 +263,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! rtti)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
+ OUString("no rtti for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -278,7 +278,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (! header)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
+ OUString("no exception header!"),
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
@@ -299,7 +299,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (0 == pExcTypeDescr)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
+ OUString("exception type not found: ") + unoName,
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
index 21b1dc7fd2c9..be63fdb0ccb1 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
@@ -404,7 +404,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
index 66d11c5350a2..95acfac20aa5 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
@@ -245,7 +245,7 @@ static typelib_TypeClass cpp_mediate(
"### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), (XInterface *)pCppI );
+ throw RuntimeException( rtl::OUString( "illegal vtable index!" ), (XInterface *)pCppI );
}
// determine called method
@@ -340,7 +340,7 @@ static typelib_TypeClass cpp_mediate(
}
default:
{
- throw RuntimeException(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), (XInterface *)pCppI );
+ throw RuntimeException(rtl::OUString( "no member description found!" ), (XInterface *)pCppI );
}
}
return eRet;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
index 68f43fe61d94..5bce4876d3d5 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
@@ -229,7 +229,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! pTypeDescr)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
+ OUString("cannot get typedescription for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -260,7 +260,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! rtti)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
+ OUString("no rtti for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -275,7 +275,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (! header)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
+ OUString("no exception header!"),
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
@@ -296,7 +296,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (0 == pExcTypeDescr)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
+ OUString("exception type not found: ") + unoName,
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
index d59c0357aad3..d91d49039472 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
@@ -575,7 +575,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
index d8b8bf2094ba..b29e3a7dce26 100644
--- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
@@ -250,7 +250,7 @@ extern "C" void cpp_vtable_call(
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
+ rtl::OUString( "illegal vtable index!" ),
(XInterface *)pThis );
}
@@ -339,7 +339,7 @@ extern "C" void cpp_vtable_call(
default:
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
+ rtl::OUString( "no member description found!" ),
(XInterface *)pThis );
}
}
diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx
index 9037c9f7e6c3..e86ab574a862 100644
--- a/bridges/source/cpp_uno/mingw_intel/except.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/except.cxx
@@ -223,7 +223,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! pTypeDescr)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
+ OUString("cannot get typedescription for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -254,7 +254,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
if (! rtti)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
+ OUString("no rtti for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
Reference< XInterface >() );
}
@@ -269,7 +269,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (! header)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
+ OUString("no exception header!"),
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
@@ -290,7 +290,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
if (0 == pExcTypeDescr)
{
RuntimeException aRE(
- OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
+ OUString("exception type not found: ") + unoName,
Reference< XInterface >() );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
diff --git a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
index 6b6652d8e47f..dd26e389c280 100644
--- a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
@@ -364,7 +364,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index 374f3b943c91..7859fb505092 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -246,7 +246,7 @@ static typelib_TypeClass __cdecl cpp_mediate(
"### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("illegal vtable index!") ),
+ throw RuntimeException( rtl::OUString("illegal vtable index!"),
(XInterface *)pThis );
}
@@ -340,7 +340,7 @@ static typelib_TypeClass __cdecl cpp_mediate(
default:
{
throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("no member description found!") ),
+ rtl::OUString("no member description found!"),
(XInterface *)pThis );
}
}
@@ -446,8 +446,8 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock(
Rtti():
n0(0), n1(0), n2(0),
rtti(CPPU_CURRENT_NAMESPACE::msci_getRTTI(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.uno.XInterface"))))
+ rtl::OUString(
+ "com.sun.star.uno.XInterface")))
{}
};
static Rtti rtti;
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
index 5ccc72a9de12..47e96d0b8aa3 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
@@ -442,7 +442,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ OUString("illegal member type description!"),
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
index 150d6bc82e0f..32c0109757a0 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -242,7 +242,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
OSL_ENSURE( nFunctionIndex < pTD->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" );
if ( nFunctionIndex >= pTD->nMapFunctionIndexToMemberIndex )
- throw RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Illegal vtable index!")),
+ throw RuntimeException( rtl::OUString("Illegal vtable index!"),
reinterpret_cast<XInterface *>( pCppI ) );
// Determine called method
@@ -345,7 +345,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
}
default:
{
- throw RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No member description found!")),
+ throw RuntimeException( rtl::OUString("No member description found!"),
reinterpret_cast<XInterface *>( pCppI ) );
}
}
@@ -456,8 +456,8 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock(
Rtti():
n0(0), n1(0), n2(0),
rtti(CPPU_CURRENT_NAMESPACE::mscx_getRTTI(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.uno.XInterface"))))
+ rtl::OUString(
+ "com.sun.star.uno.XInterface")))
{}
};
static Rtti rtti;
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
index 6040c3309273..6062332a75b9 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
@@ -412,7 +412,7 @@ void unoInterfaceProxyDispatch(
pReturn, pArgs, ppException ) )
{
RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("Too many parameters!") ),
+ OUString("Too many parameters!"),
Reference< XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
@@ -424,7 +424,7 @@ void unoInterfaceProxyDispatch(
default:
{
RuntimeException aExc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("Illegal member type description!") ),
+ OUString("Illegal member type description!"),
Reference< XInterface >() );
Type const & rExcType = ::getCppuType( &aExc );
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx
index fddc097edb42..47a2a0bd0767 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -478,12 +478,12 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
}
rtl::OUString Service::getImplementationName_static() {
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.test.bridges.testacquire.impl" ));
+ return rtl::OUString( "com.sun.star.test.bridges.testacquire.impl" );
}
css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static() {
css::uno::Sequence< rtl::OUString > names(1);
- names[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.test.bridges.testacquire" ));
+ names[0] = rtl::OUString( "com.sun.star.test.bridges.testacquire" );
return names;
}
@@ -519,7 +519,7 @@ bool writeInfo(void * registryKey, rtl::OUString const & implementationName,
css::uno::Sequence< rtl::OUString > const & serviceNames) {
rtl::OUString keyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
keyName += implementationName;
- keyName += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
+ keyName += rtl::OUString( "/UNO/SERVICES" );
css::uno::Reference< css::registry::XRegistryKey > key;
try {
key = static_cast< css::registry::XRegistryKey * >(registryKey)->
diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx
index 106e0a318c48..dc3936f77f80 100644
--- a/bridges/test/java_uno/equals/testequals.cxx
+++ b/bridges/test/java_uno/equals/testequals.cxx
@@ -110,7 +110,7 @@ void Service::connect(rtl::OUString const & rConnection,
css::connection::Connector::create(m_xContext)->connect(rConnection));
css::uno::Reference< css::bridge::XBridgeFactory > xBridgeFactory(
m_xContext->getServiceManager()->createInstanceWithContext(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.bridge.BridgeFactory" )),
+ rtl::OUString( "com.sun.star.bridge.BridgeFactory" ),
m_xContext),
css::uno::UNO_QUERY);
m_xBridge = xBridgeFactory->createBridge(rtl::OUString(), rProtocol,
@@ -126,7 +126,7 @@ Service::get(rtl::OUString const & rName) throw (css::uno::RuntimeException)
css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static()
{
css::uno::Sequence< rtl::OUString > aNames(1);
- aNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.test.bridges.testequals" ));
+ aNames[0] = rtl::OUString( "com.sun.star.test.bridges.testequals" );
return aNames;
}
@@ -179,7 +179,7 @@ bool writeInfo(void * pRegistryKey, sal_Char const * pImplementationName,
{
rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
aKeyName += rtl::OUString::createFromAscii(pImplementationName);
- aKeyName += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
+ aKeyName += rtl::OUString( "/UNO/SERVICES" );
css::uno::Reference< css::registry::XRegistryKey > xKey;
try
{
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
index df0991c245ac..907b4b41f2bd 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
@@ -75,27 +75,27 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &)
context->getServiceManager());
if (!factory.is()) {
throw new css::uno::RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no component context service manager" )),
+ rtl::OUString( "no component context service manager" ),
static_cast< cppu::OWeakObject * >(this));
}
css::uno::Reference< test::javauno::nativethreadpool::XRelay > relay;
try {
relay = css::uno::Reference< test::javauno::nativethreadpool::XRelay >(
factory->createInstanceWithContext(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test.javauno.nativethreadpool.Relay" )),
+ rtl::OUString( "test.javauno.nativethreadpool.Relay" ),
context),
css::uno::UNO_QUERY_THROW);
} catch (css::uno::RuntimeException &) {
throw;
} catch (css::uno::Exception & e) {
throw css::lang::WrappedTargetRuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "creating test.javauno.nativethreadpool.Relay service" )),
+ rtl::OUString( "creating test.javauno.nativethreadpool.Relay service" ),
static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
}
relay->start(this);
if (!data.setData(reinterpret_cast< void * >(12345))) {
throw new css::uno::RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "osl::ThreadData::setData failed" )),
+ rtl::OUString( "osl::ThreadData::setData failed" ),
static_cast< cppu::OWeakObject * >(this));
}
css::uno::Reference< test::javauno::nativethreadpool::XSource > source;
@@ -103,19 +103,19 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &)
source
= css::uno::Reference< test::javauno::nativethreadpool::XSource >(
css::bridge::UnoUrlResolver::create(context)->resolve(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "uno:socket,host=localhost,port=3830;urp;test" ))),
+ rtl::OUString( "uno:socket,host=localhost,port=3830;urp;test" )),
css::uno::UNO_QUERY_THROW);
} catch (css::connection::NoConnectException & e) {
throw css::lang::WrappedTargetRuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
+ rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
} catch (css::connection::ConnectionSetupException & e) {
throw css::lang::WrappedTargetRuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
+ rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
} catch (css::lang::IllegalArgumentException & e) {
throw css::lang::WrappedTargetRuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
+ rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
}
bool success = source->get() == 12345;
@@ -135,7 +135,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
}
rtl::OUString SAL_CALL getImplementationName() {
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test.javauno.nativethreadpool.client" ));
+ return rtl::OUString( "test.javauno.nativethreadpool.client" );
}
css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
index 607a05414c2e..6b7490b7732a 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
@@ -64,7 +64,7 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) {
context->getServiceManager());
if (!factory.is()) {
throw new css::uno::RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no component context service manager" )),
+ rtl::OUString( "no component context service manager" ),
static_cast< cppu::OWeakObject * >(this));
}
css::uno::Reference< test::javauno::nativethreadpool::XSource > source;
@@ -73,19 +73,19 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) {
source
= css::uno::Reference< test::javauno::nativethreadpool::XSource >(
css::bridge::UnoUrlResolver::create(context)->resolve(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "uno:socket,host=127.0.0.1,port=3831;urp;test" ))),
+ rtl::OUString( "uno:socket,host=127.0.0.1,port=3831;urp;test" )),
css::uno::UNO_QUERY_THROW);
} catch (css::connection::NoConnectException & e) {
throw css::lang::WrappedTargetRuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
+ rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
} catch (css::connection::ConnectionSetupException & e) {
throw css::lang::WrappedTargetRuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
+ rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
} catch (css::lang::IllegalArgumentException & e) {
throw css::lang::WrappedTargetRuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
+ rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
}
return source->get();
@@ -99,7 +99,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
}
rtl::OUString SAL_CALL getImplementationName() {
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test.javauno.nativethreadpool.server" ));
+ return rtl::OUString( "test.javauno.nativethreadpool.server" );
}
css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
diff --git a/bridges/test/testclient.cxx b/bridges/test/testclient.cxx
index e7c29c9402a4..052f598ba5e2 100644
--- a/bridges/test/testclient.cxx
+++ b/bridges/test/testclient.cxx
@@ -127,11 +127,11 @@ int main( int argc, char *argv[] )
{
Reference< XMultiServiceFactory > rSMgr = createRegistryServiceFactory(
- OUString( RTL_CONSTASCII_USTRINGPARAM("client.rdb")) );
+ OUString("client.rdb") );
Reference < XConnector > rConnector(
- createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Connector")),
+ createComponent( OUString("com.sun.star.connection.Connector"),
OUString( RTL_CONSTASCII_USTRINGPARAM("connector.uno" SAL_DLLEXTENSION)),
rSMgr ),
UNO_QUERY );
@@ -154,12 +154,12 @@ int main( int argc, char *argv[] )
else
{
// just ensure that it is registered
- createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.iiop")),
+ createComponent( OUString("com.sun.star.bridge.Bridge.iiop"),
OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge.uno" SAL_DLLEXTENSION)),
rSMgr );
Reference < XBridgeFactory > rFactory(
- createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory")),
+ createComponent( OUString("com.sun.star.bridge.BridgeFactory"),
OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION)),
rSMgr ),
UNO_QUERY );
@@ -168,13 +168,13 @@ int main( int argc, char *argv[] )
{
Reference < XBridge > rBridge = rFactory->createBridge(
- OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")),
+ OUString("bla blub"),
sProtocol,
rConnection,
new OInstanceProvider );
{
// test the factory
- Reference < XBridge > rBridge2 = rFactory->getBridge( OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) );
+ Reference < XBridge > rBridge2 = rFactory->getBridge( OUString("bla blub") );
OSL_ASSERT( rBridge2.is() );
OSL_ASSERT( rBridge2->getDescription() == rBridge->getDescription( ) );
OSL_ASSERT( rBridge2->getName() == rBridge->getName() );
@@ -183,7 +183,7 @@ int main( int argc, char *argv[] )
Reference < XInterface > rInitialObject = rBridge->getInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM("bridges-testobject")) );
+ OUString("bridges-testobject") );
if( rInitialObject.is() )
{
@@ -211,7 +211,7 @@ int main( int argc, char *argv[] )
printf( "Closing...\n" );
}
- Reference < XBridge > rBridge = rFactory->getBridge( OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) );
+ Reference < XBridge > rBridge = rFactory->getBridge( OUString("bla blub") );
// OSL_ASSERT( ! rBridge.is() );
}
diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx
index 053772b0d051..21eadd91b100 100644
--- a/bridges/test/testcomp.cxx
+++ b/bridges/test/testcomp.cxx
@@ -71,7 +71,7 @@ void parseCommandLine( char *argv[] ,
if( -1 == nIndex )
{
*pConnection = sTemp;
- *pProtocol = OUString( RTL_CONSTASCII_USTRINGPARAM( "iiop" ) );
+ *pProtocol = OUString( "iiop" );
}
else
{
@@ -97,10 +97,10 @@ Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeExce
::com::sun::star::uno::RuntimeException)
{
// Tries to get the PerformanceTestObject
- if( sObjectName == OUString( RTL_CONSTASCII_USTRINGPARAM( "TestRemoteObject" ) ) )
+ if( sObjectName == OUString( "TestRemoteObject" ) )
{
return m_rSMgr->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.test.performance.PerformanceTestObject") ) );
+ OUString("com.sun.star.test.performance.PerformanceTestObject") );
}
return Reference < XInterface > ( (::cppu::OWeakObject * ) new OTestFactory() );
}
@@ -421,7 +421,7 @@ void OInterfaceTest::call()
{
if( m_rCallMe.is() )
{
- m_rCallMe->call( OUString( RTL_CONSTASCII_USTRINGPARAM("This is my String during a callback!")) , 5);
+ m_rCallMe->call( OUString("This is my String during a callback!") , 5);
}
}
@@ -487,7 +487,7 @@ double getCallsPerSec( const Reference < XCallMe > &rCall , int nLoops, int nToD
osl_getSystemTime( &aStartTime );
for( sal_Int32 i = 0; i < nLoops; i ++ )
{
- rCall->call( OUString( RTL_CONSTASCII_USTRINGPARAM("Performance test string")) , nToDo );
+ rCall->call( OUString("Performance test string") , nToDo );
}
osl_getSystemTime( &aEndTime );
@@ -506,12 +506,12 @@ double getCallsPerSecOneway( const Reference < XCallMe > &rCall ,
osl_getSystemTime( &aStartTime );
for( sal_Int32 i = 0; i < nLoops; i ++ )
{
-// rCall->callOneway( OUString( RTL_CONSTASCII_USTRINGPARAM("Performance test string" )), 0 );
+// rCall->callOneway( OUString("Performance test string" ), 0 );
rCall->drawLine( 0 , 0 , 500 , 123 );
}
osl_getSystemTime( &aEndTime );
- rCall->call( OUString( RTL_CONSTASCII_USTRINGPARAM("Performance test string")) , nToDo );
+ rCall->call( OUString("Performance test string") , nToDo );
osl_getSystemTime( &aAfterExecution );
double fStart = (double)aStartTime.Seconds + ((double)aStartTime.Nanosec / 1000000000.0);
@@ -577,7 +577,7 @@ void testPerformance( const Reference < XCallMe > &rRemote,
void testException( const Reference < XCallMe > &r )
{
try {
- r->call( OUString( RTL_CONSTASCII_USTRINGPARAM("dummy")) , -1 );
+ r->call( OUString("dummy") , -1 );
OSL_ASSERT( ! "no exception flown !" );
}
catch( TestBridgeException & e )
@@ -599,7 +599,7 @@ void testSequenceOfCalls( const Reference< XCallMe > & rRCallMe )
printf( "Testing sequence of calls\n" );
for( sal_Int32 i = 0 ; i < 800 ; i ++ )
{
- rRCallMe->callOneway( OUString( RTL_CONSTASCII_USTRINGPARAM("hifuj" )), 0 );
+ rRCallMe->callOneway( OUString("hifuj" ), 0 );
}
}
@@ -622,7 +622,7 @@ void testAllTypes( const Reference < XCallMe > & rRCallMe )
types.UHyper = 1 << i*2;
types.Float = (float)123.239;
types.Double = 1279.12490012;
- types.String = OUString( RTL_CONSTASCII_USTRINGPARAM("abcdefghijklmnopqrstuvwxyz"));
+ types.String = OUString("abcdefghijklmnopqrstuvwxyz");
types.Interface = Reference< XInterface >( rRCallMe , UNO_QUERY);
types.Any <<= types.Double;
@@ -761,7 +761,7 @@ Reference <XInterface > createComponent( const OUString &sService ,
// erst registrieren
Reference < XImplementationRegistration > rReg (
rSMgr->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.ImplementationRegistration" ))),
+ OUString( "com.sun.star.registry.ImplementationRegistration" )),
UNO_QUERY );
OSL_ASSERT( rReg.is() );
@@ -770,7 +770,7 @@ Reference <XInterface > createComponent( const OUString &sService ,
try
{
rReg->registerImplementation(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.SharedLibrary" )),
+ OUString( "com.sun.star.loader.SharedLibrary" ),
aDllName,
Reference< XSimpleRegistry > () );
rInterface = rSMgr->createInstance( sService );
diff --git a/bridges/test/testoffice.cxx b/bridges/test/testoffice.cxx
index 55c28f4d1b0d..3f9157d01c3b 100644
--- a/bridges/test/testoffice.cxx
+++ b/bridges/test/testoffice.cxx
@@ -156,7 +156,7 @@ void testDocument( const Reference < XMultiServiceFactory > & rSmgr )
Reference< XComponent > rComponent =
rLoader->loadComponentFromURL(
OUString::createFromAscii( urls[i] ) ,
- OUString( RTL_CONSTASCII_USTRINGPARAM("_blank")),
+ OUString("_blank"),
0 ,
Sequence < ::com::sun::star::beans::PropertyValue >() );
@@ -175,7 +175,7 @@ void doSomething( const Reference < XInterface > &r )
{
printf( "got the remote naming service !\n" );
Reference < XInterface > rXsmgr = rName->getRegisteredObject(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "StarOffice.ServiceManager" )) );
+ OUString( "StarOffice.ServiceManager" ) );
Reference < XMultiServiceFactory > rSmgr( rXsmgr , UNO_QUERY );
if( rSmgr.is() )
@@ -203,22 +203,22 @@ int main( int argc, char *argv[] )
parseCommandLine( argv , &sConnectionString , &sProtocol , &bLatency , &bReverse );
{
Reference< XMultiServiceFactory > rSMgr = createRegistryServiceFactory(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "client.rdb" ) ) );
+ OUString( "client.rdb" ) );
// just ensure that it is registered
Reference < XConnector > rConnector(
- createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Connector")),
+ createComponent( OUString("com.sun.star.connection.Connector"),
OUString( RTL_CONSTASCII_USTRINGPARAM("connector.uno" SAL_DLLEXTENSION)),
rSMgr ),
UNO_QUERY );
- createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.iiop")),
+ createComponent( OUString("com.sun.star.bridge.Bridge.iiop"),
OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge.uno" SAL_DLLEXTENSION)),
rSMgr );
Reference < XBridgeFactory > rFactory(
- createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory")),
+ createComponent( OUString("com.sun.star.bridge.BridgeFactory"),
OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION)),
rSMgr ),
UNO_QUERY );
@@ -231,13 +231,13 @@ int main( int argc, char *argv[] )
rConnector->connect( sConnectionString );
Reference < XBridge > rBridge = rFactory->createBridge(
- OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")),
+ OUString("bla blub"),
sProtocol,
rConnection,
Reference < XInstanceProvider > () );
Reference < XInterface > rInitialObject
- = rBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("NamingService")) );
+ = rBridge->getInstance( OUString("NamingService") );
if( rInitialObject.is() )
{
diff --git a/bridges/test/testsameprocess.cxx b/bridges/test/testsameprocess.cxx
index 33781aaab08d..00d399b25400 100644
--- a/bridges/test/testsameprocess.cxx
+++ b/bridges/test/testsameprocess.cxx
@@ -94,7 +94,7 @@ void MyThread::run()
Reference < XBridge > rBridge =
m_rBridgeFactory->createBridge(
OUString() ,
- OUString( RTL_CONSTASCII_USTRINGPARAM("iiop")) ,
+ OUString("iiop") ,
rConnection ,
(XInstanceProvider * ) new OInstanceProvider );
@@ -119,27 +119,27 @@ int main( int argc, char *argv[] )
{
Reference< XMultiServiceFactory > rSMgr = createRegistryServiceFactory(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "client.rdb" ) ) );
+ OUString( "client.rdb" ) );
Reference < XConnector > rConnector(
- createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Connector")),
+ createComponent( OUString("com.sun.star.connection.Connector"),
OUString( RTL_CONSTASCII_USTRINGPARAM("connector.uno" SAL_DLLEXTENSION)),
rSMgr ),
UNO_QUERY );
Reference < XAcceptor > rAcceptor(
- createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor")),
+ createComponent( OUString("com.sun.star.connection.Acceptor"),
OUString( RTL_CONSTASCII_USTRINGPARAM("acceptor.uno" SAL_DLLEXTENSION)),
rSMgr ),
UNO_QUERY );
// just ensure that it is registered
-// createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.iiop")),
+// createComponent( OUString("com.sun.star.bridge.Bridge.iiop"),
// OUString( RTL_CONSTASCII_USTRINGPARAM("iiopbrdg" SAL_DLLEXTENSION)),
// rSMgr );
Reference < XBridgeFactory > rFactory(
- createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory")),
+ createComponent( OUString("com.sun.star.bridge.BridgeFactory"),
OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION)),
rSMgr ),
UNO_QUERY );
@@ -163,13 +163,13 @@ int main( int argc, char *argv[] )
{
Reference < XBridge > rBridge = rFactory->createBridge(
- OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")),
- OUString( RTL_CONSTASCII_USTRINGPARAM("iiop")),
+ OUString("bla blub"),
+ OUString("iiop"),
rConnection,
Reference < XInstanceProvider > () );
Reference < XInterface > rInitialObject
- = rBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("bla")) );
+ = rBridge->getInstance( OUString("bla") );
if( rInitialObject.is() )
{
@@ -182,7 +182,7 @@ int main( int argc, char *argv[] )
}
Reference < XBridge > rBridge = rFactory->getBridge(
- OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) );
+ OUString("bla blub") );
OSL_ASSERT( ! rBridge.is() );
}
diff --git a/bridges/test/testserver.cxx b/bridges/test/testserver.cxx
index d021294da6b0..4617b2350739 100644
--- a/bridges/test/testserver.cxx
+++ b/bridges/test/testserver.cxx
@@ -139,17 +139,17 @@ void MyThread::run()
{
printf( "doing reverse callme test (test is ok, when on each line a +- appears\n" );
Reference < XInterface > r = rBridge->getInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM("blubber" )));
+ OUString("blubber" ));
Reference < XTestFactory > rFactory( r , UNO_QUERY );
Reference < XCallMe > rCallMe = rFactory->createCallMe();
for( sal_Int32 i = 0 ; i < 1 ; i ++ )
{
rCallMe->callOneway(
- OUString( RTL_CONSTASCII_USTRINGPARAM("my test string")) , 2 );
+ OUString("my test string") , 2 );
}
printf( "all oneway are send\n" );
- rCallMe->call( OUString( RTL_CONSTASCII_USTRINGPARAM( "reverse call me test finished" )) , 0 );
+ rCallMe->call( OUString( "reverse call me test finished" ) , 0 );
printf( "revers callme test finished\n" );
}
}
@@ -190,22 +190,22 @@ int main( int argc, char *argv[] )
{
Reference< XMultiServiceFactory > rSMgr = createRegistryServiceFactory(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "server.rdb" ) ) );
+ OUString( "server.rdb" ) );
Reference < XBridgeFactory > rBridgeFactory ( createComponent(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory")),
+ OUString("com.sun.star.bridge.BridgeFactory"),
OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION )),
rSMgr ),
UNO_QUERY );
- createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.iiop")),
+ createComponent( OUString("com.sun.star.bridge.Bridge.iiop"),
OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge.uno" SAL_DLLEXTENSION)),
rSMgr );
Reference < XAcceptor > rAcceptor(
- createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor")),
+ createComponent( OUString("com.sun.star.connection.Acceptor"),
OUString( RTL_CONSTASCII_USTRINGPARAM("acceptor.uno" SAL_DLLEXTENSION)),
rSMgr ) ,
UNO_QUERY );
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index a721f77bf839..1b6a9e426b5d 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -208,10 +208,10 @@ WriterThread::WriterThread(
bool WriterThread::iteration() {
rtl::OUString options[] = {
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fish")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("chips")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("kippers")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bloaters")) };
+ rtl::OUString("fish"),
+ rtl::OUString("chips"),
+ rtl::OUString("kippers"),
+ rtl::OUString("bloaters") };
test_.setKey(path_, name_, css::uno::makeAny(options[index_]));
index_ = (index_ + 1) % (sizeof options / sizeof (rtl::OUString));
return true;
@@ -259,7 +259,7 @@ void RecursiveTest::test() {
"dotuno:WebHtml"))),
css::uno::UNO_QUERY_THROW);
properties_->addPropertyChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), this);
+ rtl::OUString("Label"), this);
step();
CPPUNIT_ASSERT(count_ == 0);
css::uno::Reference< css::lang::XComponent >(
@@ -306,8 +306,8 @@ void SimpleRecursiveTest::step() const {
RTL_CONSTASCII_USTRINGPARAM(
"/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
"dotuno:WebHtml")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")),
- css::uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("step"))));
+ rtl::OUString("Label"),
+ css::uno::makeAny(rtl::OUString("step")));
}
class CrossThreadTest: public RecursiveTest {
@@ -332,13 +332,13 @@ void CrossThreadTest::step() const {
RTL_CONSTASCII_USTRINGPARAM(
"/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
"dotuno:WebHtml")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))).join();
+ rtl::OUString("Label")).join();
test_.resetKey(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
"dotuno:WebHtml")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")));
+ rtl::OUString("Label"));
}
void Test::setUp() {
@@ -356,7 +356,7 @@ void Test::setUp() {
cppu::createRegistryServiceFactory(
rtl::OUString(registry, SAL_NO_ACQUIRE)),
css::uno::UNO_QUERY_THROW)->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))),
+ rtl::OUString("DefaultContext")),
css::uno::UNO_QUERY_THROW);
provider_ = css::configuration::theDefaultProvider::get(context_);
}
@@ -370,44 +370,40 @@ void Test::testKeyFetch() {
rtl::OUString s;
CPPUNIT_ASSERT(
getKey(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L10N/ooLocale"))) >>=
+ rtl::OUString("/org.openoffice.Setup"),
+ rtl::OUString("L10N/ooLocale")) >>=
s);
CPPUNIT_ASSERT(
getKey(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Test/AString"))) >>=
+ rtl::OUString("/org.openoffice.Setup"),
+ rtl::OUString("Test/AString")) >>=
s);
}
void Test::testKeySet() {
setKey(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString")),
- css::uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("baa"))));
+ rtl::OUString("/org.openoffice.Setup/Test"),
+ rtl::OUString("AString"),
+ css::uno::makeAny(rtl::OUString("baa")));
rtl::OUString s;
CPPUNIT_ASSERT(
getKey(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString"))) >>=
+ rtl::OUString("/org.openoffice.Setup/Test"),
+ rtl::OUString("AString")) >>=
s);
CPPUNIT_ASSERT( s == "baa" );
}
void Test::testKeyReset() {
if (resetKey(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString"))))
+ rtl::OUString("/org.openoffice.Setup/Test"),
+ rtl::OUString("AString")))
{
rtl::OUString s;
CPPUNIT_ASSERT(
getKey(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString"))) >>=
+ rtl::OUString("/org.openoffice.Setup/Test"),
+ rtl::OUString("AString")) >>=
s);
CPPUNIT_ASSERT( s == "Foo" );
}
@@ -421,7 +417,7 @@ void Test::testSetSetMemberName() {
RTL_CONSTASCII_USTRINGPARAM(
"/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
".uno:FontworkShapeType")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))) >>=
+ rtl::OUString("Label")) >>=
s);
CPPUNIT_ASSERT( s == "Fontwork Shape" );
@@ -434,13 +430,11 @@ void Test::testSetSetMemberName() {
css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::container::XNamed > member;
access->getByName(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(".uno:FontworkGalleryFloater"))) >>=
+ rtl::OUString(".uno:FontworkGalleryFloater")) >>=
member;
CPPUNIT_ASSERT(member.is());
member->setName(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(".uno:FontworkShapeType")));
+ rtl::OUString(".uno:FontworkShapeType"));
css::uno::Reference< css::util::XChangesBatch >(
access, css::uno::UNO_QUERY_THROW)->commitChanges();
css::uno::Reference< css::lang::XComponent >(
@@ -452,7 +446,7 @@ void Test::testSetSetMemberName() {
RTL_CONSTASCII_USTRINGPARAM(
"/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
".uno:FontworkShapeType")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))) >>=
+ rtl::OUString("Label")) >>=
s);
CPPUNIT_ASSERT( s == "Fontwork Gallery" );
}
@@ -475,11 +469,11 @@ void Test::testReadCommands() {
if (access->getByName(names[j]) >>= child) {
CPPUNIT_ASSERT(child.is());
child->getByName(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")));
+ rtl::OUString("Label"));
child->getByName(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContextLabel")));
+ rtl::OUString("ContextLabel"));
child->getByName(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Properties")));
+ rtl::OUString("Properties"));
}
}
}
@@ -492,32 +486,26 @@ void Test::testReadCommands() {
void Test::testThreads() {
struct Entry { rtl::OUString path; rtl::OUString relative; };
Entry list[] = {
- { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Test/AString")) },
- { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Test/AString")) },
+ { rtl::OUString("/org.openoffice.Setup"),
+ rtl::OUString("Test/AString") },
+ { rtl::OUString("/org.openoffice.Setup"),
+ rtl::OUString("Test/AString") },
{ rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "/org.openoffice.UI.GenericCommands")),
+ "/org.openoffice.UI.GenericCommands"),
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "UserInterface/Commands/dotuno:WebHtml/Label")) },
+ "UserInterface/Commands/dotuno:WebHtml/Label") },
{ rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "/org.openoffice.UI.GenericCommands")),
+ "/org.openoffice.UI.GenericCommands"),
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "UserInterface/Commands/dotuno:NewPresentation/Label")) },
+ "UserInterface/Commands/dotuno:NewPresentation/Label") },
{ rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "/org.openoffice.UI.GenericCommands")),
+ "/org.openoffice.UI.GenericCommands"),
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "UserInterface/Commands/dotuno:RecentFileList/Label")) },
- { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L10N/ooLocale")) },
- { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Test/ABoolean")) }
+ "UserInterface/Commands/dotuno:RecentFileList/Label") },
+ { rtl::OUString("/org.openoffice.Setup"),
+ rtl::OUString("L10N/ooLocale") },
+ { rtl::OUString("/org.openoffice.Setup"),
+ rtl::OUString("Test/ABoolean") }
};
std::size_t const numReaders = sizeof list / sizeof (Entry);
std::size_t const numWriters = numReaders - 2;
@@ -619,12 +607,11 @@ css::uno::Reference< css::uno::XInterface > Test::createViewAccess(
css::uno::Any arg(
css::uno::makeAny(
css::beans::NamedValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")),
+ rtl::OUString("nodepath"),
css::uno::makeAny(path))));
return provider_->createInstanceWithArguments(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationAccess")),
+ "com.sun.star.configuration.ConfigurationAccess"),
css::uno::Sequence< css::uno::Any >(&arg, 1));
}
@@ -634,12 +621,11 @@ css::uno::Reference< css::uno::XInterface > Test::createUpdateAccess(
css::uno::Any arg(
css::uno::makeAny(
css::beans::NamedValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")),
+ rtl::OUString("nodepath"),
css::uno::makeAny(path))));
return provider_->createInstanceWithArguments(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationUpdateAccess")),
+ "com.sun.star.configuration.ConfigurationUpdateAccess"),
css::uno::Sequence< css::uno::Any >(&arg, 1));
}
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 3d554bfc4ddd..9f18e8fdb9b9 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -486,7 +486,7 @@ void Access::addContainerListener(
checkLocalizedPropertyAccess();
if (!xListener.is()) {
throw css::uno::RuntimeException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
+ OUString("null listener"),
static_cast< cppu::OWeakObject * >(this));
}
if (!disposed_) {
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 58d16efdfe9f..191e45dd9d9e 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -69,8 +69,7 @@ rtl::OString convertToUtf8(
RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
{
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM("cannot convert to UTF-8")),
+ OUString("cannot convert to UTF-8"),
css::uno::Reference< css::uno::XInterface >());
}
return s;
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index fbf4082f37d4..7d19e700dfbf 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -106,7 +106,7 @@ OConnectionWrapper::~OConnectionWrapper()
// --------------------------------------------------------------------------------
::rtl::OUString SAL_CALL OConnectionWrapper::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.drivers.OConnectionWrapper" ) );
+ return ::rtl::OUString( "com.sun.star.sdbc.drivers.OConnectionWrapper" );
}
// --------------------------------------------------------------------------------
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index d15e69c1bfa0..f102744f10f6 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -219,7 +219,7 @@ Date DBTypeConversion::getNULLDate(const Reference< XNumberFormatsSupplier > &xS
{
// get the null date
Date aDate;
- xSupplier->getNumberFormatSettings()->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= aDate;
+ xSupplier->getNumberFormatSettings()->getPropertyValue(::rtl::OUString("NullDate")) >>= aDate;
return aDate;
}
catch ( const Exception& )
@@ -459,7 +459,7 @@ double DBTypeConversion::getValue( const Reference< XColumn >& i_column, const D
{
Reference< XNumberFormatsSupplier > xSupplier( xFormatter->getNumberFormatsSupplier(), UNO_SET_THROW );
Reference< XPropertySet > xFormatterSettings( xSupplier->getNumberFormatSettings(), UNO_SET_THROW );
- OSL_VERIFY( xFormatterSettings->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NullDate" ) ) ) >>= aFormatterNullDate );
+ OSL_VERIFY( xFormatterSettings->getPropertyValue( ::rtl::OUString( "NullDate" ) ) >>= aFormatterNullDate );
}
catch( const Exception& )
{
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 465702193b66..6b8f9c0e7a93 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -666,55 +666,55 @@ ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getBasicValue()
// -----------------------------------------------------------------------------
ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getSelectValue()
{
- static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT")));
+ static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("SELECT"));
return aValueRef;
}
// -----------------------------------------------------------------------------
ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getInsertValue()
{
- static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT")));
+ static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("INSERT"));
return aValueRef;
}
// -----------------------------------------------------------------------------
ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDeleteValue()
{
- static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DELETE")));
+ static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("DELETE"));
return aValueRef;
}
// -----------------------------------------------------------------------------
ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getUpdateValue()
{
- static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UPDATE")));
+ static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("UPDATE"));
return aValueRef;
}
// -----------------------------------------------------------------------------
ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getCreateValue()
{
- static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATE")));
+ static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("CREATE"));
return aValueRef;
}
// -----------------------------------------------------------------------------
ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getReadValue()
{
- static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("READ")));
+ static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("READ"));
return aValueRef;
}
// -----------------------------------------------------------------------------
ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getAlterValue()
{
- static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ALTER")));
+ static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("ALTER"));
return aValueRef;
}
// -----------------------------------------------------------------------------
ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDropValue()
{
- static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DROP")));
+ static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("DROP"));
return aValueRef;
}
// -----------------------------------------------------------------------------
ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getQuoteValue()
{
- static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'")));
+ static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("'"));
return aValueRef;
}
// -----------------------------------------------------------------------------
@@ -818,13 +818,13 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
//------------------------------------------------------------------------------
rtl::OUString ODatabaseMetaDataResultSet::getImplementationName_Static( ) throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"));
+ return ::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet");
}
//------------------------------------------------------------------------------
Sequence< ::rtl::OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static( ) throw (RuntimeException)
{
Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet"));
+ aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet");
return aSNS;
}
//------------------------------------------------------------------
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index e41a1a70b510..309ec2fe58c1 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -996,7 +996,7 @@ Any ORowSetValue::makeAny() const
case DataType::VARBINARY:
case DataType::LONGVARBINARY:
{
- ::rtl::OUStringBuffer sVal(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0x")));
+ ::rtl::OUStringBuffer sVal(::rtl::OUString("0x"));
Sequence<sal_Int8> aSeq(getSequence());
const sal_Int8* pBegin = aSeq.getConstArray();
const sal_Int8* pEnd = pBegin + aSeq.getLength();
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index 68f1e163c7be..91fa458de183 100644
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -35,13 +35,13 @@ namespace connectivity
::osl::MutexGuard aGuard(m_aMutex);
comphelper::SequenceAsHashMap aArgs(_aArguments);
uno::Reference< sdbc::XConnection > xConnection;
- xConnection = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")),xConnection);
+ xConnection = aArgs.getUnpackedValueOrDefault(::rtl::OUString("ActiveConnection"),xConnection);
m_xConnection = xConnection;
}
//------------------------------------------------------------------------------
rtl::OUString ParameterSubstitution::getImplementationName_Static( ) throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.ParameterSubstitution"));
+ return ::rtl::OUString("org.openoffice.comp.helper.ParameterSubstitution");
}
//------------------------------------------------------------------------------
::rtl::OUString SAL_CALL ParameterSubstitution::getImplementationName( ) throw(RuntimeException)
@@ -68,7 +68,7 @@ namespace connectivity
Sequence< ::rtl::OUString > ParameterSubstitution::getSupportedServiceNames_Static( ) throw (RuntimeException)
{
Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ParameterSubstitution"));
+ aSNS[0] = ::rtl::OUString("com.sun.star.sdb.ParameterSubstitution");
return aSNS;
}
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index 1f2a30a7b308..0f7830fa2692 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -93,7 +93,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName)
if ( aFind == m_pImpl->m_aColumnInfo.end() ) // we have to fill it
{
::rtl::OUString sComposedName = ::dbtools::composeTableNameForSelect( xConnection, m_pTable );
- collectColumnInformation(xConnection,sComposedName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) ,m_pImpl->m_aColumnInfo);
+ collectColumnInformation(xConnection,sComposedName,::rtl::OUString("*") ,m_pImpl->m_aColumnInfo);
aFind = m_pImpl->m_aColumnInfo.find(_rName);
}
if ( aFind != m_pImpl->m_aColumnInfo.end() )
@@ -180,7 +180,7 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName
::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " ));
aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true );
- aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ADD "));
+ aSql += ::rtl::OUString(" ADD ");
aSql += ::dbtools::createStandardColumnPart(descriptor,m_pTable->getConnection(),NULL,m_pTable->getTypeCreatePattern());
Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( );
@@ -203,7 +203,7 @@ void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem
::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString( );
aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true );
- aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DROP "));
+ aSql += ::rtl::OUString(" DROP ");
aSql += ::dbtools::quoteName( aQuote,_sElementName);
Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( );
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 02bad07afca8..210b642faac3 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -90,7 +90,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQ
Reference< XRow > xRow(xRet,UNO_QUERY);
::comphelper::SequenceAsHashMap aMap(m_aConnectionInfo);
Sequence< Any > aTypeInfoSettings;
- aTypeInfoSettings = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeInfoSettings")),aTypeInfoSettings);
+ aTypeInfoSettings = aMap.getUnpackedValueOrDefault(::rtl::OUString("TypeInfoSettings"),aTypeInfoSettings);
if ( xRow.is() )
{
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 629556137b39..ea28c41c451e 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -136,7 +136,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName
else
{
::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
- ::rtl::OUStringBuffer aSql( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATE ")));
+ ::rtl::OUStringBuffer aSql( ::rtl::OUString("CREATE "));
::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( );
::rtl::OUString aDot( RTL_CONSTASCII_USTRINGPARAM( "." ));
@@ -233,7 +233,7 @@ void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem
sIndexName = dbtools::composeTableName( m_pTable->getMetaData(), sTemp, aSchema, aName, sal_True, ::dbtools::eInIndexDefinitions );
aSql += sIndexName
- + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON "))
+ + ::rtl::OUString(" ON ")
+ aComposedName;
Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( );
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index 1d020bf2b16d..1c8b6490ab02 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -257,7 +257,7 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c
// -----------------------------------------------------------------------------
::rtl::OUString OKeysHelper::getDropForeignKey() const
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DROP CONSTRAINT "));
+ return ::rtl::OUString(" DROP CONSTRAINT ");
}
// -------------------------------------------------------------------------
// XDrop
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index f911f3e3e298..8a4baa2fa147 100644
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -40,9 +40,9 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>&
::rtl::OUString sUserWorkingFor;
Sequence< ::rtl::OUString > sTableTypes(3);
// we want all catalogues, all schemas, all tables
- sTableTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"));
- sTableTypes[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
- sTableTypes[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); // just to be sure to include anything else ....
+ sTableTypes[0] = ::rtl::OUString("VIEW");
+ sTableTypes[1] = ::rtl::OUString("TABLE");
+ sTableTypes[2] = ::rtl::OUString("%"); // just to be sure to include anything else ....
try
{
m_xTables = _rxMeta->getTables(catalog,schemaPattern,tableNamePattern,sTableTypes);
@@ -58,7 +58,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>&
static ODatabaseMetaDataResultSet::ORow aRow(8);
aRow[5] = new ORowSetValueDecorator(sUserWorkingFor);
aRow[6] = ODatabaseMetaDataResultSet::getSelectValue();
- aRow[7] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES")));
+ aRow[7] = new ORowSetValueDecorator(::rtl::OUString("YES"));
aRows.push_back(aRow);
aRow[6] = ODatabaseMetaDataResultSet::getInsertValue();
aRows.push_back(aRow);
@@ -74,7 +74,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>&
aRows.push_back(aRow);
aRow[6] = ODatabaseMetaDataResultSet::getDropValue();
aRows.push_back(aRow);
- aRow[6] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REFERENCE")));
+ aRow[6] = new ORowSetValueDecorator(::rtl::OUString("REFERENCE"));
aRows.push_back(aRow);
setRows(aRows);
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 7a85113ad5d0..3822b9af2ecd 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -272,7 +272,7 @@ void OTableHelper::refreshColumns()
aCatalog,
m_SchemaName,
m_Name,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"))
+ ::rtl::OUString("%")
) );
// collect the column names, together with their ordinal position
@@ -476,10 +476,10 @@ void OTableHelper::refreshIndexes()
::rtl::OUString OTableHelper::getRenameStart() const
{
::rtl::OUString sSql(RTL_CONSTASCII_USTRINGPARAM("RENAME "));
- if ( m_Type == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")) )
- sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" VIEW "));
+ if ( m_Type == ::rtl::OUString("VIEW") )
+ sSql += ::rtl::OUString(" VIEW ");
else
- sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TABLE "));
+ sSql += ::rtl::OUString(" TABLE ");
return sSql;
}
@@ -512,7 +512,7 @@ void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLEx
::rtl::OUString sComposedName;
sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,sal_True,::dbtools::eInDataManipulation);
sSql += sComposedName
- + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TO "));
+ + ::rtl::OUString(" TO ");
sComposedName = ::dbtools::composeTableName(getMetaData(),sCatalog,sSchema,sTable,sal_True,::dbtools::eInDataManipulation);
sSql += sComposedName;
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index 103db51025ed..70dd05740d8d 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -142,7 +142,7 @@ namespace dbtools
{
Reference< XPropertySet > xDataSource( xConnectionAsChild->getParent(), UNO_QUERY_THROW );
Reference< XPropertySet > xDataSourceSettings(
- xDataSource->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Settings" ) ) ),
+ xDataSource->getPropertyValue( ::rtl::OUString( "Settings" ) ),
UNO_QUERY_THROW );
_out_setting = xDataSourceSettings->getPropertyValue( ::rtl::OUString::createFromAscii( _asciiName ) );
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 8139793f9814..d06ca5e4e276 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -133,10 +133,10 @@ sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn,
try
{
// determine the datatype of the column
- _xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type"))) >>= nDataType;
+ _xColumn->getPropertyValue(::rtl::OUString("Type")) >>= nDataType;
if (DataType::NUMERIC == nDataType || DataType::DECIMAL == nDataType)
- _xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scale"))) >>= nScale;
+ _xColumn->getPropertyValue(::rtl::OUString("Scale")) >>= nScale;
}
catch (Exception&)
{
@@ -144,7 +144,7 @@ sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn,
}
return getDefaultNumberFormat(nDataType,
nScale,
- ::cppu::any2bool(_xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsCurrency")))),
+ ::cppu::any2bool(_xColumn->getPropertyValue(::rtl::OUString("IsCurrency"))),
_xTypes,
_rLocale);
}
@@ -295,8 +295,8 @@ Reference< XConnection > getConnection_allowException(
try
{
xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPwd;
- bPwdReq = ::cppu::any2bool(xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsPasswordRequired"))));
- xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("User"))) >>= sUser;
+ bPwdReq = ::cppu::any2bool(xProp->getPropertyValue(::rtl::OUString("IsPasswordRequired")));
+ xProp->getPropertyValue(::rtl::OUString("User")) >>= sUser;
}
catch(Exception&)
{
@@ -349,7 +349,7 @@ Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet) thro
Reference< XConnection> xReturn;
Reference< XPropertySet> xRowSetProps(_rxRowSet, UNO_QUERY);
if (xRowSetProps.is())
- xRowSetProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) >>= xReturn;
+ xRowSetProps->getPropertyValue(::rtl::OUString("ActiveConnection")) >>= xReturn;
return xReturn;
}
@@ -371,7 +371,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
// 1. already connected?
Reference< XConnection > xExistingConn(
- xRowSetProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) ) ),
+ xRowSetProps->getPropertyValue( ::rtl::OUString( "ActiveConnection" ) ),
UNO_QUERY );
if ( xExistingConn.is()
@@ -383,7 +383,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
{
if ( _bSetAsActiveConnection )
{
- xRowSetProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) ), makeAny( xExistingConn ) );
+ xRowSetProps->setPropertyValue( ::rtl::OUString( "ActiveConnection" ), makeAny( xExistingConn ) );
// no auto disposer needed, since we did not create the connection
}
@@ -395,9 +395,9 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
const ::rtl::OUString sUserProp( RTL_CONSTASCII_USTRINGPARAM( "User" ));
::rtl::OUString sDataSourceName;
- xRowSetProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sDataSourceName;
+ xRowSetProps->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sDataSourceName;
::rtl::OUString sURL;
- xRowSetProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"))) >>= sURL;
+ xRowSetProps->getPropertyValue(::rtl::OUString("URL")) >>= sURL;
Reference< XConnection > xPureConnection;
if (!sDataSourceName.isEmpty())
@@ -429,9 +429,9 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
if (!sUser.isEmpty())
{ // use user and pwd together with the url
Sequence< PropertyValue> aInfo(2);
- aInfo.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user"));
+ aInfo.getArray()[0].Name = ::rtl::OUString("user");
aInfo.getArray()[0].Value <<= sUser;
- aInfo.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password"));
+ aInfo.getArray()[1].Name = ::rtl::OUString("password");
aInfo.getArray()[1].Value <<= sPwd;
xPureConnection = xDriverManager->getConnectionWithInfo( sURL, aInfo );
}
@@ -458,7 +458,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
}
else
xRowSetProps->setPropertyValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) ),
+ ::rtl::OUString( "ActiveConnection" ),
makeAny( xConnection.getTyped() )
);
}
@@ -672,14 +672,14 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
if ( xComposerFac.is() )
{
- Reference< XSingleSelectQueryComposer > xComposer(xComposerFac->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.SingleSelectQueryComposer"))),UNO_QUERY);
+ Reference< XSingleSelectQueryComposer > xComposer(xComposerFac->createInstance( ::rtl::OUString("com.sun.star.sdb.SingleSelectQueryComposer")),UNO_QUERY);
if ( xComposer.is() )
{
xComposer->setQuery( sStatementToExecute );
// Now set the filter to a dummy restriction which will result in an empty
// result set.
- xComposer->setFilter( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "0=1" )) );
+ xComposer->setFilter( ::rtl::OUString( "0=1" ) );
sStatementToExecute = xComposer->getQuery( );
}
}
@@ -703,7 +703,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
{
if ( xStatementProps.is() )
xStatementProps->setPropertyValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxRows" ) ),
+ ::rtl::OUString( "MaxRows" ),
makeAny( sal_Int32( 0 ) )
);
}
@@ -1235,19 +1235,19 @@ catch(const Exception&)
//------------------------------------------------------------------------------
sal_Bool canInsert(const Reference< XPropertySet>& _rxCursorSet)
{
- return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Privileges")))) & Privilege::INSERT) != 0));
+ return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString("Privileges"))) & Privilege::INSERT) != 0));
}
//------------------------------------------------------------------------------
sal_Bool canUpdate(const Reference< XPropertySet>& _rxCursorSet)
{
- return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Privileges")))) & Privilege::UPDATE) != 0));
+ return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString("Privileges"))) & Privilege::UPDATE) != 0));
}
//------------------------------------------------------------------------------
sal_Bool canDelete(const Reference< XPropertySet>& _rxCursorSet)
{
- return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Privileges")))) & Privilege::DELETE) != 0));
+ return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString("Privileges"))) & Privilege::DELETE) != 0));
}
// -----------------------------------------------------------------------------
Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent)
@@ -1284,19 +1284,19 @@ Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Refere
::rtl::OUString sCommand;
sal_Bool bEscapeProcessing = sal_False;
- OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CommandType" )) ) >>= nCommandType );
- OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Command" )) ) >>= sCommand );
- OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "EscapeProcessing" )) ) >>= bEscapeProcessing );
+ OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString( "CommandType" ) ) >>= nCommandType );
+ OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString( "Command" ) ) >>= sCommand );
+ OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString( "EscapeProcessing" ) ) >>= bEscapeProcessing );
StatementComposer aComposer( xConn, sCommand, nCommandType, bEscapeProcessing );
// append sort
- aComposer.setOrder( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Order" )) ) ) );
+ aComposer.setOrder( getString( _rxRowSet->getPropertyValue( ::rtl::OUString( "Order" ) ) ) );
// append filter
sal_Bool bApplyFilter = sal_True;
- _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ApplyFilter" )) ) >>= bApplyFilter;
+ _rxRowSet->getPropertyValue( ::rtl::OUString( "ApplyFilter" ) ) >>= bApplyFilter;
if ( bApplyFilter )
- aComposer.setFilter( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Filter" )) ) ) );
+ aComposer.setFilter( getString( _rxRowSet->getPropertyValue( ::rtl::OUString( "Filter" ) ) ) );
aComposer.getQuery();
@@ -1352,8 +1352,8 @@ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer(
::rtl::OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnection,
const ::rtl::OUString& _rCatalog, const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rName )
{
- sal_Bool bUseCatalogInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseCatalogInSelect" ) ), sal_True );
- sal_Bool bUseSchemaInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseSchemaInSelect" ) ), sal_True );
+ sal_Bool bUseCatalogInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( "UseCatalogInSelect" ), sal_True );
+ sal_Bool bUseSchemaInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( "UseSchemaInSelect" ), sal_True );
return impl_doComposeTableName(
_rxConnection->getMetaData(),
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index db7b02bc8c26..a348e8743c66 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -160,14 +160,14 @@ namespace dbtools
::rtl::OUString aDefault = ::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)));
if ( !aDefault.isEmpty() )
{
- aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DEFAULT ")));
+ aSql.append(::rtl::OUString(" DEFAULT "));
aSql.append(sPreFix);
aSql.append(aDefault);
aSql.append(sPostFix);
} // if ( aDefault.getLength() )
if(::comphelper::getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISNULLABLE))) == ColumnValue::NO_NULLS)
- aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" NOT NULL")));
+ aSql.append(::rtl::OUString(" NOT NULL"));
if ( bIsAutoIncrement && !sAutoIncrementValue.isEmpty())
{
@@ -184,7 +184,7 @@ namespace dbtools
::rtl::OUString createStandardCreateStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const ::rtl::OUString& _sCreatePattern)
{
- ::rtl::OUStringBuffer aSql(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATE TABLE ")));
+ ::rtl::OUStringBuffer aSql(::rtl::OUString("CREATE TABLE "));
::rtl::OUString sCatalog,sSchema,sTable,sComposedName;
Reference<XDatabaseMetaData> xMetaData = _xConnection->getMetaData();
@@ -199,7 +199,7 @@ namespace dbtools
::dbtools::throwFunctionSequenceException(_xConnection);
aSql.append(sComposedName);
- aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (")));
+ aSql.append(::rtl::OUString(" ("));
// columns
Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY);
@@ -226,7 +226,7 @@ namespace
::rtl::OUString generateColumnNames(const Reference<XIndexAccess>& _xColumns,const Reference<XDatabaseMetaData>& _xMetaData)
{
::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
- static const ::rtl::OUString sComma(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")));
+ static const ::rtl::OUString sComma(::rtl::OUString(","));
const ::rtl::OUString sQuote(_xMetaData->getIdentifierQuoteString());
::rtl::OUString sSql( RTL_CONSTASCII_USTRINGPARAM( " (" ));
@@ -280,7 +280,7 @@ namespace
if(!xColumns.is() || !xColumns->getCount())
::dbtools::throwFunctionSequenceException(_xConnection);
- aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PRIMARY KEY ")));
+ aSql.append(::rtl::OUString(" PRIMARY KEY "));
aSql.append(generateColumnNames(xColumns,xMetaData));
}
else if(nKeyType == KeyType::UNIQUE)
@@ -290,7 +290,7 @@ namespace
if(!xColumns.is() || !xColumns->getCount())
::dbtools::throwFunctionSequenceException(_xConnection);
- aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" UNIQUE ")));
+ aSql.append(::rtl::OUString(" UNIQUE "));
aSql.append(generateColumnNames(xColumns,xMetaData));
}
else if(nKeyType == KeyType::FOREIGN)
@@ -302,7 +302,7 @@ namespace
if(!xColumns.is() || !xColumns->getCount())
::dbtools::throwFunctionSequenceException(_xConnection);
- aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FOREIGN KEY ")));
+ aSql.append(::rtl::OUString(" FOREIGN KEY "));
::rtl::OUString sRefTable = getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_REFERENCEDTABLE)));
::dbtools::qualifiedNameComponents(xMetaData,
sRefTable,
@@ -321,16 +321,16 @@ namespace
switch(nDeleteRule)
{
case KeyRule::CASCADE:
- aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE CASCADE ")));
+ aSql.append(::rtl::OUString(" ON DELETE CASCADE "));
break;
case KeyRule::RESTRICT:
- aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE RESTRICT ")));
+ aSql.append(::rtl::OUString(" ON DELETE RESTRICT "));
break;
case KeyRule::SET_NULL:
- aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE SET NULL ")));
+ aSql.append(::rtl::OUString(" ON DELETE SET NULL "));
break;
case KeyRule::SET_DEFAULT:
- aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE SET DEFAULT ")));
+ aSql.append(::rtl::OUString(" ON DELETE SET DEFAULT "));
break;
default:
;
@@ -531,7 +531,7 @@ Reference<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable
xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, _rName,_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType);
if ( !xProp.is() )
{
- xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType);
+ xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, ::rtl::OUString("%"),_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType);
if ( !xProp.is() )
xProp = new connectivity::sdbcx::OColumn(_rName,
::rtl::OUString(),::rtl::OUString(),::rtl::OUString(),
@@ -563,7 +563,7 @@ bool getBooleanDataSourceSetting( const Reference< XConnection >& _rxConnection,
if ( xDataSourceProperties.is() )
{
Reference< XPropertySet > xSettings(
- xDataSourceProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Settings") ) ),
+ xDataSourceProperties->getPropertyValue( ::rtl::OUString( "Settings") ),
UNO_QUERY_THROW
);
OSL_VERIFY( xSettings->getPropertyValue( ::rtl::OUString::createFromAscii( _pAsciiSettingName ) ) >>= bValue );
@@ -587,7 +587,7 @@ bool getDataSourceSetting( const Reference< XInterface >& _xChild, const ::rtl::
return false;
const Reference< XPropertySet > xSettings(
- xDataSourceProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Settings") ) ),
+ xDataSourceProperties->getPropertyValue( ::rtl::OUString( "Settings") ),
UNO_QUERY_THROW
);
@@ -617,7 +617,7 @@ sal_Bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp,const :
if ( xProp.is() )
{
Sequence< PropertyValue > aInfo;
- xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Info"))) >>= aInfo;
+ xProp->getPropertyValue(::rtl::OUString("Info")) >>= aInfo;
const PropertyValue* pValue =::std::find_if(aInfo.getConstArray(),
aInfo.getConstArray() + aInfo.getLength(),
::std::bind2nd(TPropertyValueEqualFunctor(),_sProperty));
@@ -746,7 +746,7 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
// Some drivers put a table privilege as soon as any column has the privilege,
// some drivers only if all columns have the privilege.
// To unifiy the situation, collect column privileges here, too.
- Reference< XResultSet > xColumnPrivileges = _xMetaData->getColumnPrivileges(aVal, _sSchema, _sTable, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")));
+ Reference< XResultSet > xColumnPrivileges = _xMetaData->getColumnPrivileges(aVal, _sSchema, _sTable, ::rtl::OUString("%"));
Reference< XRow > xColumnCurrentRow(xColumnPrivileges, UNO_QUERY);
if ( xColumnCurrentRow.is() )
{
@@ -819,14 +819,14 @@ void collectColumnInformation(const Reference< XConnection>& _xConnection,
const ::rtl::OUString& _rName,
ColumnInformationMap& _rInfo)
{
- static ::rtl::OUString STR_WHERE = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "));
+ static ::rtl::OUString STR_WHERE = ::rtl::OUString(" WHERE ");
- ::rtl::OUString sSelect = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT "));
+ ::rtl::OUString sSelect = ::rtl::OUString("SELECT ");
sSelect += _rName;
- sSelect += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM "));
+ sSelect += ::rtl::OUString(" FROM ");
sSelect += _sComposedName;
sSelect += STR_WHERE;
- sSelect += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0 = 1"));
+ sSelect += ::rtl::OUString("0 = 1");
try
{
@@ -930,7 +930,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const ::rtl::OUString& _rSourc
throw SQLException(
sMessage,
NULL,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "22018" ) ),
+ ::rtl::OUString( "22018" ),
22018,
Any()
);
@@ -956,7 +956,7 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString&
throw SQLException(
sMessage,
NULL,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "22001" ) ),
+ ::rtl::OUString( "22001" ),
22001,
Any()
);
@@ -1007,10 +1007,10 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString&
}
}
else
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.libreoffice.report.pentaho.SOReportJobFactory"));
+ return ::rtl::OUString("org.libreoffice.report.pentaho.SOReportJobFactory");
}
else
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.libreoffice.report.pentaho.SOReportJobFactory"));
+ return ::rtl::OUString("org.libreoffice.report.pentaho.SOReportJobFactory");
return ::rtl::OUString();
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index d897c9e5ff8c..f80e7ac1907c 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -130,7 +130,7 @@ namespace dbtools
_rData.m_xColumnUpdate.set( _rxColumn, UNO_QUERY );
// determine the field type, and whether it's a numeric field
- OSL_VERIFY( _rxColumn->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ) ) ) >>= _rData.m_nFieldType );
+ OSL_VERIFY( _rxColumn->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= _rData.m_nFieldType );
switch ( _rData.m_nFieldType )
{
@@ -157,7 +157,7 @@ namespace dbtools
// get the format key of our bound field
Reference< XPropertySetInfo > xPSI( _rxColumn->getPropertySetInfo(), UNO_QUERY_THROW );
bool bHaveFieldFormat = false;
- const ::rtl::OUString sFormatKeyProperty( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormatKey" ) ) );
+ const ::rtl::OUString sFormatKeyProperty( ::rtl::OUString( "FormatKey" ) );
if ( xPSI->hasPropertyByName( sFormatKeyProperty ) )
{
bHaveFieldFormat = ( _rxColumn->getPropertyValue( sFormatKeyProperty ) >>= _rData.m_nFormatKey );
@@ -173,7 +173,7 @@ namespace dbtools
// some more formatter settings
_rData.m_nKeyType = ::comphelper::getNumberFormatType( xNumberFormatsSupp->getNumberFormats(), _rData.m_nFormatKey );
Reference< XPropertySet > xFormatSettings( xNumberFormatsSupp->getNumberFormatSettings(), UNO_QUERY_THROW );
- OSL_VERIFY( xFormatSettings->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "NullDate" )) ) >>= _rData.m_aNullDate );
+ OSL_VERIFY( xFormatSettings->getPropertyValue( ::rtl::OUString( "NullDate" ) ) >>= _rData.m_aNullDate );
// remember the formatter
_rData.m_xFormatter = i_rNumberFormatter;
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index bd3c5f2c6c07..46be1486fc2d 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -228,14 +228,14 @@ namespace dbtools
// format is:
// <detail_column> = :<new_param_name>
sFilter = quoteName( m_sIdentifierQuoteString, _rDetailLink );
- sFilter += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " = :" ));
+ sFilter += ::rtl::OUString( " = :" );
// generate a parameter name which is not already used
- _rNewParamName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "link_from_" ) );
+ _rNewParamName = ::rtl::OUString( "link_from_" );
_rNewParamName += convertName2SQLName( _rMasterColumn, m_sSpecialCharacters );
while ( m_aParameterInformation.find( _rNewParamName ) != m_aParameterInformation.end() )
{
- _rNewParamName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_" ) );
+ _rNewParamName += ::rtl::OUString( "_" );
}
return sFilter += _rNewParamName;
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index bf65717dc997..414abf20eb19 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -149,7 +149,7 @@ namespace param
sal_Int32 nProperties( aProperties.getLength() );
aProperties.realloc( nProperties + 1 );
aProperties[ nProperties ] = Property(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value" ) ),
+ ::rtl::OUString( "Value" ),
PROPERTY_ID_VALUE,
::cppu::UnoType< Any >::get(),
PropertyAttribute::TRANSIENT | PropertyAttribute::MAYBEVOID
@@ -186,11 +186,11 @@ namespace param
{
// TODO : aParamType & nScale can be obtained within the constructor ....
sal_Int32 nParamType = DataType::VARCHAR;
- OSL_VERIFY( m_xDelegator->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ) ) ) >>= nParamType );
+ OSL_VERIFY( m_xDelegator->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= nParamType );
sal_Int32 nScale = 0;
- if ( m_xDelegatorPSI->hasPropertyByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scale" ) ) ) )
- OSL_VERIFY( m_xDelegator->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scale" ) ) ) >>= nScale );
+ if ( m_xDelegatorPSI->hasPropertyByName( ::rtl::OUString( "Scale" ) ) )
+ OSL_VERIFY( m_xDelegator->getPropertyValue( ::rtl::OUString( "Scale" ) ) >>= nScale );
if ( m_xValueDestination.is() )
{
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 8b6220ba6107..43ac90c181e4 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -141,7 +141,7 @@ namespace dbtools
if ( !pReturn )
{ // is it a text field ?
sal_Int32 nType = DataType::OTHER;
- _rxField->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Type" )) ) >>= nType;
+ _rxField->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= nType;
if ( ( DataType::CHAR == nType )
|| ( DataType::VARCHAR == nType )
@@ -200,17 +200,17 @@ namespace dbtools
try
{
Reference< XPropertySetInfo > xPSI( _rxField->getPropertySetInfo() );
- if ( xPSI.is() && xPSI->hasPropertyByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FormatKey" )) ) )
+ if ( xPSI.is() && xPSI->hasPropertyByName( ::rtl::OUString( "FormatKey" ) ) )
{
sal_Int32 nFormatKey = 0;
- _rxField->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FormatKey" )) ) >>= nFormatKey;
+ _rxField->getPropertyValue( ::rtl::OUString( "FormatKey" ) ) >>= nFormatKey;
if ( nFormatKey && m_xFormatter.is() )
{
Locale aFormatLocale;
::comphelper::getNumberFormatProperty(
m_xFormatter,
nFormatKey,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Locale" ) )
+ ::rtl::OUString( "Locale" )
) >>= aFormatLocale;
// valid locale
@@ -347,8 +347,8 @@ namespace dbtools
{
// first try the international version
::rtl::OUString sSql;
- sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * "));
- sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM x WHERE "));
+ sSql += ::rtl::OUString("SELECT * ");
+ sSql += ::rtl::OUString(" FROM x WHERE ");
sSql += sField;
sSql += _rPredicateValue;
::std::auto_ptr<OSQLParseNode> pParseNode( const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, sal_True ) );
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index 085f6e161d68..f0bf69a5bb63 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -127,7 +127,7 @@ namespace dbtools
if ( _rData.sCommand.isEmpty() )
break;
- sStatement = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SELECT * FROM " ) );
+ sStatement = ::rtl::OUString( "SELECT * FROM " );
::rtl::OUString sCatalog, sSchema, sTable;
qualifiedNameComponents( _rData.xConnection->getMetaData(), _rData.sCommand, sCatalog, sSchema, sTable, eInDataManipulation );
@@ -149,12 +149,12 @@ namespace dbtools
// a native query ?
sal_Bool bQueryEscapeProcessing = sal_False;
- xQuery->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EscapeProcessing" ) ) ) >>= bQueryEscapeProcessing;
+ xQuery->getPropertyValue( ::rtl::OUString( "EscapeProcessing" ) ) >>= bQueryEscapeProcessing;
if ( !bQueryEscapeProcessing )
break;
// the command used by the query
- xQuery->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Command" ) ) ) >>= sStatement;
+ xQuery->getPropertyValue( ::rtl::OUString( "Command" ) ) >>= sStatement;
if ( sStatement.isEmpty() )
break;
@@ -162,7 +162,7 @@ namespace dbtools
Reference< XMultiServiceFactory > xFactory( _rData.xConnection, UNO_QUERY_THROW );
::utl::SharedUNOComponent< XSingleSelectQueryComposer > xComposer;
xComposer.set(
- xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ),
+ xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ),
UNO_QUERY_THROW
);
@@ -170,7 +170,7 @@ namespace dbtools
xComposer->setElementaryQuery( sStatement );
// the sort order
- const ::rtl::OUString sPropOrder( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Order" ) ) );
+ const ::rtl::OUString sPropOrder( ::rtl::OUString( "Order" ) );
if ( ::comphelper::hasProperty( sPropOrder, xQuery ) )
{
::rtl::OUString sOrder;
@@ -189,7 +189,7 @@ namespace dbtools
if ( bApplyFilter )
{
::rtl::OUString sFilter;
- OSL_VERIFY( xQuery->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Filter" ) ) ) >>= sFilter );
+ OSL_VERIFY( xQuery->getPropertyValue( ::rtl::OUString( "Filter" ) ) >>= sFilter );
xComposer->setFilter( sFilter );
}
@@ -207,7 +207,7 @@ namespace dbtools
{
// create an composer
Reference< XMultiServiceFactory > xFactory( _rData.xConnection, UNO_QUERY_THROW );
- Reference< XSingleSelectQueryComposer > xComposer( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ),
+ Reference< XSingleSelectQueryComposer > xComposer( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ),
UNO_QUERY_THROW );
xComposer->setElementaryQuery( sStatement );
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index ab50f2f5b3b9..7dcd8cffff43 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -171,7 +171,7 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r
break;
case PROPERTY_ID_ISAUTOINCREMENT:
- OTools::putValue( m_aColumn.get_Properties(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Autoincrement" )), getBOOL( rValue ) );
+ OTools::putValue( m_aColumn.get_Properties(), ::rtl::OUString( "Autoincrement" ), getBOOL( rValue ) );
break;
case PROPERTY_ID_IM001:
@@ -218,7 +218,7 @@ void OAdoColumn::fillPropertyValues()
OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(),
pTypeInfoMap->end(),
::o3tl::compose1(
- ::std::bind2nd(aCase, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VarBinary"))),
+ ::std::bind2nd(aCase, ::rtl::OUString("VarBinary")),
::o3tl::compose1(
::std::mem_fun(&OExtendedTypeInfo::getDBName),
::o3tl::select2nd<OTypeInfoMap::value_type>())
@@ -252,11 +252,11 @@ void OAdoColumn::fillPropertyValues()
if ( aProps.IsValid() )
{
- m_IsAutoIncrement = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Autoincrement")) );
+ m_IsAutoIncrement = OTools::getValue( aProps, ::rtl::OUString("Autoincrement") );
- m_Description = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")) );
+ m_Description = OTools::getValue( aProps, ::rtl::OUString("Description") );
- m_DefaultValue = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Default")) );
+ m_DefaultValue = OTools::getValue( aProps, ::rtl::OUString("Default") );
#if OSL_DEBUG_LEVEL > 0
sal_Int32 nCount = aProps.GetItemCount();
diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index 2fd7b21b6937..5b918cdfef68 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -110,7 +110,7 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Referenc
sal_Bool bAutoIncrement = sal_False;
pColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement;
if ( bAutoIncrement )
- OTools::putValue( aAddedColumn.get_Properties(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Autoincrement")), bAutoIncrement );
+ OTools::putValue( aAddedColumn.get_Properties(), ::rtl::OUString("Autoincrement"), bAutoIncrement );
if ( aFind != pTypeInfoMap->end() && aColumn.get_Type() != aAddedColumn.get_Type() ) // change column type if necessary
aColumn.put_Type(aFind->first);
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 9ffc553f3182..775f0a2aa175 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -138,8 +138,8 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
WpADOProperties aProps = m_pAdoConnection->get_Properties();
if(aProps.IsValid())
{
- OTools::putValue(aProps,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Jet OLEDB:ODBC Parsing")),sal_True);
- OLEVariant aVar(OTools::getValue(aProps,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Jet OLEDB:Engine Type"))));
+ OTools::putValue(aProps,::rtl::OUString("Jet OLEDB:ODBC Parsing"),sal_True);
+ OLEVariant aVar(OTools::getValue(aProps,::rtl::OUString("Jet OLEDB:Engine Type")));
if(!aVar.isNull() && !aVar.isEmpty())
m_nEngineType = aVar;
}
@@ -208,7 +208,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::
WpADOProperties aProps = m_pAdoConnection->get_Properties();
if(aProps.IsValid())
{
- OTools::putValue(aProps,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Jet OLEDB:ODBC Parsing")),sal_True);
+ OTools::putValue(aProps,::rtl::OUString("Jet OLEDB:ODBC Parsing"),sal_True);
WpADOCommand aCommand;
aCommand.Create();
aCommand.put_ActiveConnection((IDispatch*)*m_pAdoConnection);
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index 634660f40558..df38f9e2cfb8 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
@@ -219,7 +219,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLExc
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Maximum Row Size")));
+ return getInt32Property(::rtl::OUString("Maximum Row Size"));
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException)
@@ -249,12 +249,12 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLExcept
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Active Sessions")));
+ return getInt32Property(::rtl::OUString("Active Sessions"));
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Max Columns in Table")));
+ return getInt32Property(::rtl::OUString("Max Columns in Table"));
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException)
@@ -269,7 +269,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLExcepti
// -------------------------------------------------------------------------
sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( )
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Maximum Tables in SELECT")));
+ return getInt32Property(::rtl::OUString("Maximum Tables in SELECT"));
}
// -------------------------------------------------------------------------
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
@@ -362,7 +362,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
aRow[4] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue();
aRow[5] = new ::connectivity::ORowSetValueDecorator(getUserName());
aRow[6] = ::connectivity::ODatabaseMetaDataResultSet::getSelectValue();
- aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO")));
+ aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString("NO"));
aRows.push_back(aRow);
aRow[6] = ::connectivity::ODatabaseMetaDataResultSet::getInsertValue();
@@ -404,37 +404,37 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException)
{
- return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Maximum Row Size Includes BLOB")));
+ return getBoolProperty(::rtl::OUString("Maximum Row Size Includes BLOB"));
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ;
+ return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ;
+ return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ;
}
// -------------------------------------------------------------------------
sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( )
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ;
+ return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ;
+ return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ;
+ return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ;
+ return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ;
}
// -------------------------------------------------------------------------
sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw( )
@@ -449,17 +449,17 @@ sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( )
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Maximum Index Size")));
+ return getInt32Property(::rtl::OUString("Maximum Index Size"));
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Concatenation Behavior"))) == DBPROPVAL_CB_NON_NULL;
+ return getInt32Property(::rtl::OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NON_NULL;
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException)
{
- return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Catalog Term")));
+ return getStringProperty(::rtl::OUString("Catalog Term"));
}
// -------------------------------------------------------------------------
::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( )
@@ -480,27 +480,27 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( )
// -------------------------------------------------------------------------
sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw( )
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Catalog Location"))) == DBPROPVAL_CL_START;
+ return getInt32Property(::rtl::OUString("Catalog Location")) == DBPROPVAL_CL_START;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_DDL_IGNORE;
+ return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_IGNORE;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_DDL_COMMIT;
+ return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_COMMIT;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_DML;
+ return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_DML;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_ALL;
+ return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_ALL;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException)
@@ -515,29 +515,29 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLExcep
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Prepare Abort Behavior"))) == DBPROPVAL_CB_PRESERVE;
+ return getInt32Property(::rtl::OUString("Prepare Abort Behavior")) == DBPROPVAL_CB_PRESERVE;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Prepare Commit Behavior"))) == DBPROPVAL_CB_PRESERVE;
+ return getInt32Property(::rtl::OUString("Prepare Commit Behavior")) == DBPROPVAL_CB_PRESERVE;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Isolation Retention"))) & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT;
+ return (getInt32Property(::rtl::OUString("Isolation Retention")) & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Isolation Retention"))) & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT;
+ return (getInt32Property(::rtl::OUString("Isolation Retention")) & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException)
{
sal_Bool bValue(sal_False);
- sal_Int32 nTxn = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Isolation Levels")));
+ sal_Int32 nTxn = getInt32Property(::rtl::OUString("Isolation Levels"));
if(level == TransactionIsolation::NONE)
bValue = sal_True;
else if(level == TransactionIsolation::READ_UNCOMMITTED)
@@ -554,35 +554,35 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int3
// -------------------------------------------------------------------------
sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( )
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Usage"))) & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS;
+ return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support")));
+ sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support"));
return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_FULL) == DBPROPVAL_SQL_ANSI92_FULL);
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support")));
+ sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support"));
return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_ENTRY) == DBPROPVAL_SQL_ANSI92_ENTRY);
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support")));
+ sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support"));
return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI89_IEF) == DBPROPVAL_SQL_ANSI89_IEF);
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Usage"))) & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION;
+ return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION;
}
// -------------------------------------------------------------------------
sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( )
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Usage"))) & DBPROPVAL_SU_TABLE_DEFINITION) == DBPROPVAL_SU_TABLE_DEFINITION;
+ return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_TABLE_DEFINITION) == DBPROPVAL_SU_TABLE_DEFINITION;
}
// -------------------------------------------------------------------------
sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( )
@@ -604,7 +604,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException,
{
if ( ADOS::isJetEngine(m_pConnection->getEngineType()) )
return sal_True;
- return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Outer Join Capabilities")));
+ return getBoolProperty(::rtl::OUString("Outer Join Capabilities"));
}
// -------------------------------------------------------------------------
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException)
@@ -629,7 +629,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLExcept
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_NONE;
+ return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_NONE;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException)
@@ -654,7 +654,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLExcepti
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException)
{
- return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Read-Only Data Source")));
+ return getBoolProperty(::rtl::OUString("Read-Only Data Source"));
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException)
@@ -674,7 +674,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLExcepti
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Concatenation Behavior"))) == DBPROPVAL_CB_NULL;
+ return getInt32Property(::rtl::OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NULL;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException)
@@ -689,27 +689,27 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQL
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException)
{
- return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Rowset Conversions on Command")));
+ return getBoolProperty(::rtl::OUString("Rowset Conversions on Command"));
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException)
{
- return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ORDER BY Columns in Select List")));
+ return getBoolProperty(::rtl::OUString("ORDER BY Columns in Select List"));
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GROUP BY Support"))) != DBPROPVAL_GB_NOT_SUPPORTED;
+ return getInt32Property(::rtl::OUString("GROUP BY Support")) != DBPROPVAL_GB_NOT_SUPPORTED;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GROUP BY Support"))) != DBPROPVAL_GB_CONTAINS_SELECT;
+ return getInt32Property(::rtl::OUString("GROUP BY Support")) != DBPROPVAL_GB_CONTAINS_SELECT;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GROUP BY Support"))) == DBPROPVAL_GB_NO_RELATION;
+ return getInt32Property(::rtl::OUString("GROUP BY Support")) == DBPROPVAL_GB_NO_RELATION;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException)
@@ -729,7 +729,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLExcep
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException)
{
- return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ORDER BY Columns in Select List")));
+ return getBoolProperty(::rtl::OUString("ORDER BY Columns in Select List"));
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException)
@@ -744,32 +744,32 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, Ru
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED;
+ return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED;
}
// -------------------------------------------------------------------------
sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( )
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED;
+ return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Collation Order"))) & DBPROPVAL_NC_END) == DBPROPVAL_NC_END;
+ return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_END) == DBPROPVAL_NC_END;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Collation Order"))) & DBPROPVAL_NC_START) == DBPROPVAL_NC_START;
+ return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_START) == DBPROPVAL_NC_START;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Collation Order"))) & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH;
+ return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Collation Order"))) & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW;
+ return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException)
@@ -779,7 +779,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(S
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Usage"))) & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION;
+ return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException)
@@ -794,73 +794,73 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( )
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES;
+ return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON;
+ return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS;
+ return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN;
+ return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException)
{
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED;
+ return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support")));
+ sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support"));
return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_INTERMEDIATE) == DBPROPVAL_SQL_ANSI92_INTERMEDIATE);
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:ado:"))+ m_pADOConnection->GetConnectionString();
+ return ::rtl::OUString("sdbc:ado:")+ m_pADOConnection->GetConnectionString();
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException)
{
- return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("User Name")));
+ return getStringProperty(::rtl::OUString("User Name"));
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException)
{
- return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Provider Friendly Name")));
+ return getStringProperty(::rtl::OUString("Provider Friendly Name"));
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException)
{
- return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Provider Version")));
+ return getStringProperty(::rtl::OUString("Provider Version"));
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException)
{
- return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBMS Version")));
+ return getStringProperty(::rtl::OUString("DBMS Version"));
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException)
{
- return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBMS Name")));
+ return getStringProperty(::rtl::OUString("DBMS Name"));
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException)
{
- return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Procedure Term")));
+ return getStringProperty(::rtl::OUString("Procedure Term"));
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException)
{
- return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Term")));
+ return getStringProperty(::rtl::OUString("Schema Term"));
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException)
@@ -957,19 +957,19 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support")));
+ sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support"));
return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_EXTENDED) == DBPROPVAL_SQL_ODBC_EXTENDED);
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support")));
+ sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support"));
return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_CORE) == DBPROPVAL_SQL_ODBC_CORE);
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support")));
+ sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support"));
return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_MINIMUM) == DBPROPVAL_SQL_ODBC_MINIMUM);
}
// -------------------------------------------------------------------------
@@ -977,7 +977,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLExcepti
{
if ( ADOS::isJetEngine(m_pConnection->getEngineType()) )
return sal_True;
- return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Outer Join Capabilities"))) & 0x00000004L) == 0x00000004L;
+ return (getInt32Property(::rtl::OUString("Outer Join Capabilities")) & 0x00000004L) == 0x00000004L;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException)
@@ -987,12 +987,12 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLExce
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Max Columns in GROUP BY")));
+ return getInt32Property(::rtl::OUString("Max Columns in GROUP BY"));
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException)
{
- return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Max Columns in ORDER BY")));
+ return getInt32Property(::rtl::OUString("Max Columns in ORDER BY"));
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index 3c9ab91ddb7d..e2ca3ef77a4e 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -117,7 +117,7 @@ sal_Bool ODatabaseMetaData::isCapable(sal_uInt32 _nId)
// -------------------------------------------------------------------------
void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap()
{
- m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IS_GRANTABLE")),
+ m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString("IS_GRANTABLE"),
ColumnValue::NULLABLE,
3,3,0,
DataType::VARCHAR);
@@ -125,31 +125,31 @@ void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap()
// -------------------------------------------------------------------------
void ODatabaseMetaDataResultSetMetaData::setColumnsMap()
{
- m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE_NAME")),
+ m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString("TYPE_NAME"),
ColumnValue::NO_NULLS,
0,0,0,
DataType::VARCHAR);
- m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULLABLE")),
+ m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString("NULLABLE"),
ColumnValue::NO_NULLS,
1,1,0,
DataType::INTEGER);
- m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REMARKS")),
+ m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString("REMARKS"),
ColumnValue::NULLABLE,
0,0,0,
DataType::VARCHAR);
- m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COLUMN_DEF")),
+ m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString("COLUMN_DEF"),
ColumnValue::NULLABLE,
0,0,0,
DataType::VARCHAR);
- m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATA_TYPE")),
+ m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATA_TYPE"),
ColumnValue::NO_NULLS,
1,1,0,
DataType::INTEGER);
- m_mColumns[15] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATETIME_SUB")),
+ m_mColumns[15] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATETIME_SUB"),
ColumnValue::NO_NULLS,
1,1,0,
DataType::INTEGER);
- m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR_OCTET_LENGTH")),
+ m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString("CHAR_OCTET_LENGTH"),
ColumnValue::NO_NULLS,
1,1,0,
DataType::INTEGER);
@@ -157,7 +157,7 @@ void ODatabaseMetaDataResultSetMetaData::setColumnsMap()
// -------------------------------------------------------------------------
void ODatabaseMetaDataResultSetMetaData::setTablesMap()
{
- m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REMARKS")),
+ m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString("REMARKS"),
ColumnValue::NULLABLE,
0,0,0,
DataType::VARCHAR);
@@ -165,7 +165,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablesMap()
// -------------------------------------------------------------------------
void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap()
{
- m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULLABLE")),
+ m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString("NULLABLE"),
ColumnValue::NO_NULLS,
1,1,0,
DataType::INTEGER);
@@ -173,11 +173,11 @@ void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap()
// -------------------------------------------------------------------------
void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap()
{
- m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_SEQ")),
+ m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString("KEY_SEQ"),
ColumnValue::NO_NULLS,
1,1,0,
DataType::INTEGER);
- m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PK_NAME")),
+ m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString("PK_NAME"),
ColumnValue::NULLABLE,
0,0,0,
DataType::VARCHAR);
@@ -185,15 +185,15 @@ void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap()
// -------------------------------------------------------------------------
void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap()
{
- m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NON_UNIQUE")),
+ m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString("NON_UNIQUE"),
ColumnValue::NO_NULLS,
1,1,0,
DataType::BIT);
- m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INDEX_QUALIFIER")),
+ m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString("INDEX_QUALIFIER"),
ColumnValue::NULLABLE,
0,0,0,
DataType::VARCHAR);
- m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ASC_OR_DESC")),
+ m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString("ASC_OR_DESC"),
ColumnValue::NULLABLE,
0,0,0,
DataType::VARCHAR);
@@ -201,11 +201,11 @@ void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap()
// -------------------------------------------------------------------------
void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap()
{
- m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PRIVILEGE")),
+ m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString("PRIVILEGE"),
ColumnValue::NULLABLE,
0,0,0,
DataType::VARCHAR);
- m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IS_GRANTABLE")),
+ m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString("IS_GRANTABLE"),
ColumnValue::NULLABLE,
0,0,0,
DataType::VARCHAR);
@@ -213,7 +213,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap()
// -------------------------------------------------------------------------
void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap()
{
- m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_SEQ")),
+ m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString("KEY_SEQ"),
ColumnValue::NO_NULLS,
1,1,0,
DataType::INTEGER);
@@ -221,27 +221,27 @@ void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap()
// -------------------------------------------------------------------------
void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap()
{
- m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PRECISION")),
+ m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString("PRECISION"),
ColumnValue::NO_NULLS,
1,1,0,
DataType::INTEGER);
- m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULLABLE")),
+ m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString("NULLABLE"),
ColumnValue::NO_NULLS,
1,1,0,
DataType::INTEGER);
- m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTO_INCREMENT")),
+ m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString("AUTO_INCREMENT"),
ColumnValue::NO_NULLS,
1,1,0,
DataType::BIT);
- m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATA_TYPE")),
+ m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATA_TYPE"),
ColumnValue::NO_NULLS,
1,1,0,
DataType::INTEGER);
- m_mColumns[17] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATETIME_SUB")),
+ m_mColumns[17] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATETIME_SUB"),
ColumnValue::NO_NULLS,
1,1,0,
DataType::INTEGER);
- m_mColumns[18] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUM_PREC_RADIX")),
+ m_mColumns[18] = OColumn(::rtl::OUString(),::rtl::OUString("NUM_PREC_RADIX"),
ColumnValue::NO_NULLS,
1,1,0,
DataType::INTEGER);
@@ -249,7 +249,7 @@ void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap()
// -------------------------------------------------------------------------
void ODatabaseMetaDataResultSetMetaData::setProceduresMap()
{
- m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REMARKS")),
+ m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString("REMARKS"),
ColumnValue::NULLABLE,
0,0,0,
DataType::VARCHAR);
@@ -571,7 +571,7 @@ void OAdoTable::fillPropertyValues()
{
WpADOProperties aProps = m_aTable.get_Properties();
if(aProps.IsValid())
- m_Description = OTools::getValue(aProps,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")));
+ m_Description = OTools::getValue(aProps,::rtl::OUString("Description"));
}
}
}
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index ed48af3963c2..ce04f82e5128 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -902,8 +902,8 @@ void ODatabaseMetaDataResultSet::setColumnsMap()
m_aValueRange[12] = aMap;
::std::map< sal_Int32,::rtl::OUString> aMap2;
- aMap2[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES"));
- aMap2[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO"));
+ aMap2[0] = ::rtl::OUString("YES");
+ aMap2[1] = ::rtl::OUString("NO");
m_aIntValueRange[18] = aMap2;
ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
@@ -1036,8 +1036,8 @@ void ODatabaseMetaDataResultSet::setIndexInfoMap()
::std::map< sal_Int32,::rtl::OUString> aMap3;
aMap3[0] = ::rtl::OUString();
- aMap3[DB_COLLATION_ASC] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("A"));
- aMap3[DB_COLLATION_DESC] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("D"));
+ aMap3[DB_COLLATION_ASC] = ::rtl::OUString("A");
+ aMap3[DB_COLLATION_DESC] = ::rtl::OUString("D");
m_aIntValueRange[21] = aMap3;
@@ -1058,8 +1058,8 @@ void ODatabaseMetaDataResultSet::setTablePrivilegesMap()
m_aColMapping.push_back(7);
::std::map< sal_Int32,::rtl::OUString> aMap;
- aMap[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES"));
- aMap[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO"));
+ aMap[0] = ::rtl::OUString("YES");
+ aMap[1] = ::rtl::OUString("NO");
m_aIntValueRange[7] = aMap;
@@ -1085,11 +1085,11 @@ void ODatabaseMetaDataResultSet::setCrossReferenceMap()
m_aColMapping.push_back(18);
::std::map< ::rtl::OUString,sal_Int32> aMap;
- aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CASCADE"))] = KeyRule::CASCADE;
- aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RESTRICT"))] = KeyRule::RESTRICT;
- aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SET NULL"))] = KeyRule::SET_NULL;
- aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SET DEFAULT"))] = KeyRule::SET_DEFAULT;
- aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO ACTION"))] = KeyRule::NO_ACTION;
+ aMap[ ::rtl::OUString("CASCADE")] = KeyRule::CASCADE;
+ aMap[ ::rtl::OUString("RESTRICT")] = KeyRule::RESTRICT;
+ aMap[ ::rtl::OUString("SET NULL")] = KeyRule::SET_NULL;
+ aMap[ ::rtl::OUString("SET DEFAULT")] = KeyRule::SET_DEFAULT;
+ aMap[ ::rtl::OUString("NO ACTION")] = KeyRule::NO_ACTION;
m_aStrValueRange[14] = aMap;
m_aStrValueRange[15] = aMap;
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index cbcc5561eb35..74717ba9a0a0 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -84,14 +84,14 @@ void ODriver::disposing()
//------------------------------------------------------------------------------
rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.ado.ODriver"));
+ return rtl::OUString("com.sun.star.comp.sdbc.ado.ODriver");
}
//------------------------------------------------------------------------------
Sequence< ::rtl::OUString > ODriver::getSupportedServiceNames_Static( ) throw (RuntimeException)
{
Sequence< ::rtl::OUString > aSNS( 2 );
- aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"));
- aSNS[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Driver"));
+ aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver");
+ aSNS[1] = ::rtl::OUString("com.sun.star.sdbcx.Driver");
return aSNS;
}
//------------------------------------------------------------------
@@ -162,26 +162,26 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::O
::std::vector< DriverPropertyInfo > aDriverInfo;
Sequence< ::rtl::OUString > aBooleanValues(2);
- aBooleanValues[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) );
- aBooleanValues[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) );
+ aBooleanValues[0] = ::rtl::OUString( "false" );
+ aBooleanValues[1] = ::rtl::OUString( "true" );
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreDriverPrivileges"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ignore the privileges from the database driver."))
+ ::rtl::OUString("IgnoreDriverPrivileges")
+ ,::rtl::OUString("Ignore the privileges from the database driver.")
,sal_False
- ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) )
+ ,::rtl::OUString( "false" )
,aBooleanValues)
);
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EscapeDateTime"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Escape date time format."))
+ ::rtl::OUString("EscapeDateTime")
+ ,::rtl::OUString("Escape date time format.")
,sal_False
- ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) )
+ ,::rtl::OUString( "true" )
,aBooleanValues)
);
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeInfoSettings"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Defines how the type info of the database metadata should be manipulated."))
+ ::rtl::OUString("TypeInfoSettings")
+ ,::rtl::OUString("Defines how the type info of the database metadata should be manipulated.")
,sal_False
,::rtl::OUString( )
,Sequence< ::rtl::OUString > ())
diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx
index ee19aec81448..18da7981c1b0 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -81,7 +81,7 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString&, const Reference<
WpADOKey aKey = pKey->getImpl();
::rtl::OUString sName = aKey.get_Name();
if(!sName.getLength())
- aKey.put_Name(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrimaryKey")) );
+ aKey.put_Name(::rtl::OUString("PrimaryKey") );
ADOKeys* pKeys = m_aCollection;
if ( FAILED(pKeys->Append(OLEVariant((ADOKey*)aKey),
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index ed2373a4af80..de0ba5f7e5cf 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -538,7 +538,7 @@ void OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode,
OSQLParseNode* pChildNode = _pNode->getChild(i);
if(SQL_ISRULE(pChildNode,parameter) && pChildNode->count() == 1)
{
- OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":")) ,SQL_NODE_PUNCTUATION,0);
+ OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(":") ,SQL_NODE_PUNCTUATION,0);
delete pChildNode->replace(pChildNode->getChild(0),pNewNode);
::rtl::OUString sParameterName = _sDefaultName;
sParameterName += ::rtl::OUString::valueOf(++_rParameterCount);
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 2e10ea9e6f96..804105772a16 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -54,14 +54,14 @@ using namespace com::sun::star::sdbc;
// IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.AResultSet","com.sun.star.sdbc.ResultSet");
::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ado.ResultSet"));
+ return ::rtl::OUString("com.sun.star.sdbcx.ado.ResultSet");
}
// -------------------------------------------------------------------------
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException)
{
::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet"));
- aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet");
+ aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet");
return aSupported;
}
// -------------------------------------------------------------------------
@@ -901,7 +901,7 @@ sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) throw(SQLException, Runtim
ADOS::ThrowException(*((OConnection*)m_pStmt->getConnection().get())->getConnection(),*this);
OSL_ENSURE(aProps.IsValid(),"There are no properties at the connection");
- WpADOProperty aProp(aProps.GetItem(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmarks Ordered"))));
+ WpADOProperty aProp(aProps.GetItem(::rtl::OUString("Bookmarks Ordered")));
OLEVariant aVar;
if(aProp.IsValid())
aVar = aProp.GetValue();
diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
index a2bdef9699f1..31e5938e866e 100644
--- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
@@ -84,7 +84,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(
{
WpADOProperties aProps( aField.get_Properties() );
if ( aProps.IsValid() )
- bRet = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ISCASESENSITIVE")) );
+ bRet = OTools::getValue( aProps, ::rtl::OUString("ISCASESENSITIVE") );
}
return bRet;
}
@@ -114,7 +114,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(
{
WpADOProperties aProps( aField.get_Properties() );
if ( aProps.IsValid() )
- sTableName = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BASETABLENAME")) );
+ sTableName = OTools::getValue( aProps, ::rtl::OUString("BASETABLENAME") );
}
return sTableName;
}
@@ -160,7 +160,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(
WpADOProperties aProps( aField.get_Properties() );
if ( aProps.IsValid() )
{
- bRet = OTools::getValue( aProps, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ISAUTOINCREMENT")) );
+ bRet = OTools::getValue( aProps, ::rtl::OUString("ISAUTOINCREMENT") );
#if OSL_DEBUG_LEVEL > 0
sal_Int32 nCount = aProps.GetItemCount();
for (sal_Int32 i = 0; i<nCount; ++i)
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 0d042d84f2e7..35664bdbbcb6 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -354,7 +354,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException,
::rtl::OUString aBatchSql;
sal_Int32 nLen = 0;
for(::std::list< ::rtl::OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen)
- aBatchSql = aBatchSql + *i + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
+ aBatchSql = aBatchSql + *i + ::rtl::OUString(";");
if ( m_RecordSet.IsValid() )
diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx
index fe4a337b6874..e0c51af338b2 100644
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
@@ -215,7 +215,7 @@ void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rV
case PROPERTY_ID_DESCRIPTION:
OTools::putValue( m_aTable.get_Properties(),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")),
+ ::rtl::OUString("Description"),
getString(rValue));
break;
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index cbdde99e7be5..1a24260b7f7e 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -436,7 +436,7 @@ void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc)
throw ::com::sun::star::sdbc::SQLException(
sError,
NULL,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "S1000" )),
+ ::rtl::OUString( "S1000" ),
1000,
::com::sun::star::uno::Any()
);
diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx
index 75655025e37d..37b6636df462 100644
--- a/connectivity/source/drivers/ado/adoimp.cxx
+++ b/connectivity/source/drivers/ado/adoimp.cxx
@@ -69,7 +69,7 @@ const IID ADOS::IID_ADOVIEW_25 = MYADOID(0x00000613);
OLEString& ADOS::GetKeyStr()
{
- static OLEString sKeyStr(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gxwaezucfyqpwjgqbcmtsncuhwsnyhiohwxz")));
+ static OLEString sKeyStr(::rtl::OUString("gxwaezucfyqpwjgqbcmtsncuhwsnyhiohwxz"));
return sKeyStr;
}
diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx
index 4e84462da2af..2d7481413ed8 100644
--- a/connectivity/source/drivers/evoab2/NTable.cxx
+++ b/connectivity/source/drivers/evoab2/NTable.cxx
@@ -61,7 +61,7 @@ void OEvoabTable::refreshColumns()
Any(),
m_SchemaName,
m_Name,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")));
+ ::rtl::OUString("%"));
if (xResult.is())
{
diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx
index b9a20b1fd00d..925cd763c47c 100644
--- a/connectivity/source/drivers/file/FDateFunctions.cxx
+++ b/connectivity/source/drivers/file/FDateFunctions.cxx
@@ -104,25 +104,25 @@ ORowSetValue OOp_DayName::operate(const ORowSetValue& lhs) const
switch(eDayOfWeek)
{
case MONDAY:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Monday"));
+ sRet = ::rtl::OUString("Monday");
break;
case TUESDAY:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tuesday"));
+ sRet = ::rtl::OUString("Tuesday");
break;
case WEDNESDAY:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wednesday"));
+ sRet = ::rtl::OUString("Wednesday");
break;
case THURSDAY:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Thursday"));
+ sRet = ::rtl::OUString("Thursday");
break;
case FRIDAY:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Friday"));
+ sRet = ::rtl::OUString("Friday");
break;
case SATURDAY:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Saturday"));
+ sRet = ::rtl::OUString("Saturday");
break;
case SUNDAY:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sunday"));
+ sRet = ::rtl::OUString("Sunday");
break;
default:
OSL_FAIL("Error in enum values for date");
@@ -140,40 +140,40 @@ ORowSetValue OOp_MonthName::operate(const ORowSetValue& lhs) const
switch(aD.Month)
{
case 1:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("January"));
+ sRet = ::rtl::OUString("January");
break;
case 2:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("February"));
+ sRet = ::rtl::OUString("February");
break;
case 3:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("March"));
+ sRet = ::rtl::OUString("March");
break;
case 4:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("April"));
+ sRet = ::rtl::OUString("April");
break;
case 5:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("May"));
+ sRet = ::rtl::OUString("May");
break;
case 6:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("June"));
+ sRet = ::rtl::OUString("June");
break;
case 7:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("July"));
+ sRet = ::rtl::OUString("July");
break;
case 8:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("August"));
+ sRet = ::rtl::OUString("August");
break;
case 9:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("September"));
+ sRet = ::rtl::OUString("September");
break;
case 10:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("October"));
+ sRet = ::rtl::OUString("October");
break;
case 11:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("November"));
+ sRet = ::rtl::OUString("November");
break;
case 12:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("December"));
+ sRet = ::rtl::OUString("December");
break;
}
return sRet;
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx
index 2c3c380ba691..ea447b75fc02 100644
--- a/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx
@@ -44,8 +44,8 @@ OHCatalog::OHCatalog(const Reference< XConnection >& _xConnection) : sdbcx::OCat
void OHCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfObject,TStringVector& _rNames)
{
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),
+ ::rtl::OUString("%"),
+ ::rtl::OUString("%"),
_sKindOfObject);
fillNames(xResult,_rNames);
}
@@ -71,7 +71,7 @@ void OHCatalog::refreshTables()
void OHCatalog::refreshViews()
{
Sequence< ::rtl::OUString > aTypes(1);
- aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"));
+ aTypes[0] = ::rtl::OUString("VIEW");
sal_Bool bSupportsViews = sal_False;
try
@@ -108,7 +108,7 @@ void OHCatalog::refreshUsers()
{
TStringVector aVector;
Reference< XStatement > xStmt = m_xConnection->createStatement( );
- Reference< XResultSet > xResult = xStmt->executeQuery(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("select User from hsqldb.user group by User")));
+ Reference< XResultSet > xResult = xStmt->executeQuery(::rtl::OUString("select User from hsqldb.user group by User"));
if ( xResult.is() )
{
Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 2b1f9c0464a0..62e71bb6ce6a 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -181,7 +181,7 @@ namespace connectivity { namespace hsqldb
if ( !m_bReadOnly )
{
Reference< XStatement > xStmt( m_xConnection->createStatement(), UNO_QUERY_THROW );
- xStmt->execute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CHECKPOINT DEFRAG" ) ) );
+ xStmt->execute( ::rtl::OUString( "CHECKPOINT DEFRAG" ) );
}
}
@@ -359,7 +359,7 @@ namespace connectivity { namespace hsqldb
// ask the provider to obtain a graphic
Sequence< PropertyValue > aMediaProperties( 1 );
- aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
+ aMediaProperties[0].Name = ::rtl::OUString( "URL" );
aMediaProperties[0].Value <<= sImageURL;
xGraphic = xProvider->queryGraphic( aMediaProperties );
OSL_ENSURE( xGraphic.is(), "OHsqlConnection::impl_getTextTableIcon_nothrow: the provider did not give us a graphic object!" );
diff --git a/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx
index 251f5452cc34..bb0a279743cf 100644
--- a/connectivity/source/drivers/hsqldb/accesslog.cxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.cxx
@@ -37,7 +37,7 @@ namespace connectivity { namespace hsqldb
LogFile::LogFile( JNIEnv* env, jstring streamName, const sal_Char* _pAsciiSuffix )
{
m_sFileName = StorageContainer::jstring2ustring(env,streamName);
- m_sFileName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."));
+ m_sFileName += ::rtl::OUString(".");
m_sFileName += ::rtl::OUString::createFromAscii( _pAsciiSuffix );
}
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 0fe5563271bb..61722dd1df4d 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -437,13 +437,13 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges(
// here we know that the count of column doesn't match
::std::map<sal_Int32,sal_Int32> aColumnMatching;
static const ::rtl::OUString sPrivs[] = {
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE_CAT")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE_SCHEM")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE_NAME")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GRANTOR")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GRANTEE")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PRIVILEGE")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IS_GRANTABLE"))
+ ::rtl::OUString("TABLE_CAT"),
+ ::rtl::OUString("TABLE_SCHEM"),
+ ::rtl::OUString("TABLE_NAME"),
+ ::rtl::OUString("GRANTOR"),
+ ::rtl::OUString("GRANTEE"),
+ ::rtl::OUString("PRIVILEGE"),
+ ::rtl::OUString("IS_GRANTABLE")
};
::rtl::OUString sColumnName;
@@ -560,7 +560,7 @@ sal_Bool java_sql_DatabaseMetaData::impl_callBooleanMethod( const char* _pMethod
{
::rtl::OUString sLoggedResult( sReturn );
if ( sLoggedResult.isEmpty() )
- sLoggedResult = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "<empty string>" ) );
+ sLoggedResult = ::rtl::OUString( "<empty string>" );
m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, sLoggedResult );
}
@@ -611,8 +611,8 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithS
// log the call
if ( m_aLogger.isLoggable( LogLevel::FINEST ) )
{
- ::rtl::OUString sCatalogLog = bCatalog ? sCatalog : ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "null" ) );
- ::rtl::OUString sSchemaLog = bSchema ? _rSchemaPattern : ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "null" ) );
+ ::rtl::OUString sCatalogLog = bCatalog ? sCatalog : ::rtl::OUString( "null" );
+ ::rtl::OUString sSchemaLog = bSchema ? _rSchemaPattern : ::rtl::OUString( "null" );
if ( _pOptionalAdditionalString )
m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD_ARG4, _pMethodName, sCatalogLog, sSchemaLog, _rLeastPattern, *_pOptionalAdditionalString );
else
diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx
index 7c5ec0dfa47b..de5be71cdc23 100644
--- a/connectivity/source/drivers/kab/KCatalog.cxx
+++ b/connectivity/source/drivers/kab/KCatalog.cxx
@@ -43,11 +43,11 @@ void KabCatalog::refreshTables()
{
TStringVector aVector;
Sequence< ::rtl::OUString > aTypes(1);
- aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"));
+ aTypes[0] = ::rtl::OUString("%");
Reference< XResultSet > xResult = m_xMetaData->getTables(
Any(),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),
+ ::rtl::OUString("%"),
+ ::rtl::OUString("%"),
aTypes);
if (xResult.is())
diff --git a/connectivity/source/drivers/kab/KTable.cxx b/connectivity/source/drivers/kab/KTable.cxx
index 89c04ec51262..0014e7961acd 100644
--- a/connectivity/source/drivers/kab/KTable.cxx
+++ b/connectivity/source/drivers/kab/KTable.cxx
@@ -62,7 +62,7 @@ void KabTable::refreshColumns()
Any(),
m_SchemaName,
m_Name,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")));
+ ::rtl::OUString("%"));
if (xResult.is())
{
diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx
index 5d1663323591..52ed23db9ab3 100644
--- a/connectivity/source/drivers/kab/KTables.cxx
+++ b/connectivity/source/drivers/kab/KTables.cxx
@@ -38,11 +38,11 @@ using namespace ::com::sun::star::lang;
sdbcx::ObjectType KabTables::createObject(const ::rtl::OUString& _rName)
{
::rtl::OUString aName,aSchema;
- aSchema = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%"));
+ aSchema = ::rtl::OUString("%");
aName = _rName;
Sequence< ::rtl::OUString > aTypes(1);
- aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%"));
+ aTypes[0] = ::rtl::OUString("%");
::rtl::OUString sEmpty;
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema, aName, aTypes);
diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx
index 18855adc7a21..9bfe86a46ca0 100644
--- a/connectivity/source/drivers/macab/MacabCatalog.cxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.cxx
@@ -43,11 +43,11 @@ void MacabCatalog::refreshTables()
{
TStringVector aVector;
Sequence< ::rtl::OUString > aTypes(1);
- aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"));
+ aTypes[0] = ::rtl::OUString("%");
Reference< XResultSet > xResult = m_xMetaData->getTables(
Any(),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),
+ ::rtl::OUString("%"),
+ ::rtl::OUString("%"),
aTypes);
if (xResult.is())
@@ -84,7 +84,7 @@ void MacabCatalog::refreshUsers()
// -------------------------------------------------------------------------
const ::rtl::OUString& MacabCatalog::getDot()
{
- static const ::rtl::OUString sDot = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("."));
+ static const ::rtl::OUString sDot = ::rtl::OUString(".");
return sDot;
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx
index 5bd1690c769c..a5fec27c8550 100644
--- a/connectivity/source/drivers/macab/MacabTable.cxx
+++ b/connectivity/source/drivers/macab/MacabTable.cxx
@@ -69,7 +69,7 @@ void MacabTable::refreshColumns()
Any(),
m_SchemaName,
m_Name,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")));
+ ::rtl::OUString("%"));
if (xResult.is())
{
diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx
index afc9d38caa03..a9f7d9685f0c 100644
--- a/connectivity/source/drivers/macab/MacabTables.cxx
+++ b/connectivity/source/drivers/macab/MacabTables.cxx
@@ -38,11 +38,11 @@ using namespace ::com::sun::star::lang;
sdbcx::ObjectType MacabTables::createObject(const ::rtl::OUString& _rName)
{
::rtl::OUString aName,aSchema;
- aSchema = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%"));
+ aSchema = ::rtl::OUString("%");
aName = _rName;
Sequence< ::rtl::OUString > aTypes(1);
- aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%"));
+ aTypes[0] = ::rtl::OUString("%");
::rtl::OUString sEmpty;
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema, aName, aTypes);
diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx
index 87edf95eac10..26ac1f5f3027 100644
--- a/connectivity/source/drivers/mork/MCatalog.cxx
+++ b/connectivity/source/drivers/mork/MCatalog.cxx
@@ -51,9 +51,9 @@ void OCatalog::refreshTables()
{
TStringVector aVector;
Sequence< ::rtl::OUString > aTypes(1);
- aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%"));
+ aTypes[0] = ::rtl::OUString("%");
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),aTypes);
+ ::rtl::OUString("%"),::rtl::OUString("%"),aTypes);
if(xResult.is())
{
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 2f24c94c7092..a2b6297c5936 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -87,13 +87,13 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows(
// ****************************************************
// Catalog
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString(""));
// Schema
- aRow[2] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")));
+ aRow[2] = new ORowSetValueDecorator(::rtl::OUString(""));
// DATA_TYPE
aRow[5] = new ORowSetValueDecorator(static_cast<sal_Int16>(DataType::VARCHAR));
// TYPE_NAME, not used
- aRow[6] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VARCHAR")));
+ aRow[6] = new ORowSetValueDecorator(::rtl::OUString("VARCHAR"));
// COLUMN_SIZE
aRow[7] = new ORowSetValueDecorator(s_nCOLUMN_SIZE);
// BUFFER_LENGTH, not used
@@ -115,7 +115,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows(
// CHAR_OCTET_LENGTH, refer to [5]
aRow[16] = new ORowSetValueDecorator(s_nCHAR_OCTET_LENGTH);
// IS_NULLABLE
- aRow[18] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("YES")));
+ aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES"));
// Iterate over all tables
for(size_t j = 0; j < tables.size(); j++ ) {
@@ -848,15 +848,15 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE
// there exists no possibility to get table types so we have to check
static ::rtl::OUString sTableTypes[] =
{
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TABLE")),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VIEW"))
+ ::rtl::OUString("TABLE"),
+ ::rtl::OUString("VIEW")
// Currently we only support a 'TABLE' and 'VIEW' nothing more complex
//
- // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYSTEM TABLE")),
- // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("GLOBAL TEMPORARY")),
- // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LOCAL TEMPORARY")),
- // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ALIAS")),
- // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYNONYM"))
+ // ::rtl::OUString("SYSTEM TABLE"),
+ // ::rtl::OUString("GLOBAL TEMPORARY"),
+ // ::rtl::OUString("LOCAL TEMPORARY"),
+ // ::rtl::OUString("ALIAS"),
+ // ::rtl::OUString("SYNONYM")
};
::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes);
Reference< XResultSet > xRef = pResult;
@@ -890,7 +890,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( )
ODatabaseMetaDataResultSet::ORow aRow;
aRow.reserve(19);
aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
- aRow.push_back(new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VARCHAR"))));
+ aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR")));
aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR));
aRow.push_back(new ORowSetValueDecorator((sal_Int32)s_nCHAR_OCTET_LENGTH));
aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
@@ -980,7 +980,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
aRow[3] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue();
aRow[4] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue();
aRow[5] = new ::connectivity::ORowSetValueDecorator(getUserName());
- aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NO")));
+ aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString("NO"));
// Iterate over all tables
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 6cca9c218926..ece7f291ded7 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -64,7 +64,7 @@ using namespace com::sun::star::util;
// IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.mork.ResultSet"));
+ return ::rtl::OUString("com.sun.star.sdbcx.mork.ResultSet");
}
// -------------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException)
@@ -733,11 +733,11 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMat
OSQLParseNode *pMark = pNode->getChild(0);
// Initialize to empty string
- rMatchString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(""));
+ rMatchString = ::rtl::OUString("");
rtl::OUString aParameterName;
if (SQL_ISPUNCTUATION(pMark,"?")) {
- aParameterName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?"));
+ aParameterName = ::rtl::OUString("?");
}
else if (SQL_ISPUNCTUATION(pMark,":")) {
aParameterName = pNode->getChild(1)->getTokenValue();
@@ -939,7 +939,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
// String containing only a '%' and nothing else
op = MQueryOp::Exists;
// Will be ignored for Exists case, but clear anyway.
- matchString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(""));
+ matchString = ::rtl::OUString("");
}
else if ( matchString.indexOf ( WILDCARD ) == -1 &&
matchString.indexOf ( MATCHCHAR ) == -1 )
@@ -992,7 +992,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
else
{
sal_Int32 pos = matchString.indexOf ( WILDCARD );
- matchString = matchString.replaceAt( pos, 1,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".*")) );
+ matchString = matchString.replaceAt( pos, 1,::rtl::OUString(".*") );
op = MQueryOp::RegExp;
}
@@ -1003,13 +1003,13 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
sal_Int32 pos = matchString.indexOf ( WILDCARD );
while ( (pos = matchString.indexOf ( WILDCARD )) != -1 )
{
- matchString = matchString.replaceAt( pos, 1, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".*")) );
+ matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".*") );
}
pos = matchString.indexOf ( MATCHCHAR );
while ( (pos = matchString.indexOf( MATCHCHAR )) != -1 )
{
- matchString = matchString.replaceAt( pos, 1, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".")) );
+ matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".") );
}
op = MQueryOp::RegExp;
diff --git a/connectivity/source/drivers/mork/MTables.cxx b/connectivity/source/drivers/mork/MTables.cxx
index 725f665b153e..62e0ba0adc08 100644
--- a/connectivity/source/drivers/mork/MTables.cxx
+++ b/connectivity/source/drivers/mork/MTables.cxx
@@ -47,11 +47,11 @@ using namespace dbtools;
sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName)
{
::rtl::OUString aName,aSchema;
- aSchema = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%"));
+ aSchema = ::rtl::OUString("%");
aName = _rName;
Sequence< ::rtl::OUString > aTypes(1);
- aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%"));
+ aTypes[0] = ::rtl::OUString("%");
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);
diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx
index c08bae179398..668a41f76993 100644
--- a/connectivity/source/drivers/mozab/MCatalog.cxx
+++ b/connectivity/source/drivers/mozab/MCatalog.cxx
@@ -51,9 +51,9 @@ void OCatalog::refreshTables()
{
TStringVector aVector;
Sequence< ::rtl::OUString > aTypes(1);
- aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%"));
+ aTypes[0] = ::rtl::OUString("%");
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),aTypes);
+ ::rtl::OUString("%"),::rtl::OUString("%"),aTypes);
if(xResult.is())
{
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx
index a84afd6e0658..871cbbf22a3a 100644
--- a/connectivity/source/drivers/mozab/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx
@@ -100,7 +100,7 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su
{
//.............................................................
Reference< XNameAccess > xAliasesNode;
- xDriverNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ColumnAliases")) ) >>= xAliasesNode;
+ xDriverNode->getPropertyValue( ::rtl::OUString("ColumnAliases") ) >>= xAliasesNode;
OSL_ENSURE( xAliasesNode.is(), "OColumnAlias::setAlias: missing the aliases node!" );
// this is a set of string nodes
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx
index 8b4ee14ad2a4..ee1e1b3c6761 100644
--- a/connectivity/source/drivers/mozab/MConfigAccess.cxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx
@@ -54,14 +54,14 @@ namespace connectivity
Sequence< Any > aArguments(2);
// the path to the node to open
aArguments[0] <<= PropertyValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("nodepath")),
+ ::rtl::OUString("nodepath"),
0,
makeAny( sCompleteNodePath ),
PropertyState_DIRECT_VALUE
);
// the depth: -1 means unlimited
aArguments[1] <<= PropertyValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("depth")),
+ ::rtl::OUString("depth"),
0,
makeAny( (sal_Int32)-1 ),
PropertyState_DIRECT_VALUE
@@ -70,7 +70,7 @@ namespace connectivity
//=========================================================
// create the access
Reference< XInterface > xAccess = xConfigProvider->createInstanceWithArguments(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess" )),
+ ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess" ),
aArguments
);
OSL_ENSURE( xAccess.is(), "createDriverConfigNode: invalid access returned (should throw an exception instead)!" );
@@ -125,10 +125,10 @@ namespace connectivity
Reference< XPropertySet > xDriverNode = createDriverConfigNode( xFactory );
Reference< XPropertySet > xMozPrefsNode;
if ( xDriverNode.is() )
- xDriverNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("MozillaPreferences" )) ) >>= xMozPrefsNode;
+ xDriverNode->getPropertyValue( ::rtl::OUString("MozillaPreferences" ) ) >>= xMozPrefsNode;
OSL_ENSURE( xMozPrefsNode.is(), "getPreferredProfileName: could not access the node for the mozilla preferences!" );
if ( xMozPrefsNode.is() )
- xMozPrefsNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ProfileName" )) ) >>= sPreferredName;
+ xMozPrefsNode->getPropertyValue( ::rtl::OUString("ProfileName" ) ) >>= sPreferredName;
if ( xMozPrefsNode.is() )
xMozPrefsNode->getPropertyValue( ::rtl::OUString::createFromAscii(sNode) ) >>= sDescription;
if (sDescription.getLength() == 0)
@@ -157,10 +157,10 @@ namespace connectivity
Reference< XPropertySet > xDriverNode = createDriverConfigNode( xFactory );
Reference< XPropertySet > xMozPrefsNode;
if ( xDriverNode.is() )
- xDriverNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("MozillaPreferences" )) ) >>= xMozPrefsNode;
+ xDriverNode->getPropertyValue( ::rtl::OUString("MozillaPreferences" ) ) >>= xMozPrefsNode;
OSL_ENSURE( xMozPrefsNode.is(), "getPreferredProfileName: could not access the node for the mozilla preferences!" );
if ( xMozPrefsNode.is() )
- xMozPrefsNode->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ProfileName" )) ) >>= sPreferredName;
+ xMozPrefsNode->getPropertyValue( ::rtl::OUString("ProfileName" ) ) >>= sPreferredName;
}
catch( const Exception& )
{
@@ -198,7 +198,7 @@ extern "C" const sal_Char* SAL_CALL getPabDescription( void )
{
usPabDescription = ::connectivity::mozab::getDescription(
"PabDescription" ,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Personal Address Book" )));
+ ::rtl::OUString("Personal Address Book" ));
sPabDescription = ::rtl::OUStringToOString( usPabDescription,
RTL_TEXTENCODING_UTF8);
bReadConfig = sal_True;
@@ -218,7 +218,7 @@ extern "C" const sal_Char* SAL_CALL getHisDescription( void )
{
usHisDescription = ::connectivity::mozab::getDescription(
"HisDescription" ,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Collected Addresses" )));
+ ::rtl::OUString("Collected Addresses" ));
sHisDescription = ::rtl::OUStringToOString( usHisDescription,
RTL_TEXTENCODING_UTF8);
bReadConfig = sal_True;
diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
index ea4a680f2e34..8492941706ca 100644
--- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
@@ -92,13 +92,13 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows(
// ****************************************************
// Catalog
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString(""));
// Schema
- aRow[2] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")));
+ aRow[2] = new ORowSetValueDecorator(::rtl::OUString(""));
// DATA_TYPE
aRow[5] = new ORowSetValueDecorator(static_cast<sal_Int16>(DataType::VARCHAR));
// TYPE_NAME, not used
- aRow[6] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VARCHAR")));
+ aRow[6] = new ORowSetValueDecorator(::rtl::OUString("VARCHAR"));
// COLUMN_SIZE
aRow[7] = new ORowSetValueDecorator(s_nCOLUMN_SIZE);
// BUFFER_LENGTH, not used
@@ -120,7 +120,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows(
// CHAR_OCTET_LENGTH, refer to [5]
aRow[16] = new ORowSetValueDecorator(s_nCHAR_OCTET_LENGTH);
// IS_NULLABLE
- aRow[18] = new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("YES")));
+ aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES"));
const OColumnAlias& colNames = m_pConnection->getColumnAlias();
@@ -853,15 +853,15 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE
// there exists no possibility to get table types so we have to check
static ::rtl::OUString sTableTypes[] =
{
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TABLE")),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VIEW"))
+ ::rtl::OUString("TABLE"),
+ ::rtl::OUString("VIEW")
// Currently we only support a 'TABLE' and 'VIEW' nothing more complex
//
- // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYSTEM TABLE")),
- // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("GLOBAL TEMPORARY")),
- // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LOCAL TEMPORARY")),
- // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ALIAS")),
- // ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYNONYM"))
+ // ::rtl::OUString("SYSTEM TABLE"),
+ // ::rtl::OUString("GLOBAL TEMPORARY"),
+ // ::rtl::OUString("LOCAL TEMPORARY"),
+ // ::rtl::OUString("ALIAS"),
+ // ::rtl::OUString("SYNONYM")
};
::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes);
Reference< XResultSet > xRef = pResult;
@@ -895,7 +895,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( )
ODatabaseMetaDataResultSet::ORow aRow;
aRow.reserve(19);
aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
- aRow.push_back(new ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VARCHAR"))));
+ aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR")));
aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR));
aRow.push_back(new ORowSetValueDecorator((sal_Int32)s_nCHAR_OCTET_LENGTH));
aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
@@ -975,7 +975,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
aRow[3] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue();
aRow[4] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue();
aRow[5] = new ::connectivity::ORowSetValueDecorator(getUserName());
- aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NO")));
+ aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString("NO"));
// Iterate over all tables
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index b0711fccf017..06ae1ca0fe1a 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -63,14 +63,14 @@ using namespace com::sun::star::util;
// IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.mozab.ResultSet"));
+ return ::rtl::OUString("com.sun.star.sdbcx.mozab.ResultSet");
}
// -------------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException)
{
::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2);
- aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet"));
- aSupported[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet");
+ aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet");
return aSupported;
}
// -------------------------------------------------------------------------
@@ -716,11 +716,11 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMat
OSQLParseNode *pMark = pNode->getChild(0);
// Initialize to empty string
- rMatchString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(""));
+ rMatchString = ::rtl::OUString("");
rtl::OUString aParameterName;
if (SQL_ISPUNCTUATION(pMark,"?")) {
- aParameterName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?"));
+ aParameterName = ::rtl::OUString("?");
}
else if (SQL_ISPUNCTUATION(pMark,":")) {
aParameterName = pNode->getChild(1)->getTokenValue();
@@ -922,7 +922,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
// String containing only a '%' and nothing else
op = MQueryOp::Exists;
// Will be ignored for Exists case, but clear anyway.
- matchString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(""));
+ matchString = ::rtl::OUString("");
}
else if ( matchString.indexOf ( WILDCARD ) == -1 &&
matchString.indexOf ( MATCHCHAR ) == -1 )
@@ -975,7 +975,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
else
{
sal_Int32 pos = matchString.indexOf ( WILDCARD );
- matchString = matchString.replaceAt( pos, 1,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".*")) );
+ matchString = matchString.replaceAt( pos, 1,::rtl::OUString(".*") );
op = MQueryOp::RegExp;
}
@@ -986,13 +986,13 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
sal_Int32 pos = matchString.indexOf ( WILDCARD );
while ( (pos = matchString.indexOf ( WILDCARD )) != -1 )
{
- matchString = matchString.replaceAt( pos, 1, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".*")) );
+ matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".*") );
}
pos = matchString.indexOf ( MATCHCHAR );
while ( (pos = matchString.indexOf( MATCHCHAR )) != -1 )
{
- matchString = matchString.replaceAt( pos, 1, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".")) );
+ matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".") );
}
op = MQueryOp::RegExp;
@@ -1089,9 +1089,9 @@ void OResultSet::fillRowData()
OSL_ENSURE(m_pStatement, "Cannot determine Parent Statement");
::rtl::OUString aStr;
if (xConnection->isLDAP())
- aStr = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PrimaryEmail"));
+ aStr = ::rtl::OUString("PrimaryEmail");
else
- aStr = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("card:nsIAbCard"));
+ aStr = ::rtl::OUString("card:nsIAbCard");
eVector.push_back( new MQueryExpressionString(aStr, MQueryOp::Exists) );
queryExpression.setExpressions( eVector );
diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx
index 0d11b8d1d46d..dd6f93bfd3a6 100644
--- a/connectivity/source/drivers/mozab/MTables.cxx
+++ b/connectivity/source/drivers/mozab/MTables.cxx
@@ -47,11 +47,11 @@ using namespace dbtools;
sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName)
{
::rtl::OUString aName,aSchema;
- aSchema = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%"));
+ aSchema = ::rtl::OUString("%");
aName = _rName;
Sequence< ::rtl::OUString > aTypes(1);
- aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%"));
+ aTypes[0] = ::rtl::OUString("%");
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
index bb4af33dfc6e..cf9bb13b3dd9 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
@@ -62,7 +62,7 @@ nsProfile::nsProfile()
Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
OSL_ENSURE( xFactory.is(), "can't get service factory" );
- Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) );
+ Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") );
OSL_ENSURE( xInstance.is(), "failed to create instance" );
xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY);
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index e841826a6d98..23a721742b63 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
@@ -108,7 +108,7 @@ MDatabaseMetaDataHelper::~MDatabaseMetaDataHelper()
Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
OSL_ENSURE( xFactory.is(), "can't get service factory" );
- Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) );
+ Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") );
OSL_ENSURE( xInstance.is(), "failed to create instance" );
xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY);
m_bProfileExists = xMozillaBootstrap->shutdownProfile() > 0;
@@ -440,7 +440,7 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp
// Insert table into map
if ( aTableName.isEmpty() )
- aTableName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AddressBook"));
+ aTableName = rtl::OUString("AddressBook");
OSL_TRACE("TableName = >%s<", OUtoCStr( aTableName ) );
@@ -454,12 +454,12 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp
//map mailing lists as views
_rStrings->push_back( aTableName ); // Table name
if (!bIsMailList) {
- ::rtl::OUString aTableType(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TABLE")));
+ ::rtl::OUString aTableType(::rtl::OUString("TABLE"));
_rTypes->push_back( aTableType ); // Table type
}
else
{
- ::rtl::OUString aTableType(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VIEW")));
+ ::rtl::OUString aTableType(::rtl::OUString("VIEW"));
_rTypes->push_back( aTableType ); // Table type
}
}
@@ -550,7 +550,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection*
Reference<XMozillaBootstrap> xMozillaBootstrap;
Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
OSL_ENSURE( xFactory.is(), "can't get service factory" );
- Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) );
+ Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") );
OSL_ENSURE( xInstance.is(), "failed to create instance" );
xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY);
m_bProfileExists = sal_False;
@@ -624,7 +624,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon,
::std::vector< ::rtl::OUString > tables;
::std::vector< ::rtl::OUString > tabletypes;
- ::rtl::OUString matchAny = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%"));
+ ::rtl::OUString matchAny = rtl::OUString("%");
if ( !getTableStrings( _pCon, tables,tabletypes ) )
return sal_False;
@@ -643,7 +643,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon,
0 != ::comphelper::findValue( types, aTableType, sal_True ).getLength() ||
0 != ::comphelper::findValue( types, matchAny, sal_True ).getLength())) {
if ( aTableName.isEmpty() ) {
- aTableName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AddressBook"));
+ aTableName = rtl::OUString("AddressBook");
}
OSL_TRACE( "TableName = %s ; TableType = %s", OUtoCStr(aTableName), OUtoCStr(aTableType) );
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
index 4f0dce89b0d8..305b0da6ccf3 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
@@ -80,7 +80,7 @@ sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::Mo
{
Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
OSL_ENSURE( xFactory.is(), "can't get service factory" );
- ::com::sun::star::uno::Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) );
+ ::com::sun::star::uno::Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") );
OSL_ENSURE( xInstance.is(), "failed to create instance" );
xRunner = ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XProxyRunner >(xInstance,UNO_QUERY);
}
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index cfea2d48c3e6..21bed90e07dc 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
@@ -301,7 +301,7 @@ sal_Bool isProfileLocked(OConnection* _pCon)
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
OSL_ENSURE( xFactory.is(), "can't get service factory" );
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) );
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") );
OSL_ENSURE( xInstance.is(), "failed to create instance" );
xMozillaBootstrap = ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XMozillaBootstrap >(xInstance,::com::sun::star::uno::UNO_QUERY);
if (_pCon)
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx
index 47094a43adee..a756e2ce01c8 100644
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -45,8 +45,8 @@ OMySQLCatalog::OMySQLCatalog(const Reference< XConnection >& _xConnection) : OCa
void OMySQLCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfObject,TStringVector& _rNames)
{
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),
+ ::rtl::OUString("%"),
+ ::rtl::OUString("%"),
_sKindOfObject);
fillNames(xResult,_rNames);
}
@@ -74,7 +74,7 @@ void OMySQLCatalog::refreshTables()
void OMySQLCatalog::refreshViews()
{
Sequence< ::rtl::OUString > aTypes(1);
- aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"));
+ aTypes[0] = ::rtl::OUString("VIEW");
// let's simply assume the server is new enough to support views. Current drivers
// as of this writing might not return the proper information in getTableTypes, so
@@ -100,7 +100,7 @@ void OMySQLCatalog::refreshUsers()
{
TStringVector aVector;
Reference< XStatement > xStmt = m_xConnection->createStatement( );
- Reference< XResultSet > xResult = xStmt->executeQuery(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("select User from mysql.user group by User")));
+ Reference< XResultSet > xResult = xStmt->executeQuery(::rtl::OUString("select User from mysql.user group by User"));
if ( xResult.is() )
{
Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/postgresql/pq_array.cxx b/connectivity/source/drivers/postgresql/pq_array.cxx
index 5158d9bdc59b..9344bd266fb6 100644
--- a/connectivity/source/drivers/postgresql/pq_array.cxx
+++ b/connectivity/source/drivers/postgresql/pq_array.cxx
@@ -78,7 +78,7 @@ namespace pq_sdbc_driver
::rtl::OUString Array::getBaseTypeName( )
throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "varchar" ) );
+ return OUString( "varchar" );
}
sal_Int32 Array::getBaseType( )
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index 0401c55f2805..0f9e0aeac4bd 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -124,25 +124,25 @@ static ::cppu::IPropertyArrayHelper & getResultSetPropertyArrayHelper()
// Should really share!
// At least use for the handles the #define'd values in .hxx file...
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("CursorName") ), 0,
+ OUString("CursorName"), 0,
::getCppuType( (OUString *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("EscapeProcessing") ), 1,
+ OUString("EscapeProcessing"), 1,
::getBooleanCppuType() , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("FetchDirection") ), 2,
+ OUString("FetchDirection"), 2,
::getCppuType( (sal_Int32 *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("FetchSize") ), 3,
+ OUString("FetchSize"), 3,
::getCppuType( (sal_Int32 *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("IsBookmarkable") ), 4,
+ OUString("IsBookmarkable"), 4,
::getBooleanCppuType() , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetConcurrency") ), 5,
+ OUString("ResultSetConcurrency"), 5,
::getCppuType( (sal_Int32 *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetType") ), 6,
+ OUString("ResultSetType"), 6,
::getCppuType( (sal_Int32 *)0) , 0 )
};
OSL_ASSERT( sizeof(aTable) / sizeof(Property) == BASERESULTSET_SIZE );
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 1c0d52ad887b..7a14c3b20478 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -160,7 +160,7 @@ public:
OUString ConnectionGetImplementationName()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.connectivity.pq.Connection.noext" ) );
+ return OUString( "org.openoffice.comp.connectivity.pq.Connection.noext" );
}
com::sun::star::uno::Sequence<rtl::OUString> ConnectionGetSupportedServiceNames(void)
{
@@ -331,8 +331,7 @@ Reference< XPreparedStatement > Connection::prepareCall( const ::rtl::OUString&
throw (SQLException, RuntimeException)
{
throw SQLException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM( "pq_driver: Callable statements not supported" ) ),
+ OUString( "pq_driver: Callable statements not supported" ),
Reference< XInterface > (), OUString() , 1, Any() );
}
@@ -546,7 +545,7 @@ void Connection::initialize( const Sequence< Any >& aArguments )
if( ! tc.is() )
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("pq_driver: Couldn't instantiate converter service" )),
+ OUString("pq_driver: Couldn't instantiate converter service" ),
Reference< XInterface > () );
}
if( aArguments.getLength() != 2 )
@@ -594,7 +593,7 @@ void Connection::initialize( const Sequence< Any >& aArguments )
free(err);
}
else
- errorMessage = OUString(RTL_CONSTASCII_USTRINGPARAM("#no error message#"));
+ errorMessage = OUString("#no error message#");
OUStringBuffer buf( 128 );
buf.appendAscii( "Error in database URL '" );
buf.append( url );
@@ -602,7 +601,7 @@ void Connection::initialize( const Sequence< Any >& aArguments )
buf.append( errorMessage );
// HY092 is "Invalid attribute/option identifier."
// Just the most likely error; the error might be HY024 "Invalid attribute value".
- throw SQLException( buf.makeStringAndClear(), *this, OUString(RTL_CONSTASCII_USTRINGPARAM("HY092")), 5, Any() );
+ throw SQLException( buf.makeStringAndClear(), *this, OUString("HY092"), 5, Any() );
}
for ( PQconninfoOption * opt = oOpts.get(); opt->keyword != NULL; ++opt)
@@ -621,7 +620,7 @@ void Connection::initialize( const Sequence< Any >& aArguments )
m_settings.pConnection = PQconnectdbParams( keywords.c_array(), values.c_array(), 0 );
}
if( ! m_settings.pConnection )
- throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "pq_driver: out of memory" ) ),
+ throw RuntimeException( OUString( "pq_driver: out of memory" ),
Reference< XInterface > () );
if( PQstatus( m_settings.pConnection ) == CONNECTION_BAD )
{
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index 10bdfe44b8bd..96e719faf5e0 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -134,7 +134,7 @@ Reference< XConnection > Driver::connect(
seq[1] <<= info;
return Reference< XConnection> (
m_smgr->createInstanceWithArgumentsAndContext(
- OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.connectivity.pq.Connection.noext" ) ),
+ OUString("org.openoffice.comp.connectivity.pq.Connection.noext" ),
seq, m_ctx ),
UNO_QUERY );
}
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index b2aa68313743..a8a4058c94c4 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -129,31 +129,31 @@ static ::cppu::IPropertyArrayHelper & getPreparedStatementPropertyArrayHelper()
static Property aTable[] =
{
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("CursorName") ), 0,
+ OUString("CursorName"), 0,
::getCppuType( (OUString *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("EscapeProcessing") ), 1,
+ OUString("EscapeProcessing"), 1,
::getBooleanCppuType() , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("FetchDirection") ), 2,
+ OUString("FetchDirection"), 2,
::getCppuType( (sal_Int32 *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("FetchSize") ), 3,
+ OUString("FetchSize"), 3,
::getCppuType( (sal_Int32 *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("MaxFieldSize") ), 4,
+ OUString("MaxFieldSize"), 4,
::getCppuType( (sal_Int32 *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("MaxRows") ), 5,
+ OUString("MaxRows"), 5,
::getCppuType( (sal_Int32 *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("QueryTimeOut") ), 6,
+ OUString("QueryTimeOut"), 6,
::getCppuType( (sal_Int32 *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetConcurrency") ), 7,
+ OUString("ResultSetConcurrency"), 7,
::getCppuType( (sal_Int32 *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetType") ), 8,
+ OUString("ResultSetType"), 8,
::getCppuType( (sal_Int32 *)0) , 0 )
};
OSL_ASSERT( sizeof(aTable)/ sizeof(Property) == PREPARED_STATEMENT_SIZE );
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 42ded6e07398..49b82ae63282 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -145,31 +145,31 @@ static ::cppu::IPropertyArrayHelper & getStatementPropertyArrayHelper()
static Property aTable[] =
{
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("CursorName") ), 0,
+ OUString("CursorName"), 0,
::getCppuType( (OUString *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("EscapeProcessing") ), 1,
+ OUString("EscapeProcessing"), 1,
::getBooleanCppuType() , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("FetchDirection") ), 2,
+ OUString("FetchDirection"), 2,
::getCppuType( (sal_Int32 *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("FetchSize") ), 3,
+ OUString("FetchSize"), 3,
::getCppuType( (sal_Int32 *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("MaxFieldSize") ), 4,
+ OUString("MaxFieldSize"), 4,
::getCppuType( (sal_Int32 *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("MaxRows") ), 5,
+ OUString("MaxRows"), 5,
::getCppuType( (sal_Int32 *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("QueryTimeOut") ), 6,
+ OUString("QueryTimeOut"), 6,
::getCppuType( (sal_Int32 *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetConcurrency") ), 7,
+ OUString("ResultSetConcurrency"), 7,
::getCppuType( (sal_Int32 *)0) , 0 ),
Property(
- OUString( RTL_CONSTASCII_USTRINGPARAM("ResultSetType") ), 8,
+ OUString("ResultSetType"), 8,
::getCppuType( (sal_Int32 *)0) , 0 )
};
OSL_ASSERT( sizeof(aTable)/ sizeof(Property) == STATEMENT_SIZE );
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 7e6340f9a711..2cb273678019 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -239,7 +239,7 @@ void bufferEscapeConstant( rtl::OUStringBuffer & buf, const rtl::OUString & valu
// We have no good XInterface Reference to pass here, so just give NULL
throw SQLException(OUString(errstr, strlen(errstr), settings->encoding),
NULL,
- OUString(RTL_CONSTASCII_USTRINGPARAM("22018")),
+ OUString("22018"),
-1,
Any());
}
@@ -285,7 +285,7 @@ static inline void ibufferQuoteIdentifier( rtl::OUStringBuffer & buf, const rtl:
// Implementation-defined SQLACCESS error
throw SQLException(OUString(errstr, strlen(errstr), settings->encoding),
NULL,
- OUString(RTL_CONSTASCII_USTRINGPARAM("22018")),
+ OUString("22018"),
-1,
Any());
}
diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx
index fdbc11428757..b07315bd7289 100644
--- a/connectivity/source/drivers/postgresql/pq_xbase.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx
@@ -265,8 +265,7 @@ void ReflectionBase::setName( const ::rtl::OUString& /* aName */ )
throw (::com::sun::star::uno::RuntimeException)
{
throw RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "pq_sdbc::ReflectionBase::setName not implemented" ) ),
+ rtl::OUString( "pq_sdbc::ReflectionBase::setName not implemented" ),
*this );
//setPropertyValue( getStatics().NAME , makeAny( aName ) );
}
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index 5c57a641df4b..f29c5eaab96f 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -487,8 +487,7 @@ void Test::testBigStruct() {
void Test::testPolyStruct() {
CPPUNIT_ASSERT_EQUAL(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "test.codemaker.cppumaker.Struct<char,short>")),
+ "test.codemaker.cppumaker.Struct<char,short>"),
(com::sun::star::uno::makeAny(
test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()).
getValueType().getTypeName()));
@@ -507,7 +506,7 @@ void Test::testExceptions() {
aEmptySequence;
test::codemaker::cppumaker::TestException1 e11(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1,
+ rtl::OUString("abc"), 0, 1,
com::sun::star::uno::makeAny(123.0),
test::codemaker::cppumaker::HelperEnum_ONE,
test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
@@ -517,7 +516,7 @@ void Test::testExceptions() {
e13 = e11;
CPPUNIT_ASSERT_EQUAL(e11, e13);
test::codemaker::cppumaker::TestException2 e21(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1,
+ rtl::OUString("abc"), 0, 1,
com::sun::star::uno::makeAny(123.0),
test::codemaker::cppumaker::HelperEnum_ONE,
test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index d53f0e2aa7e7..aadc1b35338c 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -301,7 +301,7 @@ void Test::testVoid() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -399,7 +399,7 @@ void Test::testBoolean() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -498,7 +498,7 @@ void Test::testByte() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -597,7 +597,7 @@ void Test::testShort() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -698,7 +698,7 @@ void Test::testUnsignedShort() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -793,7 +793,7 @@ void Test::testLong() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -888,7 +888,7 @@ void Test::testUnsignedLong() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -983,7 +983,7 @@ void Test::testHyper() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -1078,7 +1078,7 @@ void Test::testUnsignedHyper() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -1173,7 +1173,7 @@ void Test::testFloat() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -1268,7 +1268,7 @@ void Test::testDouble() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -1368,7 +1368,7 @@ void Test::testChar() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -1398,7 +1398,7 @@ void Test::testChar() {
}
void Test::testString() {
- css::uno::Any a(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1")));
+ css::uno::Any a(rtl::OUString("1"));
CPPUNIT_ASSERT(a.getValueType() == getCppuType< rtl::OUString >());
{
bool b = true;
@@ -1463,7 +1463,7 @@ void Test::testString() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -1557,7 +1557,7 @@ void Test::testType() {
"css::uno::Type", (a >>= b) && b == getCppuType< sal_Int32 >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -1654,7 +1654,7 @@ void Test::testSequence() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -1755,7 +1755,7 @@ void Test::testEnum() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -1854,7 +1854,7 @@ void Test::testStruct() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -1974,7 +1974,7 @@ void Test::testException() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -2090,7 +2090,7 @@ void Test::testInterface() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
@@ -2204,7 +2204,7 @@ void Test::testNull() {
!(a >>= b) && b == getCppuType< rtl::OUString >());
}
{
- css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")));
+ css::uno::Any b(rtl::OUString("2"));
CPPUNIT_ASSERT_MESSAGE("css::uno::Any", (a >>= b) && b == a);
}
{
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index 527cac596205..06f6763f580c 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -87,76 +87,76 @@ void Test::testUnoType() {
t = ::cppu::UnoType< ::cppu::UnoVoidType >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_VOID, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("void")), t.getTypeName());
+ ::rtl::OUString("void"), t.getTypeName());
t = ::cppu::UnoType< bool >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_BOOLEAN, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("boolean")),
+ ::rtl::OUString("boolean"),
t.getTypeName());
CPPUNIT_ASSERT(::cppu::UnoType< ::sal_Bool >::get() == t);
t = ::cppu::UnoType< ::sal_Int8 >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_BYTE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("byte")), t.getTypeName());
+ ::rtl::OUString("byte"), t.getTypeName());
t = ::cppu::UnoType< ::sal_Int16 >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SHORT, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("short")), t.getTypeName());
+ ::rtl::OUString("short"), t.getTypeName());
t = ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get();
CPPUNIT_ASSERT_EQUAL(
+css::uno::TypeClass_UNSIGNED_SHORT, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned short")),
+ ::rtl::OUString("unsigned short"),
t.getTypeName());
t = ::cppu::UnoType< ::sal_Int32 >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_LONG, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("long")), t.getTypeName());
+ ::rtl::OUString("long"), t.getTypeName());
t = ::cppu::UnoType< ::sal_uInt32 >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_UNSIGNED_LONG, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned long")),
+ ::rtl::OUString("unsigned long"),
t.getTypeName());
t = ::cppu::UnoType< ::sal_Int64 >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_HYPER, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hyper")), t.getTypeName());
+ ::rtl::OUString("hyper"), t.getTypeName());
t = ::cppu::UnoType< ::sal_uInt64 >::get();
CPPUNIT_ASSERT_EQUAL(
+css::uno::TypeClass_UNSIGNED_HYPER, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned hyper")),
+ ::rtl::OUString("unsigned hyper"),
t.getTypeName());
t = ::cppu::UnoType< float >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_FLOAT, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("float")), t.getTypeName());
+ ::rtl::OUString("float"), t.getTypeName());
t = ::cppu::UnoType< double >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_DOUBLE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("double")),
+ ::rtl::OUString("double"),
t.getTypeName());
t = ::cppu::UnoType< ::cppu::UnoCharType >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_CHAR, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("char")), t.getTypeName());
+ ::rtl::OUString("char"), t.getTypeName());
t = ::cppu::UnoType< ::rtl::OUString >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRING, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("string")),
+ ::rtl::OUString("string"),
t.getTypeName());
t = ::cppu::UnoType< css::uno::Type >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_TYPE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("type")), t.getTypeName());
+ ::rtl::OUString("type"), t.getTypeName());
t = ::cppu::UnoType< css::uno::Any >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_ANY, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any")), t.getTypeName());
+ ::rtl::OUString("any"), t.getTypeName());
t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::sal_Int8 > >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]byte")),
+ ::rtl::OUString("[]byte"),
t.getTypeName());
CPPUNIT_ASSERT(
::cppu::UnoType< css::uno::Sequence< ::sal_Int8 > >::get() == t);
@@ -164,19 +164,19 @@ void Test::testUnoType() {
::cppu::UnoSequenceType< ::cppu::UnoUnsignedShortType > >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]unsigned short")),
+ ::rtl::OUString("[]unsigned short"),
t.getTypeName());
t = ::cppu::UnoType<
::cppu::UnoSequenceType< ::cppu::UnoCharType > >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]char")),
+ ::rtl::OUString("[]char"),
t.getTypeName());
t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
::sal_Int8 > > >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]byte")),
+ ::rtl::OUString("[][]byte"),
t.getTypeName());
CPPUNIT_ASSERT(
::cppu::UnoType<
@@ -185,33 +185,30 @@ void Test::testUnoType() {
::cppu::UnoUnsignedShortType > > >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]unsigned short")),
+ ::rtl::OUString("[][]unsigned short"),
t.getTypeName());
t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
::cppu::UnoCharType > > >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]char")),
+ ::rtl::OUString("[][]char"),
t.getTypeName());
t = ::cppu::UnoType< css::uno::TypeClass >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_ENUM, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.TypeClass")),
+ ::rtl::OUString("com.sun.star.uno.TypeClass"),
t.getTypeName());
t = ::cppu::UnoType< css::lang::EventObject >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRUCT, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.EventObject")),
+ ::rtl::OUString("com.sun.star.lang.EventObject"),
t.getTypeName());
CPPUNIT_ASSERT(::cppu::UnoType< DerivedStruct1 >::get() == t);
t = ::cppu::UnoType< css::beans::PropertyChangeEvent >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRUCT, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.beans.PropertyChangeEvent")),
+ "com.sun.star.beans.PropertyChangeEvent"),
t.getTypeName());
#if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity stated
CPPUNIT_ASSERT(::cppu::UnoType< DerivedStruct2 >::get() == t);
@@ -219,21 +216,18 @@ void Test::testUnoType() {
t = ::cppu::UnoType< css::beans::Optional< ::sal_Int8 > >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRUCT, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Optional<byte>")),
+ ::rtl::OUString("com.sun.star.beans.Optional<byte>"),
t.getTypeName());
t = ::cppu::UnoType< css::uno::Exception >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_EXCEPTION, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception")),
+ ::rtl::OUString("com.sun.star.uno.Exception"),
t.getTypeName());
CPPUNIT_ASSERT(::cppu::UnoType< DerivedException1 >::get() == t);
t = ::cppu::UnoType< css::uno::RuntimeException >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_EXCEPTION, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException")),
+ ::rtl::OUString("com.sun.star.uno.RuntimeException"),
t.getTypeName());
#if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity stated
CPPUNIT_ASSERT(::cppu::UnoType< DerivedException2 >::get() == t);
@@ -241,8 +235,7 @@ void Test::testUnoType() {
t = ::cppu::UnoType< css::uno::XInterface >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_INTERFACE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface")),
+ ::rtl::OUString("com.sun.star.uno.XInterface"),
t.getTypeName());
CPPUNIT_ASSERT(
::cppu::UnoType< css::uno::Reference< css::uno::XInterface > >::get() ==
@@ -254,8 +247,7 @@ void Test::testUnoType() {
t = ::cppu::UnoType< css::uno::XComponentContext >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_INTERFACE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
- ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XComponentContext")),
+ ::rtl::OUString("com.sun.star.uno.XComponentContext"),
t.getTypeName());
CPPUNIT_ASSERT(
::cppu::UnoType<
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index 86d79f1f7564..1495f56adcc2 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -321,18 +321,18 @@ int AffineBridge::v_isValid(rtl::OUString * pReason)
{
int result = m_enterCount > 0;
if (!result)
- *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered"));
+ *pReason = rtl::OUString("not entered");
else
{
result = m_innerThreadId == osl_getThreadIdentifier(NULL);
if (!result)
- *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong thread"));
+ *pReason = rtl::OUString("wrong thread");
}
if (result)
- *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OK"));
+ *pReason = rtl::OUString("OK");
return result;
}
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index a1cacf442db8..a7c768fd42ea 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -112,18 +112,18 @@ int LogBridge::v_isValid(rtl::OUString * pReason)
int result = m_count > 0;
if (!result)
{
- *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered"));
+ *pReason = rtl::OUString("not entered");
}
else
{
result = m_threadId == osl_getThreadIdentifier(NULL);
if (!result)
- *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong thread"));
+ *pReason = rtl::OUString("wrong thread");
}
if (result)
- *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OK"));
+ *pReason = rtl::OUString("OK");
return result;
}
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 382ed3e36f7f..6a5f4831f282 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -121,18 +121,18 @@ int UnsafeBridge::v_isValid(rtl::OUString * pReason)
int result = m_count > 0;
if (!result)
{
- *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered"));
+ *pReason = rtl::OUString("not entered");
}
else
{
result = m_threadId == osl_getThreadIdentifier(NULL);
if (!result)
- *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong thread"));
+ *pReason = rtl::OUString("wrong thread");
}
if (result)
- *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OK"));
+ *pReason = rtl::OUString("OK");
return result;
}
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index b1e9cca1388c..d17299aba5af 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -2183,7 +2183,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_getByName(
{
// Check for derived interface member type:
sal_Int32 i1 = name.lastIndexOf(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":@")));
+ rtl::OUString(":@"));
if (i1 >= 0) {
sal_Int32 i2 = i1 + RTL_CONSTASCII_LENGTH(":@");
sal_Int32 i3 = name.indexOf(',', i2);
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 1909274c5d2a..93b5bf107562 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1122,7 +1122,7 @@ static uno_Environment * initDefaultEnvironment(
if (!envPurpose.isEmpty())
{
rtl::OUString libStem = envPurpose.copy(envPurpose.lastIndexOf(':') + 1);
- libStem += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_uno_uno") );
+ libStem += rtl::OUString("_uno_uno");
if(!loadEnv(libStem, pEnv))
{
diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
index d81abf0452be..88919edeeef9 100644
--- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
@@ -170,7 +170,7 @@ css::uno::Any Empty2::queryInterface(css::uno::Type const & type)
css::uno::Sequence< rtl::OUString > sequenceThird() {
css::uno::Sequence< rtl::OUString > s(1);
- s[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third"));
+ s[0] = rtl::OUString("Third");
return s;
}
@@ -275,7 +275,7 @@ sal_Int32 Full::getFirst() throw (css::uno::RuntimeException) {
void Full::setFirst(sal_Int32 value) throw (css::uno::RuntimeException) {
prepareSet(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), css::uno::Any(),
+ rtl::OUString("First"), css::uno::Any(),
css::uno::Any(), 0);
osl::MutexGuard g(m_mutex);
m_a1 = value;
@@ -304,7 +304,7 @@ void Full::setSecond(
}
BoundListeners l;
prepareSet(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), css::uno::Any(),
+ rtl::OUString("Second"), css::uno::Any(),
v, &l);
{
osl::MutexGuard g(m_mutex);
@@ -317,7 +317,7 @@ sal_Int32 Full::getThird()
throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
{
throw css::beans::UnknownPropertyException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")),
+ rtl::OUString("Third"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -325,7 +325,7 @@ void Full::setThird(sal_Int32)
throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
{
throw css::beans::UnknownPropertyException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")),
+ rtl::OUString("Third"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -333,7 +333,7 @@ sal_Int32 Full::getFourth()
throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
{
throw css::beans::UnknownPropertyException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")),
+ rtl::OUString("Fourth"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -341,7 +341,7 @@ void Full::setFourth(sal_Int32)
throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
{
throw css::beans::UnknownPropertyException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")),
+ rtl::OUString("Fourth"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -384,15 +384,13 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
rtl::OUString SAL_CALL getImplementationName() {
return rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "test.cppuhelper.propertysetmixin.comp.CppSupplier"));
+ "test.cppuhelper.propertysetmixin.comp.CppSupplier");
}
css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
css::uno::Sequence< rtl::OUString > s(1);
s[0] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "test.cppuhelper.propertysetmixin.CppSupplier"));
+ "test.cppuhelper.propertysetmixin.CppSupplier");
return s;
}
diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
index 43cf415bbe42..9455752824d0 100644
--- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
@@ -256,20 +256,20 @@ void Test::testEmpty2(
static_cast< sal_Int32 >(0), info->getProperties().getLength());
try {
info->getPropertyByName(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any")));
+ rtl::OUString("any"));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
CPPUNIT_ASSERT(
!info->hasPropertyByName(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any"))));
+ rtl::OUString("any")));
try {
empty2p->setPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any")), css::uno::Any());
+ rtl::OUString("any"), css::uno::Any());
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
empty2p->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any")));
+ rtl::OUString("any"));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
rtl::Reference< BoundListener > boundListener1(new BoundListener);
@@ -311,10 +311,10 @@ void Test::testEmpty2(
empty2a->setPropertyValues(
css::uno::Sequence< css::beans::PropertyValue >());
css::uno::Sequence< css::beans::PropertyValue > vs(2);
- vs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any1"));
+ vs[0].Name = rtl::OUString("any1");
vs[0].Handle = -1;
vs[0].State = css::beans::PropertyState_DIRECT_VALUE;
- vs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any2"));
+ vs[0].Name = rtl::OUString("any2");
vs[0].Handle = -1;
vs[0].State = css::beans::PropertyState_DIRECT_VALUE;
try {
@@ -372,16 +372,16 @@ void Test::testFull(
static_cast< sal_Int32 >(3), info->getProperties().getLength());
css::beans::Property prop(
info->getPropertyByName(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First"))));
+ rtl::OUString("First")));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), prop.Name);
+ rtl::OUString("First"), prop.Name);
CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), prop.Handle);
CPPUNIT_ASSERT_EQUAL(getCppuType(static_cast< sal_Int32 * >(0)), prop.Type);
CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int16 >(0), prop.Attributes);
prop = info->getPropertyByName(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")));
+ rtl::OUString("Second"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), prop.Name);
+ rtl::OUString("Second"), prop.Name);
CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(1), prop.Handle);
CPPUNIT_ASSERT_EQUAL(getCppuType(static_cast< sal_Int32 * >(0)), prop.Type);
CPPUNIT_ASSERT_EQUAL(
@@ -395,13 +395,13 @@ void Test::testFull(
prop.Attributes);
try {
info->getPropertyByName(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")));
+ rtl::OUString("Third"));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
prop = info->getPropertyByName(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")));
+ rtl::OUString("Fourth"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")), prop.Name);
+ rtl::OUString("Fourth"), prop.Name);
CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(3), prop.Handle);
CPPUNIT_ASSERT_EQUAL(getCppuType(static_cast< sal_Int32 * >(0)), prop.Type);
CPPUNIT_ASSERT_EQUAL(
@@ -409,93 +409,93 @@ void Test::testFull(
prop.Attributes);
try {
info->getPropertyByName(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("first")));
+ rtl::OUString("first"));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
CPPUNIT_ASSERT(
info->hasPropertyByName(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First"))));
+ rtl::OUString("First")));
CPPUNIT_ASSERT(
info->hasPropertyByName(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second"))));
+ rtl::OUString("Second")));
CPPUNIT_ASSERT(
!info->hasPropertyByName(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third"))));
+ rtl::OUString("Third")));
CPPUNIT_ASSERT(
info->hasPropertyByName(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth"))));
+ rtl::OUString("Fourth")));
CPPUNIT_ASSERT(
!info->hasPropertyByName(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("first"))));
+ rtl::OUString("first")));
CPPUNIT_ASSERT_EQUAL(
css::uno::makeAny(static_cast< sal_Int32 >(0)),
fullp->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First"))));
+ rtl::OUString("First")));
fullp->setPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")),
+ rtl::OUString("First"),
css::uno::makeAny(static_cast< sal_Int32 >(-100)));
CPPUNIT_ASSERT_EQUAL(
css::uno::makeAny(static_cast< sal_Int32 >(-100)),
fullp->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First"))));
+ rtl::OUString("First")));
css::uno::Any voidAny;
CPPUNIT_ASSERT_EQUAL(
voidAny,
fullp->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second"))));
+ rtl::OUString("Second")));
fullp->setPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")),
+ rtl::OUString("Second"),
css::uno::makeAny(static_cast< sal_Int32 >(100)));
CPPUNIT_ASSERT_EQUAL(
css::uno::makeAny(static_cast< sal_Int32 >(100)),
fullp->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second"))));
+ rtl::OUString("Second")));
CPPUNIT_ASSERT(full->getSecond().Value.Value.IsPresent);
CPPUNIT_ASSERT_EQUAL(
static_cast< sal_Int32 >(100), full->getSecond().Value.Value.Value);
CPPUNIT_ASSERT(!full->getSecond().Value.IsDefaulted);
CPPUNIT_ASSERT(!full->getSecond().IsAmbiguous);
fullp->setPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")),
+ rtl::OUString("Second"),
css::uno::Any());
CPPUNIT_ASSERT_EQUAL(
voidAny,
fullp->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second"))));
+ rtl::OUString("Second")));
CPPUNIT_ASSERT(!full->getSecond().Value.Value.IsPresent);
CPPUNIT_ASSERT(!full->getSecond().Value.IsDefaulted);
CPPUNIT_ASSERT(!full->getSecond().IsAmbiguous);
try {
fullp->setPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")),
+ rtl::OUString("Third"),
css::uno::makeAny(static_cast< sal_Int32 >(100)));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")));
+ rtl::OUString("Third"));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->setPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")),
+ rtl::OUString("Fourth"),
css::uno::makeAny(static_cast< sal_Int32 >(100)));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")));
+ rtl::OUString("Fourth"));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->setPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("first")),
+ rtl::OUString("first"),
css::uno::Any());
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("first")));
+ rtl::OUString("first"));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
css::uno::Reference< css::beans::XFastPropertySet > fullf(
@@ -522,13 +522,13 @@ void Test::testFull(
fulla->getPropertyValues());
CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(2), vs.getLength());
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), vs[0].Name);
+ rtl::OUString("First"), vs[0].Name);
CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), vs[0].Handle);
CPPUNIT_ASSERT_EQUAL(
css::uno::makeAny(static_cast< sal_Int32 >(0)), vs[0].Value);
CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[0].State);
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), vs[1].Name);
+ rtl::OUString("Second"), vs[1].Name);
CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(1), vs[1].Handle);
CPPUNIT_ASSERT_EQUAL(voidAny, vs[1].Value);
CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[1].State);
@@ -539,12 +539,12 @@ void Test::testFull(
vs = fulla->getPropertyValues();
CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(2), vs.getLength());
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), vs[0].Name);
+ rtl::OUString("First"), vs[0].Name);
CPPUNIT_ASSERT_EQUAL(
css::uno::makeAny(static_cast< sal_Int32 >(-100)), vs[0].Value);
CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[0].State);
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), vs[1].Name);
+ rtl::OUString("Second"), vs[1].Name);
CPPUNIT_ASSERT_EQUAL(
css::uno::makeAny(static_cast< sal_Int32 >(100)), vs[1].Value);
CPPUNIT_ASSERT_EQUAL(
@@ -557,76 +557,76 @@ void Test::testFull(
css::uno::Reference< css::beans::XPropertyChangeListener > boundListener(
new BoundListener);
fullp->addPropertyChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), boundListener);
+ rtl::OUString("First"), boundListener);
fullp->removePropertyChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), boundListener);
+ rtl::OUString("First"), boundListener);
fullp->addPropertyChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), boundListener);
+ rtl::OUString("Second"), boundListener);
fullp->removePropertyChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), boundListener);
+ rtl::OUString("Second"), boundListener);
try {
fullp->addPropertyChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")),
+ rtl::OUString("Third"),
boundListener);
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->removePropertyChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")),
+ rtl::OUString("Third"),
boundListener);
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
fullp->addPropertyChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")), boundListener);
+ rtl::OUString("Fourth"), boundListener);
fullp->removePropertyChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")), boundListener);
+ rtl::OUString("Fourth"), boundListener);
try {
fullp->addPropertyChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fifth")),
+ rtl::OUString("Fifth"),
boundListener);
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->removePropertyChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fifth")),
+ rtl::OUString("Fifth"),
boundListener);
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
css::uno::Reference< css::beans::XVetoableChangeListener > vetoListener(
new VetoListener);
fullp->addVetoableChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), vetoListener);
+ rtl::OUString("First"), vetoListener);
fullp->removeVetoableChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("First")), vetoListener);
+ rtl::OUString("First"), vetoListener);
fullp->addVetoableChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), vetoListener);
+ rtl::OUString("Second"), vetoListener);
fullp->removeVetoableChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second")), vetoListener);
+ rtl::OUString("Second"), vetoListener);
try {
fullp->addVetoableChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")),
+ rtl::OUString("Third"),
vetoListener);
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->removeVetoableChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Third")),
+ rtl::OUString("Third"),
vetoListener);
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
fullp->addVetoableChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")), vetoListener);
+ rtl::OUString("Fourth"), vetoListener);
fullp->removeVetoableChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fourth")), vetoListener);
+ rtl::OUString("Fourth"), vetoListener);
try {
fullp->addVetoableChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fifth")),
+ rtl::OUString("Fifth"),
vetoListener);
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->removeVetoableChangeListener(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fifth")),
+ rtl::OUString("Fifth"),
vetoListener);
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index 4ae70ad679ab..c178e986fcc7 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -197,8 +197,8 @@ void OComponentHelper::dispose()
catch (Exception & exc)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "unexpected UNO exception caught: ") ) +
+ OUString(
+ "unexpected UNO exception caught: ") +
exc.Message, Reference< XInterface >() );
}
}
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index ba2aeaf2233d..dc5cf91a0fee 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -228,7 +228,7 @@ Reference< XInterface > OSingleFactoryHelper::createInstanceWithArgumentsAndCont
xComp->dispose();
throw lang::IllegalArgumentException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("cannot pass arguments to component => no XInitialization implemented!") ),
+ OUString("cannot pass arguments to component => no XInitialization implemented!"),
Reference< XInterface >(), 0 );
}
}
@@ -818,7 +818,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
OUString aLocation;
Reference<XRegistryKey > xActivatorKey = xImplementationKey->openKey(
- OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/ACTIVATOR") ) );
+ OUString("/UNO/ACTIVATOR") );
if( xActivatorKey.is() && xActivatorKey->getValueType() == RegistryValueType_ASCII )
{
aActivatorUrl = xActivatorKey->getAsciiValue();
@@ -828,7 +828,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
aActivatorName = tmpActivator.getToken(0, ':', nIndex );
Reference<XRegistryKey > xLocationKey = xImplementationKey->openKey(
- OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/LOCATION") ) );
+ OUString("/UNO/LOCATION") );
if( xLocationKey.is() && xLocationKey->getValueType() == RegistryValueType_ASCII )
aLocation = xLocationKey->getAsciiValue();
}
@@ -837,7 +837,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
// old style"url"
// the location of the program code of the implementation
Reference<XRegistryKey > xLocationKey = xImplementationKey->openKey(
- OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/URL") ) );
+ OUString("/UNO/URL") );
// is the key of the right type ?
if( xLocationKey.is() && xLocationKey->getValueType() == RegistryValueType_ASCII )
{
@@ -846,14 +846,14 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
// search protocol delimiter
sal_Int32 nPos = aLocation.indexOf(
- OUString( RTL_CONSTASCII_USTRINGPARAM("://") ) );
+ OUString("://") );
if( nPos != -1 )
{
aActivatorName = aLocation.copy( 0, nPos );
if( aActivatorName.compareToAscii( "java" ) == 0 )
- aActivatorName = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.Java") );
+ aActivatorName = OUString("com.sun.star.loader.Java");
else if( aActivatorName.compareToAscii( "module" ) == 0 )
- aActivatorName = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary") );
+ aActivatorName = OUString("com.sun.star.loader.SharedLibrary");
aLocation = aLocation.copy( nPos + 3 );
}
}
@@ -884,7 +884,7 @@ Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames(void)
try
{
Reference<XRegistryKey > xKey = xImplementationKey->openKey(
- OUString( RTL_CONSTASCII_USTRINGPARAM("UNO/SERVICES") ) );
+ OUString("UNO/SERVICES") );
if (xKey.is())
{
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index f983e881e911..4816c4a63832 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -287,8 +287,8 @@ void WeakComponentImplHelperBase::dispose()
catch (Exception & exc)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "unexpected UNO exception caught: ") ) +
+ OUString(
+ "unexpected UNO exception caught: ") +
exc.Message, Reference< XInterface >() );
}
}
@@ -423,8 +423,8 @@ void WeakAggComponentImplHelperBase::dispose()
catch (Exception & exc)
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "unexpected UNO exception caught: ") ) +
+ OUString(
+ "unexpected UNO exception caught: ") +
exc.Message, Reference< XInterface >() );
}
}
diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx
index d45409d4d021..12a3752a44e4 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -266,8 +266,7 @@ void Data::initProperties(
if (args.getLength() != 1) {
throw css::uno::RuntimeException(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "inconsistent UNO type registry")),
+ "inconsistent UNO type registry"),
css::uno::Reference< css::uno::XInterface >());
}
t = args[0];
@@ -277,8 +276,7 @@ void Data::initProperties(
if (handles > SAL_MAX_INT32) {
throw css::uno::RuntimeException(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "interface type has too many attributes")),
+ "interface type has too many attributes"),
css::uno::Reference< css::uno::XInterface >());
}
rtl::OUString name(members[i]->getMemberName());
@@ -297,8 +295,7 @@ void Data::initProperties(
{
throw css::uno::RuntimeException(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "inconsistent UNO type registry")),
+ "inconsistent UNO type registry"),
css::uno::Reference< css::uno::XInterface >());
}
handleNames->push_back(name);
@@ -517,7 +514,7 @@ rtl::OUString PropertySetMixinImpl::Impl::translateHandle(
{
if (handle < 0 || handle >= handleMap.getLength()) {
throw css::beans::UnknownPropertyException(
- (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad handle "))
+ (rtl::OUString("bad handle ")
+ rtl::OUString::valueOf(handle)),
object);
}
@@ -589,8 +586,7 @@ void PropertySetMixinImpl::Impl::setProperty(
//TODO Clarify whether PropertyVetoException is the correct exception
// to throw when trying to set a read-only property:
throw css::beans::PropertyVetoException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("cannot set read-only property "))
+ (rtl::OUString("cannot set read-only property ")
+ name),
object);
} catch (css::lang::WrappedTargetRuntimeException & e) {
@@ -643,8 +639,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
} catch (css::lang::IllegalArgumentException & e) {
throw css::uno::RuntimeException(
(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "unexpected com.sun.star.lang.IllegalArgumentException: "))
+ "unexpected com.sun.star.lang.IllegalArgumentException: ")
+ e.Message),
object);
} catch (css::lang::WrappedTargetRuntimeException & e) {
@@ -689,8 +684,7 @@ css::uno::Any Prope