/jvmfwk/plugins/

lo/core/atom/?h=cp-24.04.3-4' type='application/atom+xml'/>
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 PropertySetMixinImpl::Impl::getProperty(
try {
if (!(css::uno::Reference< css::reflection::XIdlField2 >(
ambiguous->getField(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("IsAmbiguous"))),
+ rtl::OUString("IsAmbiguous")),
css::uno::UNO_QUERY_THROW)->get(value)
>>= isAmbiguous))
{
@@ -704,7 +698,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
}
value = css::uno::Reference< css::reflection::XIdlField2 >(
ambiguous->getField(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value"))),
+ rtl::OUString("Value")),
css::uno::UNO_QUERY_THROW)->get(value);
} catch (css::lang::IllegalArgumentException & e) {
throw css::uno::RuntimeException(
@@ -727,8 +721,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
if (!(css::uno::Reference< css::reflection::XIdlField2 >(
defaulted->getField(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("IsDefaulted"))),
+ rtl::OUString("IsDefaulted")),
css::uno::UNO_QUERY_THROW)->get(value)
>>= isDefaulted))
{
@@ -742,7 +735,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
}
value = css::uno::Reference< css::reflection::XIdlField2 >(
defaulted->getField(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value"))),
+ rtl::OUString("Value")),
css::uno::UNO_QUERY_THROW)->get(value);
} catch (css::lang::IllegalArgumentException & e) {
throw css::uno::RuntimeException(
@@ -765,8 +758,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
bool present = false;
if (!(css::uno::Reference< css::reflection::XIdlField2 >(
optional->getField(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("IsPresent"))),
+ rtl::OUString("IsPresent")),
css::uno::UNO_QUERY_THROW)->get(value)
>>= present))
{
@@ -783,7 +775,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
}
value = css::uno::Reference< css::reflection::XIdlField2 >(
optional->getField(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value"))),
+ rtl::OUString("Value")),
css::uno::UNO_QUERY_THROW)->get(value);
} catch (css::lang::IllegalArgumentException & e) {
throw css::uno::RuntimeException(
@@ -798,8 +790,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
} else {
throw css::uno::RuntimeException(
(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "unexpected type of attribute "))
+ "unexpected type of attribute ")
+ name),
object);
}
@@ -826,8 +817,7 @@ PropertySetMixinImpl::Impl::getReflection(rtl::OUString const & typeName) const
refl.ifc = css::uno::Reference< css::reflection::XIdlReflection >(
factory->createInstanceWithContext(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.reflection.CoreReflection")),
+ "com.sun.star.reflection.CoreReflection"),
m_context),
css::uno::UNO_QUERY_THROW);
} catch (css::uno::RuntimeException &) {
@@ -865,8 +855,7 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue(
try {
css::uno::Reference< css::reflection::XIdlField2 > field(
type->getField(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Value"))),
+ rtl::OUString("Value")),
css::uno::UNO_QUERY_THROW);
field->set(
strct,
@@ -875,8 +864,7 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue(
wrapDefaulted, isDefaulted, wrapOptional));
css::uno::Reference< css::reflection::XIdlField2 >(
type->getField(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("IsAmbiguous"))),
+ rtl::OUString("IsAmbiguous")),
css::uno::UNO_QUERY_THROW)->set(
strct, css::uno::makeAny(isAmbiguous));
} catch (css::lang::IllegalArgumentException & e) {
@@ -906,8 +894,7 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue(
try {
css::uno::Reference< css::reflection::XIdlField2 > field(
type->getField(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Value"))),
+ rtl::OUString("Value")),
css::uno::UNO_QUERY_THROW);
field->set(
strct,
@@ -916,8 +903,7 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue(
false, false, wrapOptional));
css::uno::Reference< css::reflection::XIdlField2 >(
type->getField(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("IsDefaulted"))),
+ rtl::OUString("IsDefaulted")),
css::uno::UNO_QUERY_THROW)->set(
strct, css::uno::makeAny(isDefaulted));
} catch (css::lang::IllegalArgumentException & e) {
@@ -948,15 +934,13 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue(
try {
css::uno::Reference< css::reflection::XIdlField2 >(
type->getField(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("IsPresent"))),
+ rtl::OUString("IsPresent")),
css::uno::UNO_QUERY_THROW)->set(
strct, css::uno::makeAny(present));
if (present) {
css::uno::Reference< css::reflection::XIdlField2 > field(
type->getField(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Value"))),
+ rtl::OUString("Value")),
css::uno::UNO_QUERY_THROW);
field->set(
strct,
@@ -986,8 +970,7 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue(
if (wrapAmbiguous || wrapDefaulted || wrapOptional) {
throw css::uno::RuntimeException(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "unexpected type of attribute")),
+ "unexpected type of attribute"),
object);
}
return value;
@@ -1027,7 +1010,7 @@ void PropertySetMixinImpl::prepareSet(
osl::MutexGuard g(m_impl->mutex);
if (m_impl->disposed) {
throw css::lang::DisposedException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("disposed")),
+ rtl::OUString("disposed"),
static_cast< css::beans::XPropertySet * >(this));
}
if ((it->second.property.Attributes
@@ -1393,10 +1376,9 @@ void PropertySetMixinImpl::setPropertyValues(
props[i].Handle)))
{
throw css::beans::UnknownPropertyException(
- (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name "))
+ (rtl::OUString("name ")
+ props[i].Name
- + rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(" does not match handle "))
+ + rtl::OUString(" does not match handle ")
+ rtl::OUString::valueOf(props[i].Handle)),
static_cast< css::beans::XPropertySet * >(this));
}
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index d2ed0cf8a524..180a05484b66 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -296,7 +296,7 @@ static void getLibEnv(oslModule lib,
const OString aStr( aEnv.getToken( 0, ';', nIndex ) );
if ( aStr.equals(implName) )
{
- *pSourceEnv_name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":log"));
+ *pSourceEnv_name += ::rtl::OUString(":log");
break;
}
} while( nIndex != -1 );
diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx
index 15e1d11df210..7179256f3a3a 100644
--- a/cppuhelper/source/unourl.cxx
+++ b/cppuhelper/source/unourl.cxx
@@ -78,8 +78,8 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor)
case STATE_NAME0:
if (bEnd || !isAlphanum(c))
throw rtl::MalformedUriException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "UNO URL contains bad descriptor name")));
+ rtl::OUString(
+ "UNO URL contains bad descriptor name"));
nStart = i;
eState = STATE_NAME;
break;
@@ -93,15 +93,15 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor)
}
else if (!isAlphanum(c))
throw rtl::MalformedUriException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "UNO URL contains bad descriptor name")));
+ rtl::OUString(
+ "UNO URL contains bad descriptor name"));
break;
case STATE_KEY0:
if (bEnd || !isAlphanum(c))
throw rtl::MalformedUriException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "UNO URL contains bad parameter key")));
+ rtl::OUString(
+ "UNO URL contains bad parameter key"));
nStart = i;
eState = STATE_KEY;
break;
@@ -115,8 +115,8 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor)
}
else if (bEnd || !isAlphanum(c))
throw rtl::MalformedUriException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "UNO URL contains bad parameter key")));
+ rtl::OUString(
+ "UNO URL contains bad parameter key"));
break;
case STATE_VALUE:
@@ -131,8 +131,7 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor)
RTL_TEXTENCODING_UTF8))).second)
throw rtl::MalformedUriException(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "UNO URL contains duplicated parameter")));
+ "UNO URL contains duplicated parameter"));
eState = STATE_KEY0;
}
break;
@@ -223,8 +222,8 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl)
sal_Int32 j = rUrl.indexOf(';', i);
if (j < 0)
throw rtl::MalformedUriException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "UNO URL has too few semicolons")));
+ rtl::OUString(
+ "UNO URL has too few semicolons"));
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< UnoUrlDescriptor::Impl >
xConnection(new UnoUrlDescriptor::Impl(rUrl.copy(i, j - i)));
@@ -233,8 +232,8 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl)
j = rUrl.indexOf(0x3B, i); // ';'
if (j < 0)
throw rtl::MalformedUriException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "UNO URL has too few semicolons")));
+ rtl::OUString(
+ "UNO URL has too few semicolons"));
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< UnoUrlDescriptor::Impl >
xProtocol(new UnoUrlDescriptor::Impl(rUrl.copy(i, j - i)));
@@ -242,8 +241,8 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl)
i = j + 1;
if (i == rUrl.getLength())
throw rtl::MalformedUriException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "UNO URL contains empty ObjectName")));
+ rtl::OUString(
+ "UNO URL contains empty ObjectName"));
for (j = i; j < rUrl.getLength(); ++j)
{
sal_Unicode c = rUrl.getStr()[j];
@@ -255,8 +254,8 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl)
&& c != 0x3F && c != 0x40 && c != 0x5F // '?', '@', '_'
&& c != 0x7E) // '~'
throw rtl::MalformedUriException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "UNO URL contains invalid ObjectName")));
+ rtl::OUString(
+ "UNO URL contains invalid ObjectName"));
}
return new Impl(xConnection, xProtocol, rUrl.copy(i));
}
diff --git a/cppuhelper/test/bootstrap/TestEnv.cxx b/cppuhelper/test/bootstrap/TestEnv.cxx
index cf06790caa84..1a0d4065ea2c 100644
--- a/cppuhelper/test/bootstrap/TestEnv.cxx
+++ b/cppuhelper/test/bootstrap/TestEnv.cxx
@@ -96,10 +96,10 @@ int TestEnv::v_isValid(rtl::OUString * pReason)
int result = m_inCount & 1;
if (result)
- *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OK"));
+ *pReason = rtl::OUString("OK");
else
- *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered/invoked"));
+ *pReason = rtl::OUString("not entered/invoked");
return result;
}
diff --git a/cppuhelper/test/bootstrap/bootstrap.test.cxx b/cppuhelper/test/bootstrap/bootstrap.test.cxx
index ebbb5ca24cc6..861491072477 100644
--- a/cppuhelper/test/bootstrap/bootstrap.test.cxx
+++ b/cppuhelper/test/bootstrap/bootstrap.test.cxx
@@ -53,7 +53,7 @@ static bool s_check_object_is_in(void * pObject)
currentEnv.get()->pExtEnv->getObjectIdentifier(currentEnv.get()->pExtEnv, &pOId, pObject);
- uno::TypeDescription typeDescription(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface")));
+ uno::TypeDescription typeDescription(rtl::OUString("com.sun.star.uno.XInterface"));
void * pRegisteredObject = NULL;
currentEnv.get()->pExtEnv->getRegisteredInterface(currentEnv.get()->pExtEnv,
@@ -92,11 +92,11 @@ static void s_test__loadSharedLibComponentFactory(rtl::OUString const & clientPu
cppu::loadSharedLibComponentFactory(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SAL_DLLPREFIX "TestComponent.uno" SAL_DLLEXTENSION)),
#ifdef WIN32
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+ rtl::OUString(""),
#else
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://../lib/")),
+ rtl::OUString("file://../lib/"),
#endif
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("impl.test.TestComponent")) + servicePurpose,
+ rtl::OUString("impl.test.TestComponent") + servicePurpose,
uno::Reference<lang::XMultiServiceFactory>(),
uno::Reference<registry::XRegistryKey>()
)
@@ -104,7 +104,7 @@ static void s_test__loadSharedLibComponentFactory(rtl::OUString const & clientPu
if (!xItf.is())
{
- s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tgot no object - FAILURE\n"));
+ s_comment += rtl::OUString("\t\tgot no object - FAILURE\n");
return;
}
@@ -125,33 +125,33 @@ static void s_test__loadSharedLibComponentFactory(rtl::OUString const & clientPu
static void s_test__loadSharedLibComponentFactory__free_free()
{
- s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__loadSharedLibComponentFactory__free_free\n"));
+ s_comment += rtl::OUString("\ts_test__loadSharedLibComponentFactory__free_free\n");
s_test__loadSharedLibComponentFactory(rtl::OUString(), rtl::OUString());
}
static void s_test__loadSharedLibComponentFactory__free_purpose()
{
- s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__loadSharedLibComponentFactory__free_purpose\n"));
+ s_comment += rtl::OUString("\ts_test__loadSharedLibComponentFactory__free_purpose\n");
s_test__loadSharedLibComponentFactory(rtl::OUString(),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv")));
+ rtl::OUString(":testenv"));
}
static void s_test__loadSharedLibComponentFactory__purpose_free()
{
- s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__loadSharedLibComponentFactory__purpose_free\n"));
+ s_comment += rtl::OUString("\ts_test__loadSharedLibComponentFactory__purpose_free\n");
- s_test__loadSharedLibComponentFactory(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv")),
+ s_test__loadSharedLibComponentFactory(rtl::OUString(":testenv"),
rtl::OUString());
}
static void s_test__loadSharedLibComponentFactory__purpose_purpose()
{
- s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__loadSharedLibComponentFactory__purpose_purpose\n"));
+ s_comment += rtl::OUString("\ts_test__loadSharedLibComponentFactory__purpose_purpose\n");
- s_test__loadSharedLibComponentFactory(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv")));
+ s_test__loadSharedLibComponentFactory(rtl::OUString(":testenv"),
+ rtl::OUString(":testenv"));
}
static rtl::OUString s_getSDrive(void)
@@ -166,10 +166,10 @@ static rtl::OUString s_getSDrive(void)
path += rtl::OUString(tmp, rtl_str_getLength(tmp), RTL_TEXTENCODING_ASCII_US);
path += rtl::OUString(SAL_PATHDELIMITER);
#ifdef WIN32
- path += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bin"));
+ path += rtl::OUString("bin");
#else
- path += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("lib"));
+ path += rtl::OUString("lib");
#endif
tmp = getenv("UPDMINOREXT");
@@ -199,7 +199,7 @@ static void s_test__createSimpleRegistry(rtl::OUString const & clientPurpose)
if (!registry.is())
{
- s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tgot no object - FAILURE\n"));
+ s_comment += rtl::OUString("\t\tgot no object - FAILURE\n");
return;
}
@@ -213,16 +213,16 @@ static void s_test__createSimpleRegistry(rtl::OUString const & clientPurpose)
static void s_test__createSimpleRegistry__free(void)
{
- s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__createSimpleRegistry__free\n"));
+ s_comment += rtl::OUString("\ts_test__createSimpleRegistry__free\n");
s_test__createSimpleRegistry(rtl::OUString());
}
static void s_test__createSimpleRegistry__purpose(void)
{
- s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__createSimpleRegistry__purpose\n"));
+ s_comment += rtl::OUString("\ts_test__createSimpleRegistry__purpose\n");
- s_test__createSimpleRegistry(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv")));
+ s_test__createSimpleRegistry(rtl::OUString(":testenv"));
}
@@ -247,7 +247,7 @@ static void s_test__bootstrap_InitialComponentContext(rtl::OUString const & clie
if (!xContext.is())
{
- s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tgot no object - FAILURE\n"));
+ s_comment += rtl::OUString("\t\tgot no object - FAILURE\n");
return;
}
@@ -264,16 +264,16 @@ static void s_test__bootstrap_InitialComponentContext(rtl::OUString const & clie
static void s_test__bootstrap_InitialComponentContext__free(void)
{
- s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__bootstrap_InitialComponentContext__free\n"));
+ s_comment += rtl::OUString("\ts_test__bootstrap_InitialComponentContext__free\n");
s_test__bootstrap_InitialComponentContext(rtl::OUString());
}
static void s_test__bootstrap_InitialComponentContext__purpose(void)
{
- s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__bootstrap_InitialComponentContext__purpose\n"));
+ s_comment += rtl::OUString("\ts_test__bootstrap_InitialComponentContext__purpose\n");
- s_test__bootstrap_InitialComponentContext(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv")));
+ s_test__bootstrap_InitialComponentContext(rtl::OUString(":testenv"));
}
@@ -293,12 +293,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv)
int ret;
if (s_comment.indexOf("FAILURE") == -1)
{
- s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS PASSED\n"));
+ s_comment += rtl::OUString("TESTS PASSED\n");
ret = 0;
}
else
{
- s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS _NOT_ PASSED\n"));
+ s_comment += rtl::OUString("TESTS _NOT_ PASSED\n");
ret = -1;
}
diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx
index 6dfece4a873f..4acc23c2e741 100644
--- a/cppuhelper/test/cfg_test.cxx
+++ b/cppuhelper/test/cfg_test.cxx
@@ -59,7 +59,7 @@ static Sequence< OUString > impl0_getSupportedServiceNames()
//--------------------------------------------------------------------------------------------------
static OUString impl0_getImplementationName()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.bootstrap.TestComponent0") );
+ return OUString("com.sun.star.comp.bootstrap.TestComponent0");
}
//--------------------------------------------------------------------------------------------------
static Sequence< OUString > impl1_getSupportedServiceNames()
@@ -70,7 +70,7 @@ static Sequence< OUString > impl1_getSupportedServiceNames()
//--------------------------------------------------------------------------------------------------
static OUString impl1_getImplementationName()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.bootstrap.TestComponent1") );
+ return OUString("com.sun.star.comp.bootstrap.TestComponent1");
}
//==================================================================================================
diff --git a/cppuhelper/test/loader/loader.test.cxx b/cppuhelper/test/loader/loader.test.cxx
index 466f243f52dc..cbaf7348d5e9 100644
--- a/cppuhelper/test/loader/loader.test.cxx
+++ b/cppuhelper/test/loader/loader.test.cxx
@@ -82,7 +82,7 @@ static rtl::OUString s_test__cppu_loadSharedLibComponentFactory(char const * pSe
rtl_str_getLength(pServicePurpose),
RTL_TEXTENCODING_ASCII_US);
- result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__cppu_loadSharedLibComponentFactory "));
+ result += rtl::OUString("\ts_test__cppu_loadSharedLibComponentFactory ");
result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(\""));
result += servicePurpose;
result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\") - "));
@@ -92,14 +92,14 @@ static rtl::OUString s_test__cppu_loadSharedLibComponentFactory(char const * pSe
cppu::loadSharedLibComponentFactory(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SAL_DLLPREFIX "TestComponent.uno" SAL_DLLEXTENSION)),
rtl::OUString(),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("impl.test.TestComponent")) + servicePurpose,
+ rtl::OUString("impl.test.TestComponent") + servicePurpose,
uno::Reference<lang::XMultiServiceFactory>(),
uno::Reference<registry::XRegistryKey>())
);
rtl::OUString envDcp_purpose(cppu::EnvDcp::getPurpose(g_envDcp));
if (envDcp_purpose == servicePurpose)
- result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("passed\n"));
+ result += rtl::OUString("passed\n");
else
{
@@ -125,7 +125,7 @@ static rtl::OUString s_test__cppu_writeSharedLibComponentInfo(char const * pServ
rtl_str_getLength(pServicePurpose),
RTL_TEXTENCODING_ASCII_US);
- result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__cppu_writeSharedLibComponentInfo "));
+ result += rtl::OUString("\ts_test__cppu_writeSharedLibComponentInfo ");
result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(\""));
result += servicePurpose;
result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\") - "));
@@ -146,7 +146,7 @@ static rtl::OUString s_test__cppu_writeSharedLibComponentInfo(char const * pServ
rtl::OUString envDcp_purpose(cppu::EnvDcp::getPurpose(g_envDcp));
if (envDcp_purpose == servicePurpose)
- result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("passed\n"));
+ result += rtl::OUString("passed\n");
else
{
@@ -172,7 +172,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv)
rtl::OUString message;
message += rtl::OUString(argv[0], rtl_str_getLength(argv[0]), RTL_TEXTENCODING_ASCII_US);
- message += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
+ message += rtl::OUString("\n");
message += s_test__cppu_loadSharedLibComponentFactory(":unsafe");
message += s_test__cppu_loadSharedLibComponentFactory(":affine");
@@ -183,11 +183,11 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv)
message += s_test__cppu_writeSharedLibComponentInfo("");
if (message.indexOf("FAILED") == -1)
- message += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS PASSED\n"));
+ message += rtl::OUString("TESTS PASSED\n");
else
{
- message += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS _NOT_ PASSED\n"));
+ message += rtl::OUString("TESTS _NOT_ PASSED\n");
result = -1;
}
diff --git a/cppuhelper/test/testcmp/TestComponent.cxx b/cppuhelper/test/testcmp/TestComponent.cxx
index e23069ad047f..a5cd71daea35 100644
--- a/cppuhelper/test/testcmp/TestComponent.cxx
+++ b/cppuhelper/test/testcmp/TestComponent.cxx
@@ -98,7 +98,7 @@ uno::Reference<uno::XInterface> SAL_CALL TestComponent::create(
}
catch (std::bad_alloc &)
{
- throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")),
+ throw uno::RuntimeException(rtl::OUString("std::bad_alloc"),
uno::Reference<uno::XInterface>());
}
}
@@ -106,7 +106,7 @@ uno::Reference<uno::XInterface> SAL_CALL TestComponent::create(
uno::Sequence<rtl::OUString> SAL_CALL TestComponent::getSupportedServiceNames_Static()
{
uno::Sequence<rtl::OUString> serviceNames(1);
- serviceNames[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.ServiceInfo"));
+ serviceNames[0] = rtl::OUString("com.sun.star.lang.ServiceInfo");
return serviceNames;
}
diff --git a/cppuhelper/test/testhelper.cxx b/cppuhelper/test/testhelper.cxx
index 371e9aad4be0..30df8637ff43 100644
--- a/cppuhelper/test/testhelper.cxx
+++ b/cppuhelper/test/testhelper.cxx
@@ -54,21 +54,21 @@ SAL_IMPLEMENT_MAIN()
try
{
Reference< XMultiComponentFactory > xMgr( createRegistryServiceFactory(
- OUString( RTL_CONSTASCII_USTRINGPARAM("cpputest.rdb") ) ), UNO_QUERY );
+ OUString("cpputest.rdb") ), UNO_QUERY );
Reference< XComponentContext > xInitialContext;
OSL_VERIFY( Reference< beans::XPropertySet >( xMgr, UNO_QUERY )->getPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xInitialContext );
+ OUString("DefaultContext") ) >>= xInitialContext );
ContextEntry_Init aEntry;
aEntry.bLateInitService = false;
- aEntry.name = OUString( RTL_CONSTASCII_USTRINGPARAM("bla, bla") );
+ aEntry.name = OUString("bla, bla");
aEntry.value = makeAny( (sal_Int32)5 );
Reference< XComponentContext > xContext( createComponentContext( &aEntry, 1, xInitialContext ) );
OSL_ASSERT( xContext->getServiceManager() != xMgr ); // must be wrapped one
OSL_ASSERT(
Reference< beans::XPropertySet >(
xContext->getServiceManager(), UNO_QUERY )->getPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) != xInitialContext );
+ OUString("DefaultContext") ) != xInitialContext );
Reference< XMultiServiceFactory > x( xMgr, UNO_QUERY );
test_ImplHelper( x );
@@ -78,9 +78,9 @@ SAL_IMPLEMENT_MAIN()
test_interfacecontainer();
OSL_VERIFY( xContext->getValueByName(
- OUString( RTL_CONSTASCII_USTRINGPARAM("bla, bla") ) ) == (sal_Int32)5 );
+ OUString("bla, bla") ) == (sal_Int32)5 );
OSL_VERIFY( ! xInitialContext->getValueByName(
- OUString( RTL_CONSTASCII_USTRINGPARAM("bla, bla") ) ).hasValue() );
+ OUString("bla, bla") ).hasValue() );
Reference< XComponent >( xInitialContext, UNO_QUERY )->dispose();
xMgr.clear();
xContext.clear();
diff --git a/cppuhelper/test/testimplhelper.cxx b/cppuhelper/test/testimplhelper.cxx
index e00043bb36fb..37c6c3f7732b 100644
--- a/cppuhelper/test/testimplhelper.cxx
+++ b/cppuhelper/test/testimplhelper.cxx
@@ -94,25 +94,25 @@ struct TestImpl : public ImplHelper4< CA, DBA, FE, G >
// A
virtual OUString SAL_CALL a() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); }
+ { return OUString("a"); }
// BA
virtual OUString SAL_CALL ba() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("ba") ); }
+ { return OUString("ba"); }
// CA
virtual OUString SAL_CALL ca() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("ca") ); }
+ { return OUString("ca"); }
// DBA
virtual OUString SAL_CALL dba() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("dba") ); }
+ { return OUString("dba"); }
// E
virtual OUString SAL_CALL e() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("e") ); }
+ { return OUString("e"); }
// FE
virtual OUString SAL_CALL fe() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("fe") ); }
+ { return OUString("fe"); }
// G
virtual OUString SAL_CALL g() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("g") ); }
+ { return OUString("g"); }
};
//==================================================================================================
@@ -123,25 +123,25 @@ struct TestWeakAggImpl : public WeakAggImplHelper4< CA, DBA, FE, G >
// A
virtual OUString SAL_CALL a() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); }
+ { return OUString("a"); }
// BA
virtual OUString SAL_CALL ba() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("ba") ); }
+ { return OUString("ba"); }
// CA
virtual OUString SAL_CALL ca() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("ca") ); }
+ { return OUString("ca"); }
// DBA
virtual OUString SAL_CALL dba() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("dba") ); }
+ { return OUString("dba"); }
// E
virtual OUString SAL_CALL e() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("e") ); }
+ { return OUString("e"); }
// FE
virtual OUString SAL_CALL fe() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("fe") ); }
+ { return OUString("fe"); }
// G
virtual OUString SAL_CALL g() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("g") ); }
+ { return OUString("g"); }
};
//==================================================================================================
@@ -154,25 +154,25 @@ struct TestWeakImpl : public WeakImplHelper4< CA, DBA, FE, G >
// A
virtual OUString SAL_CALL a() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); }
+ { return OUString("a"); }
// BA
virtual OUString SAL_CALL ba() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("ba") ); }
+ { return OUString("ba"); }
// CA
virtual OUString SAL_CALL ca() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("ca") ); }
+ { return OUString("ca"); }
// DBA
virtual OUString SAL_CALL dba() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("dba") ); }
+ { return OUString("dba"); }
// E
virtual OUString SAL_CALL e() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("e") ); }
+ { return OUString("e"); }
// FE
virtual OUString SAL_CALL fe() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("fe") ); }
+ { return OUString("fe"); }
// G
virtual OUString SAL_CALL g() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("g") ); }
+ { return OUString("g"); }
protected:
TestWeakImpl(int) {}
@@ -203,25 +203,25 @@ struct TestWeakComponentImpl : public WeakComponentImplHelper4< CA, DBA, FE, G >
// A
virtual OUString SAL_CALL a() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); }
+ { return OUString("a"); }
// BA
virtual OUString SAL_CALL ba() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("ba") ); }
+ { return OUString("ba"); }
// CA
virtual OUString SAL_CALL ca() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("ca") ); }
+ { return OUString("ca"); }
// DBA
virtual OUString SAL_CALL dba() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("dba") ); }
+ { return OUString("dba"); }
// E
virtual OUString SAL_CALL e() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("e") ); }
+ { return OUString("e"); }
// FE
virtual OUString SAL_CALL fe() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("fe") ); }
+ { return OUString("fe"); }
// G
virtual OUString SAL_CALL g() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("g") ); }
+ { return OUString("g"); }
};
//==================================================================================================
@@ -239,25 +239,25 @@ struct TestWeakAggComponentImpl : public WeakAggComponentImplHelper4< CA, DBA, F
// A
virtual OUString SAL_CALL a() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); }
+ { return OUString("a"); }
// BA
virtual OUString SAL_CALL ba() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("ba") ); }
+ { return OUString("ba"); }
// CA
virtual OUString SAL_CALL ca() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("ca") ); }
+ { return OUString("ca"); }
// DBA
virtual OUString SAL_CALL dba() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("dba") ); }
+ { return OUString("dba"); }
// E
virtual OUString SAL_CALL e() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("e") ); }
+ { return OUString("e"); }
// FE
virtual OUString SAL_CALL fe() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("fe") ); }
+ { return OUString("fe"); }
// G
virtual OUString SAL_CALL g() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("g") ); }
+ { return OUString("g"); }
};
//==================================================================================================
@@ -288,10 +288,10 @@ struct TestImplInh : public ImplInheritanceHelper2< TestWeakImpl, H, I >
// H
virtual OUString SAL_CALL h() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("h") ); }
+ { return OUString("h"); }
// I
virtual OUString SAL_CALL i() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("i") ); }
+ { return OUString("i"); }
};
//==================================================================================================
@@ -302,10 +302,10 @@ struct TestAggImplInh : public AggImplInheritanceHelper2< TestWeakAggImpl, H, I
// H
virtual OUString SAL_CALL h() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("h2") ); }
+ { return OUString("h2"); }
// I
virtual OUString SAL_CALL i() throw(RuntimeException)
- { return OUString( RTL_CONSTASCII_USTRINGPARAM("i2") ); }
+ { return OUString("i2"); }
};
@@ -485,7 +485,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
bool exc_succ = false;
lang::IllegalAccessException exc(
- OUString( RTL_CONSTASCII_USTRINGPARAM("testtest") ),
+ OUString("testtest"),
xWeakAggImpl );
// exception helper tests
try
@@ -532,7 +532,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
try
{
throwException( makeAny( RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("runtime exc") ), xImpl ) ) );
+ OUString("runtime exc"), xImpl ) ) );
}
catch (RuntimeException & rExc)
{
@@ -540,7 +540,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
try
{
throwException( makeAny( Exception(
- OUString( RTL_CONSTASCII_USTRINGPARAM("exc") ), rExc.Context ) ) );
+ OUString("exc"), rExc.Context ) ) );
}
catch (lang::IllegalAccessException &)
{
@@ -552,7 +552,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
try
{
throwException( makeAny( lang::IllegalAccessException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("axxess exc") ), rExc2.Context ) ) );
+ OUString("axxess exc"), rExc2.Context ) ) );
}
catch (lang::IllegalAccessException & rExc3)
{
diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx
index c04c4d8187ef..c67c1ecbf43e 100644
--- a/cppuhelper/test/testpropshlp.cxx
+++ b/cppuhelper/test/testpropshlp.cxx
@@ -52,17 +52,17 @@ static Property * getPropertyTable1()
if( ! pTable ) {
static Property aTable[] =
{
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString *)0) ,
+ Property( OUString("a"), 0, getCppuType( (OUString *)0) ,
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //OUString
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ) ,
+ Property( OUString("b"), 1, getCppuCharType( ) ,
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //Char
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("c") ), 2, getCppuType( (sal_Int32*)0) ,
+ Property( OUString("c"), 2, getCppuType( (sal_Int32*)0) ,
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //sal_Int32
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("d") ), 5, getCppuType( (double*)0) ,
+ Property( OUString("d"), 5, getCppuType( (double*)0) ,
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //double
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("e") ), 7, getCppuBooleanType() ,
+ Property( OUString("e"), 7, getCppuBooleanType() ,
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //BOOL
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any*)0) ,
+ Property( OUString("f"), 8, getCppuType( (Any*)0) ,
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) //Any
};
pTable = aTable;
@@ -81,17 +81,17 @@ static Property * getPropertyTable2()
if( ! pTable ) {
static Property aTable[] =
{
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any *)0) ,
+ Property( OUString("f"), 8, getCppuType( (Any *)0) ,
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Any
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ),
+ Property( OUString("b"), 1, getCppuCharType( ),
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Char
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0),
+ Property( OUString("a"), 0, getCppuType( (OUString*)0),
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // OUString
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("d") ), 5, getCppuType( (double*)0) ,
+ Property( OUString("d"), 5, getCppuType( (double*)0) ,
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Double
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("c") ), 2, getCppuType( (sal_Int32*)0),
+ Property( OUString("c"), 2, getCppuType( (sal_Int32*)0),
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // sal_Int32
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("e") ), 7, getCppuBooleanType() ,
+ Property( OUString("e"), 7, getCppuBooleanType() ,
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) // Bool
};
pTable = aTable;
@@ -109,11 +109,11 @@ static Property * getPropertyTable3()
if( ! pTable ) {
static Property aTable[] =
{
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ),
+ Property( OUString("b"), 1, getCppuCharType( ),
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Char
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any *)0) ,
+ Property( OUString("f"), 8, getCppuType( (Any *)0) ,
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // any
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0),
+ Property( OUString("a"), 0, getCppuType( (OUString*)0),
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) // OUString
};
pTable = aTable;
@@ -132,11 +132,11 @@ static Property * getPropertyTable4()
if( ! pTable ) {
static Property aTable[] =
{
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0),
+ Property( OUString("a"), 0, getCppuType( (OUString*)0),
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // OUString
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ),
+ Property( OUString("b"), 1, getCppuCharType( ),
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Char
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 2, getCppuType( (Any *)0) ,
+ Property( OUString("f"), 2, getCppuType( (Any *)0) ,
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) // Any
};
pTable = aTable;
@@ -220,10 +220,10 @@ void test_PropertyArrayHelper()
OSL_ENSURE( aP.Type == getPropertyTable1()[i].Type, "Type not correct" );
}
- OSL_ENSURE( !a1.hasPropertyByName( OUString( RTL_CONSTASCII_USTRINGPARAM("never exist") ) ), "hasPropertyByName not correct" );
+ OSL_ENSURE( !a1.hasPropertyByName( OUString("never exist") ), "hasPropertyByName not correct" );
try
{
- a1.getPropertyByName( OUString( RTL_CONSTASCII_USTRINGPARAM("never exist") ) );
+ a1.getPropertyByName( OUString("never exist") );
OSL_FAIL( "exeption not thrown" );
}
catch( UnknownPropertyException & )
@@ -239,7 +239,7 @@ void test_PropertyArrayHelper()
sal_Int32 Handle = a1.getHandleByName( getPropertyTable1()[i].Name );
OSL_ENSURE( Handle == getPropertyTable1()[i].Handle, "Handle not correct" );
}
- sal_Int32 Handle = a1.getHandleByName( OUString( RTL_CONSTASCII_USTRINGPARAM("asdaf") ) );
+ sal_Int32 Handle = a1.getHandleByName( OUString("asdaf") );
OSL_ENSURE( Handle == -1, "Handle not correct" );
}
@@ -277,10 +277,10 @@ void test_PropertyArrayHelper()
Sequence< OUString > aS( 4 );
sal_Int32 Handles[4];
// muss sortiert sein
- aS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("a") );
- aS.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("d") );
- aS.getArray()[2] = OUString( RTL_CONSTASCII_USTRINGPARAM("f") );
- aS.getArray()[3] = OUString( RTL_CONSTASCII_USTRINGPARAM("t") );
+ aS.getArray()[0] = OUString("a");
+ aS.getArray()[1] = OUString("d");
+ aS.getArray()[2] = OUString("f");
+ aS.getArray()[3] = OUString("t");
sal_Int32 nHitCount = a1.fillHandles( Handles, aS );
OSL_ENSURE( nHitCount == 3, "wrong number of hits " );
OSL_ENSURE( Handles[0] == getPropertyTable1()[0].Handle, "Handle not correct" );
@@ -408,11 +408,11 @@ Property * getBasicProps()
static Property aBasicProps[PROPERTY_COUNT] =
{
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ) , PROPERTY_BOOL , getCppuBooleanType(), PropertyAttribute::READONLY ),
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ) , PROPERTY_INT16,
+ Property( OUString("BOOL") , PROPERTY_BOOL , getCppuBooleanType(), PropertyAttribute::READONLY ),
+ Property( OUString("INT16") , PROPERTY_INT16,
getCppuType( (sal_Int16*)0 ), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ),
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ) , PROPERTY_INT32, getCppuType( (sal_Int32*)0 ), PropertyAttribute::BOUND ),
- Property( OUString( RTL_CONSTASCII_USTRINGPARAM("TEST") ) , 55 , getCppuType( (sal_Int32*)0), PropertyAttribute::BOUND )
+ Property( OUString("INT32") , PROPERTY_INT32, getCppuType( (sal_Int32*)0 ), PropertyAttribute::BOUND ),
+ Property( OUString("TEST") , 55 , getCppuType( (sal_Int32*)0), PropertyAttribute::BOUND )
};
pTable = aBasicProps;
}
@@ -468,13 +468,13 @@ public:
case PROPERTY_BOOL:
{
OSL_FAIL( "PropertySetHelper: BOOL cannot change" );
- OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ), "PropertySetHelper: wrong name" );
+ OSL_ENSURE( evt.PropertyName == OUString("BOOL"), "PropertySetHelper: wrong name" );
}
break;
case PROPERTY_INT16:
{
- OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" );
+ OSL_ENSURE( evt.PropertyName == OUString("INT16"), "PropertySetHelper: wrong name" );
OSL_ENSURE( pExceptedListenerValues[nCurrent].getValueType().getTypeClass() == TypeClass_SHORT ,
"PropertySetHelper: wrong data type" );
@@ -493,7 +493,7 @@ public:
case PROPERTY_INT32:
{
- OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" );
+ OSL_ENSURE( evt.PropertyName == OUString("INT32"), "PropertySetHelper: wrong name" );
sal_Int32 nInt32(0),nOldInt32(0);
@@ -526,13 +526,13 @@ public:
case PROPERTY_BOOL:
{
OSL_FAIL( "PropertySetHelper: BOOL cannot change" );
- OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ), "PropertySetHelper: wrong name" );
+ OSL_ENSURE( evt.PropertyName == OUString("BOOL"), "PropertySetHelper: wrong name" );
}
break;
case PROPERTY_INT16:
{
- OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" );
+ OSL_ENSURE( evt.PropertyName == OUString("INT16"), "PropertySetHelper: wrong name" );
sal_Int16 nInt16(0), nOldInt16(0);
pExceptedListenerValues[nCurrent] >>= nInt16;
@@ -554,7 +554,7 @@ public:
case PROPERTY_INT32:
{
- OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" );
+ OSL_ENSURE( evt.PropertyName == OUString("INT32"), "PropertySetHelper: wrong name" );
sal_Int32 nInt32(0),nOldInt32(0);
pExceptedListenerValues[nCurrent] >>= nInt32;
@@ -589,13 +589,13 @@ public:
case PROPERTY_BOOL:
{
OSL_FAIL( "PropertySetHelper: BOOL cannot change" );
- OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ), "PropertySetHelper: wrong name" );
+ OSL_ENSURE( evt.PropertyName == OUString("BOOL"), "PropertySetHelper: wrong name" );
}
break;
case PROPERTY_INT16:
{
- OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" );
+ OSL_ENSURE( evt.PropertyName == OUString("INT16"), "PropertySetHelper: wrong name" );
sal_Int16 nInt16(0), nOldInt16(0);
pExceptedListenerValues[nCurrent] >>= nInt16;
@@ -611,7 +611,7 @@ public:
case PROPERTY_INT32:
{
- OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" );
+ OSL_ENSURE( evt.PropertyName == OUString("INT32"), "PropertySetHelper: wrong name" );
sal_Int32 nInt32(0),nOldInt32(0);
@@ -804,26 +804,26 @@ void test_PropertySetHelper()
Reference < XPropertiesChangeListener > x1( xPS_L, UNO_QUERY );
Reference < XVetoableChangeListener > x2( xPS_L, UNO_QUERY );
- xPS->addPropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L );
+ xPS->addPropertyChangeListener( OUString("INT16"), xPS_L );
Sequence<OUString> szPN( 3 );
- szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") );
- szPN.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") );
- szPN.getArray()[2] = OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ); // must ne ignored by the addPropertiesChangeListener method
+ szPN.getArray()[0] = OUString("BOOL");
+ szPN.getArray()[1] = OUString("INT32");
+ szPN.getArray()[2] = OUString("Does not exist"); // must ne ignored by the addPropertiesChangeListener method
pPS->addPropertiesChangeListener( szPN, x1 );
szPN = Sequence<OUString>();
pPS->addPropertiesChangeListener( szPN, x1 );
- pPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 );
+ pPS->addVetoableChangeListener( OUString("INT16"), x2 );
- xPS->removePropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L );
+ xPS->removePropertyChangeListener( OUString("INT16"), xPS_L );
pPS->removePropertiesChangeListener( x1 );
pPS->removePropertiesChangeListener( x1 );
- pPS->removeVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 );
+ pPS->removeVetoableChangeListener( OUString("INT16"), x2 );
// this exception must thrown
try
{
- xPS->addPropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ), xPS_L );
+ xPS->addPropertyChangeListener( OUString("Does not exist"), xPS_L );
OSL_FAIL( "PropertySetHelper: exeption not thrown" );
}
catch( UnknownPropertyException & /*e*/ )
@@ -833,7 +833,7 @@ void test_PropertySetHelper()
try
{
- xPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ), x2 );
+ xPS->addVetoableChangeListener( OUString("Does not exist"), x2 );
OSL_FAIL( "PropertySetHelper: exeption not thrown" );
}
catch( UnknownPropertyException & /*e*/ )
@@ -849,14 +849,14 @@ void test_PropertySetHelper()
Reference < XPropertiesChangeListener > x1( xPS_L, UNO_QUERY );
Reference < XVetoableChangeListener > x2( xPS_L, UNO_QUERY );
- xPS->addPropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L );
+ xPS->addPropertyChangeListener( OUString("INT16"), xPS_L );
Sequence<OUString> szPN( 2 );
- szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") );
- szPN.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") );
+ szPN.getArray()[0] = OUString("BOOL");
+ szPN.getArray()[1] = OUString("INT32");
pPS->addPropertiesChangeListener( szPN, x1 );
szPN = Sequence<OUString>();
pPS->addPropertiesChangeListener( szPN, x1 );
- pPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 );
+ pPS->addVetoableChangeListener( OUString("INT16"), x2 );
pPS->dispose();
}
OSL_ENSURE( pPS_L->nDisposing == 4 , "PropertySetHelper: wrong disposing count" );
@@ -873,7 +873,7 @@ void test_PropertySetHelper()
sal_Bool b = sal_True;
Any aBool;
aBool.setValue( &b , getCppuBooleanType() );
- xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ), aBool );
+ xPS->setPropertyValue( OUString("BOOL"), aBool );
OSL_FAIL( "PropertySetHelper: exeption not thrown" );
}
catch( PropertyVetoException & /*e*/ )
@@ -900,7 +900,7 @@ void test_PropertySetHelper()
sal_Bool b = sal_True;
Any aBool;
aBool.setValue( &b , getCppuBooleanType() );
- xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ), aBool );
+ xPS->setPropertyValue( OUString("Does not exist"), aBool );
OSL_FAIL( "PropertySetHelper: exeption not thrown" );
}
catch( UnknownPropertyException & /*e*/ )
@@ -923,7 +923,7 @@ void test_PropertySetHelper()
try
{
Any aBool;
- aBool = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ) );
+ aBool = xPS->getPropertyValue( OUString("Does not exist") );
OSL_FAIL( "PropertySetHelper: exeption not thrown" );
}
catch( UnknownPropertyException & /*e*/ )
@@ -944,7 +944,7 @@ void test_PropertySetHelper()
try
{
Any aBool;
- xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), aBool );
+ xPS->setPropertyValue( OUString("INT32"), aBool );
OSL_FAIL( "PropertySetHelper: exeption not thrown" );
}
catch( IllegalArgumentException & /*e*/ )
@@ -966,7 +966,7 @@ void test_PropertySetHelper()
{
Any aINT32;
aINT32 <<= (sal_Int32 ) 16;
- xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), aINT32 );
+ xPS->setPropertyValue( OUString("INT16"), aINT32 );
OSL_FAIL( "PropertySetHelper: exeption not thrown" );
}
catch( IllegalArgumentException & /*e*/ )
@@ -987,7 +987,7 @@ void test_PropertySetHelper()
Any aValue;
- aValue = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ) );
+ aValue = xPS->getPropertyValue( OUString("BOOL") );
sal_Bool b = *( (sal_Bool*)aValue.getValue());
OSL_ENSURE( ! b, "PropertySetHelper: wrong BOOL value" );
aValue = ((XFastPropertySet *)pPS)->getFastPropertyValue( PROPERTY_BOOL );
@@ -997,8 +997,8 @@ void test_PropertySetHelper()
sal_Int16 n16(0);
aValue <<=(sal_Int16)22;
- xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), aValue );
- aValue = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ) );
+ xPS->setPropertyValue( OUString("INT16"), aValue );
+ aValue = xPS->getPropertyValue( OUString("INT16") );
aValue >>= n16;
OSL_ENSURE( 22 == n16 , "PropertySetHelper: wrong INT16 value" );
aValue <<= (sal_Int16)44;
@@ -1010,8 +1010,8 @@ void test_PropertySetHelper()
// widening conversion
aValue <<= (sal_Int16)55;
- xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), aValue );
- aValue = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ) );
+ xPS->setPropertyValue( OUString("INT32"), aValue );
+ aValue = xPS->getPropertyValue( OUString("INT32") );
sal_Int32 n32(0);
aValue >>= n32;
OSL_ENSURE( 55 == n32 , "PropertySetHelper: wrong INT32 value" );
@@ -1022,9 +1022,9 @@ void test_PropertySetHelper()
OSL_ENSURE( 66 == n32, "PropertySetHelper: wrong INT32 value" );
Sequence< OUString >valueNames = Sequence<OUString>( 3 );
- valueNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") );
- valueNames.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") );
- valueNames.getArray()[2] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") );
+ valueNames.getArray()[0] = OUString("BOOL");
+ valueNames.getArray()[1] = OUString("INT16");
+ valueNames.getArray()[2] = OUString("INT32");
Sequence< Any > aValues = pPS->getPropertyValues( valueNames );
b = *((sal_Bool*)aValues.getConstArray()[0].getValue());
@@ -1042,8 +1042,8 @@ void test_PropertySetHelper()
{
Reference < XVetoableChangeListener > x2( xPS_L, UNO_QUERY );
- xPS->addPropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L );
- pPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 );
+ xPS->addPropertyChangeListener( OUString("INT16"), xPS_L );
+ pPS->addVetoableChangeListener( OUString("INT16"), x2 );
pPS_L->nCount = 10;
Sequence< Any > aSeq( pPS_L->nCount );
@@ -1064,7 +1064,7 @@ void test_PropertySetHelper()
Any aValue;
aValue <<= (sal_Int16)22;
- xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), aValue );
+ xPS->setPropertyValue( OUString("INT16"), aValue );
aValue <<= (sal_Int16) 44;
((XFastPropertySet *)pPS)->setFastPropertyValue( PROPERTY_INT16, aValue );
aValue <<= (sal_Int16)100;// exception
@@ -1084,8 +1084,8 @@ void test_PropertySetHelper()
pPS_L->nCount = 0;
pPS_L->nCurrent = 0;
pPS_L->pExceptedListenerValues = NULL;
- xPS->removePropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L );
- pPS->removeVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 );
+ xPS->removePropertyChangeListener( OUString("INT16"), xPS_L );
+ pPS->removeVetoableChangeListener( OUString("INT16"), x2 );
}
// Test multi property set listener
@@ -1093,12 +1093,12 @@ void test_PropertySetHelper()
Reference < XPropertiesChangeListener > x1( xPS_L, UNO_QUERY );
Reference < XVetoableChangeListener > x2( xPS_L, UNO_QUERY );
- pPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ) , x2 );
+ pPS->addVetoableChangeListener( OUString("INT16") , x2 );
Sequence<OUString> szPN( 4 );
- szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") );
- szPN.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") );
- szPN.getArray()[2] = OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ); // must ne ignored by the addPropertiesChangeListener method
- szPN.getArray()[3] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") );
+ szPN.getArray()[0] = OUString("BOOL");
+ szPN.getArray()[1] = OUString("INT32");
+ szPN.getArray()[2] = OUString("Does not exist"); // must ne ignored by the addPropertiesChangeListener method
+ szPN.getArray()[3] = OUString("INT16");
pPS->addPropertiesChangeListener( szPN, x1 );
pPS_L->nCount = 6;
@@ -1114,8 +1114,8 @@ void test_PropertySetHelper()
pPS_L->pExceptedListenerValues[5] <<= (sal_Int32) 44; // new value bound
szPN = Sequence<OUString>( 2 );
- szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") );
- szPN.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") );
+ szPN.getArray()[0] = OUString("INT16");
+ szPN.getArray()[1] = OUString("INT32");
Sequence< Any > aValues( 2 );
aValues.getArray()[0] <<= (sal_Int16) 22;
aValues.getArray()[1] <<= (sal_Int16) 44;
@@ -1136,8 +1136,8 @@ void test_PropertySetHelper()
//vetoable exception with multible
- szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") );
- szPN.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") );
+ szPN.getArray()[0] = OUString("INT16");
+ szPN.getArray()[1] = OUString("INT16");
pPS->nINT32 = 0;
pPS->nINT16 = 0;
pPS_L->nCount = 4;
@@ -1160,7 +1160,7 @@ void test_PropertySetHelper()
OSL_ENSURE( pPS_L->nCount == pPS_L->nCurrent, "not all listeners called" );
pPS->removePropertiesChangeListener( x1 );
- pPS->removeVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 );
+ pPS->removeVetoableChangeListener( OUString("INT16"), x2 );
}
}
}
diff --git a/cppuhelper/test/testproptyphlp.cxx b/cppuhelper/test/testproptyphlp.cxx
index c4d3dae742a0..d52515bff05e 100644
--- a/cppuhelper/test/testproptyphlp.cxx
+++ b/cppuhelper/test/testproptyphlp.cxx
@@ -56,7 +56,7 @@ void testPropertyTypeHelper()
::com::sun::star::beans::Property prop;
- prop.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Huhu") );
+ prop.Name = rtl::OUString("Huhu");
prop.Handle = 5;
prop.Attributes = 3;
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 7f3361a1bc5f..0aed44a083df 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -270,13 +270,13 @@ static Reference< XInterface > loadComponent(
aExt.compareToAscii( "so" ) == 0)
{
createInstance(
- xLoader, xContext, OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary") ) );
+ xLoader, xContext, OUString("com.sun.star.loader.SharedLibrary") );
}
else if (aExt.compareToAscii( "jar" ) == 0 ||
aExt.compareToAscii( "class" ) == 0)
{
createInstance(
- xLoader, xContext, OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.Java") ) );
+ xLoader, xContext, OUString("com.sun.star.loader.Java") );
}
else
{
@@ -533,7 +533,7 @@ SAL_IMPLEMENT_MAIN()
}
if (!(aImplName.isEmpty() || aServiceName.isEmpty()))
- throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("give component exOR service name!" ) ), Reference< XInterface >() );
+ throw RuntimeException( OUString("give component exOR service name!" ), Reference< XInterface >() );
if (aImplName.isEmpty() && aServiceName.isEmpty())
{
if (! aUnoUrl.endsWithIgnoreAsciiCaseAsciiL(
@@ -545,12 +545,12 @@ SAL_IMPLEMENT_MAIN()
Reference<XInterface>() );
if (bSingleInstance)
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "unexpected option --singleinstance!") ),
+ OUString(
+ "unexpected option --singleinstance!"),
Reference<XInterface>() );
}
if (!aImplName.isEmpty() && aLocation.isEmpty())
- throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("give component location!" ) ), Reference< XInterface >() );
+ throw RuntimeException( OUString("give component location!" ), Reference< XInterface >() );
if (!aServiceName.isEmpty() && !aLocation.isEmpty())
out( "\n> warning: service name given, will ignore location!" );
@@ -573,9 +573,9 @@ SAL_IMPLEMENT_MAIN()
sal_Int32 nIndex = 0, nTokens = 0;
do { aUnoUrl.getToken( 0, ';', nIndex ); nTokens++; } while( nIndex != -1 );
if (nTokens != 3 || aUnoUrl.getLength() < 10 ||
- !aUnoUrl.copy( 0, 4 ).equalsIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM("uno:") ) ))
+ !aUnoUrl.copy( 0, 4 ).equalsIgnoreAsciiCase( OUString("uno:") ))
{
- throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("illegal uno url given!" ) ), Reference< XInterface >() );
+ throw RuntimeException( OUString("illegal uno url given!" ), Reference< XInterface >() );
}
nIndex = 0;
OUString aConnectDescr( aUnoUrl.getToken( 0, ';', nIndex ).copy( 4 ) ); // uno:CONNECTDESCR;iiop;InstanceName
@@ -584,7 +584,7 @@ SAL_IMPLEMENT_MAIN()
Reference< XAcceptor > xAcceptor;
createInstance(
xAcceptor, xContext,
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor") ) );
+ OUString("com.sun.star.connection.Acceptor") );
// init params
Sequence< Any > aInitParams( aParams.getLength() );
@@ -614,7 +614,7 @@ SAL_IMPLEMENT_MAIN()
Reference< XBridgeFactory > xBridgeFactory;
createInstance(
xBridgeFactory, xContext,
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory") ) );
+ OUString("com.sun.star.bridge.BridgeFactory") );
// bridge
Reference< XBridge > xBridge( xBridgeFactory->createBridge(
diff --git a/crashrep/source/win32/soreport.cxx b/crashrep/source/win32/soreport.cxx
index e862dd3e82df..c827c1c539e2 100644
--- a/crashrep/source/win32/soreport.cxx
+++ b/crashrep/source/win32/soreport.cxx
@@ -164,7 +164,7 @@ static BOOL GetCrashDataPath( LPTSTR szBuffer )
if ( !ustrValue.isEmpty() )
{
- ustrValue += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/user/crashdata"));
+ ustrValue += ::rtl::OUString("/user/crashdata");
::osl::FileBase::RC result = ::osl::Directory::createPath( ustrValue );
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index e66403c664a5..bbe06d6aa432 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1510,7 +1510,7 @@ private:
OUString SAL_CALL ColorPicker_getImplementationName()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.cui.ColorPicker" ) );
+ return OUString( "com.sun.star.cui.ColorPicker" );
}
// --------------------------------------------------------------------
@@ -1525,7 +1525,7 @@ Reference< XInterface > SAL_CALL ColorPicker_createInstance( Reference< XCompone
Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( RuntimeException )
{
Sequence< OUString > seq(1);
- seq[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.ColorPicker" ) );
+ seq[0] = OUString( "com.sun.star.ui.dialogs.ColorPicker" );
return seq;
}
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 31af615160fa..d5c0fed2139e 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -133,8 +133,8 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv, comphelper::getProcessComponentContext() );
Sequence< OUString > aProps( 2 );
- aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ));
- aProps.getArray()[ 1 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ));
+ aProps.getArray()[ 0 ] = OUString( "IsFolder" );
+ aProps.getArray()[ 1 ] = OUString( "IsDocument" );
::com::sun::star::uno::Reference< XResultSet > xResultSet(
aCnt.createCursor( aProps, INCLUDE_FOLDERS_AND_DOCUMENTS ) );
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index fe8408130bd1..15066802f930 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -255,9 +255,9 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL )
try
{
uno::Sequence< beans::PropertyValue > aArg(1);
- aArg.getArray()[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "Hidden" ));
+ aArg.getArray()[0].Name = OUString( "Hidden" );
aArg.getArray()[0].Value <<= (sal_Bool) sal_True;
- xComp = xLoader->loadComponentFromURL( aURL, OUString(RTL_CONSTASCII_USTRINGPARAM( "_blank" )), 0, aArg );
+ xComp = xLoader->loadComponentFromURL( aURL, OUString( "_blank" ), 0, aArg );
}
catch( const io::IOException& )
{
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 0f79ebfbdd40..a9dcd4aad45e 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -173,11 +173,11 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const
// ====================
SvxChartOptions::SvxChartOptions() :
- ::utl::ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Chart") ) ),
+ ::utl::ConfigItem( rtl::OUString("Office.Chart") ),
mbIsInitialized( sal_False )
{
maPropertyNames.realloc( 1 );
- maPropertyNames[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultColor/Series") );
+ maPropertyNames[ 0 ] = ::rtl::OUString("DefaultColor/Series");
}
SvxChartOptions::~SvxChartOptions()
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index efced8d6b6ba..cc1a243a1b82 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -468,10 +468,10 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
while(xList->hasMoreElements())
{
SequenceAsHashMap aFilter(xList->nextElement());
- OUString sFilter = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),OUString());
+ OUString sFilter = aFilter.getUnpackedValueOrDefault(OUString("Name"),OUString());
if (!sFilter.isEmpty())
{
- sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")),sal_Int32());
+ sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(OUString("Flags"),sal_Int32());
lList.push_back(sFilter);
lAlienList.push_back(0 != (nFlags & SFX_FILTER_ALIEN));
lODFList.push_back( isODFFormat( sFilter ) );
@@ -491,8 +491,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
OSL_FAIL(
rtl::OUStringToOString(
(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "exception in FilterFactory access: ")) +
+ "exception in FilterFactory access: ") +
e.Message),
RTL_TEXTENCODING_UTF8).
getStr());
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index d56ebb8d94b8..49a0354bdf86 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -190,7 +190,7 @@ void WebConnectionInfoDialog::FillPasswordList()
{
::rtl::OUString aUIEntry( aUrls[ nURLIdx ] );
aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' );
- aUIEntry += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*" ) );
+ aUIEntry += ::rtl::OUString( "*" );
SvTreeListEntry* pEntry = m_pPasswordsLB->InsertEntry( aUIEntry );
pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) );
}
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 4a0b57a37e13..dc51d3c6c675 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -1826,12 +1826,12 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes
Reference<XPropertySet> xFormSet = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats()->getByKey(nFormatKey);
OSL_ENSURE(xFormSet.is(),"XPropertySet is null!");
::rtl::OUString sFormat;
- xFormSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormatString"))) >>= sFormat;
+ xFormSet->getPropertyValue(::rtl::OUString("FormatString")) >>= sFormat;
if ( !bTextFormat )
{
Locale aLocale;
- ::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locale"))) >>= aLocale;
+ ::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,::rtl::OUString("Locale")) >>= aLocale;
sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(xNumberFormatter,nFormatKey);
if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index 886cdc11e3d5..1ae7fe74a4b4 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -205,7 +205,7 @@ namespace dbaui
Sequence< Sequence< PropertyValue> > aHistory = SvtHistoryOptions().GetList( ePICKLIST );
Reference< XNameAccess > xFilterFactory;
xFilterFactory = xFilterFactory.query( ::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ) ) ) );
+ ::rtl::OUString( "com.sun.star.document.FilterFactory" ) ) );
sal_uInt32 nCount = aHistory.getLength();
for ( sal_uInt32 nItem = 0; nItem < nCount; ++nItem )
@@ -226,7 +226,7 @@ namespace dbaui
::comphelper::SequenceAsHashMap aFilterProperties( aProps );
::rtl::OUString sDocumentService = aFilterProperties.getUnpackedValueOrDefault(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentService" ) ), ::rtl::OUString() );
+ ::rtl::OUString( "DocumentService" ), ::rtl::OUString() );
if ( sDocumentService.equalsAscii( _pAsciiModuleName ) )
{
// yes, it's a Base document
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index feee0a084aab..349a50fa3506 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -95,8 +95,8 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle ) :
m_notifier = n;
}
css::uno::Sequence< rtl::OUString > s(2);
- s[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontHeight"));
- s[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontName"));
+ s[0] = rtl::OUString("FontHeight");
+ s[1] = rtl::OUString("FontName");
n->addPropertiesChangeListener(s, m_listener.get());
m_ColorConfig.AddListener(this);
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index d768adf0358b..6baf9d09bbf3 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -106,19 +106,19 @@ namespace dbaui
if ( m_aCommandURL == ".uno:DBNewForm" )
{
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewForm")) ,sal_True));
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewView")) ,sal_True));
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewViewSQL")) ,sal_True));
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewQuery")) ,sal_True));
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewQuerySql")) ,sal_True));
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReport")) ,sal_True));
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReportAutoPilot")),sal_True));
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewTable")) ,sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewForm") ,sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewView") ,sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewViewSQL") ,sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewQuery") ,sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewQuerySql") ,sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewReport") ,sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewReportAutoPilot"),sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewTable") ,sal_True));
}
else
{
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Refresh")) ,sal_True));
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBRebuildData")) ,sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:Refresh") ,sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBRebuildData") ,sal_True));
}
TCommandState::iterator aIter = m_aStates.begin();
@@ -187,7 +187,7 @@ namespace dbaui
try
{
Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(ModuleUIConfigurationManagerSupplier::create(comphelper::getComponentContext(getServiceManager())));
- Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument")));
+ Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString("com.sun.star.sdb.OfficeDatabaseDocument"));
Reference<XImageManager> xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY);
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 1cb79146415d..3660aa5de92e 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -154,12 +154,12 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click)
{
Sequence< Any > aValues(2);
PropertyValue aValue;
- aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceName"));
+ aValue.Name = ::rtl::OUString("ResourceName");
aValue.Value <<= sSubFolder;
aValues[0] <<= aValue;
- aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceType"));
- aValue.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("folder"));
+ aValue.Name = ::rtl::OUString("ResourceType");
+ aValue.Value <<= ::rtl::OUString("folder");
aValues[1] <<= aValue;
InteractionClassification eClass = InteractionClassification_ERROR;
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index b51ecc0211c1..9c4cc2ef6b13 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -589,18 +589,18 @@ DBG_NAME(OConnectionHelper)
::rtl::OUString sContentType;
if ( INET_PROT_FILE == eProtocol )
{
- sContentType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.staroffice.fsys-folder"));
+ sContentType = ::rtl::OUString("application/vnd.sun.staroffice.fsys-folder");
// the file UCP currently does not support the ContentType property
}
else
{
- Any aContentType = aParent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")) );
+ Any aContentType = aParent.getPropertyValue( ::rtl::OUString("ContentType") );
aContentType >>= sContentType;
}
// the properties which need to be set on the new content
Sequence< ::rtl::OUString > aNewDirectoryProperties(1);
- aNewDirectoryProperties[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+ aNewDirectoryProperties[0] = ::rtl::OUString("Title");
// the values to be set
Sequence< Any > aNewDirectoryAttributes(1);
diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx
index 1176326d0dc5..e60236d7608b 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.cxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.cxx
@@ -68,28 +68,28 @@ void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sUR
}
#endif
typedef ::std::pair<sal_uInt16, ::rtl::OUString> TProperties;
- TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowDeleted")))
- ,TProperties(DSID_CHARSET,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet")))
- ,TProperties(DSID_FIELDDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FieldDelimiter")))
- ,TProperties(DSID_TEXTDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StringDelimiter")))
- ,TProperties(DSID_DECIMALDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DecimalDelimiter")))
- ,TProperties(DSID_THOUSANDSDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ThousandDelimiter")))
- ,TProperties(DSID_TEXTFILEEXTENSION,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extension")))
- ,TProperties(DSID_TEXTFILEHEADER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderLine")))
- ,TProperties(DSID_ADDITIONALOPTIONS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SystemDriverSettings")))
- ,TProperties(DSID_CONN_SHUTSERVICE,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShutdownDatabase")))
- ,TProperties(DSID_CONN_DATAINC,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataCacheSizeIncrement")))
- ,TProperties(DSID_CONN_CACHESIZE,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataCacheSize")))
- ,TProperties(DSID_CONN_CTRLUSER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlUser")))
- ,TProperties(DSID_CONN_CTRLPWD,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlPassword")))
- ,TProperties(DSID_USECATALOG,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCatalog")))
- ,TProperties(DSID_CONN_SOCKET,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LocalSocket")))
- ,TProperties(DSID_NAMED_PIPE,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NamedPipe")))
- ,TProperties(DSID_JDBCDRIVERCLASS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClass")))
- ,TProperties(DSID_CONN_LDAP_BASEDN,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseDN")))
- ,TProperties(DSID_CONN_LDAP_ROWCOUNT,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxRowCount")))
- ,TProperties(DSID_CONN_LDAP_USESSL,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSSL")))
- ,TProperties(DSID_IGNORECURRENCY,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreCurrency")))
+ TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,::rtl::OUString("ShowDeleted"))
+ ,TProperties(DSID_CHARSET,::rtl::OUString("CharSet"))
+ ,TProperties(DSID_FIELDDELIMITER,::rtl::OUString("FieldDelimiter"))
+ ,TProperties(DSID_TEXTDELIMITER,::rtl::OUString("StringDelimiter"))
+ ,TProperties(DSID_DECIMALDELIMITER,::rtl::OUString("DecimalDelimiter"))
+ ,TProperties(DSID_THOUSANDSDELIMITER,::rtl::OUString("ThousandDelimiter"))
+ ,TProperties(DSID_TEXTFILEEXTENSION,::rtl::OUString("Extension"))
+ ,TProperties(DSID_TEXTFILEHEADER,::rtl::OUString("HeaderLine"))
+ ,TProperties(DSID_ADDITIONALOPTIONS,::rtl::OUString("SystemDriverSettings"))
+ ,TProperties(DSID_CONN_SHUTSERVICE,::rtl::OUString("ShutdownDatabase"))
+ ,TProperties(DSID_CONN_DATAINC,::rtl::OUString("DataCacheSizeIncrement"))
+ ,TProperties(DSID_CONN_CACHESIZE,::rtl::OUString("DataCacheSize"))
+ ,TProperties(DSID_CONN_CTRLUSER,::rtl::OUString("ControlUser"))
+ ,TProperties(DSID_CONN_CTRLPWD,::rtl::OUString("ControlPassword"))
+ ,TProperties(DSID_USECATALOG,::rtl::OUString("UseCatalog"))
+ ,TProperties(DSID_CONN_SOCKET,::rtl::OUString("LocalSocket"))
+ ,TProperties(DSID_NAMED_PIPE,::rtl::OUString("NamedPipe"))
+ ,TProperties(DSID_JDBCDRIVERCLASS,::rtl::OUString("JavaDriverClass"))
+ ,TProperties(DSID_CONN_LDAP_BASEDN,::rtl::OUString("BaseDN"))
+ ,TProperties(DSID_CONN_LDAP_ROWCOUNT,::rtl::OUString("MaxRowCount"))
+ ,TProperties(DSID_CONN_LDAP_USESSL,::rtl::OUString("UseSSL"))
+ ,TProperties(DSID_IGNORECURRENCY,::rtl::OUString("IgnoreCurrency"))
,TProperties(0,::rtl::OUString())
};
// TODO: This mapping between IDs and property names already exists - in ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper.
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index 30e52f18813a..404cefcf5a9c 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -110,7 +110,7 @@ DBG_NAME(OUserAdminDlg)
if ( !aMetaData.supportsUserAdministration( getORB() ) )
{
String sError(ModuleRes(STR_USERADMIN_NOT_AVAILABLE));
- throw SQLException(sError,NULL,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any());
+ throw SQLException(sError,NULL,::rtl::OUString("S1000") ,0,Any());
}
}
catch(const SQLException&)
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 62c3cdabbb1d..559f04a2ed9c 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -491,7 +491,7 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const
try
{
::ucbhelper::Content aContent(aURL.GetURLNoPass(),Reference<XCommandEnvironment>(), comphelper::getProcessComponentContext());
- aContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),makeAny( sal_Bool( sal_True ) ) );
+ aContent.executeCommand( rtl::OUString("delete"),makeAny( sal_Bool( sal_True ) ) );
}
catch (const Exception& e )
{
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 424db244bf36..7a9afc377d1e 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -344,7 +344,7 @@ void ODbTypeWizDialogSetup::activateDatabasePath()
{
sal_Int32 nCreateNewDBIndex = m_pCollection->getIndexOf( m_pCollection->getEmbeddedDatabase() );
if ( nCreateNewDBIndex == -1 )
- nCreateNewDBIndex = m_pCollection->getIndexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:")) );
+ nCreateNewDBIndex = m_pCollection->getIndexOf( ::rtl::OUString("sdbc:dbase:") );
OSL_ENSURE( nCreateNewDBIndex != -1, "ODbTypeWizDialogSetup::activateDatabasePath: the GeneralPage should have prevented this!" );
activatePath( static_cast< PathId >( nCreateNewDBIndex + 1 ), sal_True );
@@ -482,13 +482,13 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver()
switch( m_pMySQLIntroPage->getMySQLMode() )
{
case OMySQLIntroPageSetup::VIA_JDBC:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:jdbc:"));
+ sRet = ::rtl::OUString("sdbc:mysql:jdbc:");
break;
case OMySQLIntroPageSetup::VIA_NATIVE:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:mysqlc:"));
+ sRet = ::rtl::OUString("sdbc:mysql:mysqlc:");
break;
case OMySQLIntroPageSetup::VIA_ODBC:
- sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:odbc:"));
+ sRet = ::rtl::OUString("sdbc:mysql:odbc:");
break;
}
}
@@ -539,16 +539,16 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState)
break;
case PAGE_DBSETUPWIZARD_MYSQL_ODBC:
- m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:odbc:")))));
+ m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString("sdbc:mysql:odbc:"))));
pPage = OConnectionTabPageSetup::CreateODBCTabPage( this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_MYSQL_JDBC:
- m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:jdbc:")))));
+ m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString("sdbc:mysql:jdbc:"))));
pPage = OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_MYSQL_NATIVE:
- m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:mysqlc:")))));
+ m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString("sdbc:mysql:mysqlc:"))));
pPage = MySQLNativeSetupPage::Create( this, *m_pOutSet);
break;
@@ -627,13 +627,13 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLInt
switch( _pMySQLIntroPageSetup->getMySQLMode() )
{
case OMySQLIntroPageSetup::VIA_ODBC:
- sURLPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:odbc:"));
+ sURLPrefix = ::rtl::OUString("sdbc:mysql:odbc:");
break;
case OMySQLIntroPageSetup::VIA_JDBC:
- sURLPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:jdbc:"));
+ sURLPrefix = ::rtl::OUString("sdbc:mysql:jdbc:");
break;
case OMySQLIntroPageSetup::VIA_NATIVE:
- sURLPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:mysqlc:"));
+ sURLPrefix = ::rtl::OUString("sdbc:mysql:mysqlc:");
break;
}
activatePath( static_cast<PathId>(m_pCollection->getIndexOf(sURLPrefix) + 1), sal_True);
@@ -814,11 +814,11 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
try
{
if ( aDriverConfig.getDriverFactoryName(sEmbeddedURL).isEmpty() || !m_pImpl->getDriver(sEmbeddedURL).is() )
- sEmbeddedURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:"));
+ sEmbeddedURL = ::rtl::OUString("sdbc:dbase:");
}
catch(const Exception&)
{
- sEmbeddedURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:"));
+ sEmbeddedURL = ::rtl::OUString("sdbc:dbase:");
}
return sEmbeddedURL;
@@ -1028,7 +1028,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
aLoadArgs >>= aLoadArgPV;
m_xFrameLoader->loadComponentFromURL( m_sURL,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ),
+ ::rtl::OUString( "_default" ),
FrameSearchFlag::ALL,
aLoadArgPV
);
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 96bafbcdef93..61392de4d379 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -239,7 +239,7 @@ DBG_NAME(DirectSQLDialog)
while (xResultSet->next())
{
// initialise the output line for each row
- String out = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(""));
+ String out = ::rtl::OUString("");
// work along the columns until that are none left
int i = 1;
try
@@ -247,7 +247,7 @@ DBG_NAME(DirectSQLDialog)
for (;;)
{
// be dumb, treat everything as a string
- out += xRow->getString(i) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+ out += xRow->getString(i) + ::rtl::OUString(",");
i++;
}
}
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 49e9697f6d02..4d646974aa68 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -179,7 +179,7 @@ DBG_NAME(DbaIndexDialog)
const Reference< XComponentContext >& _rxContext,sal_Int32 _nMaxColumnsInIndex)
:ModalDialog( _pParent, ModuleRes(DLG_INDEXDESIGN))
,m_xConnection(_rxConnection)
- ,m_aGeometrySettings(E_DIALOG, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dbaccess.tabledesign.indexdialog")))
+ ,m_aGeometrySettings(E_DIALOG, ::rtl::OUString("dbaccess.tabledesign.indexdialog"))
,m_aActions (this, ModuleRes(TLB_ACTIONS))
,m_aIndexes (this, ModuleRes(CTR_INDEXLIST))
,m_aIndexDetails (this, ModuleRes(FL_INDEXDETAILS))
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 67216909840c..1f1b2e5e17dd 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -154,8 +154,8 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow()
{
try
{
- const ::rtl::OUString sNameProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) );
- const ::rtl::OUString sAscendingProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsAscending" ) );
+ const ::rtl::OUString sNameProperty = ::rtl::OUString( "Name" );
+ const ::rtl::OUString sAscendingProperty = ::rtl::OUString( "IsAscending" );
Reference< XIndexAccess > xOrderColumns( m_xQueryComposer->getOrderColumns(), UNO_QUERY_THROW );
sal_Int32 nColumns = xOrderColumns->getCount();
@@ -231,7 +231,7 @@ void DlgOrderCrit::EnableLines()
if(m_aColumnList[i]->GetSelectEntryPos() != 0)
{
if(!sOrder.isEmpty())
- sOrder += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+ sOrder += ::rtl::OUString(",");
String sName = m_aColumnList[i]->GetSelectEntry();
try
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 874311a625bb..f9deebacf8b5 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -679,7 +679,7 @@ void OSQLMessageBox::Construct( WinBits _nStyle, MessageType _eImage )
{
SetText(
utl::ConfigManager::getProductName() +
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " Base" ) ) );
+ rtl::OUString( " Base" ) );
// position and size the controls and the dialog, depending on whether we have one or two texts to display
impl_positionControls();
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 41754803c643..f31c32af66f9 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -305,7 +305,7 @@ DBG_NAME(OTableSubscriptionPage)
sal_Bool bModified = ( xModi.is() && xModi->isModified() );
Sequence< ::rtl::OUString > aNewTableFilter(1);
- aNewTableFilter[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"));
+ aNewTableFilter[0] = ::rtl::OUString("%");
xProp->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(aNewTableFilter));
xProp->setPropertyValue( PROPERTY_TABLETYPEFILTER, makeAny( Sequence< ::rtl::OUString >() ) );
@@ -351,7 +351,7 @@ DBG_NAME(OTableSubscriptionPage)
else
{
// in addition, we need some infos about the connection used
- m_sCatalogSeparator = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); // (default)
+ m_sCatalogSeparator = ::rtl::OUString("."); // (default)
m_bCatalogAtStart = sal_True; // (default)
try
{
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 48f5d6b9f480..5d199166bb5e 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -823,7 +823,7 @@ void ODatabaseExport::ensureFormatter()
SvNumberFormatsSupplierObj* pSupplierImpl = (SvNumberFormatsSupplierObj*)sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId()));
m_pFormatter = pSupplierImpl ? pSupplierImpl->GetNumberFormatter() : NULL;
Reference<XPropertySet> xNumberFormatSettings = xSupplier->getNumberFormatSettings();
- xNumberFormatSettings->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= m_aNullDate;
+ xNumberFormatSettings->getPropertyValue(::rtl::OUString("NullDate")) >>= m_aNullDate;
}
}
// -----------------------------------------------------------------------------
@@ -832,11 +832,11 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R
,const TPositions& _rvColumns)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::createPreparedStatment" );
- ::rtl::OUString aSql(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT INTO ")));
+ ::rtl::OUString aSql(::rtl::OUString("INSERT INTO "));
::rtl::OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::eInDataManipulation, false, false, true );
aSql += sComposedTableName;
- aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ( "));
+ aSql += ::rtl::OUString(" ( ");
// set values and column names
::rtl::OUString aValues(RTL_CONSTASCII_USTRINGPARAM(" VALUES ( "));
static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM("?,"));
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index a4eaf1b23460..5bdd129a6f3a 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -66,7 +66,7 @@ void ORowSetImportExport::initialize()
m_xTargetResultSetMetaData = Reference<XResultSetMetaDataSupplier>(m_xTargetResultSetUpdate,UNO_QUERY)->getMetaData();
if(!m_xTargetResultSetMetaData.is() || !xColumnLocate.is() || !m_xResultSetMetaData.is() )
- throw SQLException(String(ModuleRes(STR_UNEXPECTED_ERROR)),*this,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any());
+ throw SQLException(String(ModuleRes(STR_UNEXPECTED_ERROR)),*this,::rtl::OUString("S1000") ,0,Any());
sal_Int32 nCount = m_xTargetResultSetMetaData->getColumnCount();
m_aColumnMapping.reserve(nCount);
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index 856a8b477def..1405204dda8a 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -213,7 +213,7 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId
aTrans.bHtml = SOT_FORMATSTR_ID_HTML == _nFormatId;
aTrans.sDefaultTableName = GetTableNameForAppend();
if ( !copyTagTable(aTrans,sal_False,_xConnection) )
- m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")),0,Any()));
+ m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString("S1000"),0,Any()));
}
catch(const SQLException&)
{
@@ -225,7 +225,7 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId
}
}
else
- m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")),0,Any()));
+ m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString("S1000"),0,Any()));
}
// -----------------------------------------------------------------------------
@@ -324,7 +324,7 @@ void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc
else if ( !_rDesc.bError )
pasteTable(_rDesc.aDroppedData,i_rDestDataSource,_xConnection);
else
- m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")),0,Any()));
+ m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString("S1000"),0,Any()));
}
// -----------------------------------------------------------------------------
//........................................................................
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 70c1bb12c5d1..3f409cf51eaa 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1146,7 +1146,7 @@ void fillAutoIncrementValue(const Reference<XPropertySet>& _xDatasource,
pValue->Value >>= _rsAutoIncrementValue;
pValue =::std::find_if(aInfo.getConstArray(),
aInfo.getConstArray() + aInfo.getLength(),
- ::std::bind2nd(TPropertyValueEqualFunctor(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAutoRetrievingEnabled")) ));
+ ::std::bind2nd(TPropertyValueEqualFunctor(),::rtl::OUString("IsAutoRetrievingEnabled") ));
if ( pValue && pValue != (aInfo.getConstArray() + aInfo.getLength()) )
pValue->Value >>= _rAutoIncrementValueEnabled;
}
@@ -1189,15 +1189,15 @@ void AppendConfigToken( ::rtl::OUString& _rURL, sal_Bool _bQuestionMark )
// query part exists?
if ( _bQuestionMark )
// no, so start with '?'
- _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?"));
+ _rURL += ::rtl::OUString("?");
else
// yes, so only append with '&'
- _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("&"));
+ _rURL += ::rtl::OUString("&");
// set parameters
- _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Language="));
+ _rURL += ::rtl::OUString("Language=");
_rURL += utl::ConfigManager::getLocale();
- _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("&System="));
+ _rURL += ::rtl::OUString("&System=");
_rURL += SvtHelpOptions().GetSystem();
}
@@ -1215,7 +1215,7 @@ namespace
::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ),
Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- if ( ( aCnt.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AnchorName")) ) >>= sAnchor ) )
+ if ( ( aCnt.getPropertyValue( ::rtl::OUString("AnchorName") ) >>= sAnchor ) )
{
if ( !sAnchor.isEmpty() )
@@ -1242,9 +1242,9 @@ namespace
::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName, const rtl::OString& sHelpId)
{
::com::sun::star::util::URL aURL;
- aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) );
+ aURL.Complete = ::rtl::OUString( "vnd.sun.star.help://" );
aURL.Complete += _sModuleName;
- aURL.Complete += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
+ aURL.Complete += ::rtl::OUString( "/" );
aURL.Complete += ::rtl::OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8);
::rtl::OUString sAnchor;
@@ -1254,7 +1254,7 @@ namespace
AppendConfigToken(aURL.Complete,sal_True);
if ( bHasAnchor )
{
- aURL.Complete += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#"));
+ aURL.Complete += ::rtl::OUString("#");
aURL.Complete += sAnchor;
}
return aURL;
@@ -1486,7 +1486,7 @@ Reference<XPropertySet> createView( const ::rtl::OUString& _rName, const Referen
}
else
{
- sCommand = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SELECT * FROM " ) );
+ sCommand = ::rtl::OUString( "SELECT * FROM " );
sCommand += composeTableNameForSelect( _rxConnection, _rxSourceObject );
}
return createView( _rName, _rxConnection, sCommand );
@@ -1557,7 +1557,7 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon
{
String sError(ModuleRes(STR_NAME_ALREADY_EXISTS));
sError.SearchAndReplaceAscii("#",sNewName);
- throw SQLException(sError,NULL,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any());
+ throw SQLException(sError,NULL,::rtl::OUString("S1000") ,0,Any());
}
try
@@ -1566,11 +1566,11 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon
Sequence< Any > aArguments(3);
PropertyValue aValue;
// set as folder
- aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
+ aValue.Name = ::rtl::OUString("Name");
aValue.Value <<= sNewName;
aArguments[0] <<= aValue;
//parent
- aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Parent"));
+ aValue.Name = ::rtl::OUString("Parent");
aValue.Value <<= xNameAccess;
aArguments[1] <<= aValue;
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 8a3a8bc300de..edf5aeab57d1 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -168,21 +168,21 @@ void ObjectCopySource::copyUISettingsTo( const Reference< XPropertySet >& _rxObj
void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _xConnection,const Reference< XPropertySet >& _rxObject ) const
{
::std::pair< ::rtl::OUString, ::rtl::OUString > aProperties[] = {
- ::std::pair< ::rtl::OUString, ::rtl::OUString >(PROPERTY_FILTER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AND ")))
- ,::std::pair< ::rtl::OUString, ::rtl::OUString >(PROPERTY_ORDER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY ")))
+ ::std::pair< ::rtl::OUString, ::rtl::OUString >(PROPERTY_FILTER,::rtl::OUString(" AND "))
+ ,::std::pair< ::rtl::OUString, ::rtl::OUString >(PROPERTY_ORDER,::rtl::OUString(" ORDER BY "))
};
size_t i = 0;
try
{
- const String sSourceName = (::dbtools::composeTableNameForSelect(m_xConnection,m_xObject) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")));
+ const String sSourceName = (::dbtools::composeTableNameForSelect(m_xConnection,m_xObject) + ::rtl::OUString("."));
const ::rtl::OUString sTargetName = ::dbtools::composeTableNameForSelect(_xConnection,_rxObject);
- const String sTargetNameTemp = (sTargetName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")));
+ const String sTargetNameTemp = (sTargetName + ::rtl::OUString("."));
::rtl::OUString sStatement(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM "));
sStatement += sTargetName;
- sStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE 0=1"));
+ sStatement += ::rtl::OUString(" WHERE 0=1");
for ( i=0; i < sizeof( aProperties ) / sizeof( aProperties[0] ); ++i )
@@ -942,7 +942,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl)
m_bCreatePrimaryKeyColumn = sal_True;
m_aKeyName = pPage->GetKeyName();
if ( m_aKeyName.isEmpty() )
- m_aKeyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" ) );
+ m_aKeyName = ::rtl::OUString( "ID" );
m_aKeyName = createUniqueName( m_aKeyName );
sal_Int32 nBreakPos2 = 0;
CheckColumns(nBreakPos2);
diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx
index d5dae84f709f..28c21278515f 100644
--- a/dbaccess/source/ui/misc/controllerframe.cxx
+++ b/dbaccess/source/ui/misc/controllerframe.cxx
@@ -225,7 +225,7 @@ namespace dbaui
{
if ( _rData.m_xDocEventBroadcaster.is() )
{
- ::rtl::OUString sEventName = _bActive ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnFocus")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnUnfocus"));
+ ::rtl::OUString sEventName = _bActive ? rtl::OUString("OnFocus") : rtl::OUString("OnUnfocus");
Reference< XController2 > xController( _rData.m_rController.getXController(), UNO_QUERY_THROW );
_rData.m_xDocEventBroadcaster->notifyDocumentEvent( sEventName, xController, Any() );
}
diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx
index 16b748d0f3c1..33013cb3887f 100644
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -124,11 +124,11 @@ namespace dbaui
NamedValue aProp;
sal_Int32 nArg = 0;
- aProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentFrame"));
+ aProp.Name = ::rtl::OUString("ParentFrame");
aProp.Value <<= m_xParentFrame;
lArgs[nArg++] <<= aProp;
- aProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TopWindow"));
+ aProp.Name = ::rtl::OUString("TopWindow");
aProp.Value <<= sal_True;
lArgs[nArg++] <<= aProp;
@@ -147,7 +147,7 @@ namespace dbaui
Reference< XComponentLoader > xFrameLoader( m_xFrameLoader, UNO_QUERY_THROW );
xReturn = xFrameLoader->loadComponentFromURL(
m_sComponentURL,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")),
+ ::rtl::OUString("_self"),
0,
i_rDispatchArgs.getPropertyValues()
);
diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx
index d28540383ba2..82deb2502ae2 100644
--- a/dbaccess/source/ui/misc/indexcollection.cxx
+++ b/dbaccess/source/ui/misc/indexcollection.cxx
@@ -165,9 +165,9 @@ namespace dbaui
}
// set the properties
- static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsUnique"));
- static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAscending"));
- static const ::rtl::OUString s_sNamePropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
+ static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString("IsUnique");
+ static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString("IsAscending");
+ static const ::rtl::OUString s_sNamePropertyName = ::rtl::OUString("Name");
// the index' own props
xIndexDescriptor->setPropertyValue(s_sUniquePropertyName, ::cppu::bool2any(_rPos->bUnique));
xIndexDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(_rPos->sName));
@@ -271,10 +271,10 @@ namespace dbaui
//------------------------------------------------------------------
void OIndexCollection::implFillIndexInfo(OIndex& _rIndex, Reference< XPropertySet > _rxDescriptor) SAL_THROW((Exception))
{
- static const ::rtl::OUString s_sPrimaryIndexPropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsPrimaryKeyIndex"));
- static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsUnique"));
- static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAscending"));
- static const ::rtl::OUString s_sCatalogPropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Catalog"));
+ static const ::rtl::OUString s_sPrimaryIndexPropertyName = ::rtl::OUString("IsPrimaryKeyIndex");
+ static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString("IsUnique");
+ static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString("IsAscending");
+ static const ::rtl::OUString s_sCatalogPropertyName = ::rtl::OUString("Catalog");
_rIndex.bPrimaryKey = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sPrimaryIndexPropertyName));
_rIndex.bUnique = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sUniquePropertyName));
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx
index a89876dae742..0f6a854ac524 100644
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@ -148,7 +148,7 @@ namespace dbaui
switch ( _eOpenMode )
{
case E_OPEN_NORMAL:
- sOpenMode = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) );
+ sOpenMode = ::rtl::OUString( "open" );
break;
case E_OPEN_FOR_MAIL:
@@ -156,7 +156,7 @@ namespace dbaui
// fall through
case E_OPEN_DESIGN:
- sOpenMode = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "openDesign" ) );
+ sOpenMode = ::rtl::OUString( "openDesign" );
break;
default:
@@ -215,7 +215,7 @@ namespace dbaui
), UNO_QUERY_THROW );
}
- xWizard->trigger( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "start" ) ) );
+ xWizard->trigger( ::rtl::OUString( "start" ) );
::comphelper::disposeComponent( xWizard );
}
catch(const Exception&)
@@ -317,7 +317,7 @@ namespace dbaui
aCommandArgs.put( "OpenMode", aOpenModeArg );
Command aCommand;
- aCommand.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "openDesign" ) );
+ aCommand.Name = ::rtl::OUString( "openDesign" );
aCommand.Argument <<= aCommandArgs.getPropertyValues();
WaitObject aWaitCursor( m_pDialogParent );
xNewDocument.set( xContent->execute( aCommand, xContent->createCommandIdentifier(), NULL ), UNO_QUERY );
@@ -379,7 +379,7 @@ namespace dbaui
aInfo = dbtools::SQLExceptionInfo(aSQLException);
// more like a hack, insert an empty message
- aInfo.prepend(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" \n")));
+ aInfo.prepend(::rtl::OUString(" \n"));
String sMessage = String(ModuleRes(STR_COULDNOTOPEN_LINKEDDOC));
sMessage.SearchAndReplaceAscii("$file$",_rLinkName);
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index 393f4397b143..5cab1e4a9bc7 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@ -69,7 +69,7 @@ namespace dbaui
// -----------------------------------------------------------------------------
::rtl::OUString OConnectionLineAccess::getImplementationName_Static(void) throw( RuntimeException )
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ConnectionLineAccessibility"));
+ return ::rtl::OUString("org.openoffice.comp.dbu.ConnectionLineAccessibility");
}
// -----------------------------------------------------------------------------
// XAccessibleContext
diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx
index c84bb7790106..37e1e260a384 100644
--- a/dbaccess/source/ui/querydesign/JAccess.cxx
+++ b/dbaccess/source/ui/querydesign/JAccess.cxx
@@ -45,7 +45,7 @@ namespace dbaui
// -----------------------------------------------------------------------------
::rtl::OUString OJoinDesignViewAccess::getImplementationName_Static(void) throw( RuntimeException )
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.JoinViewAccessibility"));
+ return ::rtl::OUString("org.openoffice.comp.dbu.JoinViewAccessibility");
}
// -----------------------------------------------------------------------------
void OJoinDesignViewAccess::clearTableView()
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 4ad229061658..4bc0556f2be3 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -440,7 +440,7 @@ void OJoinController::saveTableWindows( ::comphelper::NamedValueCollection& o_rV
aWindowData.put( "WindowHeight", static_cast<sal_Int32>((*aIter)->GetSize().Height()) );
aWindowData.put( "ShowAll", (*aIter)->IsShowAll() );
- const ::rtl::OUString sTableName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Table" ) ) + ::rtl::OUString::valueOf( i ) );
+ const ::rtl::OUString sTableName( ::rtl::OUString( "Table" ) + ::rtl::OUString::valueOf( i ) );
aAllTablesData.put( sTableName, aWindowData.getPropertyValues() );
}
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index d2577693d504..4bb97c530104 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -374,9 +374,9 @@ namespace
OUString aQuote = xMetaData->getIdentifierQuoteString();
if ( _bForce || isAppendTableAliasEnabled( _xConnection ) || pEntryTab->GetAliasName() != aDBName )
{
- aTableListStr += OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
+ aTableListStr += OUString(" ");
if ( generateAsBeforeTableAlias( _xConnection ) )
- aTableListStr += OUString(RTL_CONSTASCII_USTRINGPARAM("AS "));
+ aTableListStr += OUString("AS ");
aTableListStr += ::dbtools::quoteName( aQuote, pEntryTab->GetAliasName() );
}
aDBName = aTableListStr;
@@ -865,7 +865,7 @@ namespace
else
{
aWhereStr += aWork;
- aWhereStr += OUString(RTL_CONSTASCII_USTRINGPARAM("="));
+ aWhereStr += OUString("=");
aWhereStr += aCriteria;
}
}
@@ -999,7 +999,7 @@ namespace
eErrorCode = eStatementTooLong;
else
{
- _rsRet = OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY "));
+ _rsRet = OUString(" ORDER BY ");
_rsRet += aWorkStr;
}
}
@@ -1107,17 +1107,17 @@ namespace
{
// create outer join
if ( bUseEscape )
- aStr += OUString(RTL_CONSTASCII_USTRINGPARAM("{ OJ "));
+ aStr += OUString("{ OJ ");
aStr += aJoin;
if ( bUseEscape )
- aStr += OUString(RTL_CONSTASCII_USTRINGPARAM(" }"));
+ aStr += OUString(" }");
}
break;
default:
aStr += aJoin;
break;
}
- aStr += OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+ aStr += OUString(",");
aTableListStr += aStr;
}
}
@@ -1584,7 +1584,7 @@ namespace
for(;aIter != aTabEnd;++aIter)
{
OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second);
- if (pTabWin->ExistsField( OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aDragLeft ))
+ if (pTabWin->ExistsField( OUString("*"), aDragLeft ))
{
aDragLeft->SetAlias(String());
aDragLeft->SetTable(String());
@@ -1698,22 +1698,22 @@ namespace
case SQL_NODE_LESS:
// take the opposite as we change the order
i--;
- aCondition = aCondition + OUString(RTL_CONSTASCII_USTRINGPARAM(">"));
+ aCondition = aCondition + OUString(">");
break;
case SQL_NODE_LESSEQ:
// take the opposite as we change the order
i--;
- aCondition = aCondition + OUString(RTL_CONSTASCII_USTRINGPARAM(">="));
+ aCondition = aCondition + OUString(">=");
break;
case SQL_NODE_GREAT:
// take the opposite as we change the order
i--;
- aCondition = aCondition + OUString(RTL_CONSTASCII_USTRINGPARAM("<"));
+ aCondition = aCondition + OUString("<");
break;
case SQL_NODE_GREATEQ:
// take the opposite as we change the order
i--;
- aCondition = aCondition + OUString(RTL_CONSTASCII_USTRINGPARAM("<="));
+ aCondition = aCondition + OUString("<=");
break;
default:
break;
@@ -2258,7 +2258,7 @@ namespace
for(;aIter != aEnd;++aIter)
{
OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second);
- if (pTabWin->ExistsField( OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aInfo ))
+ if (pTabWin->ExistsField( OUString("*"), aInfo ))
{
aInfo->SetAlias(String());
aInfo->SetTable(String());
@@ -2943,16 +2943,16 @@ OUString OQueryDesignView::getStatement()
aCriteriaListStr = aTmp;
}
// ----------------- construct statement ----------------------
- OUStringBuffer aSqlCmd(OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")));
+ OUStringBuffer aSqlCmd(OUString("SELECT "));
if(rController.isDistinct())
- aSqlCmd.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" DISTINCT ")));
+ aSqlCmd.append(OUString(" DISTINCT "));
aSqlCmd.append(aFieldListStr);
- aSqlCmd.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ")));
+ aSqlCmd.append(OUString(" FROM "));
aSqlCmd.append(aTableListStr);
if (aCriteriaListStr.getLength())
{
- aSqlCmd.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE ")));
+ aSqlCmd.append(OUString(" WHERE "));
aSqlCmd.append(aCriteriaListStr.makeStringAndClear());
}
// ----------------- construct GroupBy and attachen ------------
@@ -2967,7 +2967,7 @@ OUString OQueryDesignView::getStatement()
// ----------------- attache having ------------
if(aHavingStr.getLength())
{
- aSqlCmd.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" HAVING ")));
+ aSqlCmd.append(OUString(" HAVING "));
aSqlCmd.append(aHavingStr.makeStringAndClear());
}
// ----------------- construct sorting and attach ------------
@@ -3108,8 +3108,8 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
{
// first try the international version
OUString sSql;
- sSql += OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * "));
- sSql += OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM x WHERE "));
+ sSql += OUString("SELECT * ");
+ sSql += OUString(" FROM x WHERE ");
sSql += pEntry->GetField();
sSql += _sCriteria;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 249fd03165c8..3556f0e58aa7 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -721,13 +721,13 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef&
else
sSql += sFullFieldName;
- sSql = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")) + sSql;
+ sSql = ::rtl::OUString("SELECT ") + sSql;
if ( !sFieldAlias.isEmpty() )
{ // always quote the alias name: there cannot be a function in it
- sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
+ sSql += ::rtl::OUString(" ");
sSql += ::dbtools::quoteName( xMetaData->getIdentifierQuoteString(), sFieldAlias );
}
- sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM x"));
+ sSql += ::rtl::OUString(" FROM x");
pParseNode = rParser.parseTree( sErrorMsg, sSql, bInternational );
}
@@ -822,7 +822,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef&
if ( nFunCount == 4 && SQL_ISRULE(pColumnRef->getChild(3),column_ref) )
bError = fillColumnRef( pColumnRef->getChild(3), xConnection, aSelEntry, _bListAction );
else if ( nFunCount == 3 ) // we have a COUNT(*) here, so take the first table
- bError = fillColumnRef( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")), ::rtl::OUString(), xMetaData, aSelEntry, _bListAction );
+ bError = fillColumnRef( ::rtl::OUString("*"), ::rtl::OUString(), xMetaData, aSelEntry, _bListAction );
else
{
nFunctionType |= FKT_NUMERIC;
diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
index 902132aa084e..9a4e5005f52f 100644
--- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
+++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
@@ -216,7 +216,7 @@ void OTableFieldDesc::Save( ::comphelper::NamedValueCollection& o_rSettings, con
++crit, ++c
)
{
- aCriteria[c].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Criterion_" ) ) + ::rtl::OUString::valueOf( c );
+ aCriteria[c].Name = ::rtl::OUString( "Criterion_" ) + ::rtl::OUString::valueOf( c );
aCriteria[c].Value <<= *crit;
}
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 413b3abf2540..03f57e2b37f9 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -183,7 +183,7 @@ sal_Bool OTableWindow::FillListBox()
if (GetData()->IsShowAll())
{
- SvTreeListEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) );
+ SvTreeListEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString("*") );
pEntry->SetUserData( createUserData(NULL,false) );
}
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index 3d88257e5204..b7350b15bfd9 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -88,14 +88,14 @@ namespace dbaui
Sequence< ::rtl::OUString > OTableWindowAccess::getSupportedServiceNames_Static(void) throw( RuntimeException )
{
Sequence< ::rtl::OUString > aSupported(2);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.Accessible"));
- aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.accessibility.Accessible");
+ aSupported[1] = ::rtl::OUString("com.sun.star.accessibility.AccessibleContext");
return aSupported;
}
// -----------------------------------------------------------------------------
::rtl::OUString OTableWindowAccess::getImplementationName_Static(void) throw( RuntimeException )
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.TableWindowAccessibility"));
+ return ::rtl::OUString("org.openoffice.comp.dbu.TableWindowAccessibility");
}
// -----------------------------------------------------------------------------
// XAccessibleContext
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index dc342f56ae04..174fb8d49e71 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -195,7 +195,7 @@ namespace dbaui
::dbaui::notifySystemWindow(this,m_pBeamer,::comphelper::mem_fun(&TaskPaneList::AddWindow));
- Reference < XFrame > xBeamerFrame( m_pViewSwitch->getORB()->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")), m_pViewSwitch->getORB()),UNO_QUERY );
+ Reference < XFrame > xBeamerFrame( m_pViewSwitch->getORB()->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.frame.Frame"), m_pViewSwitch->getORB()),UNO_QUERY );
m_xBeamer.set( xBeamerFrame );
OSL_ENSURE(m_xBeamer.is(),"No frame created!");
m_xBeamer->initialize( VCLUnoHelper::GetInterface ( m_pBeamer ) );
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 526202d29f52..083a76ff7b54 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -98,13 +98,13 @@ using namespace ::osl;
//------------------------------------------------------------------------------
::rtl::OUString ORelationController::getImplementationName_Static() throw( RuntimeException )
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ORelationDesign"));
+ return ::rtl::OUString("org.openoffice.comp.dbu.ORelationDesign");
}
//------------------------------------------------------------------------------
Sequence< ::rtl::OUString> ORelationController::getSupportedServiceNames_Static(void) throw( RuntimeException )
{
Sequence< ::rtl::OUString> aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.RelationDesign"));
+ aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.RelationDesign");
return aSupported;
}
//-------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 3734961ef531..f1ab891036dd 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -390,7 +390,7 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId)
Reference<XPropertySet> xTable = GetView()->getController().getTable();
if (IsReadOnly() || ( xTable.is() &&
xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) &&
- ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))))
+ ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString("VIEW")))
return NULL;
//////////////////////////////////////////////////////////////////////
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index a0d375d791b6..77ec4fce4827 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -132,13 +132,13 @@ namespace
//------------------------------------------------------------------------------
::rtl::OUString OTableController::getImplementationName_Static() throw( RuntimeException )
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OTableDesign"));
+ return ::rtl::OUString("org.openoffice.comp.dbu.OTableDesign");
}
//------------------------------------------------------------------------------
Sequence< ::rtl::OUString> OTableController::getSupportedServiceNames_Static(void) throw( RuntimeException )
{
Sequence< ::rtl::OUString> aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.TableDesign"));
+ aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.TableDesign");
return aSupported;
}
//-------------------------------------------------------------------------
@@ -999,7 +999,7 @@ sal_Bool OTableController::checkColumns(sal_Bool _bNew) throw(::com::sun::star::
pActFieldDescr->SetAutoIncrement(sal_False);
pActFieldDescr->SetIsNullable(ColumnValue::NO_NULLS);
- pActFieldDescr->SetName( createUniqueName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")) ));
+ pActFieldDescr->SetName( createUniqueName(::rtl::OUString("ID") ));
pActFieldDescr->SetPrimaryKey( sal_True );
m_vRowList.insert(m_vRowList.begin(),pNewRow);
@@ -1258,7 +1258,7 @@ void OTableController::alterColumns()
SQLException aNewException;
aNewException.Message = sError;
- aNewException.SQLState = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000"));
+ aNewException.SQLState = ::rtl::OUString("S1000");
aNewException.NextException = ::cppu::getCaughtException();
throw aNewException;
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index f3690eb29de1..5a01b0491d8e 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -99,7 +99,7 @@ void OTableRowView::KeyInput( const KeyEvent& rEvt )
if( rEvt.GetKeyCode().GetCode() == KEY_F2 )
{
::com::sun::star::util::URL aUrl;
- aUrl.Complete =::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DSBEditDoc"));
+ aUrl.Complete =::rtl::OUString(".uno:DSBEditDoc");
GetView()->getController().dispatch( aUrl,Sequence< PropertyValue >() );
}
}
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
index ad28ad1719fc..9b56fe1c5cdb 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
@@ -57,7 +57,7 @@ sal_Bool OTableFieldControl::IsReadOnly()
{
// Die Spalten einer ::com::sun::star::sdbcx::View knnen nicht verndert werden
Reference<XPropertySet> xTable = GetCtrl()->GetView()->getController().getTable();
- if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")))
+ if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString("VIEW"))
bRead = sal_True;
else
{
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index 14bbf350c855..41c2e7ce9299 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -95,7 +95,7 @@ namespace dbaui
//-------------------------------------------------------------------------
::rtl::OUString OAdvancedSettingsDialog::getImplementationName_Static() throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OAdvancedSettingsDialog"));
+ return ::rtl::OUString("org.openoffice.comp.dbu.OAdvancedSettingsDialog");
}
//-------------------------------------------------------------------------
@@ -108,7 +108,7 @@ namespace dbaui
::comphelper::StringSequence OAdvancedSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException)
{
::comphelper::StringSequence aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.AdvancedDatabaseSettingsDialog"));
+ aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.AdvancedDatabaseSettingsDialog");
return aSupported;
}
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx
index 7682a612250e..47ad0d93d140 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -55,7 +55,7 @@ Reference< XInterface > SAL_CALL OColumnControl::Create(const Reference< XMultiS
// -----------------------------------------------------------------------------
::rtl::OUString OColumnControl::GetComponentServiceName()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ColumnDescriptorControl"));
+ return ::rtl::OUString("com.sun.star.sdb.ColumnDescriptorControl");
}
// -----------------------------------------------------------------------------
void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit*/, const Reference< XWindowPeer >& rParentPeer) throw( RuntimeException )
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
index 95dd38e4fa0d..a18510f0ef5b 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
@@ -66,7 +66,7 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialog::Create(const Reference< XMult
//-------------------------------------------------------------------------
::rtl::OUString ODBTypeWizDialog::getImplementationName_Static() throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ODBTypeWizDialog"));
+ return ::rtl::OUString("org.openoffice.comp.dbu.ODBTypeWizDialog");
}
//-------------------------------------------------------------------------
@@ -79,7 +79,7 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialog::Create(const Reference< XMult
::comphelper::StringSequence ODBTypeWizDialog::getSupportedServiceNames_Static() throw(RuntimeException)
{
::comphelper::StringSequence aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DataSourceTypeChangeDialog"));
+ aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.DataSourceTypeChangeDialog");
return aSupported;
}
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
index 5ab3fb7d0dbe..31d30112d6be 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@@ -52,10 +52,10 @@ ODBTypeWizDialogSetup::ODBTypeWizDialogSetup(const Reference< XMultiServiceFacto
,m_bOpenDatabase(sal_True)
,m_bStartTableWizard(sal_False)
{
- registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OpenDatabase")), 3, PropertyAttribute::TRANSIENT,
+ registerProperty(::rtl::OUString("OpenDatabase"), 3, PropertyAttribute::TRANSIENT,
&m_bOpenDatabase, getBooleanCppuType());
- registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartTableWizard")), 4, PropertyAttribute::TRANSIENT,
+ registerProperty(::rtl::OUString("StartTableWizard"), 4, PropertyAttribute::TRANSIENT,
&m_bStartTableWizard, getBooleanCppuType());
}
//-------------------------------------------------------------------------
@@ -81,7 +81,7 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialogSetup::Create(const Reference<
//-------------------------------------------------------------------------
::rtl::OUString ODBTypeWizDialogSetup::getImplementationName_Static() throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ODBTypeWizDialogSetup"));
+ return ::rtl::OUString("org.openoffice.comp.dbu.ODBTypeWizDialogSetup");
}
//-------------------------------------------------------------------------
@@ -94,7 +94,7 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialogSetup::Create(const Reference<
::comphelper::StringSequence ODBTypeWizDialogSetup::getSupportedServiceNames_Static() throw(RuntimeException)
{
::comphelper::StringSequence aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatabaseWizardDialog"));
+ aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.DatabaseWizardDialog");
return aSupported;
}
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx
index b39d12693b3f..7538e8e44448 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.cxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx
@@ -67,7 +67,7 @@ Reference< XInterface > SAL_CALL OTableFilterDialog::Create(const Reference< XMu
//-------------------------------------------------------------------------
::rtl::OUString OTableFilterDialog::getImplementationName_Static() throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OTableFilterDialog"));
+ return ::rtl::OUString("org.openoffice.comp.dbu.OTableFilterDialog");
}
//-------------------------------------------------------------------------
@@ -80,7 +80,7 @@ Reference< XInterface > SAL_CALL OTableFilterDialog::Create(const Reference< XMu
::comphelper::StringSequence OTableFilterDialog::getSupportedServiceNames_Static() throw(RuntimeException)
{
::comphelper::StringSequence aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.TableFilterDialog"));
+ aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.TableFilterDialog");
return aSupported;
}
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
index 6284fe40f9cb..0ccace7fd67f 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
@@ -67,7 +67,7 @@ Reference< XInterface > SAL_CALL OUserSettingsDialog::Create(const Reference< XM
//-------------------------------------------------------------------------
::rtl::OUString OUserSettingsDialog::getImplementationName_Static() throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OUserSettingsDialog"));
+ return ::rtl::OUString("org.openoffice.comp.dbu.OUserSettingsDialog");
}
//-------------------------------------------------------------------------
@@ -80,7 +80,7 @@ Reference< XInterface > SAL_CALL OUserSettingsDialog::Create(const Reference< XM
::comphelper::StringSequence OUserSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException)
{
::comphelper::StringSequence aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.UserAdministrationDialog"));
+ aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.UserAdministrationDialog");
return aSupported;
}
diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx
index e054018dc8c3..613a2822d548 100644
--- a/dbaccess/source/ui/uno/admindlg.cxx
+++ b/dbaccess/source/ui/uno/admindlg.cxx
@@ -67,7 +67,7 @@ Reference< XInterface > SAL_CALL ODataSourcePropertyDialog::Create(const Referen
//-------------------------------------------------------------------------
::rtl::OUString ODataSourcePropertyDialog::getImplementationName_Static() throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ODatasourceAdministrationDialog"));
+ return ::rtl::OUString("org.openoffice.comp.dbu.ODatasourceAdministrationDialog");
}
//-------------------------------------------------------------------------
@@ -80,7 +80,7 @@ Reference< XInterface > SAL_CALL ODataSourcePropertyDialog::Create(const Referen
::comphelper::StringSequence ODataSourcePropertyDialog::getSupportedServiceNames_Static() throw(RuntimeException)
{
::comphelper::StringSequence aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatasourceAdministrationDialog"));
+ aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.DatasourceAdministrationDialog");
return aSupported;
}
diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx
index 8816d068289a..a0c093953e76 100644
--- a/desktop/qa/deployment_misc/test_dp_version.cxx
+++ b/desktop/qa/deployment_misc/test_dp_version.cxx
@@ -48,17 +48,17 @@ void Test::test() {
};
static Data const data[] = {
{ rtl::OUString(),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0.0000.00.0")),
+ rtl::OUString("0.0000.00.0"),
::dp_misc::EQUAL },
- { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".01")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0.1")),
+ { rtl::OUString(".01"),
+ rtl::OUString("0.1"),
::dp_misc::EQUAL },
- { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")),
+ { rtl::OUString("10"),
+ rtl::OUString("2"),
::dp_misc::GREATER },
- { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("9223372036854775808")),
+ { rtl::OUString("9223372036854775808"),
// 2^63
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("9223372036854775807")),
+ rtl::OUString("9223372036854775807"),
::dp_misc::GREATER }
};
for (::std::size_t i = 0; i < sizeof data / sizeof (Data); ++i) {
diff --git a/desktop/unx/source/officeloader/officeloader.cxx b/desktop/unx/source/officeloader/officeloader.cxx
index ffeb643fb179..ba8eb064dc06 100644
--- a/desktop/unx/source/officeloader/officeloader.cxx
+++ b/desktop/unx/source/officeloader/officeloader.cxx
@@ -37,7 +37,7 @@ SAL_IMPLEMENT_MAIN()
osl_getExecutableFile( &sExecutableFile.pData );
- sExecutableFile += OUString( RTL_CONSTASCII_USTRINGPARAM(".bin") );
+ sExecutableFile += OUString(".bin");
nCommandArgs = osl_getCommandArgCount();
pCommandArgs = new rtl_uString *[nCommandArgs];
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 92e21d6736e3..b23d48f48d4e 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -87,7 +87,7 @@ namespace drawinglayer
rtl::OUString XPrimitive2DRenderer_getImplementationName()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "drawinglayer::unorenderer::XPrimitive2DRenderer" ) );
+ return rtl::OUString( "drawinglayer::unorenderer::XPrimitive2DRenderer" );
}
uno::Reference< uno::XInterface > SAL_CALL XPrimitive2DRenderer_createInstance(const uno::Reference< lang::XMultiServiceFactory >&)
diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx
index 695fba7ac3b5..ad589d7b4958 100644
--- a/dtrans/source/win32/clipb/wcbentry.cxx
+++ b/dtrans/source/win32/clipb/wcbentry.cxx
@@ -59,7 +59,7 @@ namespace
Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
{
- return Reference< XInterface >( static_cast< XClipboard* >( new CWinClipboard( comphelper::getComponentContext(rServiceManager), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ) ) ) ) );
+ return Reference< XInterface >( static_cast< XClipboard* >( new CWinClipboard( comphelper::getComponentContext(rServiceManager), rtl::OUString( "" ) ) ) );
}
}
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index f7cba0448461..7156590a3f7d 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -217,7 +217,7 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool bInit)
}
SvxBaseAutoCorrCfg::SvxBaseAutoCorrCfg(SvxAutoCorrCfg& rPar) :
- utl::ConfigItem(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/AutoCorrect"))),
+ utl::ConfigItem(rtl::OUString("Office.Common/AutoCorrect")),
rParent(rPar)
{
}
@@ -526,7 +526,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
}
SvxSwAutoCorrCfg::SvxSwAutoCorrCfg(SvxAutoCorrCfg& rPar) :
- utl::ConfigItem(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Writer/AutoFunction"))),
+ utl::ConfigItem(rtl::OUString("Office.Writer/AutoFunction")),
rParent(rPar)
{
}
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 3c78120bc0c3..cdc9d2ef13ef 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2403,7 +2403,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
try
{
::ucbhelper::Content aContent ( aDest.GetMainURL( INetURLObject::DECODE_TO_IURI ), uno::Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() );
- aContent.executeCommand ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "delete" ) ), makeAny ( sal_Bool (sal_True ) ) );
+ aContent.executeCommand ( OUString( "delete" ), makeAny ( sal_Bool (sal_True ) ) );
}
catch (...)
{
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index d8937a746e3a..7440ca6af899 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -158,7 +158,7 @@ const char pSvxUnoNumberingRulesService[] = "com.sun.star.text.NumberingRules";
OUString SAL_CALL SvxUnoNumberingRules::getImplementationName( ) throw(RuntimeException)
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoNumberingRules" ) );
+ return OUString( "SvxUnoNumberingRules" );
}
sal_Bool SAL_CALL SvxUnoNumberingRules::supportsService( const OUString& ServiceName ) throw(RuntimeException)
@@ -211,7 +211,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa
sal_Unicode nCode = rFmt.GetBulletChar();
OUString aStr( &nCode, 1 );
aVal <<= aStr;
- beans::PropertyValue aBulletProp( OUString(RTL_CONSTASCII_USTRINGPARAM("BulletChar")), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ beans::PropertyValue aBulletProp( OUString("BulletChar"), -1, aVal, beans::PropertyState_DIRECT_VALUE);
pArray[nIdx++] = aBulletProp;
}
@@ -233,7 +233,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa
RTL_TEXTENCODING_ASCII_US);
aVal <<= aURL;
- const beans::PropertyValue aGraphicProp( OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicURL")), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ const beans::PropertyValue aGraphicProp( OUString("GraphicURL"), -1, aVal, beans::PropertyState_DIRECT_VALUE);
pArray[nIdx++] = aGraphicProp;
}
}
@@ -242,7 +242,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa
const Size aSize( rFmt.GetGraphicSize() );
const awt::Size aUnoSize( aSize.Width(), aSize.Height() );
aVal <<= aUnoSize;
- const beans::PropertyValue aGraphicSizeProp(OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicSize")), -1, aVal, beans::PropertyState_DIRECT_VALUE );
+ const beans::PropertyValue aGraphicSizeProp(OUString("GraphicSize"), -1, aVal, beans::PropertyState_DIRECT_VALUE );
pArray[nIdx++] = aGraphicSizeProp;
}
@@ -255,7 +255,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa
aVal <<= (sal_Int32)rFmt.GetFirstLineOffset();
pArray[nIdx++] = beans::PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_FIRST_LINE_OFFSET)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
- pArray[nIdx++] = beans::PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("SymbolTextDistance")), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ pArray[nIdx++] = beans::PropertyValue(OUString("SymbolTextDistance"), -1, aVal, beans::PropertyState_DIRECT_VALUE);
aVal <<= (sal_Int32)rFmt.GetBulletColor().GetColor();
pArray[nIdx++] = beans::PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_BULLET_COLOR)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx
index d7e1cf75b25d..30b35357314d 100644
--- a/editeng/source/uno/unopracc.cxx
+++ b/editeng/source/uno/unopracc.cxx
@@ -131,7 +131,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxAccessibleTextPropertySet::getImplementati
// XServiceInfo
::rtl::OUString SAL_CALL SAL_CALL SvxAccessibleTextPropertySet::getImplementationName (void) throw (uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("SvxAccessibleTextPropertySet"));
+ return ::rtl::OUString("SvxAccessibleTextPropertySet");
}
sal_Bool SAL_CALL SvxAccessibleTextPropertySet::supportsService (const ::rtl::OUString& sServiceName) throw (uno::RuntimeException)
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 659f0f163978..cc8cd4cd7bbb 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -1669,7 +1669,7 @@ uno::Reference< text::XText > SAL_CALL SvxUnoTextRange::getText()
OUString SAL_CALL SvxUnoTextRange::getImplementationName()
throw(uno::RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("SvxUnoTextRange"));
+ return OUString("SvxUnoTextRange");
}
// ====================================================================
@@ -2091,8 +2091,8 @@ void SvxPropertyValuesToItemSet(
if (pEntry->nFlags & beans::PropertyAttribute::READONLY)
// should be PropertyVetoException which is not yet defined for the new import API's functions
- throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + pProps[i].Name, static_cast < cppu::OWeakObject * > ( 0 ) );
- //throw PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + pProps[i].Name, static_cast < cppu::OWeakObject * > ( 0 ) );
+ throw uno::RuntimeException( OUString( "Property is read-only: " ) + pProps[i].Name, static_cast < cppu::OWeakObject * > ( 0 ) );
+ //throw PropertyVetoException ( OUString( "Property is read-only: " ) + pProps[i].Name, static_cast < cppu::OWeakObject * > ( 0 ) );
if (pEntry->nWID == WID_FONTDESC)
{
@@ -2138,7 +2138,7 @@ void SvxPropertyValuesToItemSet(
pPropSet->setPropertyValue( pProps[i].Name, pProps[i].Value, rItemSet );
}
else
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pProps[i].Name, static_cast < cppu::OWeakObject * > ( 0 ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pProps[i].Name, static_cast < cppu::OWeakObject * > ( 0 ) );
}
}
@@ -2266,7 +2266,7 @@ void SvxUnoTextBase::copyText(
OUString SAL_CALL SvxUnoTextBase::getImplementationName()
throw(uno::RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("SvxUnoTextBase"));
+ return OUString("SvxUnoTextBase");
}
uno::Sequence< OUString > SAL_CALL SvxUnoTextBase::getSupportedServiceNames( )
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 886b99e23e7a..bf18992295e4 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -365,7 +365,7 @@ void SAL_CALL SvxUnoTextContent::setPropertyToDefault( const OUString& PropertyN
OUString SAL_CALL SvxUnoTextContent::getImplementationName()
throw(uno::RuntimeException)
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoTextContent") );
+ return OUString("SvxUnoTextContent");
}
uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames()
@@ -677,7 +677,7 @@ void SAL_CALL SvxUnoTextCursor::setString( const OUString& aString ) throw(uno::
// lang::XServiceInfo
OUString SAL_CALL SvxUnoTextCursor::getImplementationName() throw(uno::RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("SvxUnoTextCursor"));
+ return OUString("SvxUnoTextCursor");
}
sal_Bool SAL_CALL SvxUnoTextCursor::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException)
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index be9abc521060..974051b63a31 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -102,7 +102,7 @@ void OCommonEmbeddedObject::Deactivate()
catch( const uno::Exception& e )
{
throw embed::StorageWrappedTargetException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The client could not store the object!" )),
+ ::rtl::OUString( "The client could not store the object!" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) ),
uno::makeAny( e ) );
}
@@ -227,7 +227,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
{
if ( !m_xClientSite.is() )
throw embed::WrongStateException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "client site not set, yet" ) ),
+ ::rtl::OUString( "client site not set, yet" ),
*this
);
@@ -387,7 +387,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
}
}
else
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is in unacceptable state!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object is in unacceptable state!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -400,7 +400,7 @@ uno::Sequence< sal_Int32 > OCommonEmbeddedObject::GetIntermediateStatesSequence_
break;
if ( nCurInd == m_aAcceptedStates.getLength() )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is in unacceptable state!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object is in unacceptable state!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
sal_Int32 nDestInd = 0;
@@ -410,7 +410,7 @@ uno::Sequence< sal_Int32 > OCommonEmbeddedObject::GetIntermediateStatesSequence_
if ( nDestInd == m_aAcceptedStates.getLength() )
throw embed::UnreachableStateException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The state either not reachable, or the object allows the state only as an intermediate one!\n" )),
+ ::rtl::OUString( "The state either not reachable, or the object allows the state only as an intermediate one!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
m_nObjectState,
nNewState );
@@ -434,7 +434,7 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState )
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
sal_Int32 nOldState = m_nObjectState;
@@ -487,7 +487,7 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState )
// let the object window be shown
if ( nNewState == embed::EmbedStates::UI_ACTIVE || nNewState == embed::EmbedStates::INPLACE_ACTIVE )
- PostEvent_Impl( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ) );
+ PostEvent_Impl( ::rtl::OUString( "OnVisAreaChanged" ) );
}
}
@@ -500,7 +500,7 @@ uno::Sequence< sal_Int32 > SAL_CALL OCommonEmbeddedObject::getReachableStates()
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
return m_aAcceptedStates;
@@ -515,7 +515,7 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject::getCurrentState()
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
return m_nObjectState;
@@ -546,7 +546,7 @@ void SAL_CALL OCommonEmbeddedObject::doVerb( sal_Int32 nVerbID )
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
// for internal documents this call is just a duplicate of changeState
@@ -579,7 +579,7 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OCommonEmbeddedObject::getSuppor
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
return m_aObjectVerbs;
@@ -599,7 +599,7 @@ void SAL_CALL OCommonEmbeddedObject::setClientSite(
{
if ( m_nObjectState != embed::EmbedStates::LOADED && m_nObjectState != embed::EmbedStates::RUNNING )
throw embed::WrongStateException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The client site can not be set currently!\n" )),
+ ::rtl::OUString( "The client site can not be set currently!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
m_xClientSite = xClient;
@@ -615,7 +615,7 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL OCommonEmbeddedObject::getClie
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
return m_xClientSite;
@@ -632,10 +632,10 @@ void SAL_CALL OCommonEmbeddedObject::update()
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
- PostEvent_Impl( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ) );
+ PostEvent_Impl( ::rtl::OUString( "OnVisAreaChanged" ) );
}
//----------------------------------------------
@@ -648,7 +648,7 @@ void SAL_CALL OCommonEmbeddedObject::setUpdateMode( sal_Int32 nMode )
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
OSL_ENSURE( nMode == embed::EmbedUpdateModes::ALWAYS_UPDATE
diff --git a/embeddedobj/source/commonembedding/inplaceobj.cxx b/embeddedobj/source/commonembedding/inplaceobj.cxx
index 731603a6e8e9..d5aa627400b8 100644
--- a/embeddedobj/source/commonembedding/inplaceobj.cxx
+++ b/embeddedobj/source/commonembedding/inplaceobj.cxx
@@ -46,7 +46,7 @@ void SAL_CALL OCommonEmbeddedObject::setObjectRectangles( const awt::Rectangle&
if ( m_nObjectState != embed::EmbedStates::INPLACE_ACTIVE
&& m_nObjectState != embed::EmbedStates::UI_ACTIVE )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not activated inplace!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object is not activated inplace!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
awt::Rectangle aNewRectToShow = GetRectangleInterception( aPosRect, aClipRect );
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index 44a344d8b352..6b09b0742b9b 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -503,7 +503,7 @@ uno::Reference< util::XCloseable > SAL_CALL OCommonEmbeddedObject::getComponent(
if ( m_nObjectState == -1 )
{
// the object is still not loaded
- throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )),
+ throw uno::RuntimeException( ::rtl::OUString( "Can't store object without persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index b7e61e485f83..fcd148936a24 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -110,7 +110,7 @@ uno::Sequence< beans::PropertyValue > addAsTemplate( const uno::Sequence< beans:
if ( !bAsTemplateSet )
{
aResult.realloc( nLength + 1 );
- aResult[nLength].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AsTemplate" ));
+ aResult[nLength].Name = ::rtl::OUString( "AsTemplate" );
aResult[nLength].Value <<= sal_True;
}
@@ -144,7 +144,7 @@ uno::Reference< io::XInputStream > createTempInpStreamFromStor(
} catch( const uno::Exception& e )
{
throw embed::StorageWrappedTargetException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't copy storage!" )),
+ ::rtl::OUString( "Can't copy storage!" ),
uno::Reference< uno::XInterface >(),
uno::makeAny( e ) );
}
@@ -224,7 +224,7 @@ static void SetDocToEmbedded( const uno::Reference< frame::XModel > xDocument, c
if ( xDocument.is() )
{
uno::Sequence< beans::PropertyValue > aSeq( 1 );
- aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SetEmbedded" ));
+ aSeq[0].Name = ::rtl::OUString( "SetEmbedded" );
aSeq[0].Value <<= sal_True;
xDocument->attachResource( ::rtl::OUString(), aSeq );
@@ -382,14 +382,14 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadLink_Impl()
sal_Int32 nLen = 2;
uno::Sequence< beans::PropertyValue > aArgs( nLen );
- aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" ));
+ aArgs[0].Name = ::rtl::OUString( "URL" );
aArgs[0].Value <<= m_aLinkURL;
- aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
+ aArgs[1].Name = ::rtl::OUString( "FilterName" );
aArgs[1].Value <<= m_aLinkFilterName;
if ( m_bLinkHasPassword )
{
aArgs.realloc( ++nLen );
- aArgs[nLen-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Password" ) );
+ aArgs[nLen-1].Name = ::rtl::OUString( "Password" );
aArgs[nLen-1].Value <<= m_aLinkPassword;
}
@@ -518,7 +518,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadDocumentFromStorag
// no need to let the file stay after the stream is removed since the embedded document
// can not be stored directly
uno::Reference< beans::XPropertySet > xTempStreamProps( xTempInpStream, uno::UNO_QUERY_THROW );
- xTempStreamProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Uri" )) ) >>= aTempFileURL;
+ xTempStreamProps->getPropertyValue( ::rtl::OUString( "Uri" ) ) >>= aTempFileURL;
}
catch( const uno::Exception& )
{
@@ -599,16 +599,16 @@ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStr
throw io::IOException(); // TODO:
uno::Sequence< beans::PropertyValue > aArgs( 4 );
- aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
+ aArgs[0].Name = ::rtl::OUString( "FilterName" );
aArgs[0].Value <<= aFilterName;
- aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OutputStream" ));
+ aArgs[1].Name = ::rtl::OUString( "OutputStream" );
aArgs[1].Value <<= xTempOut;
- aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DocumentBaseURL" ));
+ aArgs[2].Name = ::rtl::OUString( "DocumentBaseURL" );
aArgs[2].Value <<= aBaseURL;
- aArgs[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HierarchicalDocumentName" ));
+ aArgs[3].Name = ::rtl::OUString( "HierarchicalDocumentName" );
aArgs[3].Value <<= aHierarchName;
- xStorable->storeToURL( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "private:stream" )), aArgs );
+ xStorable->storeToURL( ::rtl::OUString( "private:stream" ), aArgs );
try
{
xTempOut->closeOutput();
@@ -661,7 +661,7 @@ void OCommonEmbeddedObject::SaveObject_Impl()
uno::Sequence< beans::PropertyValue > aModelProps = xParentModel->getArgs();
for ( nInd = 0; nInd < aModelProps.getLength(); nInd++ )
if ( aModelProps[nInd].Name.equals(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentBaseURL" ) ) ) )
+ ::rtl::OUString( "DocumentBaseURL" ) ) )
{
aModelProps[nInd].Value >>= aBaseURL;
break;
@@ -677,7 +677,7 @@ void OCommonEmbeddedObject::SaveObject_Impl()
{
for ( nInd = 0; nInd < m_aDocMediaDescriptor.getLength(); nInd++ )
if ( m_aDocMediaDescriptor[nInd].Name.equals(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentBaseURL" ) ) ) )
+ ::rtl::OUString( "DocumentBaseURL" ) ) )
{
m_aDocMediaDescriptor[nInd].Value >>= aBaseURL;
break;
@@ -761,11 +761,11 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed:
throw io::IOException(); // TODO:
uno::Sequence< beans::PropertyValue > aArgs( 3 );
- aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
+ aArgs[0].Name = ::rtl::OUString( "FilterName" );
aArgs[0].Value <<= aFilterName;
- aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DocumentBaseURL" ));
+ aArgs[2].Name = ::rtl::OUString( "DocumentBaseURL" );
aArgs[2].Value <<= aBaseURL;
- aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HierarchicalDocumentName" ));
+ aArgs[1].Name = ::rtl::OUString( "HierarchicalDocumentName" );
aArgs[1].Value <<= aHierarchName;
xDoc->storeToStorage( xStorage, aArgs );
@@ -869,7 +869,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_
// no need to let the file stay after the stream is removed since the embedded document
// can not be stored directly
uno::Reference< beans::XPropertySet > xTempStreamProps( xTempStream, uno::UNO_QUERY_THROW );
- xTempStreamProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Uri" )) ) >>= aTempFileURL;
+ xTempStreamProps->getPropertyValue( ::rtl::OUString( "Uri" ) ) >>= aTempFileURL;
}
catch( const uno::Exception& )
{
@@ -877,21 +877,21 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_
OSL_ENSURE( !aTempFileURL.isEmpty(), "Couldn't retrieve temporary file URL!\n" );
- aTempMediaDescr[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" ));
+ aTempMediaDescr[0].Name = ::rtl::OUString( "URL" );
aTempMediaDescr[0].Value <<= aTempFileURL;
- aTempMediaDescr[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStream" ));
+ aTempMediaDescr[1].Name = ::rtl::OUString( "InputStream" );
aTempMediaDescr[1].Value <<= xTempStream;
- aTempMediaDescr[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
+ aTempMediaDescr[2].Name = ::rtl::OUString( "FilterName" );
aTempMediaDescr[2].Value <<= GetFilterName( nStorageFormat );
- aTempMediaDescr[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AsTemplate" ));
+ aTempMediaDescr[3].Name = ::rtl::OUString( "AsTemplate" );
aTempMediaDescr[3].Value <<= sal_True;
}
else
{
aTempMediaDescr.realloc( 2 );
- aTempMediaDescr[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" ));
+ aTempMediaDescr[0].Name = ::rtl::OUString( "URL" );
aTempMediaDescr[0].Value <<= m_aLinkURL;
- aTempMediaDescr[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
+ aTempMediaDescr[1].Name = ::rtl::OUString( "FilterName" );
aTempMediaDescr[1].Value <<= m_aLinkFilterName;
}
@@ -923,12 +923,12 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
throw lang::DisposedException(); // TODO
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
@@ -943,7 +943,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
// it can switch persistent representation only without initialization
throw embed::WrongStateException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't change persistent representation of activated object!\n" )),
+ ::rtl::OUString( "Can't change persistent representation of activated object!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1124,7 +1124,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
//TODO:
//}
else
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Wrong connection mode is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
3 );
}
@@ -1150,7 +1150,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
if ( m_nObjectState == -1 )
{
// the object is still not loaded
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1278,7 +1278,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
if ( m_nObjectState == -1 )
{
// the object is still not loaded
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1325,7 +1325,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
OSL_FAIL( "Can not retrieve own storage media type!\n" );
}
- PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAs" )) );
+ PostEvent_Impl( ::rtl::OUString( "OnSaveAs" ) );
sal_Bool bTryOptimization = sal_False;
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
@@ -1413,7 +1413,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew )
if ( m_nObjectState == -1 )
{
// the object is still not loaded
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1449,7 +1449,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew )
if ( xModif.is() )
xModif->setModified( sal_False );
- PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAsDone" ) ));
+ PostEvent_Impl( ::rtl::OUString( "OnSaveAsDone" ));
}
else
{
@@ -1513,7 +1513,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::hasEntry()
if ( m_nObjectState == -1 )
{
// the object is still not loaded
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1545,7 +1545,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn()
if ( m_nObjectState == -1 )
{
// the object is still not loaded
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1561,7 +1561,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn()
if ( m_nObjectState == embed::EmbedStates::LOADED )
return;
- PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSave" )) );
+ PostEvent_Impl( ::rtl::OUString( "OnSave" ) );
OSL_ENSURE( m_pDocHolder->GetComponent().is(), "If an object is activated or in running state it must have a document!\n" );
if ( !m_pDocHolder->GetComponent().is() )
@@ -1610,7 +1610,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn()
if ( xModif.is() )
xModif->setModified( sal_False );
- PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveDone" )) );
+ PostEvent_Impl( ::rtl::OUString( "OnSaveDone" ) );
}
//------------------------------------------------------
@@ -1625,7 +1625,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isReadonly()
if ( m_nObjectState == -1 )
{
// the object is still not loaded
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1657,7 +1657,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
if ( m_nObjectState == -1 )
{
// the object is still not loaded
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1665,7 +1665,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
{
// the object is still not loaded
throw embed::WrongStateException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object must be in loaded state to be reloaded!\n" )),
+ ::rtl::OUString( "The object must be in loaded state to be reloaded!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1703,7 +1703,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
else
{
uno::Sequence< beans::PropertyValue > aArgs( 1 );
- aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
+ aArgs[0].Name = ::rtl::OUString( "URL" );
aArgs[0].Value <<= m_aLinkURL;
m_aLinkFilterName = aHelper.UpdateMediaDescriptorWithFilterName( aArgs, sal_False );
}
@@ -1779,7 +1779,7 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
{
// it must be a linked initialized object
throw embed::WrongStateException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not a valid linked object!\n" )),
+ ::rtl::OUString( "The object is not a valid linked object!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
else
@@ -1789,12 +1789,12 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
}
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
@@ -1802,7 +1802,7 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
{
// it must be a linked initialized object
throw embed::WrongStateException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not a valid linked object!\n" )),
+ ::rtl::OUString( "The object is not a valid linked object!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1880,7 +1880,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isLink()
if ( !m_bIsLink )
throw embed::WrongStateException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not a link object!\n" )),
+ ::rtl::OUString( "The object is not a link object!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
return m_aLinkURL;
diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx
index 19a53cb5d51c..c4e4e373109f 100644
--- a/embeddedobj/source/commonembedding/specialobject.cxx
+++ b/embeddedobj/source/commonembedding/specialobject.cxx
@@ -107,13 +107,13 @@ embed::VisualRepresentation SAL_CALL OSpecialEmbeddedObject::getPreferredVisualR
// TODO: if object is in loaded state it should switch itself to the running state
if ( m_nObjectState == -1 || m_nObjectState == embed::EmbedStates::LOADED )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no model!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The own object has no model!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
// TODO: return for the aspect of the document
@@ -134,7 +134,7 @@ void SAL_CALL OSpecialEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, cons
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
maSize = aSize;
@@ -153,11 +153,11 @@ awt::Size SAL_CALL OSpecialEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no model!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The own object has no model!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
awt::Size aResult;
@@ -175,7 +175,7 @@ sal_Int32 SAL_CALL OSpecialEmbeddedObject::getMapUnit( sal_Int64 nAspect )
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
return embed::EmbedMapUnits::ONE_100TH_MM;
@@ -204,7 +204,7 @@ void SAL_CALL OSpecialEmbeddedObject::doVerb( sal_Int32 nVerbID )
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( nVerbID == -7 )
diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx
index 56cdc983f5d5..499507e07b7f 100644
--- a/embeddedobj/source/commonembedding/visobj.cxx
+++ b/embeddedobj/source/commonembedding/visobj.cxx
@@ -46,11 +46,11 @@ void SAL_CALL OCommonEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The own object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
m_bHasClonedSize = sal_False;
@@ -86,7 +86,7 @@ awt::Size SAL_CALL OCommonEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The own object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
@@ -126,11 +126,11 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject::getMapUnit( sal_Int64 nAspect )
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The own object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( m_bHasClonedSize )
@@ -169,14 +169,14 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The own object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
sal_Bool bBackToLoaded = sal_False;
@@ -206,7 +206,7 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe
datatransfer::DataFlavor aDataFlavor(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "GDIMetaFile" )),
+ ::rtl::OUString( "GDIMetaFile" ),
::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
if( xTransferable->isDataFlavorSupported( aDataFlavor ))
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx
index adfd24552768..ba5af4a6ab69 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -40,15 +40,15 @@ using namespace ::com::sun::star;
uno::Sequence< ::rtl::OUString > SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > aRet(2);
- aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OOoEmbeddedObjectFactory"));
- aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OOoEmbeddedObjectFactory"));
+ aRet[0] = ::rtl::OUString("com.sun.star.embed.OOoEmbeddedObjectFactory");
+ aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.OOoEmbeddedObjectFactory");
return aRet;
}
//-------------------------------------------------------------------------
::rtl::OUString SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetImplementationName()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OOoEmbeddedObjectFactory"));
+ return ::rtl::OUString("com.sun.star.comp.embed.OOoEmbeddedObjectFactory");
}
//-------------------------------------------------------------------------
@@ -73,12 +73,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OOoEmbeddedObjectFactory::createInstanceInitFromEntry" );
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
@@ -103,7 +103,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
::rtl::OUString aMediaType;
try {
- uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MediaType" )) );
+ uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( "MediaType" ) );
aAny >>= aMediaType;
}
catch ( const uno::Exception& )
@@ -164,12 +164,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OOoEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor" );
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
@@ -231,12 +231,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
uno::Reference< uno::XInterface > xResult;
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
3 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
4 );
@@ -283,12 +283,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
// the initialization is completelly controlled by user
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
@@ -352,7 +352,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
aTempMedDescr[nInd].Value >>= aURL;
if ( aURL.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No URL for the link is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No URL for the link is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
3 );
@@ -401,12 +401,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
// the initialization is completelly controlled by user
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
@@ -418,7 +418,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
aTempMedDescr[nInd].Value >>= aURL;
if ( aURL.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No URL for the link is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No URL for the link is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
3 );
@@ -479,15 +479,15 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OOoEmbeddedObjectFactory::getSupported
uno::Sequence< ::rtl::OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > aRet(2);
- aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OOoSpecialEmbeddedObjectFactory"));
- aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"));
+ aRet[0] = ::rtl::OUString("com.sun.star.embed.OOoSpecialEmbeddedObjectFactory");
+ aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory");
return aRet;
}
//-------------------------------------------------------------------------
::rtl::OUString SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"));
+ return ::rtl::OUString("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory");
}
//-------------------------------------------------------------------------
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index ed0f7adf7d90..f953509a3e60 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -164,11 +164,11 @@ DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >&
m_aOutplaceFrameProps.realloc( 3 );
beans::NamedValue aArg;
- aArg.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TopWindow"));
+ aArg.Name = ::rtl::OUString("TopWindow");
aArg.Value <<= sal_True;
m_aOutplaceFrameProps[0] <<= aArg;
- aArg.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MakeVisible"));
+ aArg.Name = ::rtl::OUString("MakeVisible");
aArg.Value <<= sal_False;
m_aOutplaceFrameProps[1] <<= aArg;
@@ -183,7 +183,7 @@ DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >&
}
m_refCount--;
- aArg.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentFrame"));
+ aArg.Name = ::rtl::OUString("ParentFrame");
aArg.Value <<= xDesktop; //TODO/LATER: should use parent document frame
m_aOutplaceFrameProps[2] <<= aArg;
}
@@ -366,7 +366,7 @@ sal_Bool DocumentHolder::SetFrameLMVisibility( const uno::Reference< frame::XFra
{
uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
uno::Reference< beans::XPropertySet > xPropSet( xFrame, uno::UNO_QUERY_THROW );
- xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) >>= xLayoutManager;
+ xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xLayoutManager;
if ( xLayoutManager.is() )
{
xLayoutManager->setVisible( bVisible );
@@ -434,7 +434,7 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >&
}
awt::WindowDescriptor aOwnWinDescriptor( awt::WindowClass_TOP,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("dockingwindow") ),
+ ::rtl::OUString("dockingwindow"),
xMyParent,
0,
awt::Rectangle(),//aOwnRectangle,
@@ -453,14 +453,14 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >&
uno::Sequence< uno::Any > aArgs( 2 );
beans::NamedValue aArg;
- aArg.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContainerWindow"));
+ aArg.Name = ::rtl::OUString("ContainerWindow");
aArg.Value <<= xOwnWindow;
aArgs[0] <<= aArg;
uno::Reference< frame::XFrame > xContFrame( xContDisp, uno::UNO_QUERY );
if ( xContFrame.is() )
{
- aArg.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentFrame"));
+ aArg.Name = ::rtl::OUString("ParentFrame");
aArg.Value <<= xContFrame;
aArgs[1] <<= aArg;
}
@@ -535,7 +535,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl()
if( xUIConfigManager.is())
{
xResult = xUIConfigManager->getSettings(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" ) ),
+ ::rtl::OUString( "private:resource/menubar/menubar" ),
sal_False );
}
}
@@ -557,7 +557,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl()
xModConfSupplier->getUIConfigurationManager( aModuleIdent ),
uno::UNO_QUERY_THROW );
xResult = xModUIConfMan->getSettings(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" ) ),
+ ::rtl::OUString( "private:resource/menubar/menubar" ),
sal_False );
}
}
@@ -656,7 +656,7 @@ sal_Bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star
{
uno::Reference< ::com::sun::star::ui::XUIElementSettings > xUISettings(
xContLM->getElement(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" ) ) ),
+ ::rtl::OUString( "private:resource/menubar/menubar" ) ),
uno::UNO_QUERY_THROW );
uno::Reference< container::XIndexAccess > xContMenu = xUISettings->getSettings( sal_True );
if ( !xContMenu.is() )
@@ -690,7 +690,7 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::
try
{
uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW );
- xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) >>= xOwnLM;
+ xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xOwnLM;
xDocAreaAcc = xContainerLM->getDockingAreaAcceptor();
}
catch( const uno::Exception& ){}
@@ -783,7 +783,7 @@ sal_Bool DocumentHolder::HideUI( const uno::Reference< ::com::sun::star::frame::
try {
uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW );
- xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) >>= xOwnLM;
+ xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xOwnLM;
} catch( const uno::Exception& )
{}
@@ -860,7 +860,7 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame()
uno::Reference< ::com::sun::star::frame::XLayoutManager > xOwnLM;
try {
uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW );
- xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) >>= xOwnLM;
+ xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xOwnLM;
} catch( const uno::Exception& )
{}
@@ -972,18 +972,18 @@ sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace )
::rtl::OUString sUrl;
uno::Reference< lang::XServiceInfo> xServiceInfo(xDoc,uno::UNO_QUERY);
if ( xServiceInfo.is()
- && xServiceInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ReportDefinition"))) )
+ && xServiceInfo->supportsService(::rtl::OUString("com.sun.star.report.ReportDefinition")) )
{
- sUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".component:DB/ReportDesign"));
+ sUrl = ::rtl::OUString(".component:DB/ReportDesign");
}
else if( xServiceInfo.is()
- && xServiceInfo->supportsService( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.ChartDocument")) ))
- sUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/schart"));
+ && xServiceInfo->supportsService( ::rtl::OUString("com.sun.star.chart2.ChartDocument") ))
+ sUrl = ::rtl::OUString("private:factory/schart");
else
- sUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:object"));
+ sUrl = ::rtl::OUString("private:object");
xComponentLoader->loadComponentFromURL( sUrl,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_self" )),
+ rtl::OUString( "_self" ),
0,
aArgs.getPropertyValues() );
@@ -1173,7 +1173,7 @@ void SAL_CALL DocumentHolder::modified( const lang::EventObject& aEvent )
// if the component does not support document::XEventBroadcaster
// the modify notifications are used as workaround, but only for running state
if( aEvent.Source == m_xComponent && m_pEmbedObj && m_pEmbedObj->getCurrentState() == embed::EmbedStates::RUNNING )
- m_pEmbedObj->PostEvent_Impl( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ) );
+ m_pEmbedObj->PostEvent_Impl( ::rtl::OUString( "OnVisAreaChanged" ) );
}
//---------------------------------------------------------------------------
diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index 04795ffa5761..9d62ae63ce91 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -44,7 +44,7 @@ void ODummyEmbeddedObject::CheckInit()
throw lang::DisposedException();
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -228,7 +228,7 @@ void SAL_CALL ODummyEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
m_nCachedAspect = nAspect;
@@ -249,12 +249,12 @@ awt::Size SAL_CALL ODummyEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( !m_bHasCachedSize || m_nCachedAspect != nAspect )
throw embed::NoVisualAreaSizeException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No size available!\n" ) ),
+ ::rtl::OUString( "No size available!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
return m_aCachedSize;
@@ -271,7 +271,7 @@ sal_Int32 SAL_CALL ODummyEmbeddedObject::getMapUnit( sal_Int64 nAspect )
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
return embed::EmbedMapUnits::ONE_100TH_MM;
@@ -288,7 +288,7 @@ embed::VisualRepresentation SAL_CALL ODummyEmbeddedObject::getPreferredVisualRep
CheckInit();
// no representation can be retrieved
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -310,12 +310,12 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
throw lang::DisposedException(); // TODO
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
@@ -323,7 +323,7 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
&& ( m_nObjectState == -1 || nEntryConnectionMode != embed::EntryInitModes::NO_INIT ) )
{
throw embed::WrongStateException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't change persistent representation of activated object!\n" )),
+ ::rtl::OUString( "Can't change persistent representation of activated object!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -348,13 +348,13 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
m_nObjectState = embed::EmbedStates::LOADED;
}
else
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Wrong entry is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong entry is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
}
else
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Wrong connection mode is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
3 );
}
@@ -400,7 +400,7 @@ void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::X
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
- PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAs" )) );
+ PostEvent_Impl( ::rtl::OUString( "OnSaveAs" ) );
m_xParentStorage->copyElementTo( m_aEntryName, xStorage, sEntName );
@@ -435,7 +435,7 @@ void SAL_CALL ODummyEmbeddedObject::saveCompleted( sal_Bool bUseNew )
m_xParentStorage = m_xNewParentStorage;
m_aEntryName = m_aNewEntryName;
- PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAsDone" )) );
+ PostEvent_Impl( ::rtl::OUString( "OnSaveAsDone" ) );
}
m_xNewParentStorage = uno::Reference< embed::XStorage >();
diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index 88256898534e..a47ef9bed158 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -103,18 +103,12 @@ Interceptor::Interceptor( DocumentHolder* pDocHolder )
m_pDisposeEventListeners(0),
m_pStatCL(0)
{
- m_aInterceptedURL[0] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));
- m_aInterceptedURL[1] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAll"));
- m_aInterceptedURL[2] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc"));
- m_aInterceptedURL[3] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin"));
- m_aInterceptedURL[4] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame"));
- m_aInterceptedURL[5] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs"));
+ m_aInterceptedURL[0] = rtl::OUString(".uno:Save");
+ m_aInterceptedURL[1] = rtl::OUString(".uno:SaveAll");
+ m_aInterceptedURL[2] = rtl::OUString(".uno:CloseDoc");
+ m_aInterceptedURL[3] = rtl::OUString(".uno:CloseWin");
+ m_aInterceptedURL[4] = rtl::OUString(".uno:CloseFrame");
+ m_aInterceptedURL[5] = rtl::OUString(".uno:SaveAs");
}
@@ -172,12 +166,12 @@ Interceptor::dispatch(
if ( nInd == aNewArgs.getLength() )
{
aNewArgs.realloc( nInd + 1 );
- aNewArgs[nInd].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SaveTo" ));
+ aNewArgs[nInd].Name = ::rtl::OUString( "SaveTo" );
aNewArgs[nInd].Value <<= sal_True;
}
uno::Reference< frame::XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch(
- URL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_self" )), 0 );
+ URL, ::rtl::OUString( "_self" ), 0 );
if ( xDispatch.is() )
xDispatch->dispatch( URL, aNewArgs );
}
@@ -200,8 +194,7 @@ Interceptor::addStatusListener(
{ // Save
frame::FeatureStateEvent aStateEvent;
aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0];
- aStateEvent.FeatureDescriptor = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Update"));
+ aStateEvent.FeatureDescriptor = rtl::OUString("Update");
aStateEvent.IsEnabled = sal_True;
aStateEvent.Requery = sal_False;
aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($1) ")) + m_pDocHolder->GetTitle() );
@@ -225,8 +218,7 @@ Interceptor::addStatusListener(
{ // Close and return
frame::FeatureStateEvent aStateEvent;
aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i];
- aStateEvent.FeatureDescriptor = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Close and Return"));
+ aStateEvent.FeatureDescriptor = rtl::OUString("Close and Return");
aStateEvent.IsEnabled = sal_True;
aStateEvent.Requery = sal_False;
aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($2) ")) + m_pDocHolder->GetTitle() );
@@ -248,8 +240,7 @@ Interceptor::addStatusListener(
{ // SaveAs
frame::FeatureStateEvent aStateEvent;
aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5];
- aStateEvent.FeatureDescriptor = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("SaveCopyTo"));
+ aStateEvent.FeatureDescriptor = rtl::OUString("SaveCopyTo");
aStateEvent.IsEnabled = sal_True;
aStateEvent.Requery = sal_False;
aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($3)")));
diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index 2fdb868e0280..24f5bbd4c983 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -44,15 +44,15 @@ using namespace ::com::sun::star;
uno::Sequence< ::rtl::OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > aRet(2);
- aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.EmbeddedObjectCreator"));
- aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.EmbeddedObjectCreator"));
+ aRet[0] = ::rtl::OUString("com.sun.star.embed.EmbeddedObjectCreator");
+ aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.EmbeddedObjectCreator");
return aRet;
}
//-------------------------------------------------------------------------
::rtl::OUString SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetImplementationName()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.EmbeddedObjectCreator"));
+ return ::rtl::OUString("com.sun.star.comp.embed.EmbeddedObjectCreator");
}
//-------------------------------------------------------------------------
@@ -79,12 +79,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
uno::Reference< uno::XInterface > xResult;
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
3 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
4 );
@@ -93,7 +93,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
{
// use system fallback
// TODO: in future users factories can be tested
- aEmbedFactory = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLEEmbeddedObjectFactory" ));
+ aEmbedFactory = ::rtl::OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" );
}
uno::Reference < uno::XInterface > xFact( m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext) );
@@ -122,12 +122,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) UNOEmbeddedObjectCreator::createInstanceInitFromEntry" );
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
@@ -152,7 +152,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
throw uno::RuntimeException();
try {
- uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ));
+ uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( "MediaType" ));
aAny >>= aMediaType;
}
catch ( const uno::Exception& )
@@ -184,10 +184,10 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
throw uno::RuntimeException();
try {
- uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ));
+ uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( "MediaType" ));
aAny >>= aMediaType;
if ( aMediaType == "application/vnd.sun.star.oleobject" )
- aEmbedFactory = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLEEmbeddedObjectFactory" ) );
+ aEmbedFactory = ::rtl::OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" );
}
catch ( const uno::Exception& )
{
@@ -243,12 +243,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
// TODO: use lObjArgs
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
@@ -308,12 +308,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
uno::Reference< uno::XInterface > xResult;
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
3 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
4 );
@@ -357,7 +357,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
aTempMedDescr[nInd].Value >>= aURL;
if ( aURL.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No URL for the link is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No URL for the link is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
3 );
@@ -386,13 +386,13 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
// was also extended.
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >(
static_cast< ::cppu::OWeakObject* >(this) ),
3 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >(
static_cast< ::cppu::OWeakObject* >(this) ),
4 );
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index a04dbb64fd6c..f6c801aa8a4b 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -131,7 +131,7 @@ public:
rtl::OUString GetTitle() const
{
- return m_aContainerName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " - " )) + m_aDocumentNamePart;
+ return m_aContainerName + ::rtl::OUString( " - " ) + m_aDocumentNamePart;
}
rtl::OUString GetContainerName() const { return m_aContainerName; }
diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx
index b1f69c4cdf6a..7d3855884836 100644
--- a/embeddedobj/source/msole/graphconvert.cxx
+++ b/embeddedobj/source/msole/graphconvert.cxx
@@ -54,7 +54,7 @@ sal_Bool ConvertBufferToFormat( void* pBuf,
{
uno::Reference < graphic::XGraphicProvider > xGraphicProvider( graphic::GraphicProvider::create(comphelper::getProcessComponentContext()));
uno::Sequence< beans::PropertyValue > aMediaProperties( 1 );
- aMediaProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStream" ));
+ aMediaProperties[0].Name = ::rtl::OUString( "InputStream" );
aMediaProperties[0].Value <<= xIn;
uno::Reference< graphic::XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ) );
if( xGraphic.is() )
@@ -62,9 +62,9 @@ sal_Bool ConvertBufferToFormat( void* pBuf,
SvMemoryStream aNewStream( 65535, 65535 );
uno::Reference < io::XStream > xOut = new utl::OStreamWrapper( aNewStream );
uno::Sequence< beans::PropertyValue > aOutMediaProperties( 2 );
- aOutMediaProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OutputStream" ));
+ aOutMediaProperties[0].Name = ::rtl::OUString( "OutputStream" );
aOutMediaProperties[0].Value <<= xOut;
- aOutMediaProperties[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MimeType" ));
+ aOutMediaProperties[1].Name = ::rtl::OUString( "MimeType" );
aOutMediaProperties[1].Value <<= aMimeType;
xGraphicProvider->storeGraphic( xGraphic, aOutMediaProperties );
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index f7da74084f8c..4222d489ea19 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -190,27 +190,27 @@ struct OleComponentNative_Impl {
m_aSupportedGraphFormats[0] = datatransfer::DataFlavor(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" )),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Windows Enhanced Metafile" )),
+ ::rtl::OUString( "Windows Enhanced Metafile" ),
getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
m_aSupportedGraphFormats[1] = datatransfer::DataFlavor(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Windows Metafile" )),
+ ::rtl::OUString( "Windows Metafile" ),
getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
m_aSupportedGraphFormats[2] = datatransfer::DataFlavor(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bitmap" )),
+ ::rtl::OUString( "Bitmap" ),
getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
m_aSupportedGraphFormats[3] = datatransfer::DataFlavor(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "image/png" )),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "PNG" )),
+ ::rtl::OUString( "image/png" ),
+ ::rtl::OUString( "PNG" ),
getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
m_aSupportedGraphFormats[0] = datatransfer::DataFlavor(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "GDIMetafile" )),
+ ::rtl::OUString( "GDIMetafile" ),
getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
}
@@ -246,11 +246,11 @@ DWORD GetAspectFromFlavor( const datatransfer::DataFlavor& aFlavor )
::rtl::OUString aResult;
if ( nAsp == DVASPECT_THUMBNAIL )
- aResult = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ";Aspect=THUMBNAIL" ));
+ aResult = ::rtl::OUString( ";Aspect=THUMBNAIL" );
else if ( nAsp == DVASPECT_ICON )
- aResult = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ";Aspect=ICON" ));
+ aResult = ::rtl::OUString( ";Aspect=ICON" );
else if ( nAsp == DVASPECT_DOCPRINT )
- aResult = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ";Aspect=DOCPRINT" ));
+ aResult = ::rtl::OUString( ";Aspect=DOCPRINT" );
// no suffix for DVASPECT_CONTENT
@@ -292,7 +292,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
if ( aMedium.tymed == TYMED_MFPICT ) // Win Metafile
{
- aFormat = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/x-wmf"));
+ aFormat = ::rtl::OUString("image/x-wmf");
METAFILEPICT* pMF = ( METAFILEPICT* )GlobalLock( aMedium.hMetaFilePict );
if ( pMF )
{
@@ -323,7 +323,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
}
else if ( aMedium.tymed == TYMED_ENHMF ) // Enh Metafile
{
- aFormat = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/x-emf"));
+ aFormat = ::rtl::OUString("image/x-emf");
nBufSize = GetEnhMetaFileBits( aMedium.hEnhMetaFile, 0, NULL );
pBuf = new unsigned char[nBufSize];
if ( nBufSize && nBufSize == GetEnhMetaFileBits( aMedium.hEnhMetaFile, nBufSize, pBuf ) )
@@ -337,7 +337,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
}
else if ( aMedium.tymed == TYMED_GDI ) // Bitmap
{
- aFormat = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/x-MS-bmp"));
+ aFormat = ::rtl::OUString("image/x-MS-bmp");
nBufSize = GetBitmapBits( aMedium.hBitmap, 0, NULL );
pBuf = new unsigned char[nBufSize];
if ( nBufSize && nBufSize == sal::static_int_cast< ULONG >( GetBitmapBits( aMedium.hBitmap, nBufSize, pBuf ) ) )
@@ -408,7 +408,7 @@ sal_Bool GetClassIDFromSequence_Impl( uno::Sequence< sal_Int8 > aSeq, CLSID& aRe
{
if ( *pStr == '&' )
{
- aResult += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "~" ));
+ aResult += ::rtl::OUString( "~" );
while( *( ++pStr ) == '&' );
}
else
@@ -1405,7 +1405,7 @@ void OleComponent::OnViewChange_Impl( sal_uInt32 dwAspect )
{
uno::Reference < awt::XRequestCallback > xRequestCallback(
m_xFactory->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AsyncCallback") )),
+ ::rtl::OUString("com.sun.star.awt.AsyncCallback")),
uno::UNO_QUERY );
xRequestCallback->addCallback( new MainThreadNotificationRequest( xLockObject, OLECOMP_ONVIEWCHANGE, dwAspect ), uno::Any() );
}
@@ -1426,7 +1426,7 @@ void OleComponent::OnClose_Impl()
{
uno::Reference < awt::XRequestCallback > xRequestCallback(
m_xFactory->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AsyncCallback") )),
+ ::rtl::OUString("com.sun.star.awt.AsyncCallback")),
uno::UNO_QUERY );
xRequestCallback->addCallback( new MainThreadNotificationRequest( xLockObject, OLECOMP_ONCLOSE ), uno::Any() );
}
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 44f6585f419f..f4abfbf6a57c 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -209,7 +209,7 @@ uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage(
for ( sal_Int32 nInd = 0; nInd < 32000 && !xResult.is(); nInd++ )
{
::rtl::OUString aName = ::rtl::OUString::valueOf( nInd );
- aName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TMPSTOR" ) );
+ aName += ::rtl::OUString( "TMPSTOR" );
aName += m_aEntryName;
if ( !m_xParentStorage->hasByName( aName ) )
{
@@ -234,7 +234,7 @@ uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage(
for ( sal_Int32 nInd = 0; nInd < 32000 && aResult.isEmpty(); nInd++ )
{
::rtl::OUString aName = ::rtl::OUString::valueOf( nInd );
- aName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TMPSTREAM" ) );
+ aName += ::rtl::OUString( "TMPSTREAM" );
aName += m_aEntryName;
if ( !m_xParentStorage->hasByName( aName ) )
{
@@ -275,7 +275,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo()
&& ( aFilterName == "Calc MS Excel 2007 XML" || aFilterName == "Impress MS PowerPoint 2007 XML" || aFilterName == "MS Word 2007 XML" ) )
{
uno::Reference< container::XNameAccess > xFilterFactory(
- m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ) )),
+ m_xFactory->createInstance( ::rtl::OUString( "com.sun.star.document.FilterFactory" )),
uno::UNO_QUERY_THROW );
::rtl::OUString aDocServiceName;
@@ -292,7 +292,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo()
{
// create the model
uno::Sequence< uno::Any > aArguments(1);
- aArguments[0] <<= beans::NamedValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EmbeddedObject" ) ), uno::makeAny( (sal_Bool)sal_True ));
+ aArguments[0] <<= beans::NamedValue( ::rtl::OUString( "EmbeddedObject" ), uno::makeAny( (sal_Bool)sal_True ));
uno::Reference< util::XCloseable > xDocument( m_xFactory->createInstanceWithArguments( aDocServiceName, aArguments ), uno::UNO_QUERY_THROW );
uno::Reference< frame::XLoadable > xLoadable( xDocument, uno::UNO_QUERY_THROW );
@@ -301,21 +301,21 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo()
// let the model behave as embedded one
uno::Reference< frame::XModel > xModel( xDocument, uno::UNO_QUERY_THROW );
uno::Sequence< beans::PropertyValue > aSeq( 1 );
- aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SetEmbedded" ));
+ aSeq[0].Name = ::rtl::OUString( "SetEmbedded" );
aSeq[0].Value <<= sal_True;
xModel->attachResource( ::rtl::OUString(), aSeq );
// load the model from the stream
uno::Sequence< beans::PropertyValue > aArgs( 5 );
- aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HierarchicalDocumentName" ));
+ aArgs[0].Name = ::rtl::OUString( "HierarchicalDocumentName" );
aArgs[0].Value <<= m_aEntryName;
- aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ReadOnly" ));
+ aArgs[1].Name = ::rtl::OUString( "ReadOnly" );
aArgs[1].Value <<= sal_True;
- aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
+ aArgs[2].Name = ::rtl::OUString( "FilterName" );
aArgs[2].Value <<= aFilterName;
- aArgs[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" ));
- aArgs[3].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "private:stream" ));
- aArgs[4].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStream" ));
+ aArgs[3].Name = ::rtl::OUString( "URL" );
+ aArgs[3].Value <<= ::rtl::OUString( "private:stream" );
+ aArgs[4].Name = ::rtl::OUString( "InputStream" );
aArgs[4].Value <<= m_xObjectStream->getInputStream();
xSeekable->seek( 0 );
@@ -327,7 +327,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo()
xDocument->close( sal_True );
uno::Reference< beans::XPropertySet > xStorProps( xTmpStorage, uno::UNO_QUERY_THROW );
::rtl::OUString aMediaType;
- xStorProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MediaType" )) ) >>= aMediaType;
+ xStorProps->getPropertyValue( ::rtl::OUString( "MediaType" ) ) >>= aMediaType;
xTmpStorage->dispose();
// look for the related embedded object factory
@@ -463,7 +463,7 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
// in case the object is already in requested state
@@ -619,7 +619,7 @@ uno::Sequence< sal_Int32 > SAL_CALL OleEmbeddedObject::getReachableStates()
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
#ifdef WNT
@@ -661,7 +661,7 @@ sal_Int32 SAL_CALL OleEmbeddedObject::getCurrentState()
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
// TODO: Shouldn't we ask object? ( I guess no )
@@ -705,7 +705,7 @@ namespace
aArgs[1] <<= (sal_Bool)sal_True; // do not create copy
uno::Reference< container::XNameContainer > xNameContainer(
xFactory->createInstanceWithArguments(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OLESimpleStorage")),
+ ::rtl::OUString("com.sun.star.embed.OLESimpleStorage"),
aArgs ), uno::UNO_QUERY_THROW );
uno::Reference< io::XStream > xCONTENTS;
@@ -729,9 +729,9 @@ namespace
if (bCopied)
{
- xNativeTempFile->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveFile")),
+ xNativeTempFile->setPropertyValue(::rtl::OUString("RemoveFile"),
uno::makeAny(sal_False));
- uno::Any aUrl = xNativeTempFile->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")));
+ uno::Any aUrl = xNativeTempFile->getPropertyValue(::rtl::OUString("Uri"));
aUrl >>= sUrl;
xNativeTempFile = uno::Reference<beans::XPropertySet>();
@@ -743,7 +743,7 @@ namespace
}
else
{
- xNativeTempFile->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveFile")),
+ xNativeTempFile->setPropertyValue(::rtl::OUString("RemoveFile"),
uno::makeAny(sal_True));
}
#else
@@ -779,7 +779,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
#ifdef WNT
@@ -914,7 +914,7 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OleEmbeddedObject::getSupportedV
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
#ifdef WNT
if ( m_pOleComponent )
@@ -959,7 +959,7 @@ void SAL_CALL OleEmbeddedObject::setClientSite(
{
if ( m_nObjectState != embed::EmbedStates::LOADED && m_nObjectState != embed::EmbedStates::RUNNING )
throw embed::WrongStateException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The client site can not be set currently!\n" )),
+ ::rtl::OUString( "The client site can not be set currently!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
m_xClientSite = xClient;
@@ -985,7 +985,7 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL OleEmbeddedObject::getClientSi
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
return m_xClientSite;
@@ -1012,7 +1012,7 @@ void SAL_CALL OleEmbeddedObject::update()
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( m_nUpdateMode == embed::EmbedUpdateModes::EXPLICIT_UPDATE )
@@ -1046,7 +1046,7 @@ void SAL_CALL OleEmbeddedObject::setUpdateMode( sal_Int32 nMode )
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
OSL_ENSURE( nMode == embed::EmbedUpdateModes::ALWAYS_UPDATE
@@ -1076,7 +1076,7 @@ sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64
throw lang::DisposedException(); // TODO
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object must be in running state!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object must be in running state!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
sal_Int64 nResult = 0;
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index b0fddcaa3df2..a71944bd4cea 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -376,7 +376,7 @@ uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent()
if ( m_nObjectState == -1 ) // || m_nObjectState == embed::EmbedStates::LOADED )
{
// the object is still not running
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not loaded!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 165f2dd2832e..4e56995221e7 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -86,8 +86,8 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang:
uno::UNO_QUERY_THROW );
try {
- xTempFile->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RemoveFile" )), uno::makeAny( sal_False ) );
- uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Uri" ) ));
+ xTempFile->setPropertyValue( ::rtl::OUString( "RemoveFile" ), uno::makeAny( sal_False ) );
+ uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString( "Uri" ));
aUrl >>= aResult;
}
catch ( const uno::Exception& )
@@ -166,8 +166,8 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang:
xParentStorage->copyStreamElementData( aEntryName, xTempStream );
- xTempFile->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RemoveFile" )), uno::makeAny( sal_False ) );
- uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Uri" ) ));
+ xTempFile->setPropertyValue( ::rtl::OUString( "RemoveFile" ), uno::makeAny( sal_False ) );
+ uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString( "Uri" ));
aUrl >>= aResult;
}
catch( const uno::RuntimeException& )
@@ -191,7 +191,7 @@ void SetStreamMediaType_Impl( const uno::Reference< io::XStream >& xStream, cons
if ( !xPropSet.is() )
throw uno::RuntimeException(); // TODO: all the storage streams must support XPropertySet
- xPropSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MediaType" )), uno::makeAny( aMediaType ) );
+ xPropSet->setPropertyValue( ::rtl::OUString( "MediaType" ), uno::makeAny( aMediaType ) );
}
#endif
//------------------------------------------------------
@@ -201,7 +201,7 @@ void LetCommonStoragePassBeUsed_Impl( const uno::Reference< io::XStream >& xStre
if ( !xPropSet.is() )
throw uno::RuntimeException(); // Only StorageStreams must be provided here, they must implement the interface
- xPropSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UseCommonStoragePasswordEncryption" )),
+ xPropSet->setPropertyValue( ::rtl::OUString( "UseCommonStoragePasswordEncryption" ),
uno::makeAny( (sal_Bool)sal_True ) );
}
#ifdef WNT
@@ -379,7 +379,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea
uno::Reference< container::XNameContainer > xNameContainer(
m_xFactory->createInstanceWithArguments(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )),
+ ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ),
aArgs ),
uno::UNO_QUERY );
@@ -502,7 +502,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea
throw io::IOException(); // TODO:
// insert the result file as replacement image
- ::rtl::OUString aCacheName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "\002OlePres000" ));
+ ::rtl::OUString aCacheName = ::rtl::OUString( "\002OlePres000" );
if ( xNameContainer->hasByName( aCacheName ) )
xNameContainer->replaceByName( aCacheName, uno::makeAny( xTempFile ) );
else
@@ -528,7 +528,7 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea
aArgs[1] <<= (sal_Bool)sal_True; // do not create copy
uno::Reference< container::XNameContainer > xNameContainer(
m_xFactory->createInstanceWithArguments(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )),
+ ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ),
aArgs ),
uno::UNO_QUERY );
@@ -597,7 +597,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream()
aArgs[1] <<= (sal_Bool)sal_True; // do not create copy
uno::Reference< container::XNameContainer > xNameContainer(
m_xFactory->createInstanceWithArguments(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )),
+ ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ),
aArgs ),
uno::UNO_QUERY );
@@ -644,7 +644,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres
{
xNameContainer = uno::Reference< container::XNameContainer >(
m_xFactory->createInstanceWithArguments(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )),
+ ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ),
aArgs ),
uno::UNO_QUERY );
}
@@ -673,7 +673,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres
if ( nInd == 0 )
{
// to be compatible with the old versions Ole10Native is checked after OlePress000
- aStreamName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\001Ole10Native" ) );
+ aStreamName = ::rtl::OUString( "\001Ole10Native" );
try
{
if ( ( xNameContainer->getByName( aStreamName ) >>= xCachedCopyStream ) && xCachedCopyStream.is() )
@@ -871,7 +871,7 @@ sal_Bool OleEmbeddedObject::OnShowWindow_Impl( sal_Bool bShow )
void OleEmbeddedObject::OnIconChanged_Impl()
{
// TODO/LATER: currently this notification seems to be impossible
- // MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnIconChanged" )) );
+ // MakeEventListenerNotification_Impl( ::rtl::OUString( "OnIconChanged" ) );
}
//------------------------------------------------------
@@ -901,7 +901,7 @@ void OleEmbeddedObject::OnViewChanged_Impl()
// The view is changed while the object is in running state, save the new object
m_xCachedVisualRepresentation = uno::Reference< io::XStream >();
SaveObject_Impl();
- MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" )) );
+ MakeEventListenerNotification_Impl( ::rtl::OUString( "OnVisAreaChanged" ) );
}
// ===============================================================
}
@@ -1082,7 +1082,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
if ( m_nObjectState == -1 )
{
// the object is still not loaded
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1170,7 +1170,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
if ( !xTargetStream.is() )
throw io::IOException(); //TODO: access denied
- SetStreamMediaType_Impl( xTargetStream, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.oleobject" ) ));
+ SetStreamMediaType_Impl( xTargetStream, ::rtl::OUString( "application/vnd.sun.star.oleobject" ));
uno::Reference< io::XOutputStream > xOutStream = xTargetStream->getOutputStream();
if ( !xOutStream.is() )
throw io::IOException(); //TODO: access denied
@@ -1317,12 +1317,12 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
throw lang::DisposedException(); // TODO
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
@@ -1337,7 +1337,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
// it can switch persistent representation only without initialization
throw embed::WrongStateException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't change persistent representation of activated object!\n" )),
+ ::rtl::OUString( "Can't change persistent representation of activated object!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1443,7 +1443,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
if ( aURL.isEmpty() )
throw lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty URL is provided in the media descriptor!\n" )),
+ ::rtl::OUString( "Empty URL is provided in the media descriptor!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
4 );
@@ -1465,7 +1465,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
//TODO:
//}
else
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Wrong connection mode is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
3 );
}
@@ -1483,7 +1483,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
// do nothing, the object has already switched it's persistence
}
else
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Wrong connection mode is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
3 );
@@ -1583,7 +1583,7 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew )
if ( m_nObjectState == -1 )
{
// the object is still not loaded
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1648,13 +1648,13 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew )
aGuard.clear();
if ( bUseNew )
{
- MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAsDone" ) ));
+ MakeEventListenerNotification_Impl( ::rtl::OUString( "OnSaveAsDone" ));
// the object can be changed only on windows
// the notification should be done only if the object is not in loaded state
if ( m_pOleComponent && m_nUpdateMode == embed::EmbedUpdateModes::ALWAYS_UPDATE && !bStoreLoaded )
{
- MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ));
+ MakeEventListenerNotification_Impl( ::rtl::OUString( "OnVisAreaChanged" ));
}
}
}
@@ -1709,7 +1709,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::hasEntry()
if ( m_nObjectState == -1 )
{
// the object is still not loaded
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1754,7 +1754,7 @@ void SAL_CALL OleEmbeddedObject::storeOwn()
if ( m_nObjectState == -1 )
{
// the object is still not loaded
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1780,7 +1780,7 @@ void SAL_CALL OleEmbeddedObject::storeOwn()
if ( !m_xObjectStream.is() )
throw io::IOException(); //TODO: access denied
- SetStreamMediaType_Impl( m_xObjectStream, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.oleobject" ) ));
+ SetStreamMediaType_Impl( m_xObjectStream, ::rtl::OUString( "application/vnd.sun.star.oleobject" ));
uno::Reference< io::XOutputStream > xOutStream = m_xObjectStream->getOutputStream();
if ( !xOutStream.is() )
throw io::IOException(); //TODO: access denied
@@ -1834,12 +1834,12 @@ void SAL_CALL OleEmbeddedObject::storeOwn()
aGuard.clear();
- MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveDone" ) ));
+ MakeEventListenerNotification_Impl( ::rtl::OUString( "OnSaveDone" ));
// the object can be changed only on Windows
// the notification should be done only if the object is not in loaded state
if ( m_pOleComponent && m_nUpdateMode == embed::EmbedUpdateModes::ALWAYS_UPDATE && !bStoreLoaded )
- MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ));
+ MakeEventListenerNotification_Impl( ::rtl::OUString( "OnVisAreaChanged" ));
}
//------------------------------------------------------
@@ -1863,7 +1863,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::isReadonly()
if ( m_nObjectState == -1 )
{
// the object is still not loaded
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1904,7 +1904,7 @@ void SAL_CALL OleEmbeddedObject::reload(
if ( m_nObjectState == -1 )
{
// the object is still not loaded
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1943,12 +1943,12 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag
throw lang::DisposedException(); // TODO
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
@@ -1957,7 +1957,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag
{
// it must be a linked initialized object
throw embed::WrongStateException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not a valid linked object!\n" )),
+ ::rtl::OUString( "The object is not a valid linked object!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -2086,7 +2086,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::isLink()
if ( !m_bIsLink )
throw embed::WrongStateException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not a link object!\n" )),
+ ::rtl::OUString( "The object is not a link object!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
// TODO: probably the link URL can be retrieved from OLE
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index c517a7445248..1628a36c853d 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -55,7 +55,7 @@ embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFo
// it's a bitmap
aVisualRepr.Flavor = datatransfer::DataFlavor(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bitmap" )),
+ ::rtl::OUString( "Bitmap" ),
::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
}
else
@@ -63,7 +63,7 @@ embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFo
// it's a metafile
aVisualRepr.Flavor = datatransfer::DataFlavor(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Windows Metafile" )),
+ ::rtl::OUString( "Windows Metafile" ),
::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
}
@@ -100,11 +100,11 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not loaded!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
#ifdef WNT
@@ -180,11 +180,11 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not loaded!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
awt::Size aResult;
@@ -218,7 +218,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
catch( const uno::Exception& )
{
throw embed::NoVisualAreaSizeException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No size available!\n" ) ),
+ ::rtl::OUString( "No size available!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
}
@@ -261,7 +261,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
if ( !bSuccess )
throw embed::NoVisualAreaSizeException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No size available!\n" ) ),
+ ::rtl::OUString( "No size available!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
aGuard.reset();
@@ -280,7 +280,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
catch ( const uno::Exception& )
{
throw embed::NoVisualAreaSizeException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No size available!\n" ) ),
+ ::rtl::OUString( "No size available!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
}
@@ -296,7 +296,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
else
{
throw embed::NoVisualAreaSizeException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No size available!\n" ) ),
+ ::rtl::OUString( "No size available!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
}
@@ -328,13 +328,13 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
// TODO: if the object has cached representation then it should be returned
// TODO: if the object has no cached representation and is in loaded state it should switch itself to the running state
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not loaded!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
embed::VisualRepresentation aVisualRepr;
@@ -362,7 +362,7 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres
datatransfer::DataFlavor aDataFlavor(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Windows Metafile" )),
+ ::rtl::OUString( "Windows Metafile" ),
::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
aVisualRepr.Data = m_pOleComponent->getTransferData( aDataFlavor );
@@ -394,7 +394,7 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres
if ( !m_xCachedVisualRepresentation.is() )
{
// no representation can be retrieved
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -421,11 +421,11 @@ sal_Int32 SAL_CALL OleEmbeddedObject::getMapUnit( sal_Int64 nAspect )
OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
if ( nAspect == embed::Aspects::MSOLE_ICON )
// no representation can be retrieved
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not loaded!\n" )),
+ throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
return embed::EmbedMapUnits::ONE_100TH_MM;
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 8b4dbf8ca58f..1f5fb367b2fb 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -120,28 +120,28 @@ sal_Bool OwnView_Impl::CreateModelFromURL( const ::rtl::OUString& aFileURL )
uno::Sequence< beans::PropertyValue > aArgs( m_aFilterName.isEmpty() ? 4 : 5 );
- aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" ));
+ aArgs[0].Name = ::rtl::OUString( "URL" );
aArgs[0].Value <<= aFileURL;
- aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ReadOnly" ));
+ aArgs[1].Name = ::rtl::OUString( "ReadOnly" );
aArgs[1].Value <<= sal_True;
- aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
+ aArgs[2].Name = ::rtl::OUString( "InteractionHandler" );
aArgs[2].Value <<= uno::Reference< task::XInteractionHandler >(
static_cast< ::cppu::OWeakObject* >( new DummyHandler_Impl() ), uno::UNO_QUERY );
- aArgs[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DontEdit" ));
+ aArgs[3].Name = ::rtl::OUString( "DontEdit" );
aArgs[3].Value <<= sal_True;
if ( !m_aFilterName.isEmpty() )
{
- aArgs[4].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
+ aArgs[4].Name = ::rtl::OUString( "FilterName" );
aArgs[4].Value <<= m_aFilterName;
}
uno::Reference< frame::XModel > xModel( xDocumentLoader->loadComponentFromURL(
aFileURL,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_blank" )),
+ ::rtl::OUString( "_blank" ),
0,
aArgs ),
uno::UNO_QUERY );
@@ -202,7 +202,7 @@ sal_Bool OwnView_Impl::CreateModel( sal_Bool bUseNative )
throw uno::RuntimeException();
uno::Reference< document::XTypeDetection > xTypeDetection(
- xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ) )),
+ xFactory->createInstance( ::rtl::OUString( "com.sun.star.document.TypeDetection" )),
uno::UNO_QUERY_THROW );
::rtl::OUString aTypeName;
@@ -210,18 +210,18 @@ sal_Bool OwnView_Impl::CreateModel( sal_Bool bUseNative )
if ( !aNameWithExtention.isEmpty() )
{
::rtl::OUString aURLToAnalyze =
- ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "file:///" ) ) + aNameWithExtention );
+ ( ::rtl::OUString( "file:///" ) + aNameWithExtention );
aTypeName = xTypeDetection->queryTypeByURL( aURLToAnalyze );
}
uno::Sequence< beans::PropertyValue > aArgs( aTypeName.isEmpty() ? 2 : 3 );
- aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
- aArgs[0].Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:stream" ) );
- aArgs[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InputStream" ) );
+ aArgs[0].Name = ::rtl::OUString( "URL" );
+ aArgs[0].Value <<= ::rtl::OUString( "private:stream" );
+ aArgs[1].Name = ::rtl::OUString( "InputStream" );
aArgs[1].Value <<= xInputStream;
if ( !aTypeName.isEmpty() )
{
- aArgs[2].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TypeName" ) );
+ aArgs[2].Name = ::rtl::OUString( "TypeName" );
aArgs[2].Value <<= aTypeName;
}
@@ -273,8 +273,8 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io
throw uno::RuntimeException();
try {
- xNativeTempFile->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RemoveFile" )), uno::makeAny( sal_False ) );
- uno::Any aUrl = xNativeTempFile->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Uri" ) ));
+ xNativeTempFile->setPropertyValue( ::rtl::OUString( "RemoveFile" ), uno::makeAny( sal_False ) );
+ uno::Any aUrl = xNativeTempFile->getPropertyValue( ::rtl::OUString( "Uri" ));
aUrl >>= aNativeTempURL;
}
catch ( uno::Exception& )
@@ -421,11 +421,11 @@ void OwnView_Impl::CreateNative()
aArgs[0] <<= xInStream;
uno::Reference< container::XNameAccess > xNameAccess(
m_xFactory->createInstanceWithArguments(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )),
+ ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ),
aArgs ),
uno::UNO_QUERY_THROW );
- ::rtl::OUString aSubStreamName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "\1Ole10Native" ));
+ ::rtl::OUString aSubStreamName = ::rtl::OUString( "\1Ole10Native" );
uno::Reference< embed::XClassifiedObject > xStor( xNameAccess, uno::UNO_QUERY_THROW );
uno::Sequence< sal_Int8 > aStorClassID = xStor->getClassID();
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
index 3ec9206e82ac..ea7947a58a49 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -108,15 +108,15 @@ uno::Sequence< sal_Int8 > GetRelatedInternalID_Impl( const uno::Sequence< sal_In
uno::Sequence< ::rtl::OUString > SAL_CALL MSOLEDialogObjectCreator::impl_staticGetSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > aRet(2);
- aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.MSOLEObjectSystemCreator"));
- aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.MSOLEObjectSystemCreator"));
+ aRet[0] = ::rtl::OUString("com.sun.star.embed.MSOLEObjectSystemCreator");
+ aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.MSOLEObjectSystemCreator");
return aRet;
}
//-------------------------------------------------------------------------
::rtl::OUString SAL_CALL MSOLEDialogObjectCreator::impl_staticGetImplementationName()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.MSOLEObjectSystemCreator"));
+ return ::rtl::OUString("com.sun.star.comp.embed.MSOLEObjectSystemCreator");
}
//-------------------------------------------------------------------------
@@ -142,12 +142,12 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
#ifdef WNT
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( !sEntName.getLength() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
@@ -170,11 +170,11 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
::osl::Module aOleDlgLib;
- if( !aOleDlgLib.load( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "oledlg" ) ) ))
+ if( !aOleDlgLib.load( ::rtl::OUString( "oledlg" ) ))
throw uno::RuntimeException();
OleUIInsertObjectA_Type * pInsertFct = (OleUIInsertObjectA_Type *)
- aOleDlgLib.getSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OleUIInsertObjectA" ) ));
+ aOleDlgLib.getSymbol( ::rtl::OUString( "OleUIInsertObjectA" ));
if( !pInsertFct )
throw uno::RuntimeException();
@@ -214,7 +214,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
throw uno::RuntimeException();
uno::Sequence< beans::PropertyValue > aMediaDescr( 1 );
- aMediaDescr[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" ));
+ aMediaDescr[0].Name = ::rtl::OUString( "URL" );
aMediaDescr[0].Value <<= aFileURL;
// TODO: use config helper for type detection
@@ -253,13 +253,13 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
{
datatransfer::DataFlavor aFlavor(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Image WMF" )),
+ ::rtl::OUString( "Image WMF" ),
getCppuType( ( const uno::Sequence< sal_Int8 >* ) 0 ) );
aObjectInfo.Options.realloc( 2 );
- aObjectInfo.Options[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Icon" ));
+ aObjectInfo.Options[0].Name = ::rtl::OUString( "Icon" );
aObjectInfo.Options[0].Value <<= aMetafile;
- aObjectInfo.Options[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IconFormat" ));
+ aObjectInfo.Options[1].Name = ::rtl::OUString( "IconFormat" );
aObjectInfo.Options[1].Value <<= aFlavor;
}
@@ -294,12 +294,12 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF
#ifdef WNT
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( !sEntryName.getLength() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx
index 2d5b35a0863f..558092573d71 100644
--- a/embeddedobj/source/msole/xolefactory.cxx
+++ b/embeddedobj/source/msole/xolefactory.cxx
@@ -39,15 +39,15 @@ using namespace ::com::sun::star;
uno::Sequence< ::rtl::OUString > SAL_CALL OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > aRet(2);
- aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OLEEmbeddedObjectFactory"));
- aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"));
+ aRet[0] = ::rtl::OUString("com.sun.star.embed.OLEEmbeddedObjectFactory");
+ aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.OLEEmbeddedObjectFactory");
return aRet;
}
//-------------------------------------------------------------------------
::rtl::OUString SAL_CALL OleEmbeddedObjectFactory::impl_staticGetImplementationName()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"));
+ return ::rtl::OUString("com.sun.star.comp.embed.OLEEmbeddedObjectFactory");
}
//-------------------------------------------------------------------------
@@ -72,12 +72,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceInitFromEntry" );
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
@@ -144,12 +144,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor" );
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
@@ -186,12 +186,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceInitNew" );
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
3 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
4 );
@@ -227,13 +227,13 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceLink" );
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >(
static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >(
static_cast< ::cppu::OWeakObject* >(this) ),
2 );
@@ -274,12 +274,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
// the initialization is completelly controlled by user
if ( !xStorage.is() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
1 );
if ( sEntName.isEmpty() )
- throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
+ throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
2 );
diff --git a/embeddedobj/test/MainThreadExecutor/register.cxx b/embeddedobj/test/MainThreadExecutor/register.cxx
index ab21864711c6..d1d55a9ed520 100644
--- a/embeddedobj/test/MainThreadExecutor/register.cxx
+++ b/embeddedobj/test/MainThreadExecutor/register.cxx
@@ -62,9 +62,9 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK
uno::Reference< registry::XRegistryKey > xNewKey;
- xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+ xNewKey = xKey->createKey( ::rtl::OUString("/") +
UNOMainThreadExecutor::impl_staticGetImplementationName() +
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
+ ::rtl::OUString( "/UNO/SERVICES") );
uno::Sequence< ::rtl::OUString > &rServices = UNOMainThreadExecutor::impl_staticGetSupportedServiceNames();
for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )
diff --git a/embeddedobj/test/mtexecutor/mteregister.cxx b/embeddedobj/test/mtexecutor/mteregister.cxx
index 33f98dc272d7..7ef94d2cf6df 100644
--- a/embeddedobj/test/mtexecutor/mteregister.cxx
+++ b/embeddedobj/test/mtexecutor/mteregister.cxx
@@ -76,17 +76,17 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK
uno::Sequence< ::rtl::OUString > rServices;
sal_Int32 ind = 0;
- xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+ xNewKey = xKey->createKey( ::rtl::OUString("/") +
MainThreadExecutor::impl_staticGetImplementationName() +
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
+ ::rtl::OUString( "/UNO/SERVICES") );
rServices = MainThreadExecutor::impl_staticGetSupportedServiceNames();
for( ind = 0; ind < rServices.getLength(); ind++ )
xNewKey->createKey( rServices.getConstArray()[ind] );
- xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+ xNewKey = xKey->createKey( ::rtl::OUString("/") +
VCLBitmapCreator::impl_staticGetImplementationName() +
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
+ ::rtl::OUString( "/UNO/SERVICES") );
rServices = VCLBitmapCreator::impl_staticGetSupportedServiceNames();
for( ind = 0; ind < rServices.getLength(); ind++ )
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index acd4d57ec440..d78d01702e17 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -120,24 +120,21 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode )
aAny <<= uno::Reference<uno::XInterface>(
m_xDocument, uno::UNO_QUERY);
aSeq[0] = beans::PropertyValue(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Model")),
+ rtl::OUString("Model"),
-1,
aAny,
beans::PropertyState_DIRECT_VALUE);
aAny <<= sal_False;
aSeq[1] = beans::PropertyValue(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("ReadOnly")),
+ rtl::OUString("ReadOnly"),
-1,
aAny,
beans::PropertyState_DIRECT_VALUE);
aAny <<= (sal_Bool) sal_True;
aSeq[2] = beans::PropertyValue(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("NoAutoSave")),
+ rtl::OUString("NoAutoSave"),
-1,
aAny,
beans::PropertyState_DIRECT_VALUE);
@@ -147,8 +144,7 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode )
aSeq.realloc( ++nLen );
aAny <<= (sal_Int16) 3;
aSeq[nLen-1] = beans::PropertyValue(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("PluginMode")),
+ rtl::OUString("PluginMode"),
-1,
aAny,
beans::PropertyState_DIRECT_VALUE);
@@ -157,24 +153,21 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode )
aSeq.realloc( nLen+=2 );
aAny <<= xHandler;
aSeq[nLen-2] = beans::PropertyValue(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")),
+ rtl::OUString("InteractionHandler"),
-1,
aAny,
beans::PropertyState_DIRECT_VALUE);
aAny <<= m_nMacroExecMode;
aSeq[nLen-1] = beans::PropertyValue(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode")),
+ rtl::OUString("MacroExecutionMode"),
-1,
aAny,
beans::PropertyState_DIRECT_VALUE);
xComponentLoader->loadComponentFromURL(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("private:object")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")),
+ rtl::OUString("private:object"),
+ rtl::OUString("_self"),
0,
aSeq);
@@ -375,7 +368,7 @@ HRESULT DocumentHolder::InPlaceActivate(
if( xPS.is() )
{
aAny = xPS->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")));
+ rtl::OUString("LayoutManager"));
aAny >>= m_xLayoutManager;
}
@@ -392,8 +385,8 @@ HRESULT DocumentHolder::InPlaceActivate(
if(m_xLayoutManager.is()) {
uno::Reference< ::com::sun::star::ui::XUIElement > xUIEl(
m_xLayoutManager->getElement(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "private:resource/menubar/menubar"))));
+ rtl::OUString(
+ "private:resource/menubar/menubar")));
OSL_ENSURE(xUIEl.is(),"no menubar");
uno::Reference<awt::XSystemDependentMenuPeer> xSDMP(
xUIEl->getRealInterface(),
@@ -405,8 +398,7 @@ HRESULT DocumentHolder::InPlaceActivate(
m_nMenuHandle = HMENU(tmp);
m_xLayoutManager->hideElement(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "private:resource/menubar/menubar" )));
+ "private:resource/menubar/menubar" ));
}
}
@@ -744,7 +736,7 @@ void DocumentHolder::SetDocument( const uno::Reference< frame::XModel >& xDoc, s
{
// set the document mode to embedded
uno::Sequence< beans::PropertyValue > aSeq(1);
- aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SetEmbedded" ));
+ aSeq[0].Name = ::rtl::OUString( "SetEmbedded" );
aSeq[0].Value <<= sal_True;
m_xDocument->attachResource(::rtl::OUString(),aSeq);
}
@@ -805,7 +797,7 @@ uno::Reference< frame::XFrame > DocumentHolder::DocumentFrame()
// this is so only for outplace activation
if( xFrame.is() )
m_xFrame = xFrame->findFrame(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")),0);
+ rtl::OUString("_blank"),0);
uno::Reference< util::XCloseBroadcaster > xBroadcaster(
m_xFrame, uno::UNO_QUERY );
@@ -881,11 +873,11 @@ void DocumentHolder::show()
if ( xProps.is() )
{
uno::Reference< frame::XLayoutManager > xLayoutManager;
- xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) ) >>= xLayoutManager;
+ xProps->getPropertyValue( rtl::OUString( "LayoutManager" ) ) >>= xLayoutManager;
uno::Reference< beans::XPropertySet > xLMProps( xLayoutManager, uno::UNO_QUERY );
if ( xLMProps.is() )
{
- xLMProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MenuBarCloser" )),
+ xLMProps->setPropertyValue( ::rtl::OUString( "MenuBarCloser" ),
uno::makeAny( uno::Reference< frame::XStatusListener >() ) );
}
}
@@ -981,8 +973,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName)
for(sal_Int32 j = 0; j < aSeq.getLength(); ++j)
{
if(aSeq[j].Name ==
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("FilterName")))
+ rtl::OUString("FilterName"))
{
aSeq[j].Value >>= aFilterName;
break;
@@ -994,8 +985,8 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName)
{
uno::Reference<container::XNameAccess> xNameAccess(
m_xFactory->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.document.FilterFactory"))),
+ rtl::OUString(
+ "com.sun.star.document.FilterFactory")),
uno::UNO_QUERY);
try {
if(xNameAccess.is() &&
@@ -1003,8 +994,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName)
{
for(sal_Int32 j = 0; j < aSeq.getLength(); ++j)
if(aSeq[j].Name ==
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("UIName")))
+ rtl::OUString("UIName"))
{
aSeq[j].Value >>= m_aFilterName;
break;
@@ -1031,7 +1021,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName)
aAny <<= aTotalName;
try {
xPropSet->setPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
+ rtl::OUString("Title"),
aAny);
}
catch( const uno::Exception& ) {
diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx
index c62f6eae8cbe..d76d3aa3bc65 100644
--- a/embedserv/source/embed/ed_idataobj.cxx
+++ b/embedserv/source/embed/ed_idataobj.cxx
@@ -49,13 +49,13 @@ sal_uInt64 EmbedDocument_Impl::getMetaFileHandle_Impl( sal_Bool isEnhMeta )
{
aFlavor.MimeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ) );
- aFlavor.HumanPresentableName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enhanced Windows MetaFile" ) );
+ aFlavor.HumanPresentableName = ::rtl::OUString( "Enhanced Windows MetaFile" );
}
else
{
aFlavor.MimeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ) );
- aFlavor.HumanPresentableName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Windows GDIMetaFile" ) );
+ aFlavor.HumanPresentableName = ::rtl::OUString( "Windows GDIMetaFile" );
}
aFlavor.DataType = getCppuType( (const sal_uInt64*) 0 );
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index 3ff0ab75b390..aad96c614439 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -206,19 +206,19 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Imp
uno::Sequence< beans::PropertyValue > aArgs( 3 );
sal_Int32 nInd = 0; // must not be bigger than the preset size
- aArgs[nInd].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "FilterName" ) );
+ aArgs[nInd].Name = ::rtl::OUString( "FilterName" );
aArgs[nInd++].Value <<= getFilterNameFromGUID_Impl( &m_guid );
if ( xStream.is() )
{
- aArgs[nInd].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "InputStream" ) );
+ aArgs[nInd].Name = ::rtl::OUString( "InputStream" );
aArgs[nInd++].Value <<= xStream;
- aArgs[nInd].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "URL" ) );
- aArgs[nInd++].Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "private:stream" ) );
+ aArgs[nInd].Name = ::rtl::OUString( "URL" );
+ aArgs[nInd++].Value <<= ::rtl::OUString( "private:stream" );
}
else
{
- aArgs[nInd].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "URL" ) );
+ aArgs[nInd].Name = ::rtl::OUString( "URL" );
rtl::OUString sDocUrl;
if ( pFilePath )
@@ -237,7 +237,7 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Imp
aArgs.realloc( nInd );
- // aArgs[].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ReadOnly" ) );
+ // aArgs[].Name = ::rtl::OUString( "ReadOnly" );
// aArgs[].Value <<= sal_False; //( ( nStreamMode & ( STGM_READWRITE | STGM_WRITE ) ) ? sal_True : sal_False );
return aArgs;
@@ -247,12 +247,12 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForStoring_Imp
{
uno::Sequence< beans::PropertyValue > aArgs( xStream.is() ? 2 : 1 );
- aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "FilterName" ) );
+ aArgs[0].Name = ::rtl::OUString( "FilterName" );
aArgs[0].Value <<= getFilterNameFromGUID_Impl( &m_guid );
if ( xStream.is() )
{
- aArgs[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "OutputStream" ) );
+ aArgs[1].Name = ::rtl::OUString( "OutputStream" );
aArgs[1].Value <<= xStream;
}
@@ -631,7 +631,7 @@ STDMETHODIMP EmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoad )
{
try
{
- xStorable->storeToURL( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "private:stream" ) ),
+ xStorable->storeToURL( ::rtl::OUString( "private:stream" ),
fillArgsForStoring_Impl( xTempOut ) );
hr = copyXTempOutToIStream( xTempOut, pTargetStream );
if ( SUCCEEDED( hr ) )
diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx
index b7520cd51552..6827d650db4e 100644
--- a/embedserv/source/embed/guid.cxx
+++ b/embedserv/source/embed/guid.cxx
@@ -27,34 +27,34 @@
::rtl::OUString getStorageTypeFromGUID_Impl( GUID* guid )
{
if ( *guid == OID_WriterTextServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarWriterDocument.6" ) );
+ return ::rtl::OUString( "soffice.StarWriterDocument.6" );
if ( *guid == OID_WriterOASISTextServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "LibreOffice.WriterDocument.1" ) );
+ return ::rtl::OUString( "LibreOffice.WriterDocument.1" );
if ( *guid == OID_CalcServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarCalcDocument.6" ) );
+ return ::rtl::OUString( "soffice.StarCalcDocument.6" );
if ( *guid == OID_CalcOASISServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "LibreOffice.CalcDocument.1" ) );
+ return ::rtl::OUString( "LibreOffice.CalcDocument.1" );
if ( *guid == OID_DrawingServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarDrawDocument.6" ) );
+ return ::rtl::OUString( "soffice.StarDrawDocument.6" );
if ( *guid == OID_DrawingOASISServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "LibreOffice.DrawDocument.1" ) );
+ return ::rtl::OUString( "LibreOffice.DrawDocument.1" );
if ( *guid == OID_PresentationServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarImpressDocument.6" ) );
+ return ::rtl::OUString( "soffice.StarImpressDocument.6" );
if ( *guid == OID_PresentationOASISServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "LibreOffice.ImpressDocument.1" ) );
+ return ::rtl::OUString( "LibreOffice.ImpressDocument.1" );
if ( *guid == OID_MathServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarMathDocument.6" ) );
+ return ::rtl::OUString( "soffice.StarMathDocument.6" );
if ( *guid == OID_MathOASISServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "LibreOffice.MathDocument.1" ) );
+ return ::rtl::OUString( "LibreOffice.MathDocument.1" );
return ::rtl::OUString();
}
@@ -62,34 +62,34 @@
::rtl::OUString getServiceNameFromGUID_Impl( GUID* guid )
{
if ( *guid == OID_WriterTextServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.TextDocument" ) );
+ return ::rtl::OUString( "com.sun.star.comp.Writer.TextDocument" );
if ( *guid == OID_WriterOASISTextServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.TextDocument" ) );
+ return ::rtl::OUString( "com.sun.star.comp.Writer.TextDocument" );
if ( *guid == OID_CalcServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Calc.SpreadsheetDocument" ) );
+ return ::rtl::OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" );
if ( *guid == OID_CalcOASISServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Calc.SpreadsheetDocument" ) );
+ return ::rtl::OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" );
if ( *guid == OID_DrawingServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.DrawingDocument" ) );
+ return ::rtl::OUString( "com.sun.star.comp.Draw.DrawingDocument" );
if ( *guid == OID_DrawingOASISServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.DrawingDocument" ) );
+ return ::rtl::OUString( "com.sun.star.comp.Draw.DrawingDocument" );
if ( *guid == OID_PresentationServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.PresentationDocument" ) );
+ return ::rtl::OUString( "com.sun.star.comp.Draw.PresentationDocument" );
if ( *guid == OID_PresentationOASISServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.PresentationDocument" ) );
+ return ::rtl::OUString( "com.sun.star.comp.Draw.PresentationDocument" );
if ( *guid == OID_MathServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Math.FormulaDocument" ) );
+ return ::rtl::OUString( "com.sun.star.comp.Math.FormulaDocument" );
if ( *guid == OID_MathOASISServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Math.FormulaDocument" ) );
+ return ::rtl::OUString( "com.sun.star.comp.Math.FormulaDocument" );
return ::rtl::OUString();
}
@@ -100,31 +100,31 @@
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Writer)" ) );
if ( *guid == OID_WriterOASISTextServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer8" ) );
+ return ::rtl::OUString( "writer8" );
if ( *guid == OID_CalcServer )
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Calc)" ) );
if ( *guid == OID_CalcOASISServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "calc8" ) );
+ return ::rtl::OUString( "calc8" );
if ( *guid == OID_DrawingServer )
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Draw)" ) );
if ( *guid == OID_DrawingOASISServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw8" ) );
+ return ::rtl::OUString( "draw8" );
if ( *guid == OID_PresentationServer )
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Impress)" ) );
if ( *guid == OID_PresentationOASISServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "impress8" ) );
+ return ::rtl::OUString( "impress8" );
if ( *guid == OID_MathServer )
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Math)" ) );
if ( *guid == OID_MathOASISServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "math8" ) );
+ return ::rtl::OUString( "math8" );
return ::rtl::OUString();
}
@@ -132,34 +132,34 @@
::rtl::OUString getTestFileURLFromGUID_Impl( GUID* guid )
{
if ( *guid == OID_WriterTextServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxw" ) );
+ return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxw" );
if ( *guid == OID_WriterOASISTextServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.odt" ) );
+ return ::rtl::OUString( "file:///d:/OLE_TEST/test.odt" );
if ( *guid == OID_CalcServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxc" ) );
+ return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxc" );
if ( *guid == OID_CalcOASISServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.ods" ) );
+ return ::rtl::OUString( "file:///d:/OLE_TEST/test.ods" );
if ( *guid == OID_DrawingServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxd" ) );
+ return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxd" );
if ( *guid == OID_DrawingOASISServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.odg" ) );
+ return ::rtl::OUString( "file:///d:/OLE_TEST/test.odg" );
if ( *guid == OID_PresentationServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxi" ) );
+ return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxi" );
if ( *guid == OID_PresentationOASISServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.odp" ) );
+ return ::rtl::OUString( "file:///d:/OLE_TEST/test.odp" );
if ( *guid == OID_MathServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxm" ) );
+ return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxm" );
if ( *guid == OID_MathOASISServer )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.odf" ) );
+ return ::rtl::OUString( "file:///d:/OLE_TEST/test.odf" );
return ::rtl::OUString();
}
diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx
index e048eecf1446..e617ca1f3eb9 100644
--- a/embedserv/source/embed/intercept.cxx
+++ b/embedserv/source/embed/intercept.cxx
@@ -127,18 +127,12 @@ Interceptor::Interceptor(
m_pDisposeEventListeners(0),
m_bLink( bLink )
{
- m_aInterceptedURL[0] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));
- m_aInterceptedURL[1] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAll"));
- m_aInterceptedURL[2] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc"));
- m_aInterceptedURL[3] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin"));
- m_aInterceptedURL[4] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame"));
- m_aInterceptedURL[5] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs"));
+ m_aInterceptedURL[0] = rtl::OUString(".uno:Save");
+ m_aInterceptedURL[1] = rtl::OUString(".uno:SaveAll");
+ m_aInterceptedURL[2] = rtl::OUString(".uno:CloseDoc");
+ m_aInterceptedURL[3] = rtl::OUString(".uno:CloseWin");
+ m_aInterceptedURL[4] = rtl::OUString(".uno:CloseFrame");
+ m_aInterceptedURL[5] = rtl::OUString(".uno:SaveAs");
}
@@ -215,12 +209,12 @@ Interceptor::dispatch(
if ( nInd == aNewArgs.getLength() )
{
aNewArgs.realloc( nInd + 1 );
- aNewArgs[nInd].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SaveTo" ));
+ aNewArgs[nInd].Name = ::rtl::OUString( "SaveTo" );
aNewArgs[nInd].Value <<= sal_True;
}
uno::Reference< frame::XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch(
- URL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_self" )), 0 );
+ URL, ::rtl::OUString( "_self" ), 0 );
if ( xDispatch.is() )
xDispatch->dispatch( URL, aNewArgs );
}
@@ -266,8 +260,7 @@ void Interceptor::generateFeatureStateEvent()
{
aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0];
- aStateEvent.FeatureDescriptor = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Update"));
+ aStateEvent.FeatureDescriptor = rtl::OUString("Update");
aStateEvent.State <<= (rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("($1) ")) +
aTitle);
@@ -276,16 +269,14 @@ void Interceptor::generateFeatureStateEvent()
else if ( i == 5 )
{
aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5];
- aStateEvent.FeatureDescriptor = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("SaveCopyTo"));
+ aStateEvent.FeatureDescriptor = rtl::OUString("SaveCopyTo");
aStateEvent.State <<= (rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("($3)")));
}
else
{
aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i];
- aStateEvent.FeatureDescriptor = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Close and Return"));
+ aStateEvent.FeatureDescriptor = rtl::OUString("Close and Return");
aStateEvent.State <<= (rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("($2) ")) +
aTitle);
@@ -334,8 +325,7 @@ Interceptor::addStatusListener(
frame::FeatureStateEvent aStateEvent;
aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0];
- aStateEvent.FeatureDescriptor = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Update"));
+ aStateEvent.FeatureDescriptor = rtl::OUString("Update");
aStateEvent.IsEnabled = sal_True;
aStateEvent.Requery = sal_False;
aStateEvent.State <<= (rtl::OUString(
@@ -375,8 +365,7 @@ Interceptor::addStatusListener(
frame::FeatureStateEvent aStateEvent;
aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i];
- aStateEvent.FeatureDescriptor = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Close and Return"));
+ aStateEvent.FeatureDescriptor = rtl::OUString("Close and Return");
aStateEvent.IsEnabled = sal_True;
aStateEvent.Requery = sal_False;
aStateEvent.State <<= (rtl::OUString(
@@ -400,8 +389,7 @@ Interceptor::addStatusListener(
{ // SaveAs
frame::FeatureStateEvent aStateEvent;
aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5];
- aStateEvent.FeatureDescriptor = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("SaveCopyTo"));
+ aStateEvent.FeatureDescriptor = rtl::OUString("SaveCopyTo");
aStateEvent.IsEnabled = sal_True;
aStateEvent.Requery = sal_False;
aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($3)")));
diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx
index 1ce0a67b5350..1a58ad5f8b94 100644
--- a/embedserv/source/embed/register.cxx
+++ b/embedserv/source/embed/register.cxx
@@ -45,14 +45,14 @@ throw (uno::Exception)
::rtl::OUString SAL_CALL EmbedServer_getImplementationName() throw()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.EmbedServer") );
+ return ::rtl::OUString("com.sun.star.comp.ole.EmbedServer");
}
uno::Sequence< ::rtl::OUString > SAL_CALL EmbedServer_getSupportedServiceNames() throw()
{
uno::Sequence< ::rtl::OUString > aServiceNames( 1 );
- aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.OleEmbeddedServerRegistration" ) );
+ aServiceNames[0] = ::rtl::OUString( "com.sun.star.document.OleEmbeddedServerRegistration" );
return aServiceNames;
}
diff --git a/extensions/qa/update/test_update.cxx b/extensions/qa/update/test_update.cxx
index 7d5195075ba0..5459bc5a3b5c 100644
--- a/extensions/qa/update/test_update.cxx
+++ b/extensions/qa/update/test_update.cxx
@@ -84,7 +84,7 @@ protected:
deployment::UpdateInformationEntry aEntry;
if ( aUpdateInfoEnumeration->nextElement() >>= aEntry )
{
- CPPUNIT_ASSERT( aEntry.UpdateDocument->getNodeName() == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "description" ) ) );
+ CPPUNIT_ASSERT( aEntry.UpdateDocument->getNodeName() == rtl::OUString( "description" ) );
uno::Reference< dom::XNodeList> xChildNodes = aEntry.UpdateDocument->getChildNodes();
CPPUNIT_ASSERT( xChildNodes.is() );
@@ -104,8 +104,8 @@ protected:
//uno::Reference< dom::XElement > xChildId( xChildNodes->item( 0 ), uno::UNO_QUERY );
//CPPUNIT_ASSERT( xChildId.is() );
- //CPPUNIT_ASSERT( xChildId->getNodeValue() == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LibreOffice_3.4" ) ) );
- //fprintf( stderr, "Attribute == %s\n", rtl::OUStringToOString( aEntry.UpdateDocument->getAttribute( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test" ) ) ), RTL_TEXTENCODING_UTF8 ).getStr() );
+ //CPPUNIT_ASSERT( xChildId->getNodeValue() == rtl::OUString( "LibreOffice_3.4" ) );
+ //fprintf( stderr, "Attribute == %s\n", rtl::OUStringToOString( aEntry.UpdateDocument->getAttribute( rtl::OUString( "test" ) ), RTL_TEXTENCODING_UTF8 ).getStr() );
//fprintf( stderr, "Value == %s\n", rtl::OUStringToOString( xChildId->getNodeValue(), RTL_TEXTENCODING_UTF8 ).getStr() );
// TODO check more deeply
}
@@ -120,14 +120,14 @@ protected:
rtl::Reference< UpdateCheck > aController( UpdateCheck::get() );
if ( checkForUpdates( aInfo, m_xContext, aController->getInteractionHandler(), m_xProvider,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Linux" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "x86" ) ),
+ rtl::OUString( "Linux" ),
+ rtl::OUString( "x86" ),
m_aRepositoryList,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "111111-222222-333333-444444" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InstallSetID" ) ) ) )
+ rtl::OUString( "111111-222222-333333-444444" ),
+ rtl::OUString( "InstallSetID" ) ) )
{
CPPUNIT_ASSERT( aInfo.Sources.size() == 1 );
- CPPUNIT_ASSERT( aInfo.Sources[0].URL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "http://www.libreoffice.org/download/" ) ) );
+ CPPUNIT_ASSERT( aInfo.Sources[0].URL == rtl::OUString( "http://www.libreoffice.org/download/" ) );
}
else
CPPUNIT_FAIL( "Calling checkForUpdates() failed." );
@@ -140,11 +140,11 @@ protected:
rtl::Reference< UpdateCheck > aController( UpdateCheck::get() );
if ( checkForUpdates( aInfo, m_xContext, aController->getInteractionHandler(), m_xProvider,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Linux" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "x86" ) ),
+ rtl::OUString( "Linux" ),
+ rtl::OUString( "x86" ),
m_aRepositoryList,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "123456-abcdef-1a2b3c-4d5e6f" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InstallSetID" ) ) ) )
+ rtl::OUString( "123456-abcdef-1a2b3c-4d5e6f" ),
+ rtl::OUString( "InstallSetID" ) ) )
{
CPPUNIT_ASSERT( aInfo.Sources.empty() );
}
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index 003f70bb4736..87bf790b5a80 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -67,8 +67,8 @@ namespace abp
try
{
// the service name of the administration dialog
- const static ::rtl::OUString s_sAdministrationServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatasourceAdministrationDialog"));
- const static ::rtl::OUString s_sDataSourceTypeChangeDialog = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DataSourceTypeChangeDialog"));
+ const static ::rtl::OUString s_sAdministrationServiceName = ::rtl::OUString("com.sun.star.sdb.DatasourceAdministrationDialog");
+ const static ::rtl::OUString s_sDataSourceTypeChangeDialog = ::rtl::OUString("com.sun.star.sdb.DataSourceTypeChangeDialog");
// the parameters for the call
Sequence< Any > aArguments(3);
@@ -76,14 +76,14 @@ namespace abp
// the parent window
Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface(m_pMessageParent);
- *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE);
+ *pArguments++ <<= PropertyValue(::rtl::OUString("ParentWindow"), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE);
// the title of the dialog
String sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE));
- *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), -1, makeAny(::rtl::OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE);
+ *pArguments++ <<= PropertyValue(::rtl::OUString("Title"), -1, makeAny(::rtl::OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE);
// the name of the new data source
- *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InitialSelection")), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE);
+ *pArguments++ <<= PropertyValue(::rtl::OUString("InitialSelection"), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE);
// create the dialog
Reference< XExecutableDialog > xDialog;
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index ca82fb997aef..25d1d12d1b9d 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -125,7 +125,7 @@ namespace abp
if (xNewDataSource.is())
{
xNewDataSource->setPropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" )),
+ ::rtl::OUString( "URL" ),
makeAny( ::rtl::OUString::createFromAscii( _pInitialAsciiURL ) )
);
}
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index c872943400d6..d0af8438ccf2 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -104,7 +104,7 @@ namespace abp
#ifdef DBG_UTIL
sal_Bool bSuccess =
#endif
- xDialogProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FieldMapping" )) ) >>= aMapping;
+ xDialogProps->getPropertyValue( ::rtl::OUString( "FieldMapping" ) ) >>= aMapping;
DBG_ASSERT( bSuccess, "fieldmapping::invokeDialog: invalid property type for FieldMapping!" );
// and copy it into the map
@@ -170,7 +170,7 @@ namespace abp
// access the configuration information which the driver uses for determining it's column names
::rtl::OUString sDriverAliasesNodeName = lcl_getDriverSettingsNodeName();
- sDriverAliasesNodeName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/ColumnAliases" ));
+ sDriverAliasesNodeName += ::rtl::OUString( "/ColumnAliases" );
// create a config node for this
OConfigurationTreeRoot aDriverFieldAliasing = OConfigurationTreeRoot::createWithComponentContext(
@@ -230,7 +230,7 @@ namespace abp
OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext(
_rxContext, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE);
- OConfigurationNode aFields = aAddressBookSettings.openNode( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Fields" )) );
+ OConfigurationNode aFields = aAddressBookSettings.openNode( ::rtl::OUString( "Fields" ) );
// loop through all existent fields
Sequence< ::rtl::OUString > aExistentFields = aFields.getNodeNames();
@@ -307,9 +307,9 @@ namespace abp
OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext(
_rxContext, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE);
- aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceName" )), makeAny( _rDataSourceName ) );
- aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Command" )), makeAny( _rTableName ) );
- aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CommandType" )), makeAny( (sal_Int32)CommandType::TABLE ) );
+ aAddressBookSettings.setNodeValue( ::rtl::OUString( "DataSourceName" ), makeAny( _rDataSourceName ) );
+ aAddressBookSettings.setNodeValue( ::rtl::OUString( "Command" ), makeAny( _rTableName ) );
+ aAddressBookSettings.setNodeValue( ::rtl::OUString( "CommandType" ), makeAny( (sal_Int32)CommandType::TABLE ) );
// commit the changes done
aAddressBookSettings.commit();
@@ -326,7 +326,7 @@ namespace abp
_rxContext, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE);
// set the flag
- aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoPilotCompleted" )), makeAny( (sal_Bool)sal_True ) );
+ aAddressBookSettings.setNodeValue( ::rtl::OUString( "AutoPilotCompleted" ), makeAny( (sal_Bool)sal_True ) );
// commit the changes done
aAddressBookSettings.commit();
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index d57fef8eef09..34563504581b 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -100,7 +100,7 @@ namespace abp
try
{
// check whether Evolution is available
- Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution:local"))) );
+ Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString("sdbc:address:evolution:local")) );
if ( xDriver.is() )
bHaveEvolution = true;
}
@@ -111,7 +111,7 @@ namespace abp
// check whether KDE address book is available
try
{
- Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:kab"))) );
+ Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString("sdbc:address:kab")) );
if ( xDriver.is() )
bHaveKab = true;
}
@@ -122,7 +122,7 @@ namespace abp
try
{
// check whether Mac OS X address book is available
- Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:macab"))) );
+ Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString("sdbc:address:macab")) );
if ( xDriver.is() )
bHaveMacab = true;
}
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index 797bae2b9050..f6799253653a 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -47,7 +47,7 @@ namespace abp
OABSPilotUno::OABSPilotUno(const Reference< XMultiServiceFactory >& _rxORB)
:OGenericUnoDialog(_rxORB)
{
- registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName")), PROPERTY_ID_DATASOURCENAME, PropertyAttribute::READONLY ,
+ registerProperty( ::rtl::OUString("DataSourceName"), PROPERTY_ID_DATASOURCENAME, PropertyAttribute::READONLY ,
&m_sDataSourceName, ::getCppuType( &m_sDataSourceName ) );
}
@@ -110,7 +110,7 @@ namespace abp
//---------------------------------------------------------------------
::rtl::OUString OABSPilotUno::getImplementationName_Static() throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.abp.OAddressBookSourcePilot"));
+ return ::rtl::OUString("org.openoffice.comp.abp.OAddressBookSourcePilot");
}
//---------------------------------------------------------------------
@@ -123,7 +123,7 @@ namespace abp
::comphelper::StringSequence OABSPilotUno::getSupportedServiceNames_Static() throw(RuntimeException)
{
::comphelper::StringSequence aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.AddressBookSourcePilot"));
+ aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.ui.dialogs.AddressBookSourcePilot");
return aSupported;
}
@@ -179,7 +179,7 @@ namespace abp
// (or he can start it again by using wizard-menu!)
// So we should deregister it on our general job execution service by using right protocol parameters.
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lProtocol(1);
- lProtocol[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Deactivate"));
+ lProtocol[0].Name = ::rtl::OUString("Deactivate");
lProtocol[0].Value <<= sal_True;
return makeAny( lProtocol );
}
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 15a510e71bd6..4a9f607eaec2 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -318,7 +318,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl:
{
try
{
- Any a = xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
+ Any a = xPropSet->getPropertyValue( OUString( "LayoutManager" ));
a >>= xLayoutManager;
}
catch ( const uno::Exception& )
@@ -327,7 +327,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl:
}
if ( xLayoutManager.is() )
- xLayoutManager->createElement( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" )));
+ xLayoutManager->createElement( OUString( "private:resource/menubar/menubar" ));
}
BibDataManager* BibliographyLoader::GetDataManager()const
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 60450e199794..9891fe077fff 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -915,7 +915,7 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY);
if ( xFactory.is() )
- m_xParser.set( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ), UNO_QUERY );
+ m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY );
::rtl::OUString aString("SELECT * FROM ");
@@ -1075,7 +1075,7 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL)
aPropertySet->setPropertyValue("ActiveConnection", aVal);
Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY);
if ( xFactory.is() )
- m_xParser.set( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ), UNO_QUERY );
+ m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY );
if(xOldConnection.is())
xOldConnection->dispose();
@@ -1168,7 +1168,7 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable)
Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY);
if ( xFactory.is() )
- m_xParser.set( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ), UNO_QUERY );
+ m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY );
::rtl::OUString aString("SELECT * FROM ");
@@ -1409,7 +1409,7 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel(
xPropSet->setPropertyValue( FM_PROP_NAME,aFieldName);
xPropSet->setPropertyValue( FM_PROP_CONTROLSOURCE, makeAny( rName ) );
- xPropSet->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NativeWidgetLook" ) ), makeAny( (sal_Bool)sal_True ) );
+ xPropSet->setPropertyValue( ::rtl::OUString( "NativeWidgetLook" ), makeAny( (sal_Bool)sal_True ) );
Reference< XFormComponent > aFormComp(xModel,UNO_QUERY );
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 26925ebaea65..9dfd994a031b 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -204,7 +204,7 @@ BibFrameController_Impl::~BibFrameController_Impl()
::rtl::OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.Bibliography"));
+ return ::rtl::OUString("com.sun.star.comp.extensions.Bibliography");
}
sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException)
@@ -217,7 +217,7 @@ sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUStrin
// return only top level services ...
// base services are included there and should be asked by uno-rtti.
::com::sun::star::uno::Sequence< ::rtl::OUString > lNames(1);
- lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Bibliography"));
+ lNames[0] = ::rtl::OUString("com.sun.star.frame.Bibliography");
return lNames;
}
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index 4ca43379e4e7..cc1992b2229e 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -249,8 +249,7 @@ void LdapConnection::initConnection()
if (aUser.isEmpty())
{
throw lang::IllegalArgumentException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
- ("LdapConnection::findUserDn -User id is empty")),
+ rtl::OUString("LdapConnection::findUserDn -User id is empty"),
NULL, 0) ;
}
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx
index 88cb1b316172..b3b2fdc0d07e 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.cxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx
@@ -61,7 +61,7 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContex
xContext, &aDefinition, &loggedOnUser))
{
throw css::uno::RuntimeException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LdapUserProfileBe- LDAP not configured")),
+ rtl::OUString("LdapUserProfileBe- LDAP not configured"),
NULL);
}
@@ -107,7 +107,7 @@ bool LdapUserProfileBe::readLdapConfiguration(
uno::Reference< lang::XMultiServiceFactory > xCfgProvider(
css::configuration::theDefaultProvider::get(context));
- css::beans::NamedValue aPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), uno::makeAny(kComponent) );
+ css::beans::NamedValue aPath(rtl::OUString("nodepath"), uno::makeAny(kComponent) );
uno::Sequence< uno::Any > aArgs(1);
aArgs[0] <<= aPath;
@@ -177,8 +177,7 @@ void LdapUserProfileBe::setPropertyValue(
css::uno::RuntimeException)
{
throw css::lang::IllegalArgumentException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")),
+ rtl::OUString("setPropertyValue not supported"),
static_cast< cppu::OWeakObject * >(this), -1);
}
@@ -213,7 +212,7 @@ css::uno::Any LdapUserProfileBe::getPropertyValue(
//------------------------------------------------------------------------------
rtl::OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName(void) {
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.LdapUserProfileBe"));
+ return rtl::OUString("com.sun.star.comp.configuration.backend.LdapUserProfileBe");
}
//------------------------------------------------------------------------------
@@ -227,7 +226,7 @@ rtl::OUString SAL_CALL LdapUserProfileBe::getImplementationName(void)
uno::Sequence<rtl::OUString> SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceNames(void)
{
uno::Sequence<rtl::OUString> aServices(1) ;
- aServices[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.LdapUserProfileBe")) ;
+ aServices[0] = rtl::OUString("com.sun.star.configuration.backend.LdapUserProfileBe") ;
return aServices ;
}
//------------------------------------------------------------------------------
diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx
index bb4716e33abb..ce57a349cda5 100644
--- a/extensions/source/logging/consolehandler.cxx
+++ b/extensions/source/logging/consolehandler.cxx
@@ -300,14 +300,14 @@ namespace logging
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL ConsoleHandler::getImplementationName_static()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.ConsoleHandler" ) );
+ return ::rtl::OUString( "com.sun.star.comp.extensions.ConsoleHandler" );
}
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames_static()
{
Sequence< ::rtl::OUString > aServiceNames(1);
- aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.ConsoleHandler" ) );
+ aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.ConsoleHandler" );
return aServiceNames;
}
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index 26dfc9de8636..704b4527e0ff 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -108,8 +108,8 @@ namespace logging
namespace
{
const sal_Unicode quote_char = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"")).toChar();
- const sal_Unicode comma_char = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")).toChar();
- const ::rtl::OUString dos_newline = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\r\n"));
+ const sal_Unicode comma_char = ::rtl::OUString(",").toChar();
+ const ::rtl::OUString dos_newline = ::rtl::OUString("\r\n");
inline bool needsQuoting(const ::rtl::OUString& str)
{
@@ -150,7 +150,7 @@ namespace
::com::sun::star::uno::Sequence< ::rtl::OUString> initialColumns()
{
com::sun::star::uno::Sequence< ::rtl::OUString> result = ::com::sun::star::uno::Sequence< ::rtl::OUString>(1);
- result[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("message"));
+ result[0] = ::rtl::OUString("message");
return result;
};
}
@@ -341,13 +341,13 @@ namespace logging
::rtl::OUString SAL_CALL CsvFormatter::getImplementationName_static()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.CsvFormatter" ) );
+ return ::rtl::OUString( "com.sun.star.comp.extensions.CsvFormatter" );
}
Sequence< ::rtl::OUString > SAL_CALL CsvFormatter::getSupportedServiceNames_static()
{
Sequence< ::rtl::OUString > aServiceNames(1);
- aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.CsvFormatter" ) );
+ aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.CsvFormatter" );
return aServiceNames;
}
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index 845bb1e1b3bd..8c56f74ecb95 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -402,14 +402,14 @@ namespace logging
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL FileHandler::getImplementationName_static()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.FileHandler" ) );
+ return ::rtl::OUString( "com.sun.star.comp.extensions.FileHandler" );
}
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL FileHandler::getSupportedServiceNames_static()
{
Sequence< ::rtl::OUString > aServiceNames(1);
- aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.FileHandler" ) );
+ aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.FileHandler" );
return aServiceNames;
}
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index 8052d618d69f..7e120e878e70 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -285,7 +285,7 @@ namespace logging
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL EventLogger::getImplementationName() throw(RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.EventLogger" ) );
+ return ::rtl::OUString( "com.sun.star.comp.extensions.EventLogger" );
}
//--------------------------------------------------------------------
@@ -298,7 +298,7 @@ namespace logging
Sequence< ::rtl::OUString > SAL_CALL EventLogger::getSupportedServiceNames() throw(RuntimeException)
{
Sequence< ::rtl::OUString > aServiceNames(1);
- aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.Logger" ) );
+ aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.Logger" );
return aServiceNames;
}
@@ -332,7 +332,7 @@ namespace logging
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL LoggerPool::getImplementationName_static()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.LoggerPool" ) );
+ return ::rtl::OUString( "com.sun.star.comp.extensions.LoggerPool" );
}
//--------------------------------------------------------------------
@@ -346,7 +346,7 @@ namespace logging
//--------------------------------------------------------------------
::rtl::OUString LoggerPool::getSingletonName_static()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.LoggerPool" ) );
+ return ::rtl::OUString( "com.sun.star.logging.LoggerPool" );
}
//--------------------------------------------------------------------
@@ -375,7 +375,7 @@ namespace logging
//--------------------------------------------------------------------
Reference< XLogger > SAL_CALL LoggerPool::getDefaultLogger( ) throw (RuntimeException)
{
- return getNamedLogger( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.logging.DefaultLogger" ) ) );
+ return getNamedLogger( ::rtl::OUString( "org.openoffice.logging.DefaultLogger" ) );
}
//--------------------------------------------------------------------
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index 8c4e08a33fa0..609742b891ec 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -209,11 +209,11 @@ namespace logging
// write access to the "Settings" node (which includes settings for all loggers)
Sequence< Any > aArguments(1);
aArguments[0] <<= NamedValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ),
- makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Logging/Settings" ) ) )
+ ::rtl::OUString( "nodepath" ),
+ makeAny( ::rtl::OUString( "/org.openoffice.Office.Logging/Settings" ) )
);
Reference< XNameContainer > xAllSettings( xConfigProvider->createInstanceWithArguments(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" ) ),
+ ::rtl::OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ),
aArguments
), UNO_QUERY_THROW );
@@ -233,7 +233,7 @@ namespace logging
// the log level
sal_Int32 nLogLevel( LogLevel::OFF );
- OSL_VERIFY( xLoggerSettings->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LogLevel" ) ) ) >>= nLogLevel );
+ OSL_VERIFY( xLoggerSettings->getByName( ::rtl::OUString( "LogLevel" ) ) >>= nLogLevel );
_rxLogger->setLevel( nLogLevel );
// the default handler, if any
diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx
index dcba3ba995b2..716be61967a5 100644
--- a/extensions/source/logging/loghandler.cxx
+++ b/extensions/source/logging/loghandler.cxx
@@ -83,10 +83,10 @@ namespace logging
m_rMutex.acquire();
if ( !getIsInitialized() )
- throw DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "component not initialized" ) ), NULL );
+ throw DisposedException( ::rtl::OUString( "component not initialized" ), NULL );
if ( m_rBHelper.bDisposed )
- throw DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "component already disposed" ) ), NULL );
+ throw DisposedException( ::rtl::OUString( "component already disposed" ), NULL );
// fallback settings, in case they weren't passed at construction time
if ( !getFormatter().is() )
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index b23aed57b816..239705003bc4 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -186,14 +186,14 @@ namespace logging
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL PlainTextFormatter::getImplementationName_static()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.PlainTextFormatter" ) );
+ return ::rtl::OUString( "com.sun.star.comp.extensions.PlainTextFormatter" );
}
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames_static()
{
Sequence< ::rtl::OUString > aServiceNames(1);
- aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.PlainTextFormatter" ) );
+ aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.PlainTextFormatter" );
return aServiceNames;
}
diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
index 37a9f523b688..c244a07c12a3 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -175,7 +175,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
// create frame
m_xFrame = Reference< frame::XFrame >(
- mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame") )),
+ mxRemoteMSF->createInstance( ::rtl::OUString("com.sun.star.frame.Frame")),
uno::UNO_QUERY );
if (!m_xFrame.is())
{
@@ -191,9 +191,9 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
// currently ignore errors in this code
uno::Reference< beans::XPropertySet > xFrameProps( m_xFrame, uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xLMProps;
- xFrameProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ) >>= xLMProps;
+ xFrameProps->getPropertyValue( ::rtl::OUString("LayoutManager") ) >>= xLMProps;
if ( xLMProps.is() )
- xLMProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticToolbars")), uno::makeAny( (sal_Bool)sal_False ) );
+ xLMProps->setPropertyValue( ::rtl::OUString("AutomaticToolbars"), uno::makeAny( (sal_Bool)sal_False ) );
}
catch( const uno::Exception& )
{}
@@ -233,11 +233,11 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
// prepare to load document
debug_fprintf(NSP_LOG_APPEND, "try to load document\n");
Sequence< ::com::sun::star::beans::PropertyValue > setPropValues(3);
- setPropValues[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ViewOnly") );
+ setPropValues[0].Name = OUString("ViewOnly");
setPropValues[0].Value <<= sal_True;
- setPropValues[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ReadOnly") );
+ setPropValues[1].Name = OUString("ReadOnly");
setPropValues[1].Value <<= sal_True;
- setPropValues[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream"));
+ setPropValues[2].Name = OUString("InputStream");
setPropValues[2].Value <<= xInputStream;
/*
setPropValues[ 3 ].Name = "FilterName";
@@ -249,11 +249,11 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
// load document
Sequence< ::com::sun::star::beans::PropertyValue > setPropValues2(3);
- setPropValues2[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ViewOnly") );
+ setPropValues2[0].Name = OUString("ViewOnly");
setPropValues2[0].Value <<= sal_True;
- setPropValues2[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ReadOnly") );
+ setPropValues2[1].Name = OUString("ReadOnly");
setPropValues2[1].Value <<= sal_True;
- setPropValues2[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("AsTemplate") );
+ setPropValues2[2].Name = OUString("AsTemplate");
setPropValues2[2].Value <<= sal_False;
m_xComponent = xLoader->loadComponentFromURL(
m_sURL,
@@ -290,10 +290,10 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
//try to enable toolbar and tool windows
Sequence< ::com::sun::star::beans::PropertyValue > propertyValue(1);
- propertyValue[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FunctionBarVisible") );
+ propertyValue[0].Name = OUString("FunctionBarVisible");
propertyValue[0].Value <<= sal_True;
m_xDispatcher->executeDispatch(m_xDispatchProvider,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FunctionBarVisible")),
+ ::rtl::OUString(".uno:FunctionBarVisible"),
m_xFrame->getName(), 0,
propertyValue );
@@ -309,7 +309,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
uno::Reference< presentation::XPresentationSupplier > xPresSuppl( m_xComponent, uno::UNO_QUERY_THROW );
uno::Reference< presentation::XPresentation > xPres( xPresSuppl->getPresentation(), uno::UNO_SET_THROW );
uno::Reference< beans::XPropertySet > xProps( xPresSuppl->getPresentation(), uno::UNO_QUERY_THROW );
- xProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFullScreen" ) ), uno::makeAny( sal_False ) );
+ xProps->setPropertyValue( ::rtl::OUString( "IsFullScreen" ), uno::makeAny( sal_False ) );
xPres->start();
}
catch( const uno::Exception& )
@@ -400,7 +400,7 @@ sal_Bool SoPluginInstance::Destroy(void)
aArgs[0] <<= m_xFrame;
uno::Reference< lang::XComponent > xDocumentCloser(
mxRemoteMSF->createInstanceWithArguments(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.DocumentCloser" ) ),
+ ::rtl::OUString( "com.sun.star.embed.DocumentCloser" ),
aArgs ),
uno::UNO_QUERY_THROW );
@@ -441,7 +441,7 @@ sal_Bool SoPluginInstance::Print(void)
Sequence< ::com::sun::star::beans::PropertyValue > propertyValue(1);
m_xDispatcher->executeDispatch(m_xDispatchProvider,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:PrintDefault")),
+ ::rtl::OUString(".uno:PrintDefault"),
m_xFrame->getName(), 0,
propertyValue );
return sal_True;
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 8710478b9229..2814850ff221 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -408,15 +408,15 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName,
throw RuntimeException();
break;
case DISP_E_OVERFLOW:
- throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>(
+ throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr);
break;
case DISP_E_PARAMNOTFOUND:
- throw IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>(
+ throw IllegalArgumentException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(this)), ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )) ;
break;
case DISP_E_TYPEMISMATCH:
- throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>(
+ throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::UNKNOWN, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr ));
break;
case DISP_E_UNKNOWNINTERFACE:
@@ -426,7 +426,7 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName,
throw RuntimeException();
break;
case DISP_E_PARAMNOTOPTIONAL:
- throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")),static_cast<XInterface*>(
+ throw CannotConvertException(rtl::OUString("call to OLE object failed"),static_cast<XInterface*>(
static_cast<XWeak*>(this)) , TypeClass_UNKNOWN, FailReason::NO_DEFAULT_AVAILABLE, uArgErr);
break;
default:
@@ -489,7 +489,7 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName )
{
if ( pInfo && m_sTypeName.getLength() == 0 )
{
- m_sTypeName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IDispatch") );
+ m_sTypeName = rtl::OUString("IDispatch");
CComBSTR sName;
if ( SUCCEEDED( pInfo->GetDocumentation( -1, &sName, NULL, NULL, NULL ) ) )
@@ -506,7 +506,7 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName )
if ( SUCCEEDED( pTypeLib->GetDocumentation( -1, &sName, NULL, NULL, NULL ) ) )
{
rtl::OUString sLibName( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName)));
- m_sTypeName = sLibName.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sTmp );
+ m_sTypeName = sLibName.concat( rtl::OUString(".") ).concat( sTmp );
}
}
@@ -1177,7 +1177,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName,
}
if( !bConvRet) // conversion of return or out parameter failed
- throw CannotConvertException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Call to COM object failed. Conversion of return or out value failed")),
+ throw CannotConvertException( rtl::OUString("Call to COM object failed. Conversion of return or out value failed"),
Reference<XInterface>( static_cast<XWeak*>(this), UNO_QUERY ), TypeClass_UNKNOWN,
FailReason::UNKNOWN, 0);// lookup error code
// conversion of return or out parameter failed
@@ -1201,15 +1201,15 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName,
throw IllegalArgumentException();
break;
case DISP_E_OVERFLOW:
- throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>(
+ throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr);
break;
case DISP_E_PARAMNOTFOUND:
- throw IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>(
+ throw IllegalArgumentException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(this)), ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr ));
break;
case DISP_E_TYPEMISMATCH:
- throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")),static_cast<XInterface*>(
+ throw CannotConvertException(rtl::OUString("call to OLE object failed"),static_cast<XInterface*>(
static_cast<XWeak*>(this)) , TypeClass_UNKNOWN, FailReason::UNKNOWN, uArgErr);
break;
case DISP_E_UNKNOWNINTERFACE:
@@ -1219,7 +1219,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName,
throw RuntimeException() ;
break;
case DISP_E_PARAMNOTOPTIONAL:
- throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>(
+ throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::NO_DEFAULT_AVAILABLE, uArgErr);
break;
default:
@@ -1528,7 +1528,7 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aNa
"returned DISP_E_NONAMEDARGS",0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr ));
break;
case DISP_E_OVERFLOW:
- throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[automation bridge] Call failed.")),
+ throw CannotConvertException(rtl::OUString("[automation bridge] Call failed."),
static_cast<XInterface*>(
static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr);
break;
@@ -2160,7 +2160,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
"returned DISP_E_NONAMEDARGS",0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr ));
break;
case DISP_E_OVERFLOW:
- throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[automation bridge] Call failed.")),
+ throw CannotConvertException(rtl::OUString("[automation bridge] Call failed."),
static_cast<XInterface*>(
static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr);
break;
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index 4aa61c85a551..66333dd0f820 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -78,28 +78,28 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL oleautobridge_component_getFacto
if (pServiceManager && aImplName.equals( reinterpret_cast<const sal_Unicode*>(L"com.sun.star.comp.ole.OleConverter2") ))
{
xFactory= createSingleFactory( reinterpret_cast< XMultiServiceFactory*>(pServiceManager),
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.OleConverter2")),
+ OUString("com.sun.star.comp.ole.OleConverter2"),
ConverterProvider_CreateInstance2, seqServiceNames,
&globalModuleCount.modCnt );
}
else if (pServiceManager && aImplName.equals( reinterpret_cast<const sal_Unicode*>(L"com.sun.star.comp.ole.OleConverterVar1") ))
{
xFactory= createSingleFactory( reinterpret_cast<XMultiServiceFactory*>(pServiceManager),
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.OleConverterVar1")),
+ OUString("com.sun.star.comp.ole.OleConverterVar1"),
ConverterProvider_CreateInstanceVar1, seqServiceNames,
&globalModuleCount.modCnt );
}
else if(pServiceManager && aImplName.equals(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.comp.ole.OleClient")))
{
xFactory= createSingleFactory( reinterpret_cast< XMultiServiceFactory*>(pServiceManager),
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.OleClient")),
+ OUString("com.sun.star.comp.ole.OleClient"),
OleClient_CreateInstance, seqServiceNames,
&globalModuleCount.modCnt);
}
else if(pServiceManager && aImplName.equals(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.comp.ole.OleServer")))
{
xFactory= createOneInstanceFactory( reinterpret_cast< XMultiServiceFactory*>(pServiceManager),
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.OleServer")),
+ OUString("com.sun.star.comp.ole.OleServer"),
OleServer_CreateInstance, seqServiceNames,
&globalModuleCount.modCnt);
}
diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx
index e50853d9296f..6e10027b8053 100644
--- a/extensions/source/plugin/inc/plugin/impl.hxx
+++ b/extensions/source/plugin/inc/plugin/impl.hxx
@@ -315,7 +315,7 @@ public:
static rtl::OUString getImplementationName_Static() throw( )
{
/** the soplayer uses this name in its source! maybe not after 5.2 */
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.extensions.PluginManager" ));
+ return rtl::OUString( "com.sun.star.extensions.PluginManager" );
}
};
Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory > & ) throw( Exception );
diff --git a/extensions/source/plugin/inc/plugin/model.hxx b/extensions/source/plugin/inc/plugin/model.hxx
index f0acad737e14..c315b298118b 100644
--- a/extensions/source/plugin/inc/plugin/model.hxx
+++ b/extensions/source/plugin/inc/plugin/model.hxx
@@ -105,7 +105,7 @@ class PluginModel : public BroadcasterHelperHolder,
static rtl::OUString SAL_CALL getImplementationName_Static() throw( )
{
/** the soplayer uses this name in its source! maybe not after 5.2 */
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.extensions.PluginModel" ));
+ return rtl::OUString( "com.sun.star.extensions.PluginModel" );
}
// OPropertySetHelper
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index 023cd4e0716c..d399925c3c59 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -411,7 +411,7 @@ namespace pcr
Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create(xContext) );
Sequence< PropertyValue > aMediaProperties(1);
- aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
+ aMediaProperties[0].Name = ::rtl::OUString( "URL" );
aMediaProperties[0].Value <<= _rImageURL;
Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW );
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx
index a0a910612df7..bef8d73f25bb 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.cxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx
@@ -53,7 +53,7 @@ namespace pcr
DBG_CTOR( ButtonNavigationHandler, NULL );
m_aContext.createComponent(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.FormComponentPropertyHandler" ) ),
+ ::rtl::OUString( "com.sun.star.form.inspection.FormComponentPropertyHandler" ),
m_xSlaveHandler );
if ( !m_xSlaveHandler.is() )
throw RuntimeException();
@@ -68,14 +68,14 @@ namespace pcr
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL ButtonNavigationHandler::getImplementationName_static( ) throw (RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.ButtonNavigationHandler" ) );
+ return ::rtl::OUString( "com.sun.star.comp.extensions.ButtonNavigationHandler" );
}
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< ::rtl::OUString > aSupported( 1 );
- aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.ButtonNavigationHandler" ) );
+ aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.ButtonNavigationHandler" );
return aSupported;
}
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index aeaf6b47d2db..4162df9970b1 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -63,14 +63,14 @@ namespace pcr
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL CellBindingPropertyHandler::getImplementationName_static( ) throw (RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.CellBindingPropertyHandler" ) );
+ return ::rtl::OUString( "com.sun.star.comp.extensions.CellBindingPropertyHandler" );
}
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< ::rtl::OUString > aSupported( 1 );
- aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.CellBindingPropertyHandler" ) );
+ aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.CellBindingPropertyHandler" );
return aSupported;
}
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
index 6eb58e3a35b3..f31ca74a7c0a 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -66,14 +66,14 @@ namespace pcr
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL EditPropertyHandler::getImplementationName_static( ) throw (RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.EditPropertyHandler" ) );
+ return ::rtl::OUString( "com.sun.star.comp.extensions.EditPropertyHandler" );
}
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< ::rtl::OUString > aSupported( 1 );
- aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.EditPropertyHandler" ) );
+ aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.EditPropertyHandler" );
return aSupported;
}
@@ -285,7 +285,7 @@ namespace pcr
_rxInspectorUI->enablePropertyUI( PROPERTY_LINEEND_FORMAT, nTextType != TEXTTYPE_SINGLELINE );
_rxInspectorUI->enablePropertyUI( PROPERTY_VERTICAL_ALIGN, nTextType == TEXTTYPE_SINGLELINE );
- _rxInspectorUI->showCategory( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Data" ) ), nTextType != TEXTTYPE_RICHTEXT );
+ _rxInspectorUI->showCategory( ::rtl::OUString( "Data" ), nTextType != TEXTTYPE_RICHTEXT );
}
break;
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index fd26dde08c83..848f6f52c47e 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -74,14 +74,14 @@ namespace pcr
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL EFormsPropertyHandler::getImplementationName_static( ) throw (RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.EFormsPropertyHandler" ) );
+ return ::rtl::OUString( "com.sun.star.comp.extensions.EFormsPropertyHandler" );
}
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< ::rtl::OUString > aSupported( 1 );
- aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.XMLFormsPropertyHandler" ) );
+ aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.XMLFormsPropertyHandler" );
return aSupported;
}
@@ -468,7 +468,7 @@ namespace pcr
}
aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId );
- aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Data" ) );
+ aDescriptor.Category = ::rtl::OUString( "Data" );
aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) );
return aDescriptor;
}
@@ -512,15 +512,15 @@ namespace pcr
if ( !( xModel.is() && xBinding.is() && !sFacetName.isEmpty() ) )
return InteractiveSelectionResult_Cancelled;
- xDialogProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormModel" ) ), makeAny( xModel ) );
- xDialogProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Binding" ) ), makeAny( xBinding ) );
- xDialogProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FacetName" ) ), makeAny( sFacetName ) );
+ xDialogProps->setPropertyValue( ::rtl::OUString( "FormModel" ), makeAny( xModel ) );
+ xDialogProps->setPropertyValue( ::rtl::OUString( "Binding" ), makeAny( xBinding ) );
+ xDialogProps->setPropertyValue( ::rtl::OUString( "FacetName" ), makeAny( sFacetName ) );
if ( !xDialog->execute() )
// cancelled
return InteractiveSelectionResult_Cancelled;
- _rData = xDialogProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ConditionValue" ) ) );
+ _rData = xDialogProps->getPropertyValue( ::rtl::OUString( "ConditionValue" ) );
return InteractiveSelectionResult_ObtainedValue;
}
catch( const Exception& )
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index ebd18a1885a9..00878035854b 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -315,14 +315,14 @@ namespace pcr
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL FormGeometryHandler::getImplementationName_static( ) throw (RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.FormGeometryHandler" ) );
+ return ::rtl::OUString( "com.sun.star.comp.extensions.FormGeometryHandler" );
}
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< ::rtl::OUString > aSupported( 1 );
- aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.FormGeometryHandler" ) );
+ aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.FormGeometryHandler" );
return aSupported;
}
@@ -601,7 +601,7 @@ namespace pcr
if ( !xPSI->hasPropertyByName( PROPERTY_ANCHOR ) )
return false;
Reference< XServiceInfo > xSI( m_xAssociatedShape, UNO_QUERY_THROW );
- if ( xSI->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.Shape" ) ) ) )
+ if ( xSI->supportsService( ::rtl::OUString( "com.sun.star.sheet.Shape" ) ) )
return true;
}
catch( const Exception& )
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index d38b2475e50f..cefae712007f 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -518,7 +518,7 @@ namespace pcr
{
xKeys->getByIndex( key ) >>= xKey;
sal_Int32 nKeyType = 0;
- xKey->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ) ) ) >>= nKeyType;
+ xKey->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= nKeyType;
if ( nKeyType != KeyType::FOREIGN )
continue;
@@ -542,7 +542,7 @@ namespace pcr
if ( xKeyColumn.is() )
{
xKeyColumn->getPropertyValue( PROPERTY_NAME ) >>= sColumnName;
- xKeyColumn->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RelatedColumn" ) ) ) >>= sRelatedColumnName;
+ xKeyColumn->getPropertyValue( ::rtl::OUString( "RelatedColumn" ) ) >>= sRelatedColumnName;
_rLeftFields[ column ] = sColumnName;
_rRightFields[ column ] = sRelatedColumnName;
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 134c3c7af3f3..703c0985c9a2 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -103,7 +103,7 @@ namespace pcr
if ( _rxContext.is() )
{
Reference< XHierarchicalNameAccess > xTypeDescProv(
- _rxContext->getValueByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ) ),
+ _rxContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ),
UNO_QUERY_THROW );
m_xTypeDescription = Reference< XEnumTypeDescription >( xTypeDescProv->getByHierarchicalName( m_aEnumType.getTypeName() ), UNO_QUERY_THROW );
@@ -283,14 +283,14 @@ namespace pcr
void UrlClickHandler::impl_dispatch_throw( const ::rtl::OUString& _rURL )
{
Reference< XURLTransformer > xTransformer( URLTransformer::create(m_aContext.getUNOContext()) );
- URL aURL; aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:OpenHyperlink" ) );
+ URL aURL; aURL.Complete = ::rtl::OUString( ".uno:OpenHyperlink" );
xTransformer->parseStrict( aURL );
Reference< XDesktop2 > xDispProv = Desktop::create( m_aContext.getUNOContext() );
Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aURL, ::rtl::OUString(), 0 ), UNO_QUERY_THROW );
Sequence< PropertyValue > aDispatchArgs(1);
- aDispatchArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
+ aDispatchArgs[0].Name = ::rtl::OUString("URL");
aDispatchArgs[0].Value <<= _rURL;
xDispatch->dispatch( aURL, aDispatchArgs );
@@ -340,14 +340,14 @@ namespace pcr
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL GenericPropertyHandler::getImplementationName_static( ) throw (RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.GenericPropertyHandler" ) );
+ return ::rtl::OUString( "com.sun.star.comp.extensions.GenericPropertyHandler" );
}
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< ::rtl::OUString > aSupported( 1 );
- aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.inspection.GenericPropertyHandler" ) );
+ aSupported[0] = ::rtl::OUString( "com.sun.star.inspection.GenericPropertyHandler" );
return aSupported;
}
@@ -380,7 +380,7 @@ namespace pcr
Reference< XIntrospectionAccess > xIntrospectionAccess( xIntrospection->inspect( makeAny( _rxIntrospectee ) ) );
if ( !xIntrospectionAccess.is() )
- throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The introspection service could not handle the given component." ) ), *this );
+ throw RuntimeException( ::rtl::OUString( "The introspection service could not handle the given component." ), *this );
m_xComponent = Reference< XPropertySet >( xIntrospectionAccess->queryAdapter( XPropertySet::static_type() ), UNO_QUERY_THROW );
// now that we survived so far, remember m_xComponentIntrospectionAccess
@@ -667,7 +667,7 @@ namespace pcr
if ( !aDescriptor.Control.is() )
PropertyHandlerHelper::describePropertyLine( pos->second, aDescriptor, _rxControlFactory );
- aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "General" ) );
+ aDescriptor.Category = ::rtl::OUString( "General" );
return aDescriptor;
}
diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx
index d346b16f4e81..05ac138abb86 100644
--- a/extensions/source/propctrlr/inspectormodelbase.cxx
+++ b/extensions/source/propctrlr/inspectormodelbase.cxx
@@ -99,25 +99,25 @@ namespace pcr
,m_bIsReadOnly( sal_False )
{
registerProperty(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasHelpSection" ) ),
+ ::rtl::OUString( "HasHelpSection" ),
MODEL_PROPERTY_ID_HAS_HELP_SECTION,
PropertyAttribute::READONLY,
&m_bHasHelpSection, ::getCppuType( &m_bHasHelpSection )
);
registerProperty(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MinHelpTextLines" ) ),
+ ::rtl::OUString( "MinHelpTextLines" ),
MODEL_PROPERTY_ID_MIN_HELP_TEXT_LINES,
PropertyAttribute::READONLY,
&m_nMinHelpTextLines, ::getCppuType( &m_nMinHelpTextLines )
);
registerProperty(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxHelpTextLines" ) ),
+ ::rtl::OUString( "MaxHelpTextLines" ),
MODEL_PROPERTY_ID_MAX_HELP_TEXT_LINES,
PropertyAttribute::READONLY,
&m_nMaxHelpTextLines, ::getCppuType( &m_nMaxHelpTextLines )
);
registerProperty(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ) ),
+ ::rtl::OUString( "IsReadOnly" ),
MODEL_PROPERTY_ID_IS_READ_ONLY,
PropertyAttribute::BOUND,
&m_bIsReadOnly, ::getCppuType( &m_bIsReadOnly )
diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx
index 61f116a90e93..287ba8b2cb2b 100644
--- a/extensions/source/propctrlr/objectinspectormodel.cxx
+++ b/extensions/source/propctrlr/objectinspectormodel.cxx
@@ -170,7 +170,7 @@ namespace pcr
//--------------------------------------------------------------------
::rtl::OUString ObjectInspectorModel::getImplementationName_static( ) throw(RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.extensions.ObjectInspectorModel" ) );
+ return ::rtl::OUString( "org.openoffice.comp.extensions.ObjectInspectorModel" );
}
//--------------------------------------------------------------------
@@ -190,7 +190,7 @@ namespace pcr
void ObjectInspectorModel::createDefault()
{
m_aFactories.realloc( 1 );
- m_aFactories[0] <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.inspection.GenericPropertyHandler" ) );
+ m_aFactories[0] <<= ::rtl::OUString( "com.sun.star.inspection.GenericPropertyHandler" );
}
//--------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index 54a50c0476ba..4da3b9426245 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -219,9 +219,9 @@ namespace pcr
aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId );
if ( ( m_pInfoService->getPropertyUIFlags( nPropId ) & PROP_FLAG_DATA_PROPERTY ) != 0 )
- aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Data" ) );
+ aDescriptor.Category = ::rtl::OUString( "Data" );
else
- aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "General" ) );
+ aDescriptor.Category = ::rtl::OUString( "General" );
return aDescriptor;
}
@@ -379,28 +379,28 @@ namespace pcr
::rtl::OUString sConfigurationProperty;
if ( xDocumentSI->supportsService( SERVICE_WEB_DOCUMENT ) )
{ // writer
- sConfigurationLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.WriterWeb/Layout/Other" ) );
- sConfigurationProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MeasureUnit" ) );
+ sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.WriterWeb/Layout/Other" );
+ sConfigurationProperty = ::rtl::OUString( "MeasureUnit" );
}
else if ( xDocumentSI->supportsService( SERVICE_TEXT_DOCUMENT ) )
{ // writer
- sConfigurationLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Writer/Layout/Other" ) );
- sConfigurationProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MeasureUnit" ) );
+ sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Writer/Layout/Other" );
+ sConfigurationProperty = ::rtl::OUString( "MeasureUnit" );
}
else if ( xDocumentSI->supportsService( SERVICE_SPREADSHEET_DOCUMENT ) )
{ // calc
- sConfigurationLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Calc/Layout/Other/MeasureUnit" ) );
- sConfigurationProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Metric" ) );
+ sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Calc/Layout/Other/MeasureUnit" );
+ sConfigurationProperty = ::rtl::OUString( "Metric" );
}
else if ( xDocumentSI->supportsService( SERVICE_DRAWING_DOCUMENT ) )
{
- sConfigurationLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Draw/Layout/Other/MeasureUnit" ) );
- sConfigurationProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Metric" ) );
+ sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Draw/Layout/Other/MeasureUnit" );
+ sConfigurationProperty = ::rtl::OUString( "Metric" );
}
else if ( xDocumentSI->supportsService( SERVICE_PRESENTATION_DOCUMENT ) )
{
- sConfigurationLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Impress/Layout/Other/MeasureUnit" ) );
- sConfigurationProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Metric" ) );
+ sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Impress/Layout/Other/MeasureUnit" );
+ sConfigurationProperty = ::rtl::OUString( "Metric" );
}
// read the measurement unit from the configuration
diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx
index c419ec7f8ee6..bff49b1b3d0c 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.cxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.cxx
@@ -244,12 +244,12 @@ namespace pcr
aArgs[3].Name = PROPERTY_ESCAPE_PROCESSING;
aArgs[3].Value <<= m_xObjectAdapter->getEscapeProcessing();
- aArgs[4].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GraphicalDesign" ) );
+ aArgs[4].Name = ::rtl::OUString( "GraphicalDesign" );
aArgs[4].Value <<= m_xObjectAdapter->getEscapeProcessing();
Reference< XComponent > xQueryDesign = xLoader->loadComponentFromURL(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".component:DB/QueryDesign" ) ),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_self" ) ),
+ ::rtl::OUString( ".component:DB/QueryDesign" ),
+ ::rtl::OUString( "_self" ),
FrameSearchFlag::TASKS | FrameSearchFlag::CREATE,
aArgs
);
@@ -296,7 +296,7 @@ namespace pcr
Reference< XDesktop2 > xDesktop = Desktop::create(m_xContext);
Reference< XFrames > xDesktopFramesCollection( xDesktop->getFrames(), UNO_QUERY_THROW );
- xFrame = xDesktop->findFrame( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_blank" ) ), FrameSearchFlag::CREATE );
+ xFrame = xDesktop->findFrame( ::rtl::OUString( "_blank" ), FrameSearchFlag::CREATE );
OSL_ENSURE( xFrame.is(), "SQLCommandDesigner::impl_createEmptyParentlessTask_nothrow: could not create an empty frame!" );
xDesktopFramesCollection->remove( xFrame );
}
@@ -330,11 +330,11 @@ namespace pcr
// instead of calling XCloseable::close directly. The latter method would also close
// the frame, but not care for things like shutting down the office when the last
// frame is gone ...
- const UnoURL aCloseURL( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CloseDoc" ) ),
+ const UnoURL aCloseURL( ::rtl::OUString( ".uno:CloseDoc" ),
Reference< XMultiServiceFactory >( m_xORB, UNO_QUERY ) );
Reference< XDispatchProvider > xProvider( m_xDesigner->getFrame(), UNO_QUERY_THROW );
- Reference< XDispatch > xDispatch( xProvider->queryDispatch( aCloseURL, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_top" ) ), FrameSearchFlag::SELF ) );
+ Reference< XDispatch > xDispatch( xProvider->queryDispatch( aCloseURL, ::rtl::OUString( "_top" ), FrameSearchFlag::SELF ) );
OSL_ENSURE( xDispatch.is(), "SQLCommandDesigner::impl_closeDesigner_nothrow: no dispatcher for the CloseDoc command!" );
if ( xDispatch.is() )
{
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index eb01b058d209..b90a4a11b4dc 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -466,7 +466,7 @@ namespace pcr
//------------------------------------------------------------------
IMPL_LINK( OHyperlinkControl, OnHyperlinkClicked, void*, /*_NotInterestedIn*/ )
{
- ActionEvent aEvent( *this, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "clicked" ) ) );
+ ActionEvent aEvent( *this, ::rtl::OUString( "clicked" ) );
m_aActionListeners.forEach< XActionListener >(
boost::bind(
&XActionListener::actionPerformed,
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index 5772daa67106..394ad17454c7 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -240,7 +240,7 @@ void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > &
if ( m_xContext.is() )
{
uno::Reference< container::XHierarchicalNameAccess > xTypeDescProv(
- m_xContext->getValueByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ) ),
+ m_xContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ),
uno::UNO_QUERY_THROW );
m_xTypeDescription.set( xTypeDescProv->getByHierarchicalName( sConstantName ), uno::UNO_QUERY_THROW );
@@ -600,15 +600,15 @@ bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _
namespace comp_StringRepresentation {
::rtl::OUString SAL_CALL _getImplementationName() {
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "StringRepresentation"));
+ return ::rtl::OUString(
+ "StringRepresentation");
}
uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > s(1);
- s[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.inspection.StringRepresentation"));
+ s[0] = ::rtl::OUString(
+ "com.sun.star.inspection.StringRepresentation");
return s;
}
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index 5612e18bf07c..1dd05f7b962b 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -106,14 +106,14 @@ namespace pcr
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL SubmissionPropertyHandler::getImplementationName_static( ) throw (RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.SubmissionPropertyHandler" ) );
+ return ::rtl::OUString( "com.sun.star.comp.extensions.SubmissionPropertyHandler" );
}
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< ::rtl::OUString > aSupported( 1 );
- aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.SubmissionPropertyHandler" ) );
+ aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.SubmissionPropertyHandler" );
return aSupported;
}
@@ -312,7 +312,7 @@ namespace pcr
LineDescriptor aDescriptor;
aDescriptor.Control = PropertyHandlerHelper::createListBoxControl( _rxControlFactory, aListEntries, sal_False, sal_True );
aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId );
- aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "General" ) );
+ aDescriptor.Category = ::rtl::OUString( "General" );
aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) );
return aDescriptor;
}
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 83bd64d60a9a..8b7e0e98a4e9 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -243,7 +243,7 @@ namespace pcr
{
Reference< XTabController > xTabController;
if ( m_xORB.is() )
- xTabController = xTabController.query( m_xORB->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.FormController" ) ) ) );
+ xTabController = xTabController.query( m_xORB->createInstance( ::rtl::OUString( "com.sun.star.form.FormController" ) ) );
DBG_ASSERT( xTabController.is(), "TabOrderDialog::AutoOrderClickHdl: could not instantiate a tab controller!" );
if ( !xTabController.is() )
return 0;
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 346ff55d5698..be9ec1e83fff 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -88,14 +88,14 @@ namespace pcr
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL XSDValidationPropertyHandler::getImplementationName_static( ) throw (RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.XSDValidationPropertyHandler" ) );
+ return ::rtl::OUString( "com.sun.star.comp.extensions.XSDValidationPropertyHandler" );
}
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< ::rtl::OUString > aSupported( 1 );
- aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.XSDValidationPropertyHandler" ) );
+ aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.XSDValidationPropertyHandler" );
return aSupported;
}
@@ -323,8 +323,8 @@ namespace pcr
aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_ADD_DATA_TYPE);
aDescriptor.SecondaryButtonId = rtl::OUString::createFromAscii(UID_PROP_REMOVE_DATA_TYPE);;
aDescriptor.HasPrimaryButton = aDescriptor.HasSecondaryButton = sal_True;
- aDescriptor.PrimaryButtonImageURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/extensions/res/buttonplus.png" ) );
- aDescriptor.SecondaryButtonImageURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/extensions/res/buttonminus.png" ) );
+ aDescriptor.PrimaryButtonImageURL = ::rtl::OUString( "private:graphicrepository/extensions/res/buttonplus.png" );
+ aDescriptor.SecondaryButtonImageURL = ::rtl::OUString( "private:graphicrepository/extensions/res/buttonminus.png" );
break;
case PROPERTY_ID_XSD_WHITESPACES:
@@ -419,7 +419,7 @@ namespace pcr
break;
}
- aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Data" ) );
+ aDescriptor.Category = ::rtl::OUString( "Data" );
aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId );
aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) );
diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx
index 66c263df941c..c9b9a581b36e 100644
--- a/extensions/source/resource/ResourceIndexAccess.cxx
+++ b/extensions/source/resource/ResourceIndexAccess.cxx
@@ -122,7 +122,7 @@ Reference<XInterface> initResourceIndexAccess(ResourceIndexAccess* pResourceInde
// and will crash on getByIndex calls, better just give back an empty Reference
// so that such ResourceStringIndexAccess instances are never release into the wild
throw RuntimeException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("resource manager could not get initialized")),
+ OUString("resource manager could not get initialized"),
/* xResult */ Reference<XInterface>());
return xResult;
}
@@ -153,8 +153,8 @@ Sequence<OUString> SAL_CALL ResourceIndexAccess::getElementNames( )
if( aResult.getLength() == 0)
{
aResult.realloc(2);
- aResult[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("String"));
- aResult[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("StringList"));
+ aResult[0] = OUString("String");
+ aResult[1] = OUString("StringList");
}
return aResult;
}
@@ -174,7 +174,7 @@ Any SAL_CALL ResourceStringIndexAccess::getByIndex(sal_Int32 nIdx)
SolarMutexGuard aGuard;
if(!m_pResMgr.get())
throw RuntimeException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("resource manager not available")),
+ OUString("resource manager not available"),
Reference<XInterface>());
const ResId aId(static_cast<sal_uInt16>(nIdx), *m_pResMgr);
@@ -182,7 +182,7 @@ Any SAL_CALL ResourceStringIndexAccess::getByIndex(sal_Int32 nIdx)
if(!m_pResMgr->IsAvailable(aId))
throw RuntimeException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("string resource for id not available")),
+ OUString("string resource for id not available"),
Reference<XInterface>());
return makeAny(OUString(String(aId)));
@@ -197,14 +197,14 @@ Any SAL_CALL ResourceStringListIndexAccess::getByIndex(sal_Int32 nIdx)
if(!m_pResMgr.get())
throw RuntimeException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("resource manager not available")),
+ OUString("resource manager not available"),
Reference<XInterface>());
const ResId aId(static_cast<sal_uInt16>(nIdx), *m_pResMgr);
aId.SetRT(RSC_STRINGARRAY);
if(!m_pResMgr->IsAvailable(aId))
throw RuntimeException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("string list resource for id not available")),
+ OUString("string list resource for id not available"),
Reference<XInterface>());
const ResStringArray aStringList(aId);
Sequence<PropertyValue> aPropList(aStringList.Count());
diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx
index 2c0920c954cf..25900c823f62 100644
--- a/extensions/source/resource/oooresourceloader.cxx
+++ b/extensions/source/resource/oooresourceloader.cxx
@@ -202,7 +202,7 @@ namespace extensions { namespace resource
}
// supported resource types so far: strings
- m_aResourceTypes[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "string" ) ) ] =
+ m_aResourceTypes[ ::rtl::OUString( "string" ) ] =
ResourceTypePtr( new StringResourceAccess );
}
diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx
index 5d3e437cab64..11327284ef41 100644
--- a/extensions/source/scanner/scanner.cxx
+++ b/extensions/source/scanner/scanner.cxx
@@ -79,7 +79,7 @@ SEQ( sal_Int8 ) SAL_CALL ScannerManager::getMaskDIB() throw()
OUString ScannerManager::getImplementationName_Static() throw()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.scanner.ScannerManager" ) );
+ return ::rtl::OUString( "com.sun.star.scanner.ScannerManager" );
}
// -----------------------------------------------------------------------------
@@ -88,7 +88,7 @@ SEQ( OUString ) ScannerManager::getSupportedServiceNames_Static() throw ()
{
SEQ( OUString ) aSNS( 1 );
- aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.scanner.ScannerManager" ) );
+ aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.scanner.ScannerManager" );
return aSNS;
}
diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx
index 8079d76a58f4..9d7a0ce5f922 100644
--- a/extensions/test/ole/cpnt/cpnt.cxx
+++ b/extensions/test/ole/cpnt/cpnt.cxx
@@ -1045,7 +1045,7 @@ Reference<XInvocation > SAL_CALL OComponent::in_methodInvocation( const Referenc
Sequence<sal_Int16> outIndex;
Sequence<Any> outParams;
try{
- inv->invoke( OUString(RTL_CONSTASCII_USTRINGPARAM("disposing")),
+ inv->invoke( OUString("disposing"),
params, outIndex, outParams);
}catch(IllegalArgumentException &) {
}
@@ -1065,8 +1065,8 @@ SimpleStruct SAL_CALL OComponent::in_methodStruct( const SimpleStruct& aStruct )
throw (RuntimeException)
{
SimpleStruct& s= const_cast<SimpleStruct&>(aStruct);
- s.message= s.message + OUString(RTL_CONSTASCII_USTRINGPARAM(
- "This string was set in OleTest"));
+ s.message= s.message + OUString(
+ "This string was set in OleTest");
return aStruct;
}
void SAL_CALL OComponent::in_methodAll(
@@ -1493,7 +1493,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac
if( any.getValueTypeClass() == TypeClass_STRUCT)
{
SimpleStruct* pStruct= ( SimpleStruct*) any.getValue();
- pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest"));
+ pStruct->message= OUString("This struct was created in OleTest");
SimpleStruct aStruct;
any >>= aStruct;
@@ -1641,7 +1641,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac
if( any.getValueTypeClass() == TypeClass_STRUCT)
{
SimpleStruct* pStruct= ( SimpleStruct*) any.getValue();
- pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest"));
+ pStruct->message= OUString("This struct was created in OleTest");
any >>= aStruct;
}
}
@@ -1797,7 +1797,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac
if( any.getValueTypeClass() == TypeClass_STRUCT)
{
SimpleStruct* pStruct= ( SimpleStruct*) any.getValue();
- pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest"));
+ pStruct->message= OUString("This struct was created in OleTest");
any >>= aStruct;
}
}
diff --git a/extensions/test/ole/unloading/unloadTest.cxx b/extensions/test/ole/unloading/unloadTest.cxx
index f07f8b48a059..435042c6f115 100644
--- a/extensions/test/ole/unloading/unloadTest.cxx
+++ b/extensions/test/ole/unloading/unloadTest.cxx
@@ -61,7 +61,7 @@ sal_Bool test1()
{
printf("\n Test1: com.sun.star.bridge.oleautomation.BridgeSupplier\n");
Reference<XSimpleRegistry> xreg= createSimpleRegistry();
- xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("services.rdb")),
+ xreg->open( OUString("services.rdb"),
sal_False, sal_False );
Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg);
@@ -96,7 +96,7 @@ sal_Bool test2()
{
printf("Test2: com.sun.star.bridge.OleBridgeSupplierVar1\n");
Reference<XSimpleRegistry> xreg= createSimpleRegistry();
- xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("services.rdb")),
+ xreg->open( OUString("services.rdb"),
sal_False, sal_False );
Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg);
@@ -129,7 +129,7 @@ sal_Bool test3()
{
printf("Test3: com.sun.star.bridge.oleautomation.Factory\n");
Reference<XSimpleRegistry> xreg= createSimpleRegistry();
- xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("services.rdb")),
+ xreg->open( OUString("services.rdb"),
sal_False, sal_False );
Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg);
@@ -173,7 +173,7 @@ sal_Bool test4()
{
printf("Test4: com.sun.star.bridge.oleautomation.ApplicationRegistration\n");
Reference<XSimpleRegistry> xreg= createSimpleRegistry();
- xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("services.rdb")),
+ xreg->open( OUString("services.rdb"),
sal_False, sal_False );
Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg);
diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx
index 8cc09e6c0ba8..5d15a3ff1ad8 100644
--- a/filter/source/msfilter/mscodec.cxx
+++ b/filter/source/msfilter/mscodec.cxx
@@ -168,15 +168,15 @@ sal_Bool MSCodec_Xor95::InitCodec( const uno::Sequence< beans::NamedValue >& aDa
sal_Bool bResult = sal_False;
::comphelper::SequenceAsHashMap aHashData( aData );
- uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95EncryptionKey" ) ), uno::Sequence< sal_Int8 >() );
+ uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "XOR95EncryptionKey" ), uno::Sequence< sal_Int8 >() );
if ( aKey.getLength() == 16 )
{
(void)memcpy( mpnKey, aKey.getConstArray(), 16 );
bResult = sal_True;
- mnKey = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95BaseKey" ) ), (sal_Int16)0 );
- mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95PasswordHash" ) ), (sal_Int16)0 );
+ mnKey = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "XOR95BaseKey" ), (sal_Int16)0 );
+ mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "XOR95PasswordHash" ), (sal_Int16)0 );
}
else
OSL_FAIL( "Unexpected key size!\n" );
@@ -187,9 +187,9 @@ sal_Bool MSCodec_Xor95::InitCodec( const uno::Sequence< beans::NamedValue >& aDa
uno::Sequence< beans::NamedValue > MSCodec_Xor95::GetEncryptionData()
{
::comphelper::SequenceAsHashMap aHashData;
- aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95EncryptionKey" ) ) ] <<= uno::Sequence<sal_Int8>( (sal_Int8*)mpnKey, 16 );
- aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95BaseKey" ) ) ] <<= (sal_Int16)mnKey;
- aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XOR95PasswordHash" ) ) ] <<= (sal_Int16)mnHash;
+ aHashData[ ::rtl::OUString( "XOR95EncryptionKey" ) ] <<= uno::Sequence<sal_Int8>( (sal_Int8*)mpnKey, 16 );
+ aHashData[ ::rtl::OUString( "XOR95BaseKey" ) ] <<= (sal_Int16)mnKey;
+ aHashData[ ::rtl::OUString( "XOR95PasswordHash" ) ] <<= (sal_Int16)mnHash;
return aHashData.getAsConstNamedValueList();
}
@@ -293,12 +293,12 @@ sal_Bool MSCodec_Std97::InitCodec( const uno::Sequence< beans::NamedValue >& aDa
sal_Bool bResult = sal_False;
::comphelper::SequenceAsHashMap aHashData( aData );
- uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97EncryptionKey" ) ), uno::Sequence< sal_Int8 >() );
+ uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "STD97EncryptionKey" ), uno::Sequence< sal_Int8 >() );
if ( aKey.getLength() == RTL_DIGEST_LENGTH_MD5 )
{
(void)memcpy( m_pDigestValue, aKey.getConstArray(), RTL_DIGEST_LENGTH_MD5 );
- uno::Sequence< sal_Int8 > aUniqueID = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97UniqueID" ) ), uno::Sequence< sal_Int8 >() );
+ uno::Sequence< sal_Int8 > aUniqueID = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "STD97UniqueID" ), uno::Sequence< sal_Int8 >() );
if ( aUniqueID.getLength() == 16 )
{
(void)memcpy( m_pDocId, aUniqueID.getConstArray(), 16 );
@@ -318,8 +318,8 @@ sal_Bool MSCodec_Std97::InitCodec( const uno::Sequence< beans::NamedValue >& aDa
uno::Sequence< beans::NamedValue > MSCodec_Std97::GetEncryptionData()
{
::comphelper::SequenceAsHashMap aHashData;
- aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97EncryptionKey" ) ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDigestValue, RTL_DIGEST_LENGTH_MD5 );
- aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97UniqueID" ) ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDocId, 16 );
+ aHashData[ ::rtl::OUString( "STD97EncryptionKey" ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDigestValue, RTL_DIGEST_LENGTH_MD5 );
+ aHashData[ ::rtl::OUString( "STD97UniqueID" ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDocId, 16 );
return aHashData.getAsConstNamedValueList();
}
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index ae48fd679322..5a06d41358ab 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -158,17 +158,17 @@ CustomToolBarImportHelper::createMenu( const rtl::OUString& rName, const uno::Re
uno::Reference< container::XIndexContainer > xPopup( xCfgManager->createSettings(), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xProps( xPopup, uno::UNO_QUERY_THROW );
// set name for menubar
- xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ), uno::makeAny( rName ) );
+ xProps->setPropertyValue( rtl::OUString("UIName"), uno::makeAny( rName ) );
if ( xPopup.is() )
{
uno::Sequence< beans::PropertyValue > aPopupMenu( 4 );
- aPopupMenu[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
- aPopupMenu[0].Value = uno::makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("vnd.openoffice.org:") ) + rName );
- aPopupMenu[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Label") );
+ aPopupMenu[0].Name = rtl::OUString("CommandURL");
+ aPopupMenu[0].Value = uno::makeAny( rtl::OUString("vnd.openoffice.org:") + rName );
+ aPopupMenu[1].Name = rtl::OUString("Label");
aPopupMenu[1].Value <<= rName;
- aPopupMenu[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ItemDescriptorContainer") );
+ aPopupMenu[2].Name = rtl::OUString("ItemDescriptorContainer");
aPopupMenu[2].Value = uno::makeAny( xMenuDesc );
- aPopupMenu[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type" ) );
+ aPopupMenu[3].Name = rtl::OUString("Type" );
aPopupMenu[3].Value <<= sal_Int32( 0 );
xPopup->insertByIndex( xPopup->getCount(), uno::makeAny( aPopupMenu ) );
@@ -297,7 +297,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect
bBeginGroup = rHeader.isBeginGroup();
controlGeneralInfo.ImportToolBarControlData( helper, props );
beans::PropertyValue aProp;
- aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Visible") ) ;
+ aProp.Name = rtl::OUString("Visible") ;
aProp.Value = uno::makeAny( rHeader.isVisible() ); // where is the visible attribute stored
props.push_back( aProp );
if ( rHeader.getTct() == 0x01
@@ -348,7 +348,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect
}
else if ( rHeader.getTct() == 0x0a )
{
- aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") ) ;
+ aProp.Name = rtl::OUString("CommandURL") ;
rtl::OUString sMenuBar( RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/") );
TBCMenuSpecific* pMenu = getMenuSpecific();
@@ -359,7 +359,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect
}
short icontext = ( rHeader.getTbct() & 0x03 );
- aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Style") ) ;
+ aProp.Name = rtl::OUString("Style") ;
if ( bIsMenuBar )
{
nStyle |= ui::ItemStyle::TEXT;
@@ -495,24 +495,24 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std
// if ( rHeader.getTct() == 0x01 && rHeader.getTcID() == 0x01 ) // not defined, probably this is a command
if ( !extraInfo.getOnAction().isEmpty() )
{
- aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
+ aProp.Name = rtl::OUString("CommandURL");
ooo::vba::MacroResolvedInfo aMacroInf = ooo::vba::resolveVBAMacro( &helper.GetDocShell(), extraInfo.getOnAction(), true );
if ( aMacroInf.mbFound )
aProp.Value = helper.createCommandFromMacro( aMacroInf.msResolvedMacro );
else
- aProp.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UnResolvedMacro[" )).concat( extraInfo.getOnAction() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "]" )) );
+ aProp.Value <<= rtl::OUString( "UnResolvedMacro[" ).concat( extraInfo.getOnAction() ).concat( rtl::OUString( "]" ) );
sControlData.push_back( aProp );
}
- aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Label") );
+ aProp.Name = rtl::OUString("Label");
aProp.Value = uno::makeAny( customText.getString().replace('&','~') );
sControlData.push_back( aProp );
- aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type") );
+ aProp.Name = rtl::OUString("Type");
aProp.Value = uno::makeAny( ui::ItemType::DEFAULT );
sControlData.push_back( aProp );
- aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Tooltip") );
+ aProp.Name = rtl::OUString("Tooltip");
aProp.Value = uno::makeAny( tooltip.getString() );
sControlData.push_back( aProp );
/*
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index f776d3e2869b..649b83ad94f0 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -204,14 +204,14 @@ OdfFlatXml::exporter(const Sequence< PropertyValue >& sourceData,
OUString OdfFlatXml::impl_getImplementationName()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.filter.OdfFlatXml"));
+ return OUString("com.sun.star.comp.filter.OdfFlatXml");
}
Sequence< OUString > OdfFlatXml::impl_getSupportedServiceNames()
{
Sequence< OUString > lServiceNames(2);
- lServiceNames[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ImportFilter" ));
- lServiceNames[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExportFilter" ));
+ lServiceNames[0] = OUString( "com.sun.star.document.ImportFilter" );
+ lServiceNames[1] = OUString( "com.sun.star.document.ExportFilter" );
return lServiceNames;
}
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index f019f52093ca..f2096d6105c5 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -290,7 +290,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
{
sal_Bool bRet = sal_False;
- mxGraphicExporter = Reference< XExporter >::query( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicExportFilter") ) ) );
+ mxGraphicExporter = Reference< XExporter >::query( mxMSF->createInstance( OUString("com.sun.star.drawing.GraphicExportFilter") ) );
Reference< XDrawPagesSupplier > xDrawPagesSupplier(xDoc, UNO_QUERY);
if(!xDrawPagesSupplier.is())
return sal_False;
@@ -301,7 +301,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
if(xStatusIndicator.is())
{
- xStatusIndicator->start(OUString( RTL_CONSTASCII_USTRINGPARAM( "PlaceWare:" )),xDrawPages->getCount());
+ xStatusIndicator->start(OUString( "PlaceWare:" ),xDrawPages->getCount());
}
Reference< XDrawPage > xDrawPage;
@@ -346,7 +346,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
OUString aName( RTL_CONSTASCII_USTRINGPARAM("i") );
aName += OUString::valueOf( nPage );
- aName += OUString( RTL_CONSTASCII_USTRINGPARAM(".gif") );
+ aName += OUString(".gif");
pEntry->setURL( aName );
if(xStatusIndicator.is())
@@ -485,17 +485,17 @@ PageEntry* PlaceWareExporter::exportPage( Reference< XDrawPage >&xDrawPage )
Reference< XFilter > xFilter( mxGraphicExporter, UNO_QUERY );
Sequence< PropertyValue > aFilterData( 2 );
- aFilterData[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Width") );
+ aFilterData[0].Name = OUString("Width");
aFilterData[0].Value <<= (sal_Int32)704;
- aFilterData[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Translucent") );
+ aFilterData[1].Name = OUString("Translucent");
aFilterData[1].Value <<= (sal_Bool)sal_False;
Sequence< PropertyValue > aDescriptor( 3 );
- aDescriptor[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FilterName") );
- aDescriptor[0].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM("GIF") );
- aDescriptor[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("URL") );
+ aDescriptor[0].Name = OUString("FilterName");
+ aDescriptor[0].Value <<= OUString("GIF");
+ aDescriptor[1].Name = OUString("URL");
aDescriptor[1].Value <<= OUString( pEntry->getTempURL() );
- aDescriptor[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FilterData") );
+ aDescriptor[2].Name = OUString("FilterData");
aDescriptor[2].Value <<= aFilterData;
mxGraphicExporter->setSourceDocument( xComp );
xFilter->filter( aDescriptor );
diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx
index deb97bdbfa3c..6ad7e8733d6c 100644
--- a/filter/source/placeware/filter.cxx
+++ b/filter/source/placeware/filter.cxx
@@ -144,7 +144,7 @@ void SAL_CALL PlaceWareExportFilter::initialize( const ::com::sun::star::uno::Se
OUString PlaceWareExportFilter_getImplementationName ()
throw (RuntimeException)
{
- return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Impress.PlaceWareExportFilter" ) );
+ return OUString( "com.sun.star.comp.Impress.PlaceWareExportFilter" );
}
// -----------------------------------------------------------------------------
diff --git a/filter/source/placeware/tempfile.cxx b/filter/source/placeware/tempfile.cxx
index 2cbf2b4f45e7..6168d2271f9c 100644
--- a/filter/source/placeware/tempfile.cxx
+++ b/filter/source/placeware/tempfile.cxx
@@ -147,9 +147,9 @@ OUString TempFile::createTempFileURL()
u %= (nRadix*nRadix*nRadix);
OUString aTmp( aTempDirURL );
if( aTmp.getStr()[ aTmp.getLength() - 1 ] != sal_Unicode( '/' ) )
- aTmp += OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ));
+ aTmp += OUString( "/" );
aTmp += OUString::valueOf( (sal_Int32) (unsigned) u, nRadix );
- aTmp += OUString( RTL_CONSTASCII_USTRINGPARAM( ".tmp" ));
+ aTmp += OUString( ".tmp" );
osl::File aFile( aTmp );
osl::FileBase::RC err = aFile.open(osl_File_OpenFlag_Create);
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 2570fee33b30..6b7245192d16 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -295,12 +295,12 @@ rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescrip
sal_Int8 aMagic1[] = {'<', 's', 'v', 'g'};
if( std::search(pBuf, pBuf+nBytes,
aMagic1, aMagic1+sizeof(aMagic1)/sizeof(*aMagic1)) != pBuf+nBytes )
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("svg_Scalable_Vector_Graphics") );
+ return rtl::OUString("svg_Scalable_Vector_Graphics");
sal_Int8 aMagic2[] = {'D', 'O', 'C', 'T', 'Y', 'P', 'E', ' ', 's', 'v', 'g'};
if( std::search(pBuf, pBuf+nBytes,
aMagic2, aMagic2+sizeof(aMagic2)/sizeof(*aMagic2)) != pBuf+nBytes )
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("svg_Scalable_Vector_Graphics") );
+ return rtl::OUString("svg_Scalable_Vector_Graphics");
return rtl::OUString();
}
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 588207b0bd86..62b7bb575f55 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2173,7 +2173,7 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly,
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, OUString::valueOf( aRect.GetWidth() ) );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::valueOf( aRect.GetHeight() ) );
- mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "userSpaceOnUse") ) );
+ mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, rtl::OUString( "userSpaceOnUse") );
{
SvXMLElementExport aElemPattern( mrExport, XML_NAMESPACE_NONE, aXMLElemPattern, sal_True, sal_True );
@@ -2264,7 +2264,7 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly,
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::valueOf( aPoly[ 1 ].Y() ) );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "userSpaceOnUse" ) ) );
+ rtl::OUString( "userSpaceOnUse" ) );
}
{
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index ed2901bfbbed..f32c3dd85922 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -82,7 +82,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
comphelper::MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >()));
if (xStatusIndicator.is()){
- xStatusIndicator->start(OUString( RTL_CONSTASCII_USTRINGPARAM( "Loading :" )),nProgressRange);
+ xStatusIndicator->start(OUString( "Loading :" ),nProgressRange);
}
OUString sXMLImportService ( udImport );
@@ -90,7 +90,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
Sequence< Any > aAnys(1);
OUString aBaseURI;
- if (aMediaMap.find(OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" )))->second >>= aBaseURI)
+ if (aMediaMap.find(OUString( "URL" ))->second >>= aBaseURI)
{
INetURLObject aURLObj(aBaseURI);
// base URI in this case is the URI of the actual saving location
@@ -108,7 +108,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
Reference< XPropertySet > xInfoSet(
GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) );
xInfoSet->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" )), makeAny( aBaseURI ));
+ OUString( "BaseURI" ), makeAny( aBaseURI ));
aAnys[0] <<= xInfoSet;
@@ -159,12 +159,12 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
Sequence<com::sun::star::beans::PropertyValue> pValue=xstyleLoader->getStyleLoaderOptions();
//Load the Styles from the Template URL Supplied in the TypeDetection file
- if(msTemplateName.indexOf(OUString( RTL_CONSTASCII_USTRINGPARAM( "file:" )))==-1)
+ if(msTemplateName.indexOf(OUString( "file:" ))==-1)
{
Reference< XConfigManager >xCfgMgr ( mxMSF->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" )) ), UNO_QUERY );
+ OUString( "com.sun.star.config.SpecialConfigManager" ) ), UNO_QUERY );
OUString PathString(xCfgMgr->substituteVariables(OUString(RTL_CONSTASCII_USTRINGPARAM("$(progurl)"))));
- PathString = PathString.concat(OUString( RTL_CONSTASCII_USTRINGPARAM( "/" )));
+ PathString = PathString.concat(OUString( "/" ));
msTemplateName=PathString.concat(msTemplateName);
}
@@ -221,7 +221,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
comphelper::MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >()));
if (xStatusIndicator.is())
- xStatusIndicator->start(OUString( RTL_CONSTASCII_USTRINGPARAM( "Saving :" )),nProgressRange);
+ xStatusIndicator->start(OUString( "Saving :" ),nProgressRange);
// Set up converter bridge.
Reference< com::sun::star::xml::XExportFilter > xConverter(mxMSF->createInstance(udConvertClass ), UNO_QUERY);
@@ -261,7 +261,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
// get the base URI, so we can use relative links
OUString aBaseURI;
- if (aMediaMap.find(OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" )))->second >>= aBaseURI)
+ if (aMediaMap.find(OUString( "URL" ))->second >>= aBaseURI)
{
INetURLObject aURLObj(aBaseURI);
// base URI in this case is the URI of the actual saving location
@@ -281,12 +281,12 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
Reference< XPropertySet > xInfoSet(
GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) );
xInfoSet->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "UsePrettyPrinting" )), makeAny( bPrettyPrint ));
+ OUString( "UsePrettyPrinting" ), makeAny( bPrettyPrint ));
xInfoSet->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportTextNumberElement" )),
+ OUString( "ExportTextNumberElement" ),
makeAny( bExportTextNumberElementForListItems ));
xInfoSet->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" )), makeAny( aBaseURI ));
+ OUString( "BaseURI" ), makeAny( aBaseURI ));
aAnys[1] <<= xInfoSet;
Reference< XExporter > xExporter( mxMSF->createInstanceWithArguments (
@@ -365,17 +365,17 @@ void SAL_CALL XmlFilterAdaptor::initialize( const Sequence< Any >& aArguments )
{
comphelper::SequenceAsHashMap aMap(aAnySeq);
msFilterName = aMap.getUnpackedValueOrDefault(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" )), OUString());
+ OUString( "Type" ), OUString());
msUserData = aMap.getUnpackedValueOrDefault(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "UserData" )), Sequence< OUString >());
+ OUString( "UserData" ), Sequence< OUString >());
msTemplateName = aMap.getUnpackedValueOrDefault(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "TemplateName" )), OUString());
+ OUString( "TemplateName" ), OUString());
}
}
OUString XmlFilterAdaptor_getImplementationName ()
throw (RuntimeException)
{
- return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XmlFilterAdaptor" ) );
+ return OUString( "com.sun.star.comp.Writer.XmlFilterAdaptor" );
}
#define SERVICE_NAME1 "com.sun.star.document.ExportFilter"
#define SERVICE_NAME2 "com.sun.star.document.ImportFilter"
diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx
index bec453d8ae08..953a3dc7c7f8 100644
--- a/filter/source/xmlfilterdetect/filterdetect.cxx
+++ b/filter/source/xmlfilterdetect/filterdetect.cxx
@@ -255,7 +255,7 @@ void SAL_CALL FilterDetect::initialize( const Sequence< Any >& aArguments )
OUString FilterDetect_getImplementationName ()
{
- return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.filters.XMLFilterDetect" ) );
+ return OUString( "com.sun.star.comp.filters.XMLFilterDetect" );
}
#define SERVICE_NAME1 "com.sun.star.document.ExtendedTypeDetection"
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx
index ac7118459c8b..9fb075306486 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -100,10 +100,10 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS, const XML
xHandler->setOutputStream( xOS );
::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList;
- pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "xmlns:oor" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "http://openoffice.org/2001/registry" )) );
- pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "xmlns:xs" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "http://www.w3.org/2001/XMLSchema" )) );
- pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "TypeDetection" )) );
- pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:package" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office" )) );
+ pAttrList->AddAttribute ( OUString( "xmlns:oor" ), sCdataAttribute, OUString( "http://openoffice.org/2001/registry" ) );
+ pAttrList->AddAttribute ( OUString( "xmlns:xs" ), sCdataAttribute, OUString( "http://www.w3.org/2001/XMLSchema" ) );
+ pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( "TypeDetection" ) );
+ pAttrList->AddAttribute ( OUString( "oor:package" ), sCdataAttribute, OUString( "org.openoffice.Office" ) );
Reference < XAttributeList > xAttrList (pAttrList);
xHandler->startDocument();
@@ -113,7 +113,7 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS, const XML
// export types
{
xAttrList = pAttrList = new ::comphelper::AttributeList;
- pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "Types" )) );
+ pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( "Types" ) );
xHandler->ignorableWhitespace ( sWhiteSpace );
xHandler->startElement( sNode, xAttrList );
@@ -156,7 +156,7 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS, const XML
// export filters
{
xAttrList = pAttrList = new ::comphelper::AttributeList;
- pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "Filters" )) );
+ pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( "Filters" ) );
xHandler->ignorableWhitespace ( sWhiteSpace );
xHandler->startElement( sNode, xAttrList );
@@ -233,8 +233,8 @@ void TypeDetectionExporter::addProperty( Reference< XWriter > xHandler, const OU
const OUString sWhiteSpace ( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList;
- pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:name" )), sCdataAttribute, rName );
- pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:type" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "xs:string" )) );
+ pAttrList->AddAttribute ( OUString( "oor:name" ), sCdataAttribute, rName );
+ pAttrList->AddAttribute ( OUString( "oor:type" ), sCdataAttribute, OUString( "xs:string" ) );
Reference < XAttributeList > xAttrList (pAttrList);
xHandler->ignorableWhitespace ( sWhiteSpace );
@@ -263,14 +263,14 @@ void TypeDetectionExporter::addLocaleProperty( Reference< XWriter > xHandler, co
const OUString sWhiteSpace ( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList;
- pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:name" )), sCdataAttribute, rName );
- pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:type" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "xs:string" )) );
+ pAttrList->AddAttribute ( OUString( "oor:name" ), sCdataAttribute, rName );
+ pAttrList->AddAttribute ( OUString( "oor:type" ), sCdataAttribute, OUString( "xs:string" ) );
Reference < XAttributeList > xAttrList (pAttrList);
xHandler->ignorableWhitespace ( sWhiteSpace );
xHandler->startElement( sProp, xAttrList );
xAttrList = pAttrList = new ::comphelper::AttributeList;
- pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "xml:lang" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "en-US" )) );
+ pAttrList->AddAttribute ( OUString( "xml:lang" ), sCdataAttribute, OUString( "en-US" ) );
xHandler->ignorableWhitespace ( sWhiteSpace );
xHandler->startElement( sValue, xAttrList );
xHandler->characters( rValue );
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 3bf4119c00b3..91691d68e4bf 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -190,7 +190,7 @@ void SAL_CALL XMLFilterDialogComponent::release() throw ()
OUString XMLFilterDialogComponent_getImplementationName() throw ( RuntimeException )
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "XMLFilterDialogComponent" ) );
+ return OUString( "XMLFilterDialogComponent" );
}
//-------------------------------------------------------------------------
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index 8bf0f710a829..5947131be136 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -72,7 +72,7 @@ XMLFilterJarHelper::XMLFilterJarHelper( Reference< XMultiServiceFactory >& xMSF
{
try
{
- Reference< XConfigManager > xCfgMgr( xMSF->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" ))), UNO_QUERY );
+ Reference< XConfigManager > xCfgMgr( xMSF->createInstance(OUString( "com.sun.star.config.SpecialConfigManager" )), UNO_QUERY );
if( xCfgMgr.is() )
{
sProgPath = xCfgMgr->substituteVariables( sProgPath );
@@ -135,7 +135,7 @@ void XMLFilterJarHelper::addFile( Reference< XInterface > xRootFolder, Reference
{
OUString aFileURL( rSourceFile );
- if( !aFileURL.matchIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM("file://") ) ) )
+ if( !aFileURL.matchIgnoreAsciiCase( OUString("file://") ) )
{
aFileURL = URIHelper::SmartRel2Abs( sProgPath, aFileURL, Link(), false );
}
@@ -162,13 +162,13 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
// let ZipPackage be used ( no manifest.xml is required )
beans::NamedValue aArg;
- aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StorageFormat" ) );
+ aArg.Name = ::rtl::OUString( "StorageFormat" );
aArg.Value <<= ZIP_STORAGE_FORMAT_STRING;
aArguments[ 1 ] <<= aArg;
Reference< XHierarchicalNameAccess > xIfc(
mxMSF->createInstanceWithArguments(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.packages.comp.ZipPackage" )),
+ rtl::OUString( "com.sun.star.packages.comp.ZipPackage" ),
aArguments ), UNO_QUERY );
if( xIfc.is() )
@@ -262,13 +262,13 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect
// let ZipPackage be used ( no manifest.xml is required )
beans::NamedValue aArg;
- aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StorageFormat" ) );
+ aArg.Name = ::rtl::OUString( "StorageFormat" );
aArg.Value <<= ZIP_STORAGE_FORMAT_STRING;
aArguments[ 1 ] <<= aArg;
Reference< XHierarchicalNameAccess > xIfc(
mxMSF->createInstanceWithArguments(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.packages.comp.ZipPackage" )),
+ rtl::OUString( "com.sun.star.packages.comp.ZipPackage" ),
aArguments ), UNO_QUERY );
if( xIfc.is() )
@@ -341,8 +341,8 @@ bool XMLFilterJarHelper::copyFile( Reference< XHierarchicalNameAccess > xIfc, OU
{
OUString szPackagePath( encodeZipUri( rURL.copy( sVndSunStarPackage.getLength() ) ) );
- if ( ::comphelper::OStorageHelper::PathHasSegment( szPackagePath, OUString( RTL_CONSTASCII_USTRINGPARAM( ".." ) ) )
- || ::comphelper::OStorageHelper::PathHasSegment( szPackagePath, OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) ) )
+ if ( ::comphelper::OStorageHelper::PathHasSegment( szPackagePath, OUString( ".." ) )
+ || ::comphelper::OStorageHelper::PathHasSegment( szPackagePath, OUString( "." ) ) )
throw lang::IllegalArgumentException();
if( xIfc->hasByHierarchicalName( szPackagePath ) )
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 4e387b9397f9..15b86e1eccda 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1345,7 +1345,7 @@ OUString getApplicationUIName( const OUString& rServiceName )
OUString aRet = RESIDSTR(STR_UNKNOWN_APPLICATION);
if( !rServiceName.isEmpty() )
{
- aRet += OUString( RTL_CONSTASCII_USTRINGPARAM( " (" ));
+ aRet += OUString( " (" );
aRet += rServiceName;
aRet += OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ));
}
@@ -1620,7 +1620,7 @@ Sequence< OUString > filter_info_impl::getFilterUserData() const
{
Sequence< OUString > aUserData(8);
- aUserData[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" ) );
+ aUserData[0] = OUString( "com.sun.star.documentconversion.XSLTFilter" );
aUserData[1] = OUString::valueOf( mbNeedsXSLT2 );
aUserData[2] = maImportService;
aUserData[3] = maExportService;
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 727b5d46a6ef..b90b9cfc748c 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -117,7 +117,7 @@ static bool checkComponent( Reference< XComponent >& rxComponent, const OUString
if ( rServiceName == "com.sun.star.drawing.DrawingDocument" )
{
// so if we want a draw we need to check if its not an impress
- if( !xInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument") ) ) )
+ if( !xInfo->supportsService( OUString( "com.sun.star.presentation.PresentationDocument") ) )
return true;
}
else
@@ -297,8 +297,8 @@ void XMLFilterTestDialog::onExportBrowse()
com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
0 );
- Reference< XNameAccess > xFilterContainer( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" )) ), UNO_QUERY );
- Reference< XNameAccess > xTypeDetection( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" )) ), UNO_QUERY );
+ Reference< XNameAccess > xFilterContainer( mxMSF->createInstance( OUString( "com.sun.star.document.FilterFactory" ) ), UNO_QUERY );
+ Reference< XNameAccess > xTypeDetection( mxMSF->createInstance( OUString( "com.sun.star.document.TypeDetection" ) ), UNO_QUERY );
if( xFilterContainer.is() && xTypeDetection.is() )
{
Sequence< OUString > aFilterNames( xFilterContainer->getElementNames() );
@@ -372,7 +372,7 @@ void XMLFilterTestDialog::onExportBrowse()
{
if( n > 0 )
aExtension += OUString( sal_Unicode(';') );
- aExtension += OUString( RTL_CONSTASCII_USTRINGPARAM( "*." ));
+ aExtension += OUString( "*." );
aExtension += (*pExtensions++);
}
}
@@ -406,7 +406,7 @@ void XMLFilterTestDialog::onExportBrowse()
Reference< XInteractionHandler2 > xInter( InteractionHandler::createWithParent(comphelper::getComponentContext(mxMSF), 0) );
OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) );
Sequence< PropertyValue > aArguments(1);
- aArguments[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
+ aArguments[0].Name = OUString( "InteractionHandler" );
aArguments[0].Value <<= xInter;
Reference< XComponent > xComp( xLoader->loadComponentFromURL( m_sExportRecentFile, aFrame, 0, aArguments ) );
if( xComp.is() )
@@ -453,19 +453,19 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
int i = 0;
- aSourceData[i ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OutputStream" ) );
+ aSourceData[i ].Name = OUString( "OutputStream" );
aSourceData[i++].Value <<= xIS;
- aSourceData[i].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Indent" ) );
+ aSourceData[i].Name = OUString( "Indent" );
aSourceData[i++].Value <<= (sal_Bool)sal_True;
if( bUseDocType )
{
- aSourceData[i ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("DocType_Public"));
+ aSourceData[i ].Name = OUString("DocType_Public");
aSourceData[i++].Value <<= m_pFilterInfo->maDocType;
}
- Reference< XExportFilter > xExporter( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" )) ), UNO_QUERY );
+ Reference< XExportFilter > xExporter( mxMSF->createInstance( OUString( "com.sun.star.documentconversion.XSLTFilter" ) ), UNO_QUERY );
Reference< XDocumentHandler > xHandler( xExporter, UNO_QUERY );
if( xHandler.is() )
{
@@ -481,8 +481,8 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
{
try
{
- xGrfResolver = Reference< XGraphicObjectResolver >::query( xDocFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExportGraphicObjectResolver" )) ) );
- xObjectResolver = Reference< XEmbeddedObjectResolver >::query( xDocFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExportEmbeddedObjectResolver" )) ) );
+ xGrfResolver = Reference< XGraphicObjectResolver >::query( xDocFac->createInstance( OUString( "com.sun.star.document.ExportGraphicObjectResolver" ) ) );
+ xObjectResolver = Reference< XEmbeddedObjectResolver >::query( xDocFac->createInstance( OUString( "com.sun.star.document.ExportEmbeddedObjectResolver" ) ) );
}
catch( const Exception& )
{
@@ -506,7 +506,7 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
xExporter2->setSourceDocument( xComp );
Sequence< PropertyValue > aDescriptor( 1 );
- aDescriptor[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ) );
+ aDescriptor[0].Name = OUString( "FileName" );
aDescriptor[0].Value <<= aTempFileURL;
if( xFilter->filter( aDescriptor ) )
@@ -592,9 +592,9 @@ void XMLFilterTestDialog::import( const OUString& rURL )
OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) );
Sequence< PropertyValue > aArguments(2);
- aArguments[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
+ aArguments[0].Name = OUString( "FilterName" );
aArguments[0].Value <<= m_pFilterInfo->maFilterName;
- aArguments[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
+ aArguments[1].Name = OUString( "InteractionHandler" );
aArguments[1].Value <<= xInter;
xLoader->loadComponentFromURL( rURL, aFrame, 0, aArguments );
@@ -606,7 +606,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
TempFile aTempFile(lead, &ext);
OUString aTempFileURL( aTempFile.GetURL() );
- Reference< XImportFilter > xImporter( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" )) ), UNO_QUERY );
+ Reference< XImportFilter > xImporter( mxMSF->createInstance( OUString( "com.sun.star.documentconversion.XSLTFilter" ) ), UNO_QUERY );
if( xImporter.is() )
{
osl::File aInputFile( rURL );
@@ -617,13 +617,13 @@ void XMLFilterTestDialog::import( const OUString& rURL )
Sequence< PropertyValue > aSourceData( 3 );
int i = 0;
- aSourceData[i ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "InputStream" ));
+ aSourceData[i ].Name = OUString( "InputStream" );
aSourceData[i++].Value <<= xIS;
- aSourceData[i ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ));
+ aSourceData[i ].Name = OUString( "FileName" );
aSourceData[i++].Value <<= rURL;
- aSourceData[i ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Indent" ));
+ aSourceData[i ].Name = OUString( "Indent" );
aSourceData[i++].Value <<= (sal_Bool)sal_True;
Reference< XWriter > xWriter = Writer::create( comphelper::getComponentContext(mxMSF) );
diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx
index 395bc8192d75..eb4336479545 100644
--- a/filter/source/xsltfilter/OleHandler.cxx
+++ b/filter/source/xsltfilter/OleHandler.cxx
@@ -108,8 +108,7 @@ namespace XSLT
//create an com.sun.star.embed.OLESimpleStorage from the temp stream
Sequence<Any> args(1);
args[0] <<= xSeek;
- Reference<XNameContainer> cont(m_msf->createInstanceWithArguments(OUString(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )), args), UNO_QUERY);
+ Reference<XNameContainer> cont(m_msf->createInstanceWithArguments(OUString( "com.sun.star.embed.OLESimpleStorage" ), args), UNO_QUERY);
m_storage = cont;
}
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 0b8f7f1a014a..5895bc8ad571 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -70,16 +70,16 @@ const StringSequence& getColumnTypes()
if (aColumnTypes.getConstArray()[0].isEmpty())
{
::rtl::OUString* pNames = aColumnTypes.getArray();
- pNames[TYPE_CHECKBOX] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CheckBox" ) );
- pNames[TYPE_COMBOBOX] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ComboBox" ) );
- pNames[TYPE_CURRENCYFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CurrencyField" ) );
- pNames[TYPE_DATEFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateField" ) );
- pNames[TYPE_FORMATTEDFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormattedField" ) );
- pNames[TYPE_LISTBOX] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ) );
- pNames[TYPE_NUMERICFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NumericField" ) );
- pNames[TYPE_PATTERNFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PatternField" ) );
- pNames[TYPE_TEXTFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextField" ) );
- pNames[TYPE_TIMEFIELD] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TimeField" ) );
+ pNames[TYPE_CHECKBOX] = ::rtl::OUString( "CheckBox" );
+ pNames[TYPE_COMBOBOX] = ::rtl::OUString( "ComboBox" );
+ pNames[TYPE_CURRENCYFIELD] = ::rtl::OUString( "CurrencyField" );
+ pNames[TYPE_DATEFIELD] = ::rtl::OUString( "DateField" );
+ pNames[TYPE_FORMATTEDFIELD] = ::rtl::OUString( "FormattedField" );
+ pNames[TYPE_LISTBOX] = ::rtl::OUString( "ListBox" );
+ pNames[TYPE_NUMERICFIELD] = ::rtl::OUString( "NumericField" );
+ pNames[TYPE_PATTERNFIELD] = ::rtl::OUString( "PatternField" );
+ pNames[TYPE_TEXTFIELD] = ::rtl::OUString( "TextField" );
+ pNames[TYPE_TIMEFIELD] = ::rtl::OUString( "TimeField" );
}
return aColumnTypes;
}
@@ -341,7 +341,7 @@ void OGridColumn::clearAggregateProperties( Sequence< Property >& _rProps, sal_B
aForbiddenProperties.insert( PROPERTY_VERTICAL_ALIGN );
aForbiddenProperties.insert( PROPERTY_IMAGE_URL );
aForbiddenProperties.insert( PROPERTY_IMAGE_POSITION );
- aForbiddenProperties.insert( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) ) );
+ aForbiddenProperties.insert( ::rtl::OUString( "EnableVisible" ) );
if ( !bAllowDropDown )
aForbiddenProperties.insert( PROPERTY_DROPDOWN );
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index fb19bccf50b2..29abbe3a7af8 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -521,7 +521,7 @@ void OComboBoxModel::loadData( bool _bForce )
// otherwise look for the alias
Reference<XPropertySet> xFormProp(xForm,UNO_QUERY);
Reference< XColumnsSupplier > xSupplyFields;
- xFormProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSupplyFields;
+ xFormProp->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSupplyFields;
// search the field
DBG_ASSERT(xSupplyFields.is(), "OComboBoxModel::loadData : invalid query composer !");
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index 4536b207ea69..6076fc64b7d2 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -110,11 +110,11 @@ void OCurrencyModel::implConstruct()
bPrependCurrencySymbol = sal_False;
break;
case 2: // $ 1
- sCurrencySymbol = ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") );
+ sCurrencySymbol = ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())) + ::rtl::OUString(" ");
bPrependCurrencySymbol = sal_True;
break;
case 3: // 1 $
- sCurrencySymbol = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") ) + ::rtl::OUString(String(aLocaleInfo.getCurrSymbol()));
+ sCurrencySymbol = ::rtl::OUString(" ") + ::rtl::OUString(String(aLocaleInfo.getCurrSymbol()));
bPrependCurrencySymbol = sal_False;
break;
}
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 24d07499bbf6..378febb070ff 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -404,7 +404,7 @@ ODatabaseForm::ODatabaseForm( const ODatabaseForm& _cloneSource )
catch(const Exception&)
{
throw WrappedTargetException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Could not clone the given database form." ) ),
+ ::rtl::OUString( "Could not clone the given database form." ),
*const_cast< ODatabaseForm* >( &_cloneSource ),
::cppu::getCaughtException()
);
@@ -2165,7 +2165,7 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransfor
if (xDisp.is())
{
Sequence<PropertyValue> aArgs(2);
- aArgs.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") );
+ aArgs.getArray()[0].Name = ::rtl::OUString("Referer");
aArgs.getArray()[0].Value <<= aReferer;
// build a sequence from the to-be-submitted string
@@ -2174,7 +2174,7 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransfor
Sequence< sal_Int8 > aPostData((const sal_Int8*)a8BitData.getStr(), a8BitData.getLength());
Reference< XInputStream > xPostData = new SequenceInputStream(aPostData);
- aArgs.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostData") );
+ aArgs.getArray()[1].Name = ::rtl::OUString("PostData");
aArgs.getArray()[1].Value <<= xPostData;
xDisp->dispatch(aURL, aArgs);
@@ -2259,7 +2259,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
if (xDisp.is())
{
Sequence<PropertyValue> aArgs(1);
- aArgs.getArray()->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") );
+ aArgs.getArray()->Name = ::rtl::OUString("Referer");
aArgs.getArray()->Value <<= aReferer;
xDisp->dispatch(aURL, aArgs);
}
@@ -2292,15 +2292,15 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
return;
Sequence<PropertyValue> aArgs(3);
- aArgs.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") );
+ aArgs.getArray()[0].Name = ::rtl::OUString("Referer");
aArgs.getArray()[0].Value <<= aReferer;
- aArgs.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType") );
+ aArgs.getArray()[1].Name = ::rtl::OUString("ContentType");
aArgs.getArray()[1].Value <<= aContentType;
// build a sequence from the to-be-submitted string
Reference< XInputStream > xPostData = new SequenceInputStream(aData);
- aArgs.getArray()[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostData") );
+ aArgs.getArray()[2].Name = ::rtl::OUString("PostData");
aArgs.getArray()[2].Value <<= xPostData;
xDisp->dispatch(aURL, aArgs);
@@ -3781,7 +3781,7 @@ void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) th
//------------------------------------------------------------------------------
::rtl::OUString SAL_CALL ODatabaseForm::getImplementationName_Static()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.ODatabaseForm" ) );
+ return ::rtl::OUString( "com.sun.star.comp.forms.ODatabaseForm" );
}
//------------------------------------------------------------------------------
@@ -3802,7 +3802,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getCurrentServiceNames_Stati
::rtl::OUString* pServices = aServices.getArray();
*pServices++ = FRM_SUN_FORMCOMPONENT;
- *pServices++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormComponents") );
+ *pServices++ = ::rtl::OUString("com.sun.star.form.FormComponents");
*pServices++ = FRM_SUN_COMPONENT_FORM;
*pServices++ = FRM_SUN_COMPONENT_HTMLFORM;
*pServices++ = FRM_SUN_COMPONENT_DATAFORM;
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index c69a23e1e4b7..b6e43b54b4c0 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -619,7 +619,7 @@ void OEditModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm )
if ( !m_bMaxTextLenModified )
{
sal_Int32 nFieldLen = 0;
- xField->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Precision") ) ) >>= nFieldLen;
+ xField->getPropertyValue(::rtl::OUString("Precision") ) >>= nFieldLen;
if (nFieldLen && nFieldLen <= USHRT_MAX)
{
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 9afc606ecfeb..d2bc3239260b 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -158,22 +158,22 @@ namespace frm
switch (m_nControlClass)
{
case FormComponentType::RADIOBUTTON:
- aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("radiobutton") );
+ aServiceName = rtl::OUString("radiobutton");
break;
case FormComponentType::CHECKBOX:
- aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("checkbox") );
+ aServiceName = rtl::OUString("checkbox");
break;
case FormComponentType::COMBOBOX:
- aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("combobox") );
+ aServiceName = rtl::OUString("combobox");
break;
case FormComponentType::LISTBOX:
- aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("listbox") );
+ aServiceName = rtl::OUString("listbox");
break;
default:
if (m_bMultiLine)
- aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MultiLineEdit") );
+ aServiceName = rtl::OUString("MultiLineEdit");
else
- aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Edit") );
+ aServiceName = rtl::OUString("Edit");
}
return aServiceName;
}
@@ -405,7 +405,7 @@ namespace frm
// create a query composer
Reference< XColumnsSupplier > xSuppColumns;
- xFormProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSuppColumns;
+ xFormProps->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSuppColumns;
const Reference< XConnection > xConnection( ::dbtools::getConnection( xForm ), UNO_SET_THROW );
const Reference< XNameAccess > xFieldNames( xSuppColumns->getColumns(), UNO_SET_THROW );
@@ -899,15 +899,15 @@ namespace frm
//---------------------------------------------------------------------
::rtl::OUString SAL_CALL OFilterControl::getImplementationName_Static()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.OFilterControl" ) );
+ return ::rtl::OUString( "com.sun.star.comp.forms.OFilterControl" );
}
//---------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OFilterControl::getSupportedServiceNames_Static()
{
Sequence< ::rtl::OUString > aNames( 2 );
- aNames[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.control.FilterControl" ) );
- aNames[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControl" ) );
+ aNames[ 0 ] = ::rtl::OUString( "com.sun.star.form.control.FilterControl" );
+ aNames[ 1 ] = ::rtl::OUString( "com.sun.star.awt.UnoControl" );
return aNames;
}
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 569fe435554c..ac5b96c92a17 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -772,7 +772,7 @@ Sequence< ::rtl::OUString > SAL_CALL OControlModel::getSupportedServiceNames_Sta
{
Sequence< ::rtl::OUString > aServiceNames( 2 );
aServiceNames[ 0 ] = FRM_SUN_FORMCOMPONENT;
- aServiceNames[ 1 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormControlModel") );
+ aServiceNames[ 1 ] = ::rtl::OUString("com.sun.star.form.FormControlModel");
return aServiceNames;
}
@@ -1656,7 +1656,7 @@ StringSequence SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(Run
Sequence< ::rtl::OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Static() throw( RuntimeException )
{
Sequence< ::rtl::OUString > aOwnServiceNames( 1 );
- aOwnServiceNames[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.DataAwareControlModel") );
+ aOwnServiceNames[ 0 ] = ::rtl::OUString("com.sun.star.form.DataAwareControlModel");
return ::comphelper::concatSequences(
OControlModel::getSupportedServiceNames_Static(),
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index dd918461eb04..a371c69e1729 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -601,7 +601,7 @@ void OFormattedModel::updateFormatterNullDate()
// calc the current NULL date
Reference< XNumberFormatsSupplier > xSupplier( calcFormatsSupplier() );
if ( xSupplier.is() )
- xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NullDate" ) ) ) >>= m_aNullDate;
+ xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString( "NullDate" ) ) >>= m_aNullDate;
}
//------------------------------------------------------------------------------
@@ -774,7 +774,7 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor
Reference<XNumberFormatsSupplier> xSupplier = calcFormatsSupplier();
m_bNumeric = getBOOL( getPropertyValue( PROPERTY_TREATASNUMERIC ) );
m_nKeyType = getNumberFormatType( xSupplier->getNumberFormats(), nFormatKey );
- xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate") ) ) >>= m_aNullDate;
+ xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString("NullDate") ) >>= m_aNullDate;
OEditBaseModel::onConnectedDbColumn( _rxForm );
}
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index ebd40a4f4c3d..e634bbf8ed7c 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -195,7 +195,7 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw
//------------------------------------------------------------------
::rtl::OUString SAL_CALL OFormattedFieldWrapper::getImplementationName( ) throw (RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormattedFieldWrapper") );
+ return ::rtl::OUString("com.sun.star.comp.forms.OFormattedFieldWrapper");
}
//------------------------------------------------------------------
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index a31e15c368e6..e997ef77b948 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -108,7 +108,7 @@ Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(Runtim
//------------------------------------------------------------------------------
::rtl::OUString SAL_CALL OFormsCollection::getImplementationName() throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormsCollection") );
+ return ::rtl::OUString("com.sun.star.comp.forms.OFormsCollection");
}
//------------------------------------------------------------------------------
@@ -128,7 +128,7 @@ StringSequence SAL_CALL OFormsCollection::getSupportedServiceNames() throw(Runti
StringSequence aReturn(2);
aReturn.getArray()[0] = FRM_SUN_FORMS_COLLECTION;
- aReturn.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormComponents") );
+ aReturn.getArray()[1] = ::rtl::OUString("com.sun.star.form.FormComponents");
return aReturn;
}
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 005c7199340a..d25212629ec5 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -202,7 +202,7 @@ StringSequence OGridControlModel::getSupportedServiceNames() throw(RuntimeExcept
aSupported.realloc(aSupported.getLength() + 2);
::rtl::OUString*pArray = aSupported.getArray();
- pArray[aSupported.getLength()-2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlModel"));
+ pArray[aSupported.getLength()-2] = ::rtl::OUString("com.sun.star.awt.UnoControlModel");
pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_GRIDCONTROL;
return aSupported;
}
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index da407cf8e544..caa015af2d0b 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -257,7 +257,7 @@ Sequence< Reference<XControlModel> > OGroup::GetControlModels() const
DBG_NAME(OGroupManager);
//------------------------------------------------------------------
OGroupManager::OGroupManager(const Reference< XContainer >& _rxContainer)
- :m_pCompGroup( new OGroup( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AllComponentGroup") ) ) )
+ :m_pCompGroup( new OGroup( ::rtl::OUString("AllComponentGroup") ) )
,m_xContainer(_rxContainer)
{
DBG_CTOR(OGroupManager,NULL);
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 8100ce2551dc..801d833c9341 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -294,7 +294,7 @@ void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, con
::rtl::OUString sNewImageURL;
if ( m_xGraphicObject.is() )
{
- sNewImageURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:" ) );
+ sNewImageURL = ::rtl::OUString( "vnd.sun.star.GraphicObject:" );
sNewImageURL = sNewImageURL + m_xGraphicObject->getUniqueID();
}
m_sImageURL = sNewImageURL;
@@ -795,7 +795,7 @@ void OImageControlControl::implClearGraphics( sal_Bool _bForce )
if ( sOldImageURL.isEmpty() )
// the ImageURL is already empty, so simply setting a new empty one would not suffice
// (since it would be ignored)
- xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:emptyImage" ) ) ) );
+ xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( ::rtl::OUString( "private:emptyImage" ) ) );
// (the concrete URL we're passing here doens't matter. It's important that
// the model cannot resolve it to a a valid resource describing an image stream
}
@@ -879,7 +879,7 @@ bool OImageControlControl::impl_isEmptyGraphics_nothrow() const
{
Reference< XPropertySet > xModelProps( const_cast< OImageControlControl* >( this )->getModel(), UNO_QUERY_THROW );
Reference< XGraphic > xGraphic;
- OSL_VERIFY( xModelProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Graphic" ) ) ) >>= xGraphic );
+ OSL_VERIFY( xModelProps->getPropertyValue( ::rtl::OUString( "Graphic" ) ) >>= xGraphic );
bIsEmpty = !xGraphic.is();
}
catch( const Exception& )
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 306829e9ce7c..a448416a80a7 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -719,7 +719,7 @@ namespace frm
{
// otherwise look for the alias
Reference< XColumnsSupplier > xSupplyFields;
- xFormProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSupplyFields;
+ xFormProps->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSupplyFields;
// search the field
DBG_ASSERT(xSupplyFields.is(), "OListBoxModel::loadData : invalid query composer !");
@@ -741,15 +741,15 @@ namespace frm
::rtl::OUString aQuote = xMeta->getIdentifierQuoteString();
::rtl::OUString aStatement(RTL_CONSTASCII_USTRINGPARAM("SELECT "));
if (aBoundFieldName.isEmpty()) // act like a combobox
- aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DISTINCT ") );
+ aStatement += ::rtl::OUString("DISTINCT ");
aStatement += quoteName(aQuote,aFieldName);
if (!aBoundFieldName.isEmpty())
{
- aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(", ") );
+ aStatement += ::rtl::OUString(", ");
aStatement += quoteName(aQuote, aBoundFieldName);
}
- aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ") );
+ aStatement += ::rtl::OUString(" FROM ");
::rtl::OUString sCatalog, sSchema, sTable;
qualifiedNameComponents( xMeta, sListSource, sCatalog, sSchema, sTable, eInDataManipulation );
@@ -841,7 +841,7 @@ namespace frm
try
{
Reference< XPropertySet > xBoundField( xColumns->getByIndex( *aBoundColumn ), UNO_QUERY_THROW );
- OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type") ) ) >>= m_nBoundColumnType );
+ OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString("Type") ) >>= m_nBoundColumnType );
}
catch( const Exception& )
{
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index 12c205c9a436..97b06d6b9309 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -305,7 +305,7 @@ namespace frm
Sequence<PropertyValue> aArgs(1);
PropertyValue& rProp = aArgs.getArray()[0];
- rProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") );
+ rProp.Name = ::rtl::OUString("Referer");
rProp.Value <<= xModel->getURL();
if (xDisp.is())
@@ -320,13 +320,13 @@ namespace frm
if ( xDisp.is() )
{
Sequence<PropertyValue> aProps(3);
- aProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
+ aProps[0].Name = ::rtl::OUString("URL");
aProps[0].Value <<= aURL.Complete;
- aProps[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName"));
+ aProps[1].Name = ::rtl::OUString("FrameName");
aProps[1].Value = xSet->getPropertyValue(PROPERTY_TARGET_FRAME);
- aProps[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+ aProps[2].Name = ::rtl::OUString("Referer");
aProps[2].Value <<= xModel->getURL();
xDisp->dispatch( aHyperLink, aProps );
@@ -679,7 +679,7 @@ namespace frm
ImageProducer *pImgProd = GetImageProducer();
// grab the ImageURL
rtl::OUString sURL;
- getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ) ) >>= sURL;
+ getPropertyValue( rtl::OUString("ImageURL") ) >>= sURL;
if (!m_pMedium)
{
if ( ::svt::GraphicAccess::isSupportedURL( sURL ) )
diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx
index cd4c527d5c25..f2f133688fa7 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -173,7 +173,7 @@ namespace frm
//------------------------------------------------------------------
::rtl::OUString SAL_CALL ONavigationBarModel::getImplementationName_Static()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.form.ONavigationBarModel" ) );
+ return ::rtl::OUString( "com.sun.star.comp.form.ONavigationBarModel" );
}
//------------------------------------------------------------------
@@ -183,7 +183,7 @@ namespace frm
aSupported.realloc( aSupported.getLength() + 2 );
::rtl::OUString* pArray = aSupported.getArray();
- pArray[ aSupported.getLength() - 2 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlModel" ) );
+ pArray[ aSupported.getLength() - 2 ] = ::rtl::OUString( "com.sun.star.awt.UnoControlModel" );
pArray[ aSupported.getLength() - 1 ] = FRM_SUN_COMPONENT_NAVTOOLBAR;
return aSupported;
}
@@ -447,7 +447,7 @@ namespace frm
break;
case PROPERTY_ID_DEFAULTCONTROL:
- aDefault <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.control.NavigationToolBar" ) );
+ aDefault <<= ::rtl::OUString( "com.sun.star.form.control.NavigationToolBar" );
break;
case PROPERTY_ID_HELPTEXT:
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index 8d34774d6fa1..dd8a6673af9d 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -287,8 +287,8 @@ namespace frm
Any OScrollBarModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const
{
return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollValueMin" ) ),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollValueMax" ) ) );
+ ::rtl::OUString( "ScrollValueMin" ),
+ ::rtl::OUString( "ScrollValueMax" ) );
}
//--------------------------------------------------------------------
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index 0b764009d02f..77fe5439fa61 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -243,8 +243,8 @@ namespace frm
Any OSpinButtonModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const
{
return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpinValueMin" ) ),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpinValueMax" ) ) );
+ ::rtl::OUString( "SpinValueMin" ),
+ ::rtl::OUString( "SpinValueMax" ) );
}
//--------------------------------------------------------------------
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 3403df8c2308..b0b71fa35ddb 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -93,7 +93,7 @@ namespace frm
// old macro for quickly implementing XServiceInfo::getImplementationName
#define IMPLEMENTATION_NAME(ImplName) \
virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) \
- { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.") ) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#ImplName)); }
+ { return ::rtl::OUString("com.sun.star.comp.forms.") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#ImplName)); }
class OControlModel;
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 4e09785d15ee..b8c7a1c04505 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -123,7 +123,7 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn
break;
Reference< XMultiServiceFactory > xDocFac( xDoc, UNO_QUERY_THROW );
- Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VBACodeNameProvider") ) ), UNO_QUERY );
+ Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( rtl::OUString("ooo.vba.VBACodeNameProvider") ), UNO_QUERY );
if ( !xNameQuery.is() )
break;
@@ -146,9 +146,9 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn
Reference< XPropertySet > xProps( xElement, UNO_QUERY_THROW );
::rtl::OUString sServiceName;
- xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultControl") ) ) >>= sServiceName;
+ xProps->getPropertyValue( rtl::OUString("DefaultControl") ) >>= sServiceName;
- Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VBAToOOEventDesc") ) ), UNO_QUERY_THROW );
+ Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( rtl::OUString("ooo.vba.VBAToOOEventDesc") ), UNO_QUERY_THROW );
Sequence< ScriptEventDescriptor > vbaEvents = xDescSupplier->getEventDescriptions( m_xServiceFactory->createInstance( sServiceName ), sCodeName );
// register the vba script events
m_xEventAttacher->registerScriptEvents( i_nIndex, vbaEvents );
@@ -223,7 +223,7 @@ void OInterfaceContainer::clonedFrom( const OInterfaceContainer& _cloneSource )
catch( const Exception& )
{
throw WrappedTargetException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Could not clone the given interface hierarchy." ) ),
+ ::rtl::OUString( "Could not clone the given interface hierarchy." ),
static_cast< XIndexContainer* >( const_cast< OInterfaceContainer* >( &_cloneSource ) ),
::cppu::getCaughtException()
);
@@ -870,7 +870,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
bool bHandleVbaEvents = false;
try
{
- _rxElement->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("GenerateVbaEvents") ) ) >>= bHandleVbaEvents;
+ _rxElement->getPropertyValue(rtl::OUString("GenerateVbaEvents") ) >>= bHandleVbaEvents;
}
catch( const Exception& )
{
diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx
index 06bba11583b7..8a3597c16f7c 100644
--- a/forms/source/misc/limitedformats.cxx
+++ b/forms/source/misc/limitedformats.cxx
@@ -54,8 +54,8 @@ namespace frm
//---------------------------------------------------------------------
static const Locale& getLocale(LocaleType _eType)
{
- static const Locale s_aEnglishUS( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en") ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("us") ), ::rtl::OUString() );
- static const Locale s_aGerman( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de") ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE") ), ::rtl::OUString() );
+ static const Locale s_aEnglishUS( ::rtl::OUString("en"), ::rtl::OUString("us"), ::rtl::OUString() );
+ static const Locale s_aGerman( ::rtl::OUString("de"), ::rtl::OUString("DE"), ::rtl::OUString() );
static const ::rtl::OUString s_sEmptyString;
static const Locale s_aSystem( s_sEmptyString, s_sEmptyString, s_sEmptyString );
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index 844b6c2c4437..0ba171fcd1a7 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -123,7 +123,7 @@ void registerClassInfo(
//.......................................................................................
#define REGISTER_CLASS_CORE(classImplName) \
registerClassInfo( \
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.") ) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#classImplName)), \
+ ::rtl::OUString("com.sun.star.form.") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#classImplName)), \
aServices, \
frm::classImplName##_CreateInstance)
@@ -218,7 +218,7 @@ void ensureClassInfos()
aServices.getArray()[2] = frm::FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD;
aServices.getArray()[3] = frm::BINDABLE_DATABASE_FORMATTED_FIELD;
- registerClassInfo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted") ),
+ registerClassInfo(::rtl::OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"),
aServices,
frm::OFormattedFieldWrapper_CreateInstance_ForceFormatted);
diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx
index 097ab031b30b..72e078973f6d 100644
--- a/forms/source/richtext/clipboarddispatcher.cxx
+++ b/forms/source/richtext/clipboarddispatcher.cxx
@@ -44,13 +44,13 @@ namespace frm
switch ( _eFunc )
{
case OClipboardDispatcher::eCut:
- aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Cut" ) );
+ aURL.Complete = ::rtl::OUString( ".uno:Cut" );
break;
case OClipboardDispatcher::eCopy:
- aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Copy" ) );
+ aURL.Complete = ::rtl::OUString( ".uno:Copy" );
break;
case OClipboardDispatcher::ePaste:
- aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Paste" ) );
+ aURL.Complete = ::rtl::OUString( ".uno:Paste" );
break;
}
return aURL;
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 053abd151116..93e8497eec4c 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -280,15 +280,15 @@ namespace frm
//------------------------------------------------------------------
::rtl::OUString SAL_CALL ORichTextControl::getImplementationName_Static()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.form.ORichTextControl" ) );
+ return ::rtl::OUString( "com.sun.star.comp.form.ORichTextControl" );
}
//------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL ORichTextControl::getSupportedServiceNames_Static()
{
Sequence< ::rtl::OUString > aServices( 3 );
- aServices[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControl" ) );
- aServices[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlEdit" ) );
+ aServices[ 0 ] = ::rtl::OUString( "com.sun.star.awt.UnoControl" );
+ aServices[ 1 ] = ::rtl::OUString( "com.sun.star.awt.UnoControlEdit" );
aServices[ 2 ] = FRM_SUN_CONTROL_RICHTEXTCONTROL;
return aServices;
}
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 2d8f431ef4ac..5799ca8a90af 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -244,13 +244,13 @@ namespace frm
//--------------------------------------------------------------------
IMPLEMENT_SERVICE_REGISTRATION_8( ORichTextModel, OControlModel,
FRM_SUN_COMPONENT_RICHTEXTCONTROL,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextRange" ) ),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CharacterProperties" ) ),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.ParagraphProperties" ) ),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CharacterPropertiesAsian" ) ),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CharacterPropertiesComplex" ) ),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.ParagraphPropertiesAsian" ) ),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.ParagraphPropertiesComplex" ) )
+ ::rtl::OUString( "com.sun.star.text.TextRange" ),
+ ::rtl::OUString( "com.sun.star.style.CharacterProperties" ),
+ ::rtl::OUString( "com.sun.star.style.ParagraphProperties" ),
+ ::rtl::OUString( "com.sun.star.style.CharacterPropertiesAsian" ),
+ ::rtl::OUString( "com.sun.star.style.CharacterPropertiesComplex" ),
+ ::rtl::OUString( "com.sun.star.style.ParagraphPropertiesAsian" ),
+ ::rtl::OUString( "com.sun.star.style.ParagraphPropertiesComplex" )
)
//------------------------------------------------------------------------------
@@ -409,7 +409,7 @@ namespace frm
// forward to our aggregate, so the EditEngine knows about it
if ( m_xAggregateSet.is() )
m_xAggregateSet->setPropertyValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WritingMode" ) ), _rValue );
+ ::rtl::OUString( "WritingMode" ), _rValue );
}
break;
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 529a43ea8546..d1c810e86a54 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -144,14 +144,14 @@ namespace frm
//--------------------------------------------------------------------
::rtl::OUString FormOperations::getImplementationName_Static( ) throw(RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.FormOperations" ) );
+ return ::rtl::OUString( "com.sun.star.comp.forms.FormOperations" );
}
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > FormOperations::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
Sequence< ::rtl::OUString > aNames(1);
- aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.runtime.FormOperations" ) );
+ aNames[0] = ::rtl::OUString( "com.sun.star.form.runtime.FormOperations" );
return aNames;
}
@@ -402,7 +402,7 @@ namespace frm
::rtl::OUString sValue = ::rtl::OUString::valueOf( sal_Int32( nCount ) );
if ( !bFinalCount )
- sValue += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" *") );
+ sValue += ::rtl::OUString(" *");
aState.State <<= sValue;
aState.Enabled = sal_True;
@@ -1137,7 +1137,7 @@ namespace frm
Reference< XMultiServiceFactory > xFactory( ::dbtools::getConnection( m_xCursor ), UNO_QUERY );
if ( xFactory.is() )
{
- m_xParser.set( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ), UNO_QUERY );
+ m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY );
OSL_ENSURE( m_xParser.is(), "FormOperations::impl_ensureInitializedParser_nothrow: factory did not create a parser for us!" );
}
}
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 001b711d250c..56f54c19d202 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -219,15 +219,15 @@ namespace frm
//------------------------------------------------------------------
::rtl::OUString SAL_CALL ONavigationBarControl::getImplementationName_Static()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.form.ONavigationBarControl" ) );
+ return ::rtl::OUString( "com.sun.star.comp.form.ONavigationBarControl" );
}
//------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames_Static()
{
Sequence< ::rtl::OUString > aServices( 2 );
- aServices[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControl" ) );
- aServices[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.control.NavigationToolBar" ) );
+ aServices[ 0 ] = ::rtl::OUString( "com.sun.star.awt.UnoControl" );
+ aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.control.NavigationToolBar" );
return aServices;
}
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index 3222f4d69f2e..2d102247b080 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -89,7 +89,7 @@ namespace frm
case FormFeature::RemoveFilterAndSort : pAsciiCommandName = "RemoveFilterSort"; break;
}
if ( pAsciiCommandName != NULL )
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ) ) + ::rtl::OUString::createFromAscii( pAsciiCommandName );
+ return ::rtl::OUString( ".uno:" ) + ::rtl::OUString::createFromAscii( pAsciiCommandName );
OSL_FAIL( "lcl_getCommandURL: unknown FormFeature!" );
return ::rtl::OUString();
diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx
index 0b6131021db0..c209a7f92c6a 100644
--- a/forms/source/xforms/datatyperepository.cxx
+++ b/forms/source/xforms/datatyperepository.cxx
@@ -157,7 +157,7 @@ namespace xforms
Repository::iterator aTypePos = implLocate( typeName );
if ( aTypePos->second->getIsBasic() )
- throw VetoException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "This is a built-in type and cannot be removed." ) ), *this );
+ throw VetoException( ::rtl::OUString( "This is a built-in type and cannot be removed." ), *this );
// TODO: localize this error message
m_aRepository.erase( aTypePos );
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index 8b458fcbdfbe..94f6fa8828a5 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -289,7 +289,7 @@ namespace xforms
RegexMatcher aMatcher( aIcuPattern, 0, nMatchStatus );
if ( U_FAILURE( nMatchStatus ) )
{
- _rErrorMessage = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "This is no valid pattern." ) );
+ _rErrorMessage = ::rtl::OUString( "This is no valid pattern." );
return false;
}
}
@@ -547,7 +547,7 @@ namespace xforms
sal_Int32 nValue( 0 );
OSL_VERIFY( _rNewValue >>= nValue );
if ( nValue <= 0 )
- _rErrorMessage = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Length limits must denote positive integer values." ) );
+ _rErrorMessage = ::rtl::OUString( "Length limits must denote positive integer values." );
// TODO/eforms: localize the error message
}
break;
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index 8cd3f09c09f4..cc4d8ddcb52d 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -502,7 +502,7 @@ void SAL_CALL Submission::submitWithInteraction(
if ( !xModel.is() || msID.isEmpty() )
throw RuntimeException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "This is not a valid submission object." ) ),
+ ::rtl::OUString( "This is not a valid submission object." ),
*this
);
diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx
index f08b3f628a7e..27bcd4baee84 100644
--- a/forms/source/xforms/submission/replace.cxx
+++ b/forms/source/xforms/submission/replace.cxx
@@ -63,13 +63,13 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
// open the stream from the result...
// build media descriptor
Sequence< PropertyValue > descriptor(2);
- descriptor[0] = PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream") ),
+ descriptor[0] = PropertyValue(::rtl::OUString("InputStream"),
-1, makeAny(m_aResultStream), PropertyState_DIRECT_VALUE);
- descriptor[1] = PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly") ),
+ descriptor[1] = PropertyValue(::rtl::OUString("ReadOnly"),
-1, makeAny(sal_True), PropertyState_DIRECT_VALUE);
::rtl::OUString aURL = m_aURLObj.GetMainURL(INetURLObject::NO_DECODE);
- ::rtl::OUString aTarget = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default") );
+ ::rtl::OUString aTarget = ::rtl::OUString("_default");
xLoader->loadComponentFromURL(aURL, aTarget, FrameSearchFlag::ALL, descriptor);
return CSubmission::SUCCESS;
diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx
index f64e1ac19ce1..462972018cd7 100644
--- a/forms/source/xforms/submission/submission_post.cxx
+++ b/forms/source/xforms/submission/submission_post.cxx
@@ -60,7 +60,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference<
aPostArgument.Source = apSerialization->getInputStream();
CSS::uno::Reference< XActiveDataSink > aSink(new ucbhelper::ActiveDataSink);
aPostArgument.Sink = aSink;
- aPostArgument.MediaType = OUString(RTL_CONSTASCII_USTRINGPARAM("application/xml"));
+ aPostArgument.MediaType = OUString("application/xml");
aPostArgument.Referer = OUString();
Any aCommandArgument;
aCommandArgument <<= aPostArgument;
diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx
index 5e567f78c1fd..75c6922e109f 100644
--- a/forms/source/xforms/xpathlib/extension.cxx
+++ b/forms/source/xforms/xpathlib/extension.cxx
@@ -41,13 +41,13 @@ Reference< XInterface > SAL_CALL CLibxml2XFormsExtension::Create(
::rtl::OUString SAL_CALL CLibxml2XFormsExtension::getImplementationName_Static()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.xml.xpath.XFormsExtension") );
+ return ::rtl::OUString("com.sun.star.comp.xml.xpath.XFormsExtension");
}
Sequence< ::rtl::OUString > SAL_CALL CLibxml2XFormsExtension::getSupportedServiceNames_Static()
{
Sequence< ::rtl::OUString > aSequence(1);
- aSequence[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xpath.XPathExtension") );
+ aSequence[0] = ::rtl::OUString("com.sun.star.xml.xpath.XPathExtension");
return aSequence;
}
diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index fc0ec2c98dde..3ae91cdafc09 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -93,7 +93,7 @@ SAL_CALL FormulaOpCodeMapperObj::getAvailableMappings(
// -----------------------------------------------------------------------------
::rtl::OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName_Static()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "simple.formula.FormulaOpCodeMapperObj" ) );
+ return rtl::OUString( "simple.formula.FormulaOpCodeMapperObj" );
}
// --------------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames( ) throw(uno::RuntimeException)
@@ -103,7 +103,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedSe
uno::Sequence< rtl::OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames_Static()
{
uno::Sequence< rtl::OUString > aSeq( 1 );
- aSeq[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.FormulaOpCodeMapper" ));
+ aSeq[0] = ::rtl::OUString( "com.sun.star.sheet.FormulaOpCodeMapper" );
return aSeq;
}
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index aec7824cae43..414c6fc23d13 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -434,9 +434,9 @@ uno::Reference< sheet::XFormulaOpCodeMapper > FormulaDlg_Impl::GetFormulaOpCodeM
m_pBinaryOpCodesEnd = m_aBinaryOpCodes.getConstArray() + m_aBinaryOpCodes.getLength();
uno::Sequence< ::rtl::OUString > aArgs(3);
- aArgs[TOKEN_OPEN] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("("));
+ aArgs[TOKEN_OPEN] = ::rtl::OUString("(");
aArgs[TOKEN_CLOSE] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
- aArgs[TOKEN_SEP] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
+ aArgs[TOKEN_SEP] = ::rtl::OUString(";");
m_aSeparatorsOpCodes = m_xOpCodeMapper->getMappings(aArgs,sheet::FormulaLanguage::ODFF);
m_aSpecialOpCodes = m_xOpCodeMapper->getAvailableMappings(sheet::FormulaLanguage::ODFF,sheet::FormulaMapGroup::SPECIAL);
@@ -1171,7 +1171,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd )
for(i=0;i<=nEd;i++)
{
if ( m_aArguments[i].isEmpty() )
- m_aArguments[i] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
+ m_aArguments[i] = ::rtl::OUString(" ");
}
if(pParaWin->GetArgument(nEd).Len()!=0)
m_aArguments[nEd] = pParaWin->GetArgument(nEd);
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 359ef6f7f2f4..d4c6769015aa 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -93,7 +93,7 @@ static Reference< css::uno::XInterface > FilePicker_createInstance (
{
// Always fall back to OfficeFilePicker.
xResult = xFactory->createInstanceWithContext (
- OUString (RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.OfficeFilePicker")),
+ OUString( "com.sun.star.ui.dialogs.OfficeFilePicker"),
rxContext);
}
if (xResult.is())
@@ -106,14 +106,14 @@ static Reference< css::uno::XInterface > FilePicker_createInstance (
static OUString FilePicker_getImplementationName()
{
- return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.comp.fpicker.FilePicker"));
+ return OUString("com.sun.star.comp.fpicker.FilePicker");
}
static Sequence< OUString > FilePicker_getSupportedServiceNames()
{
Sequence< OUString > aServiceNames(1);
aServiceNames.getArray()[0] =
- OUString (RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker"));
+ OUString( "com.sun.star.ui.dialogs.FilePicker");
return aServiceNames;
}
@@ -125,13 +125,13 @@ static OUString FolderPicker_getSystemPickerServiceName()
OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
#ifdef UNX
if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde")))
- return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.TDEFolderPicker"));
+ return OUString("com.sun.star.ui.dialogs.TDEFolderPicker");
else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
- return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFolderPicker"));
+ return OUString("com.sun.star.ui.dialogs.KDEFolderPicker");
else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("macosx")))
- return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.AquaFolderPicker"));
+ return OUString("com.sun.star.ui.dialogs.AquaFolderPicker");
#endif
- return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.SystemFolderPicker"));
+ return OUString("com.sun.star.ui.dialogs.SystemFolderPicker");
}
static Reference< css::uno::XInterface > FolderPicker_createInstance (
@@ -164,7 +164,7 @@ static Reference< css::uno::XInterface > FolderPicker_createInstance (
{
// Always fall back to OfficeFolderPicker.
xResult = xFactory->createInstanceWithContext (
- OUString (RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.OfficeFolderPicker")),
+ OUString( "com.sun.star.ui.dialogs.OfficeFolderPicker"),
rxContext);
}
if (xResult.is())
@@ -177,14 +177,14 @@ static Reference< css::uno::XInterface > FolderPicker_createInstance (
static OUString FolderPicker_getImplementationName()
{
- return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.comp.fpicker.FolderPicker"));
+ return OUString("com.sun.star.comp.fpicker.FolderPicker");
}
static Sequence< OUString > FolderPicker_getSupportedServiceNames()
{
Sequence< OUString > aServiceNames(1);
aServiceNames.getArray()[0] =
- OUString (RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FolderPicker"));
+ OUString( "com.sun.star.ui.dialogs.FolderPicker");
return aServiceNames;
}
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index acc3fc677949..de1f84a156ed 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -56,8 +56,8 @@ namespace
uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
{
uno::Sequence<rtl::OUString> aRet(2);
- aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker"));
- aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker"));
+ aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker");
+ aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker");
return aRet;
}
}
@@ -93,7 +93,7 @@ void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePicke
{
if ( rBHelper.bDisposed )
throw lang::DisposedException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "object is already disposed" )),
+ rtl::OUString( "object is already disposed" ),
static_cast< XFilePicker2* >( this ) );
if ( !rBHelper.bInDispose && !rBHelper.bDisposed )
@@ -109,7 +109,7 @@ void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePi
{
if ( rBHelper.bDisposed )
throw lang::DisposedException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "object is already disposed" )),
+ rtl::OUString( "object is already disposed" ),
static_cast< XFilePicker2* >( this ) );
rBHelper.aLC.removeInterface( getCppuType( &xListener ), xListener );
@@ -432,7 +432,7 @@ sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException)
OSL_FAIL("Could not start event notifier thread!");
throw uno::RuntimeException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error executing dialog")),
+ rtl::OUString("Error executing dialog"),
static_cast<XFilePicker2*>(this));
}
@@ -600,7 +600,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
uno::Any aAny;
if ( 0 == aArguments.getLength( ) )
throw lang::IllegalArgumentException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )),
+ rtl::OUString( "no arguments" ),
static_cast<XFilePicker2*>(this), 1);
aAny = aArguments[0];
@@ -608,7 +608,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
if ( (aAny.getValueType() != ::getCppuType((sal_Int16*)0)) &&
(aAny.getValueType() != ::getCppuType((sal_Int8*)0)) )
throw lang::IllegalArgumentException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid argument type")),
+ rtl::OUString("invalid argument type"),
static_cast<XFilePicker2*>(this), 1);
sal_Int16 templateId = -1;
@@ -670,7 +670,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
default:
throw lang::IllegalArgumentException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )),
+ rtl::OUString( "Unknown template" ),
static_cast< XFilePicker2* >( this ),
1 );
}
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 40c2fa37d548..bc02fa0109c6 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -75,8 +75,8 @@ namespace
css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker_getSupportedServiceNames()
{
css::uno::Sequence< ::rtl::OUString > aRet(2);
- aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker"));
- aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker"));
+ aRet[0] = ::rtl::OUString("com.sun.star.ui.dialogs.FilePicker");
+ aRet[1] = ::rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker");
return aRet;
}
}
@@ -606,7 +606,7 @@ void SAL_CALL VistaFilePicker::cancel()
::rtl::OUString SAL_CALL VistaFilePicker::getImplementationName()
throw(css::uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.fpicker.VistaFileDialog"));
+ return ::rtl::OUString("com.sun.star.comp.fpicker.VistaFileDialog");
}
// -------------------------------------------------
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 75a3f797f4de..95b12b3e805b 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -885,7 +885,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)
::rtl::OUString aFileURL(m_sDirectory);
sal_Int32 nIndex = aFileURL.lastIndexOf('/');
if (nIndex != aFileURL.getLength()-1)
- aFileURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/"));
+ aFileURL += ::rtl::OUString("/");
aFileURL += m_sFilename;
TFileDialogCustomize iCustom = impl_getCustomizeInterface();
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index fcea195267f6..d55a4eae29e2 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -118,7 +118,7 @@ void CWinFileOpenImpl::setDisplayDirectory(const rtl::OUString& aDirectory)
if ( ::osl::FileBase::E_None !=
::osl::FileBase::getSystemPathFromFileURL(aDirectory,aSysDirectory))
throw IllegalArgumentException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid directory")),
+ rtl::OUString("Invalid directory"),
static_cast<XFilePicker2*>(m_FilePicker), 1);
// we ensure that there is a trailing '/' at the end of
@@ -189,7 +189,7 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::execute( ) throw(uno::RuntimeException)
rc = ::com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL;
else
throw uno::RuntimeException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error executing dialog")),
+ rtl::OUString("Error executing dialog"),
static_cast<XFilePicker2*>(m_FilePicker));
return rc;
@@ -208,7 +208,7 @@ void SAL_CALL CWinFileOpenImpl::appendFilter(const rtl::OUString& aTitle, const
if (!bRet)
throw IllegalArgumentException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filter already exists")),
+ rtl::OUString("filter already exists"),
static_cast<XFilePicker2*>(m_FilePicker), 1);
// #95345# see MSDN OPENFILENAME
@@ -233,7 +233,7 @@ void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const rtl::OUString& aTitle)
if (filterPos < 0)
throw IllegalArgumentException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filter doesn't exist")),
+ rtl::OUString("filter doesn't exist"),
static_cast<XFilePicker2*>(m_FilePicker), 1);
// filter index of the base class starts with 1
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index 7c4b6bb6f88c..b20b65d020cc 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -79,12 +79,12 @@ void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type&
{
if ( m_rBroadcastHelper.bDisposed )
throw lang::DisposedException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilePicker is already disposed" )),
+ ::rtl::OUString( "FilePicker is already disposed" ),
uno::Reference< uno::XInterface >() );
if ( m_rBroadcastHelper.bInDispose )
throw lang::DisposedException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilePicker will be disposed now." )),
+ ::rtl::OUString( "FilePicker will be disposed now." ),
uno::Reference< uno::XInterface >() );
m_rBroadcastHelper.aLC.addInterface( aType, xListener );
@@ -99,7 +99,7 @@ void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type&
{
if ( m_rBroadcastHelper.bDisposed )
throw lang::DisposedException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilePicker is already disposed." )),
+ ::rtl::OUString( "FilePicker is already disposed." ),
uno::Reference< uno::XInterface >() );
m_rBroadcastHelper.aLC.removeInterface( aType, xListener );
diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx
index db176f7cc7b6..0488b4ed10a1 100644
--- a/fpicker/source/win32/filepicker/previewbase.cxx
+++ b/fpicker/source/win32/filepicker/previewbase.cxx
@@ -80,11 +80,11 @@ void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const ::com::sun::s
{
if (aImageFormat != ::com::sun::star::ui::dialogs::FilePreviewImageFormats::BITMAP)
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("unsupported image format")), 0, 1);
+ OUString("unsupported image format"), 0, 1);
if (aImage.hasValue() && (aImage.getValueType() != getCppuType((Sequence<sal_Int8>*)0)))
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("invalid image data")), 0, 2);
+ OUString("invalid image data"), 0, 2);
// save the new image data and force a redraw
m_ImageData = aImage;
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index 7a3eca82f13d..9d3347893fd4 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -273,9 +273,9 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[] )
if ( xFPNotifier.is( ) )
xFPNotifier->addFilePickerListener( xFPListener );
- xFilePicker->setTitle( OUString(RTL_CONSTASCII_USTRINGPARAM("FileOpen Simple...")));
+ xFilePicker->setTitle( OUString("FileOpen Simple..."));
xFilePicker->setMultiSelectionMode( sal_True );
- xFilePicker->setDefaultName( OUString(RTL_CONSTASCII_USTRINGPARAM("d:\\test2.sxw")));
+ xFilePicker->setDefaultName( OUString("d:\\test2.sxw"));
OUString aDirURL;
OUString aSysPath = OStringToOUString( "d:\\ueaeoe", osl_getThreadTextEncoding( ) );
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index 953c50d665b3..de5f714a0fc3 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -52,7 +52,7 @@ namespace
Sequence< OUString > SAL_CALL FolderPicker_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFolderPicker"));
+ aRet[0] = OUString("com.sun.star.ui.dialogs.SystemFolderPicker");
return aRet;
}
}
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index 6f49d07d17bf..97c29ec25273 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
@@ -78,7 +78,7 @@ void SAL_CALL CWinFolderPickerImpl::setDisplayDirectory( const OUString& aDirect
if ( ::osl::FileBase::E_None != rc )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "directory is not a valid file url" )),
+ OUString( "directory is not a valid file url" ),
static_cast< cppu::OWeakObject * >( m_pFolderPicker ),
1 );
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index 93c9244227b5..8a993306b03f 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -139,7 +139,7 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt
if ( !aItem.hasValue( ) ||
aItem.getValueType( ) != getCppuType((OUString*)0) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
+ OUString( "invalid value type or any has no value" ),
rXInterface,
aArgPos );
@@ -161,7 +161,7 @@ void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference<
if ( !aItemList.hasValue( ) ||
aItemList.getValueType( ) != getCppuType((Sequence<OUString>*)0) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
+ OUString( "invalid value type or any has no value" ),
rXInterface,
aArgPos );
@@ -189,7 +189,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc
(aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) &&
(aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
+ OUString( "invalid value type or any has no value" ),
rXInterface,
aArgPos );
@@ -202,7 +202,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc
// index was not correct
if ( CB_ERR == lRet )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid item position" )),
+ OUString( "invalid item position" ),
rXInterface,
aArgPos );
}
@@ -241,7 +241,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref
(aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) &&
(aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
+ OUString( "invalid value type or any has no value" ),
rXInterface,
aArgPos );
@@ -250,7 +250,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref
if ( nPos < -1 )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")),
+ OUString("invalid index"),
rXInterface,
aArgPos );
@@ -258,7 +258,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref
if ( (CB_ERR == lRet) && (-1 != nPos) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")),
+ OUString("invalid index"),
rXInterface,
aArgPos );
}
@@ -351,7 +351,7 @@ void SAL_CALL CheckboxSetState(
if ( !aState.hasValue( ) ||
aState.getValueType( ) != getCppuType((sal_Bool*)0) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
+ OUString( "invalid value type or any has no value" ),
rXInterface,
aArgPos );
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index e9bc6ed74915..2e83bd4c04c2 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
@@ -70,7 +70,7 @@ String aEmptyStr;
SAL_IMPLEMENT_MAIN()
{
Reference< XMultiServiceFactory > xMS;
- xMS = cppu::createRegistryServiceFactory( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True );
+ xMS = cppu::createRegistryServiceFactory( rtl::OUString( "applicat.rdb" ), sal_True );
com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory> xMSch;
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xComponentContext;
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index a1b38ab6425a..3e274743c231 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -309,7 +309,7 @@ void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems)
{
OSL_FAIL("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp.");
throw css::uno::RuntimeException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp.")),
+ ::rtl::OUString("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp."),
m_xOwner);
}
@@ -714,7 +714,7 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr
throw(css::uno::RuntimeException)
{
if (!xListener.is())
- throw css::uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid listener reference.")), static_cast< css::frame::XDispatch* >(this));
+ throw css::uno::RuntimeException(::rtl::OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this));
// container is threadsafe by using a shared mutex!
m_lListener.addInterface(aURL.Complete, xListener);
@@ -749,7 +749,7 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css:
throw(css::uno::RuntimeException)
{
if (!xListener.is())
- throw css::uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid listener reference.")), static_cast< css::frame::XDispatch* >(this));
+ throw css::uno::RuntimeException(::rtl::OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this));
// container is threadsafe by using a shared mutex!
m_lListener.removeInterface(aURL.Complete, xListener);
}
@@ -1123,7 +1123,7 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume
if (rInfo.AppModule.isEmpty())
{
throw css::uno::RuntimeException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant find out the default filter and its extension, if no application module is known!")),
+ ::rtl::OUString("Cant find out the default filter and its extension, if no application module is known!"),
static_cast< css::frame::XDispatch* >(this));
}
@@ -1166,11 +1166,11 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume
css::uno::Sequence< ::rtl::OUString > lExtensions = lTypeProps.getUnpackedValueOrDefault(rtl::OUString(TYPE_PROP_EXTENSIONS), css::uno::Sequence< ::rtl::OUString >());
if (lExtensions.getLength())
{
- rInfo.Extension = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."));
+ rInfo.Extension = ::rtl::OUString(".");
rInfo.Extension += lExtensions[0];
}
else
- rInfo.Extension = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".unknown"));
+ rInfo.Extension = ::rtl::OUString(".unknown");
}
catch(const css::uno::Exception&)
{
@@ -3624,7 +3624,7 @@ void AutoRecovery::st_impl_removeFile(const ::rtl::OUString& sURL)
try
{
::ucbhelper::Content aContent = ::ucbhelper::Content(sURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getComponentContext(m_xSMGR));
- aContent.executeCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), css::uno::makeAny(sal_True));
+ aContent.executeCommand(::rtl::OUString("delete"), css::uno::makeAny(sal_True));
}
catch(const css::uno::Exception&)
{
diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx
index 6d98722542d4..4cfa131ae101 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -134,7 +134,7 @@ namespace framework
);
void dispatchURL( const rtl::OUString& i_rURL,
- const rtl::OUString& i_rTarget = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ),
+ const rtl::OUString& i_rTarget = rtl::OUString( "_default" ),
const com::sun::star::uno::Reference< com::sun::star::frame::XDispatchProvider >& i_xProv = com::sun::star::uno::Reference< com::sun::star::frame::XDispatchProvider >(),
const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& = com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >()
);
diff --git a/helpcompiler/source/HelpIndexer.cxx b/helpcompiler/source/HelpIndexer.cxx
index 05db910f7e17..06e542a57c61 100644
--- a/helpcompiler/source/HelpIndexer.cxx
+++ b/helpcompiler/source/HelpIndexer.cxx
@@ -47,8 +47,8 @@ HelpIndexer::HelpIndexer(rtl::OUString const &lang, rtl::OUString const &module,
{
d_indexDir = rtl::OUStringBuffer(outDir).append('/').
append(module).appendAscii(RTL_CONSTASCII_STRINGPARAM(".idxl")).toString();
- d_captionDir = srcDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/caption"));
- d_contentDir = srcDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/content"));
+ d_captionDir = srcDir + rtl::OUString("/caption");
+ d_contentDir = srcDir + rtl::OUString("/content");
}
bool HelpIndexer::indexDocuments()
@@ -117,7 +117,7 @@ bool HelpIndexer::scanForFiles(rtl::OUString const & path) {
osl::Directory dir(path);
if (osl::FileBase::E_None != dir.open()) {
- d_error = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error reading directory ")) + path;
+ d_error = rtl::OUString("Error reading directory ") + path;
return true;
}
@@ -136,8 +136,8 @@ bool HelpIndexer::scanForFiles(rtl::OUString const & path) {
bool HelpIndexer::helpDocument(rtl::OUString const & fileName, Document *doc) {
// Add the help path as an indexed, untokenized field.
- rtl::OUString path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#HLP#")) +
- d_module + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + fileName;
+ rtl::OUString path = rtl::OUString("#HLP#") +
+ d_module + rtl::OUString("/") + fileName;
std::vector<TCHAR> aPath(OUStringToTCHARVec(path));
doc->add(*_CLNEW Field(_T("path"), &aPath[0], Field::STORE_YES | Field::INDEX_UNTOKENIZED));
@@ -146,11 +146,11 @@ bool HelpIndexer::helpDocument(rtl::OUString const & fileName, Document *doc) {
rtl_UriCharClassUric, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8);
// Add the caption as a field.
- rtl::OUString captionPath = d_captionDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sEscapedFileName;
+ rtl::OUString captionPath = d_captionDir + rtl::OUString("/") + sEscapedFileName;
doc->add(*_CLNEW Field(_T("caption"), helpFileReader(captionPath), Field::STORE_NO | Field::INDEX_TOKENIZED));
// Add the content as a field.
- rtl::OUString contentPath = d_contentDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sEscapedFileName;
+ rtl::OUString contentPath = d_contentDir + rtl::OUString("/") + sEscapedFileName;
doc->add(*_CLNEW Field(_T("content"), helpFileReader(contentPath), Field::STORE_NO | Field::INDEX_TOKENIZED));
return true;
diff --git a/hwpfilter/qa/cppunit/test_hwpfilter.cxx b/hwpfilter/qa/cppunit/test_hwpfilter.cxx
index 88a09a0d6671..b96f4a0110de 100644
--- a/hwpfilter/qa/cppunit/test_hwpfilter.cxx
+++ b/hwpfilter/qa/cppunit/test_hwpfilter.cxx
@@ -64,8 +64,8 @@ namespace
test::BootstrapFixture::setUp();
m_xFilter = uno::Reference< document::XFilter >(m_xSFactory->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.comp.hwpimport.HwpImportFilter"))),
+ ::rtl::OUString(
+ "com.sun.comp.hwpimport.HwpImportFilter")),
uno::UNO_QUERY_THROW);
}
@@ -74,7 +74,7 @@ namespace
unsigned int, unsigned int, unsigned int)
{
uno::Sequence< beans::PropertyValue > aDescriptor(1);
- aDescriptor[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
+ aDescriptor[0].Name = rtl::OUString("URL");
aDescriptor[0].Value <<= rURL;
return m_xFilter->filter(aDescriptor);
}
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
index 665747b5fc01..288a2374f446 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -93,8 +93,8 @@ void TestBreakIterator::testLineBreaking()
{
rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
- aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
- aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
+ aLocale.Language = rtl::OUString("en");
+ aLocale.Country = rtl::OUString("US");
{
//Here we want the line break to leave text here) on the next line
@@ -115,8 +115,8 @@ void TestBreakIterator::testLineBreaking()
rtl::OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1));
rtl::OUString aTest(rtl::OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear());
- aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he"));
- aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IL"));
+ aLocale.Language = rtl::OUString("he");
+ aLocale.Country = rtl::OUString("IL");
{
//Here we want the line break to happen at the whitespace
@@ -129,8 +129,8 @@ void TestBreakIterator::testLineBreaking()
{
rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("foo /bar/baz"));
- aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
- aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
+ aLocale.Language = rtl::OUString("en");
+ aLocale.Country = rtl::OUString("US");
{
//Here we want the line break to leave /bar/ba clumped together on the next line
@@ -144,8 +144,8 @@ void TestBreakIterator::testLineBreaking()
{
rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("aaa]aaa"));
- aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
- aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
+ aLocale.Language = rtl::OUString("en");
+ aLocale.Country = rtl::OUString("US");
{
//Here we want the line break to move the whole lot to the next line
@@ -160,8 +160,8 @@ void TestBreakIterator::testLineBreaking()
void TestBreakIterator::testWordBoundaries()
{
lang::Locale aLocale;
- aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
- aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
+ aLocale.Language = rtl::OUString("en");
+ aLocale.Country = rtl::OUString("US");
i18n::Boundary aBounds;
@@ -393,8 +393,8 @@ void TestBreakIterator::testWordBoundaries()
//See https://issues.apache.org/ooo/show_bug.cgi?id=13451
{
- aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ca"));
- aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ES"));
+ aLocale.Language = rtl::OUString("ca");
+ aLocale.Country = rtl::OUString("ES");
rtl::OUString aTest("mirar-se comprar-vos donem-nos les mans aneu-vos-en!");
@@ -578,8 +578,8 @@ void TestBreakIterator::testWordBoundaries()
void TestBreakIterator::testGraphemeIteration()
{
lang::Locale aLocale;
- aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bn"));
- aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IN"));
+ aLocale.Language = rtl::OUString("bn");
+ aLocale.Country = rtl::OUString("IN");
{
const sal_Unicode BA_HALANT_LA[] = { 0x09AC, 0x09CD, 0x09AF };
@@ -623,8 +623,8 @@ void TestBreakIterator::testGraphemeIteration()
CPPUNIT_ASSERT_MESSAGE("Should skip full grapheme", nPos == 0);
}
- aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ta"));
- aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IN"));
+ aLocale.Language = rtl::OUString("ta");
+ aLocale.Country = rtl::OUString("IN");
{
const sal_Unicode KA_VIRAMA_SSA[] = { 0x0B95, 0x0BCD, 0x0BB7 };
@@ -700,8 +700,8 @@ void TestBreakIterator::testGraphemeIteration()
CPPUNIT_ASSERT_MESSAGE("Should be considered 1 grapheme", nGraphemeCount == 1);
}
- aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hi"));
- aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IN"));
+ aLocale.Language = rtl::OUString("hi");
+ aLocale.Country = rtl::OUString("IN");
{
const sal_Unicode SHA_VOWELSIGNII[] = { 0x936, 0x940 };
@@ -725,8 +725,8 @@ void TestBreakIterator::testGraphemeIteration()
void TestBreakIterator::testWeak()
{
lang::Locale aLocale;
- aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
- aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
+ aLocale.Language = rtl::OUString("en");
+ aLocale.Country = rtl::OUString("US");
{
const sal_Unicode WEAKS[] =
@@ -766,8 +766,8 @@ void TestBreakIterator::testWeak()
void TestBreakIterator::testAsian()
{
lang::Locale aLocale;
- aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
- aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
+ aLocale.Language = rtl::OUString("en");
+ aLocale.Country = rtl::OUString("US");
{
const sal_Unicode ASIANS[] =
@@ -802,8 +802,8 @@ void TestBreakIterator::testAsian()
void TestBreakIterator::testThai()
{
lang::Locale aLocale;
- aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th"));
- aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH"));
+ aLocale.Language = rtl::OUString("th");
+ aLocale.Country = rtl::OUString("TH");
//See http://lists.freedesktop.org/archives/libreoffice/2012-February/025959.html
{
@@ -855,8 +855,8 @@ void TestBreakIterator::testThai()
void TestBreakIterator::testNorthernThai()
{
lang::Locale aLocale;
- aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nod"));
- aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH"));
+ aLocale.Language = rtl::OUString("nod");
+ aLocale.Country = rtl::OUString("TH");
const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
@@ -876,8 +876,8 @@ void TestBreakIterator::testNorthernThai()
void TestBreakIterator::testKhmer()
{
lang::Locale aLocale;
- aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("km"));
- aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KH"));
+ aLocale.Language = rtl::OUString("km");
+ aLocale.Country = rtl::OUString("KH");
const sal_Unicode KHMER[] = { 0x17B2, 0x17D2, 0x1799, 0x1782, 0x17C1 };
diff --git a/i18npool/qa/cppunit/test_characterclassification.cxx b/i18npool/qa/cppunit/test_characterclassification.cxx
index 69b6c9f2eaa8..7e99ec2fd419 100644
--- a/i18npool/qa/cppunit/test_characterclassification.cxx
+++ b/i18npool/qa/cppunit/test_characterclassification.cxx
@@ -59,8 +59,8 @@ private:
void TestCharacterClassification::testTitleCase()
{
lang::Locale aLocale;
- aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
- aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
+ aLocale.Language = ::rtl::OUString("en");
+ aLocale.Country = ::rtl::OUString("US");
{
//basic example
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index efce89b1b8ca..684555ce75b3 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -304,7 +304,7 @@ sal_Bool AstService::dump(RegistryKey& rKey)
if (m_defaultConstructor) {
writer.setMethodData(
constructorIndex++, emptyStr, RT_MODE_TWOWAY,
- emptyStr, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("void")),
+ emptyStr, rtl::OUString("void"),
0, 0);
}
sal_uInt32 size;
@@ -396,7 +396,7 @@ void AstAttribute::dumpExceptions(
writer.setMethodData(
idx, documentation, flags,
OStringToOUString(getLocalName(), RTL_TEXTENCODING_UTF8),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("void")), 0,
+ rtl::OUString("void"), 0,
static_cast< sal_uInt16 >(exceptions.size()));
sal_uInt16 exceptionIndex = 0;
for (DeclList::const_iterator i(exceptions.begin());
diff --git a/idlc/source/astoperation.cxx b/idlc/source/astoperation.cxx
index f1d11174a057..b4aa3f74354e 100644
--- a/idlc/source/astoperation.cxx
+++ b/idlc/source/astoperation.cxx
@@ -48,7 +48,7 @@ sal_Bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index)
rtl::OUString returnTypeName;
if (m_pReturnType == 0) {
- returnTypeName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("void"));
+ returnTypeName = rtl::OUString("void");
} else {
returnTypeName = rtl::OStringToOUString(
m_pReturnType->getRelativName(), RTL_TEXTENCODING_UTF8);
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index 1acbf8440ede..13a8b3fa63c1 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -289,7 +289,7 @@ sal_Int32 compileFile(const OString * pathname)
} while( nIndex != -1 );
}
- lCppArgs.push_back(OUString(RTL_CONSTASCII_USTRINGPARAM("-o")));
+ lCppArgs.push_back(OUString("-o"));
cppArgs.append(preprocFile);
lCppArgs.push_back(OStringToOUString(cppArgs.makeStringAndClear(), RTL_TEXTENCODING_UTF8));
@@ -308,9 +308,9 @@ sal_Int32 compileFile(const OString * pathname)
cpp = cpp.copy(0, idx);
#if defined(SAL_W32)
- cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("ucpp.exe"));
+ cpp += OUString("ucpp.exe");
#else
- cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("ucpp"));
+ cpp += OUString("ucpp");
#endif
#else // SYSTEM_UCPP
cpp = OUString( RTL_CONSTASCII_USTRINGPARAM(UCPP));
diff --git a/io/test/stm/pipetest.cxx b/io/test/stm/pipetest.cxx
index 67eef0311b5f..44f6244a0915 100644
--- a/io/test/stm/pipetest.cxx
+++ b/io/test/stm/pipetest.cxx
@@ -153,7 +153,7 @@ void OPipeTest::testInvariant( const OUString& TestName, const Reference < XInte
{
ERROR_ASSERT( info->supportsService( TestName ), "XServiceInfo test failed" );
ERROR_ASSERT( ! info->supportsService(
- OUString( RTL_CONSTASCII_USTRINGPARAM("bla bluzb") ) ), "XServiceInfo test failed" );
+ OUString("bla bluzb") ), "XServiceInfo test failed" );
}
}
@@ -165,7 +165,7 @@ sal_Int32 OPipeTest::test(
sal_Int32 hTestHandle)
throw ( IllegalArgumentException, RuntimeException)
{
- if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe") ) == TestName ) {
+ if( OUString("com.sun.star.io.Pipe") == TestName ) {
try
{
if( 0 == hTestHandle ) {
diff --git a/io/test/stm/testfactreg.cxx b/io/test/stm/testfactreg.cxx
index 4887a066718a..99f9a1404826 100644
--- a/io/test/stm/testfactreg.cxx
+++ b/io/test/stm/testfactreg.cxx
@@ -46,57 +46,57 @@ sal_Bool SAL_CALL component_writeInfo(
Reference< XRegistryKey > xKey(
reinterpret_cast< XRegistryKey * >( pRegistryKey ) );
- OUString str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+ OUString str = OUString("/") +
OPipeTest_getImplementationName() +
- OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+ OUString("/UNO/SERVICES");
Reference< XRegistryKey > xNewKey = xKey->createKey( str );
xNewKey->createKey( OPipeTest_getServiceName() );
- str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+ str = OUString("/") +
OPumpTest_getImplementationName() +
- OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+ OUString("/UNO/SERVICES");
xNewKey = xKey->createKey( str );
xNewKey->createKey( OPumpTest_getServiceName() );
- str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+ str = OUString("/") +
ODataStreamTest_getImplementationName(1) +
- OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+ OUString("/UNO/SERVICES");
xNewKey = xKey->createKey( str );
xNewKey->createKey( ODataStreamTest_getServiceName(1) );
- str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+ str = OUString("/") +
ODataStreamTest_getImplementationName(2) +
- OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+ OUString("/UNO/SERVICES");
xNewKey = xKey->createKey( str );
xNewKey->createKey( ODataStreamTest_getServiceName(2) );
- str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+ str = OUString("/") +
OObjectStreamTest_getImplementationName(1) +
- OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+ OUString("/UNO/SERVICES");
xNewKey = xKey->createKey( str );
xNewKey->createKey( OObjectStreamTest_getServiceName(1) );
- str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+ str = OUString("/") +
OObjectStreamTest_getImplementationName(2) +
- OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+ OUString("/UNO/SERVICES");
xNewKey = xKey->createKey( str );
xNewKey->createKey( OObjectStreamTest_getServiceName(2) );
- str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+ str = OUString("/") +
OMarkableOutputStreamTest_getImplementationName() +
- OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+ OUString("/UNO/SERVICES");
xNewKey = xKey->createKey( str );
xNewKey->createKey( OMarkableOutputStreamTest_getServiceName() );
- str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+ str = OUString("/") +
OMarkableInputStreamTest_getImplementationName() +
- OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+ OUString("/UNO/SERVICES");
xNewKey = xKey->createKey( str );
xNewKey->createKey( OMarkableInputStreamTest_getServiceName() );
- str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+ str = OUString("/") +
OMyPersistObject_getImplementationName() +
- OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+ OUString("/UNO/SERVICES");
xNewKey = xKey->createKey( str );
xNewKey->createKey( OMyPersistObject_getServiceName() );
diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx
index d73a058f2348..fdcad2711a4a 100644
--- a/javaunohelper/source/vm.cxx
+++ b/javaunohelper/source/vm.cxx
@@ -74,13 +74,11 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWith
css::uno::Any arg(
css::uno::makeAny(
css::beans::NamedValue(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "UnoVirtualMachine" ) ),
+ rtl::OUString( "UnoVirtualMachine" ),
css::uno::makeAny( handle ) ) ) );
return xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.java.JavaVirtualMachine")),
+ "com.sun.star.java.JavaVirtualMachine"),
css::uno::Sequence< css::uno::Any >( &arg, 1 ), xContext );
}
@@ -90,8 +88,7 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWith
{
return xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.java.JavaVirtualMachine")),
+ "com.sun.star.java.JavaVirtualMachine"),
args, xContext );
}
@@ -126,8 +123,7 @@ css::uno::Reference< css::uno::XComponentContext > install_vm_singleton(
css::uno::Reference< css::lang::XSingleComponentFactory > xFac( new SingletonFactory( vm_access ) );
::cppu::ContextEntry_Init entry(
::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "/singletons/com.sun.star.java.theJavaVirtualMachine")),
+ "/singletons/com.sun.star.java.theJavaVirtualMachine"),
css::uno::makeAny( xFac ), true );
return ::cppu::createComponentContext( &entry, 1, xContext );
}
diff --git a/jvmaccess/source/classpath.cxx b/jvmaccess/source/classpath.cxx
index 5fc4a7e38ea7..f0513352c550 100644
--- a/jvmaccess/source/classpath.cxx
+++ b/jvmaccess/source/classpath.cxx
@@ -72,8 +72,7 @@ void * ::jvmaccess::ClassPath::doTranslateToUrls(
} catch (const css::lang::IllegalArgumentException & e) {
throw css::uno::RuntimeException(
(::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.lang.IllegalArgumentException: "))
+ "com.sun.star.lang.IllegalArgumentException: ")
+ e.Message),
css::uno::Reference< css::uno::XInterface >());
}
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index e0339eb3f409..0723910b566f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -168,7 +168,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
return false;
if (m_sJavaHome.isEmpty())
- m_sJavaHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib"));
+ m_sJavaHome = rtl::OUString("file:///usr/lib");
// init m_sRuntimeLibrary
OSL_ASSERT(!m_sHome.isEmpty());
@@ -233,9 +233,9 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
#ifdef X86_64
//Make one last final legacy attempt on x86_64 in case the distro placed it in lib64 instead
- if (!bRt && m_sJavaHome != rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib")))
+ if (!bRt && m_sJavaHome != rtl::OUString("file:///usr/lib"))
{
- m_sHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib64"));
+ m_sHome = rtl::OUString("file:///usr/lib64");
for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip)
{
//Construct an absolute path to the possible runtime
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 662f66d6f2d2..7b6901aed5ec 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -394,7 +394,7 @@ bool getJavaProps(const OUString & exePath,
//prepare the arguments
sal_Int32 cArgs = 3;
- OUString arg1 = OUString(RTL_CONSTASCII_USTRINGPARAM("-classpath"));// + sClassPath;
+ OUString arg1 = OUString("-classpath");// + sClassPath;
OUString arg2 = sClassPath;
OUString arg3(RTL_CONSTASCII_USTRINGPARAM("JREProperties"));
OUString arg4 = "noaccessibility";
@@ -904,7 +904,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
sFullPath = sResolvedDir + (*i);
else
sFullPath = sResolvedDir +
- OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + (*i);
+ OUString("/") + (*i);
sFilePath = resolveFilePath(sFullPath);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
index ffc7d7e5fcc9..cab102757f64 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
@@ -74,7 +74,7 @@ struct SameOrSubDirJREMap
if (s1 == s2.first)
return true;
rtl::OUString sSub;
- sSub = s2.first + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ sSub = s2.first + rtl::OUString("/");
if (s1.match(sSub) == sal_True)
return true;
return false;
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 6bfe53af7b62..03a575a5708d 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -157,7 +157,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
}
jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc =
(jfw_plugin_getAllJavaInfos_ptr) pluginLib.getFunctionSymbol(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getAllJavaInfos")));
+ rtl::OUString("jfw_plugin_getAllJavaInfos"));
#else
jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc =
jfw_plugin_getAllJavaInfos;
@@ -193,7 +193,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
#ifndef DISABLE_DYNLOADING
jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
(jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getJavaInfoByPath")));
+ rtl::OUString("jfw_plugin_getJavaInfoByPath"));
OSL_ASSERT(jfw_plugin_getJavaInfoByPathFunc);
if (jfw_plugin_getJavaInfoByPathFunc == NULL)
return JFW_E_ERROR;
@@ -543,7 +543,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc =
(jfw_plugin_getAllJavaInfos_ptr) pluginLib.getFunctionSymbol(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getAllJavaInfos")));
+ rtl::OUString("jfw_plugin_getAllJavaInfos"));
#else
jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc =
jfw_plugin_getAllJavaInfos;
@@ -629,7 +629,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
//get the function from the plugin
jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
(jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getJavaInfoByPath")));
+ rtl::OUString("jfw_plugin_getJavaInfoByPath"));
#else
jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
jfw_plugin_getJavaInfoByPath;
@@ -872,7 +872,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
(jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getJavaInfoByPath")));
+ rtl::OUString("jfw_plugin_getJavaInfoByPath"));
#else
jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
jfw_plugin_getJavaInfoByPath;
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 0ec6231f726e..c9da3c947729 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -228,10 +228,10 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const rtl::OString& sCur ,
rtl::OUString sSourceText(
pXMLElement->ToOUString().
replaceAll(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")),
+ rtl::OUString("\n"),
rtl::OUString()).
replaceAll(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t")),
+ rtl::OUString("\t"),
rtl::OUString()));
// re-add spaces to the beginning of translated string,
// important for indentation of Basic code examples
diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx
index 172c7753d574..b31c88c74385 100644
--- a/linguistic/workben/sspellimp.hxx
+++ b/linguistic/workben/sspellimp.hxx
@@ -152,7 +152,7 @@ public:
inline OUString SpellChecker::getImplementationName_Static() throw()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.lingu.examples.SpellChecker" ));
+ return ::rtl::OUString( "com.sun.star.lingu.examples.SpellChecker" );
}
diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx
index 898c1584adbd..22e94a0a983e 100644
--- a/mysqlc/source/mysqlc_databasemetadata.cxx
+++ b/mysqlc/source/mysqlc_databasemetadata.cxx
@@ -1497,7 +1497,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes()
const char * table_types[] = {"TABLE", "VIEW"};
sal_Int32 requiredVersion[] = {0, 50000};
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
@@ -1519,7 +1519,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getTypeInfo");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
@@ -1563,7 +1563,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs()
{
OSL_TRACE("ODatabaseMetaData::getCatalogs");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
try {
@@ -1598,7 +1598,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas()
{
OSL_TRACE("ODatabaseMetaData::getSchemas");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
try {
@@ -1643,7 +1643,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getColumnPrivileges");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1686,7 +1686,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getColumns");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
@@ -1739,7 +1739,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
Reference< XResultSet > xResultSet(getOwnConnection().
getDriver().getFactory()->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ ::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1811,7 +1811,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getProcedures");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1856,7 +1856,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getVersionColumns");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
lcl_setRows_throw(xResultSet, 16,rRows);
return xResultSet;
@@ -1872,7 +1872,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getExportedKeys");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
@@ -1913,7 +1913,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
{
OSL_TRACE("ODatabaseMetaData::getImportedKeys");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1954,7 +1954,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getPrimaryKeys");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1997,7 +1997,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getIndexInfo");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -2040,7 +2040,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getBestRowIdentifier");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -2081,7 +2081,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getTablePrivileges");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -2146,7 +2146,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getCrossReference");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""),
diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx
index 1ee31493a154..bda703152022 100644
--- a/mysqlc/source/mysqlc_general.cxx
+++ b/mysqlc/source/mysqlc_general.cxx
@@ -36,11 +36,11 @@ namespace mysqlc_sdbc_driver
void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
throw (SQLException)
{
- const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": feature not implemented." ) );
+ const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( ": feature not implemented." );
throw SQLException(
sMessage,
_rxContext,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HYC00")),
+ ::rtl::OUString("HYC00"),
0,
_pNextException ? *_pNextException : Any()
);
@@ -50,11 +50,11 @@ void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, co
void throwInvalidArgumentException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
throw (SQLException)
{
- const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": invalid arguments." ) );
+ const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( ": invalid arguments." );
throw SQLException(
sMessage,
_rxContext,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HYC00")),
+ ::rtl::OUString("HYC00"),
0,
_pNextException ? *_pNextException : Any()
);
diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx
index e0659baf2d0d..c428dd7ab2ca 100644
--- a/mysqlc/source/mysqlc_resultset.cxx
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -56,7 +56,7 @@ OUString SAL_CALL OResultSet::getImplementationName()
throw (RuntimeException)
{
OSL_TRACE("OResultSet::getImplementationName");
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbcx.mysqlc.ResultSet" ) );
+ return ::rtl::OUString( "com.sun.star.sdbcx.mysqlc.ResultSet" );
}
/* }}} */
@@ -67,8 +67,8 @@ Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames()
{
OSL_TRACE("OResultSet::getSupportedServiceNames");
Sequence< OUString > aSupported(2);
- aSupported[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.ResultSet" ) );
- aSupported[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbcx.ResultSet" ) );
+ aSupported[0] = OUString( "com.sun.star.sdbc.ResultSet" );
+ aSupported[1] = OUString( "com.sun.star.sdbcx.ResultSet" );
return (aSupported);
}
/* }}} */
diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx
index 8fac61698cca..ce483459483e 100644
--- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx
+++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx
@@ -66,7 +66,7 @@ static void ShowMessageBox( const Reference< XToolkit >& rToolkit, const Referen
// describe window properties.
WindowDescriptor aDescriptor;
aDescriptor.Type = WindowClass_MODALTOP;
- aDescriptor.WindowServiceName = OUString( RTL_CONSTASCII_USTRINGPARAM( "infobox" ));
+ aDescriptor.WindowServiceName = OUString( "infobox" );
aDescriptor.ParentIndex = -1;
aDescriptor.Parent = Reference< XWindowPeer >( rFrame->getContainerWindow(), UNO_QUERY );
aDescriptor.Bounds = Rectangle(0,0,300,200);
@@ -139,21 +139,21 @@ void SAL_CALL Addon::dispatch( const URL& aURL, const Sequence < PropertyValue >
if ( aURL.Path.compareToAscii( "Function1" ) == 0 )
{
ShowMessageBox( mxToolkit, mxFrame,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "SDK Add-On example" )),
- OUString( RTL_CONSTASCII_USTRINGPARAM( "Function 1 activated" )) );
+ OUString( "SDK Add-On example" ),
+ OUString( "Function 1 activated" ) );
}
else if ( aURL.Path.compareToAscii( "Function2" ) == 0 )
{
ShowMessageBox( mxToolkit, mxFrame,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "SDK Add-On example" )),
- OUString( RTL_CONSTASCII_USTRINGPARAM( "Function 2 activated" )) );
+ OUString( "SDK Add-On example" ),
+ OUString( "Function 2 activated" ) );
}
else if ( aURL.Path.compareToAscii( "Help" ) == 0 )
{
// Show info box
ShowMessageBox( mxToolkit, mxFrame,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "About SDK Add-On example" )),
- OUString( RTL_CONSTASCII_USTRINGPARAM( "This is the SDK Add-On example" )) );
+ OUString( "About SDK Add-On example" ),
+ OUString( "This is the SDK Add-On example" ) );
}
}
}
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx
index 849667b74964..0dd690995dcd 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx
@@ -61,11 +61,11 @@ SAL_IMPLEMENT_MAIN()
my_module::MyService1::create(xContext);
// call methodOne and print the return value on stdout
- OUString s = xSomething->methodOne(OUString(RTL_CONSTASCII_USTRINGPARAM("Hello World!")));
+ OUString s = xSomething->methodOne(OUString("Hello World!"));
fprintf(stdout,"\nCreate new instance of MyService1\nCall of XSomething.methOne at MyService1 = %s", OUStringToOString( s, RTL_TEXTENCODING_ASCII_US ).getStr());
// create a new instance of MyService2 with the specified string argument
- xSomething = my_module::MyService2::create(xContext, OUString(RTL_CONSTASCII_USTRINGPARAM("Hello My World!")));
+ xSomething = my_module::MyService2::create(xContext, OUString("Hello My World!"));
// call methodTwo and print the return value of methodTwo
s = xSomething->methodTwo();
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
index 606c8385f7c0..4eb89c3cd72d 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
@@ -54,14 +54,14 @@ namespace my_sc_impl
Sequence< OUString > SAL_CALL getSupportedServiceNames_MyService1Impl()
{
Sequence< OUString > names(1);
- names[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("my_module.MyService1"));
+ names[0] = OUString("my_module.MyService1");
return names;
}
OUString SAL_CALL getImplementationName_MyService1Impl()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "my_module.my_sc_implementation.MyService1") );
+ return OUString(
+ "my_module.my_sc_implementation.MyService1");
}
@@ -224,8 +224,8 @@ OUString MyService1Impl::getImplementationName()
throw (RuntimeException)
{
// unique implementation name
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "my_module.my_sc_implementation.MyService1") );
+ return OUString(
+ "my_module.my_sc_implementation.MyService1");
}
sal_Bool MyService1Impl::supportsService( OUString const & serviceName )
throw (RuntimeException)
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
index af999111d893..ba6bf5d29410 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
@@ -60,14 +60,14 @@ extern Reference< XInterface > SAL_CALL create_MyService1Impl(
static Sequence< OUString > getSupportedServiceNames_MyService2Impl()
{
Sequence<OUString> names(1);
- names[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("my_module.MyService2"));
+ names[0] = OUString("my_module.MyService2");
return names;
}
static OUString getImplementationName_MyService2Impl()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "my_module.my_sc_implementation.MyService2") );
+ return OUString(
+ "my_module.my_sc_implementation.MyService2");
}
class MyService2Impl : public ::cppu::WeakImplHelper3<
@@ -112,8 +112,8 @@ void MyService2Impl::initialize( Sequence< Any > const & args )
if (args.getLength() != 1)
{
throw lang::IllegalArgumentException(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "give a string instanciating this component!") ),
+ OUString(
+ "give a string instanciating this component!"),
// resolve to XInterface reference:
static_cast< ::cppu::OWeakObject * >(this),
0 ); // argument pos
@@ -121,8 +121,8 @@ void MyService2Impl::initialize( Sequence< Any > const & args )
if (! (args[ 0 ] >>= m_sData))
{
throw lang::IllegalArgumentException(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "no string given as argument!") ),
+ OUString(
+ "no string given as argument!"),
// resolve to XInterface reference:
static_cast< ::cppu::OWeakObject * >(this),
0 ); // argument pos
@@ -150,8 +150,8 @@ OUString MyService2Impl::getImplementationName()
throw (RuntimeException)
{
// unique implementation name
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "my_module.my_sc_implementation.MyService2") );
+ return OUString(
+ "my_module.my_sc_implementation.MyService2");
}
sal_Bool MyService2Impl::supportsService( OUString const & serviceName )
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
index 71ccd97c0597..66432c73bcd4 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
@@ -208,7 +208,7 @@ void SAL_CALL FilterDetect::initialize( const Sequence< Any >& aArguments )
OUString FilterDetect_getImplementationName ()
throw (RuntimeException)
{
- return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "devguide.officedev.samples.filter.FlatXmlDetect" ) );
+ return OUString( "devguide.officedev.samples.filter.FlatXmlDetect" );
}
#define SERVICE_NAME1 "com.sun.star.document.ExtendedTypeDetection"
diff --git a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx
index 780c18ebcd5b..fe7354d48443 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx
+++ b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx
@@ -76,8 +76,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
// open a spreadsheet document
Reference< XComponent > xComponent( xComponentLoader->loadComponentFromURL(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "private:factory/scalc" ) ),
- OUString( RTL_CONSTASCII_USTRINGPARAM( "_blank" ) ), 0,
+ OUString( "private:factory/scalc" ),
+ OUString( "_blank" ), 0,
Sequence < ::com::sun::star::beans::PropertyValue >() ) );
if ( !xComponent.is() )
{
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
index efa527c89027..057fe46ef372 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
@@ -54,7 +54,7 @@ void BaseDispatch::ShowMessageBox( const Reference< XFrame >& rFrame, const ::rt
Reference< XMessageBox > xMsgBox = xMsgBoxFactory->createMessageBox(
Reference< XWindowPeer >( rFrame->getContainerWindow(), UNO_QUERY ),
Rectangle(0,0,300,200),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "infobox" ) ),
+ rtl::OUString( "infobox" ),
MessageBoxButtons::BUTTONS_OK,
aTitle,
aMsgText );
diff --git a/oox/source/drawingml/customshapepresets5.cxx b/oox/source/drawingml/customshapepresets5.cxx
index d4cf90cc066e..08a5ad2fb8e8 100644
--- a/oox/source/drawingml/customshapepresets5.cxx
+++ b/oox/source/drawingml/customshapepresets5.cxx
@@ -9483,41 +9483,41 @@ class ShapeCflowChartProcess : public CustomShapeProvider
} // anonymous namespace
void CustomShapeProperties::initializePresetsMap5()
{
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "accentCallout3" ) ) ) ] = new ShapeCaccentCallout3();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "leftCircularArrow" ) ) ) ] = new ShapeCleftCircularArrow();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "rightArrow" ) ) ) ] = new ShapeCrightArrow();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartPunchedCard" ) ) ) ] = new ShapeCflowChartPunchedCard();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "snip2DiagRect" ) ) ) ] = new ShapeCsnip2DiagRect();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "verticalScroll" ) ) ) ] = new ShapeCverticalScroll();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "star7" ) ) ) ] = new ShapeCstar7();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "chartX" ) ) ) ] = new ShapeCchartX();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "cloud" ) ) ) ] = new ShapeCcloud();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "cube" ) ) ) ] = new ShapeCcube();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "round2DiagRect" ) ) ) ] = new ShapeCround2DiagRect();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartMultidocument" ) ) ) ] = new ShapeCflowChartMultidocument();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "actionButtonDocument" ) ) ) ] = new ShapeCactionButtonDocument();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartTerminator" ) ) ) ] = new ShapeCflowChartTerminator();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartDelay" ) ) ) ] = new ShapeCflowChartDelay();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "curvedConnector5" ) ) ) ] = new ShapeCcurvedConnector5();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "horizontalScroll" ) ) ) ] = new ShapeChorizontalScroll();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "bentConnector4" ) ) ) ] = new ShapeCbentConnector4();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "leftRightCircularArrow" ) ) ) ] = new ShapeCleftRightCircularArrow();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "wedgeRectCallout" ) ) ) ] = new ShapeCwedgeRectCallout();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "accentCallout2" ) ) ) ] = new ShapeCaccentCallout2();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartMagneticDrum" ) ) ) ] = new ShapeCflowChartMagneticDrum();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "corner" ) ) ) ] = new ShapeCcorner();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "borderCallout2" ) ) ) ] = new ShapeCborderCallout2();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "donut" ) ) ) ] = new ShapeCdonut();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartCollate" ) ) ) ] = new ShapeCflowChartCollate();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "mathNotEqual" ) ) ) ] = new ShapeCmathNotEqual();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "bentConnector2" ) ) ) ] = new ShapeCbentConnector2();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "mathMultiply" ) ) ) ] = new ShapeCmathMultiply();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "heptagon" ) ) ) ] = new ShapeCheptagon();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "rect" ) ) ) ] = new ShapeCrect();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "accentBorderCallout2" ) ) ) ] = new ShapeCaccentBorderCallout2();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "pieWedge" ) ) ) ] = new ShapeCpieWedge();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "upArrowCallout" ) ) ) ] = new ShapeCupArrowCallout();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartProcess" ) ) ) ] = new ShapeCflowChartProcess();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "accentCallout3" ) ) ] = new ShapeCaccentCallout3();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "leftCircularArrow" ) ) ] = new ShapeCleftCircularArrow();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "rightArrow" ) ) ] = new ShapeCrightArrow();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "flowChartPunchedCard" ) ) ] = new ShapeCflowChartPunchedCard();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "snip2DiagRect" ) ) ] = new ShapeCsnip2DiagRect();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "verticalScroll" ) ) ] = new ShapeCverticalScroll();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "star7" ) ) ] = new ShapeCstar7();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "chartX" ) ) ] = new ShapeCchartX();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "cloud" ) ) ] = new ShapeCcloud();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "cube" ) ) ] = new ShapeCcube();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "round2DiagRect" ) ) ] = new ShapeCround2DiagRect();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "flowChartMultidocument" ) ) ] = new ShapeCflowChartMultidocument();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "actionButtonDocument" ) ) ] = new ShapeCactionButtonDocument();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "flowChartTerminator" ) ) ] = new ShapeCflowChartTerminator();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "flowChartDelay" ) ) ] = new ShapeCflowChartDelay();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "curvedConnector5" ) ) ] = new ShapeCcurvedConnector5();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "horizontalScroll" ) ) ] = new ShapeChorizontalScroll();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "bentConnector4" ) ) ] = new ShapeCbentConnector4();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "leftRightCircularArrow" ) ) ] = new ShapeCleftRightCircularArrow();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "wedgeRectCallout" ) ) ] = new ShapeCwedgeRectCallout();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "accentCallout2" ) ) ] = new ShapeCaccentCallout2();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "flowChartMagneticDrum" ) ) ] = new ShapeCflowChartMagneticDrum();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "corner" ) ) ] = new ShapeCcorner();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "borderCallout2" ) ) ] = new ShapeCborderCallout2();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "donut" ) ) ] = new ShapeCdonut();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "flowChartCollate" ) ) ] = new ShapeCflowChartCollate();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "mathNotEqual" ) ) ] = new ShapeCmathNotEqual();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "bentConnector2" ) ) ] = new ShapeCbentConnector2();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "mathMultiply" ) ) ] = new ShapeCmathMultiply();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "heptagon" ) ) ] = new ShapeCheptagon();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "rect" ) ) ] = new ShapeCrect();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "accentBorderCallout2" ) ) ] = new ShapeCaccentBorderCallout2();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "pieWedge" ) ) ] = new ShapeCpieWedge();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "upArrowCallout" ) ) ] = new ShapeCupArrowCallout();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( "flowChartProcess" ) ) ] = new ShapeCflowChartProcess();
}
} } // oox // drawingml
diff --git a/padmin/source/adddlg.hxx b/padmin/source/adddlg.hxx
index 0ceb8fcb1d5c..169550f3376a 100644
--- a/padmin/source/adddlg.hxx
+++ b/padmin/source/adddlg.hxx
@@ -85,7 +85,7 @@ class APChooseDriverPage : public APTabPage
DECL_LINK( ClickBtnHdl, PushButton* );
DECL_LINK( DelPressedHdl, ListBox* );
- void updateDrivers( bool bRefresh = false, const rtl::OUString& rSelectDriver = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) ) );
+ void updateDrivers( bool bRefresh = false, const rtl::OUString& rSelectDriver = rtl::OUString( "SGENPRT" ) );
public:
APChooseDriverPage( AddPrinterDialog* pParent );
~APChooseDriverPage();
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index 3905360818ee..eb9667f10427 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -86,7 +86,7 @@ static PyRef getLoaderModule() throw( RuntimeException )
if( !module.is() )
{
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "pythonloader: Couldn't load pythonloader module" ) ),
+ OUString( "pythonloader: Couldn't load pythonloader module" ),
Reference< XInterface > () );
}
return PyRef( PyModule_GetDict( module.get() ));
@@ -108,7 +108,7 @@ static PyRef getObjectFromLoaderModule( const char * func )
OUString getImplementationName()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.pyuno.Loader" ) );
+ return OUString( "org.openoffice.comp.pyuno.Loader" );
}
Sequence< OUString > getSupportedServiceNames()
@@ -189,8 +189,8 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c
rtl::Bootstrap bootstrap(path);
// look for pythonhome
- bootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "PYUNO_LOADER_PYTHONHOME") ), pythonHome );
- bootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "PYUNO_LOADER_PYTHONPATH" ) ) , pythonPath );
+ bootstrap.getFrom( OUString( "PYUNO_LOADER_PYTHONHOME"), pythonHome );
+ bootstrap.getFrom( OUString( "PYUNO_LOADER_PYTHONPATH" ) , pythonPath );
// pythonhome+pythonpath must be set before Py_Initialize(), otherwise there appear warning on the console
// sadly, there is no api for setting the pythonpath, we have to use the environment variable
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index efc1d62ba670..d42aa20589e6 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -72,7 +72,7 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
{
OSL_ASSERT( pVal );
if (pTypeRef->eTypeClass == typelib_TypeClass_VOID)
- return OUString( RTL_CONSTASCII_USTRINGPARAM("void") );
+ return OUString("void");
OUStringBuffer buf( 64 );
buf.append( (sal_Unicode)'(' );
diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx
index 08b76ad78a25..968f52bb9f9e 100644
--- a/pyuno/source/module/pyuno_adapter.cxx
+++ b/pyuno/source/module/pyuno_adapter.cxx
@@ -138,8 +138,7 @@ Sequence< sal_Int16 > Adapter::getOutIndexes( const OUString & functionName )
{
throw RuntimeException(
(OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "pyuno bridge: Couldn't get reflection for method "))
+ "pyuno bridge: Couldn't get reflection for method ")
+ functionName),
Reference< XInterface > () );
}
diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index f8231045bcf2..de051b2727f7 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -101,7 +101,7 @@ public:
, nMembersSet (0)
{
if ( ! used )
- throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("pyuno._createUnoStructHelper failed to create new dictionary")), Reference< XInterface > ());
+ throw RuntimeException(OUString("pyuno._createUnoStructHelper failed to create new dictionary"), Reference< XInterface > ());
}
~fillStructState()
{
diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index a5577bea4de9..437cafe348ef 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -149,12 +149,12 @@ Reference< XInterface > ResolverImpl::resolve( const OUString & rUnoUrl )
Reference< XConnector > xConnector(
_xSMgr->createInstanceWithContext(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Connector") ),
+ OUString("com.sun.star.connection.Connector"),
_xCtx ),
UNO_QUERY );
if (! xConnector.is())
- throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("no connector!" ) ), Reference< XInterface >() );
+ throw RuntimeException( OUString("no connector!" ), Reference< XInterface >() );
Reference< XConnection > xConnection( xConnector->connect( aConnectDescr ) );
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx
index 6cd65d95d73d..9d5e56f89c85 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -209,7 +209,7 @@ void SAL_CALL OFixedLine::dispose() throw(uno::RuntimeException)
// -----------------------------------------------------------------------------
::rtl::OUString OFixedLine::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OFixedLine"));
+ return ::rtl::OUString("com.sun.star.comp.report.OFixedLine");
}
//--------------------------------------------------------------------------
@@ -526,7 +526,7 @@ void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::Proper
// XShapeDescriptor
::rtl::OUString SAL_CALL OFixedLine::getShapeType( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape"));
+ return ::rtl::OUString("com.sun.star.drawing.ControlShape");
}
// -----------------------------------------------------------------------------
::rtl::OUString SAL_CALL OFixedLine::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException)
diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx
index 2d127a1eac0f..de2ff89b7c82 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -99,7 +99,7 @@ void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException)
// -----------------------------------------------------------------------------
::rtl::OUString OFixedText::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OFixedText"));
+ return ::rtl::OUString("com.sun.star.comp.report.OFixedText");
}
//--------------------------------------------------------------------------
@@ -321,7 +321,7 @@ void SAL_CALL OFixedText::setSize( const awt::Size& aSize ) throw (beans::Proper
// XShapeDescriptor
::rtl::OUString SAL_CALL OFixedText::getShapeType( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape"));
+ return ::rtl::OUString("com.sun.star.drawing.ControlShape");
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx
index 4f42791f01a6..96d9df3c4c3b 100644
--- a/reportdesign/source/core/api/FormatCondition.cxx
+++ b/reportdesign/source/core/api/FormatCondition.cxx
@@ -64,7 +64,7 @@ void SAL_CALL OFormatCondition::dispose() throw(uno::RuntimeException)
// -----------------------------------------------------------------------------
::rtl::OUString OFormatCondition::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OFormatCondition"));
+ return ::rtl::OUString("com.sun.star.comp.report.OFormatCondition");
}
//--------------------------------------------------------------------------
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx
index a05fc557f320..9f5462fe01db 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -107,7 +107,7 @@ void SAL_CALL OFormattedField::dispose() throw(uno::RuntimeException)
// -----------------------------------------------------------------------------
::rtl::OUString OFormattedField::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OFormattedField"));
+ return ::rtl::OUString("com.sun.star.comp.report.OFormattedField");
}
//--------------------------------------------------------------------------
@@ -120,7 +120,7 @@ uno::Sequence< ::rtl::OUString > OFormattedField::getSupportedServiceNames_Stati
{
uno::Sequence< ::rtl::OUString > aServices(2);
aServices.getArray()[0] = SERVICE_FORMATTEDFIELD;
- aServices.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFormattedFieldModel"));
+ aServices.getArray()[1] = ::rtl::OUString("com.sun.star.awt.UnoControlFormattedFieldModel");
return aServices;
}
@@ -262,7 +262,7 @@ uno::Reference< util::XNumberFormatsSupplier > SAL_CALL OFormattedField::getForm
{
uno::Reference< beans::XPropertySet> xProp(::dbtools::findDataSource(getParent()),uno::UNO_QUERY);
if ( xProp.is() )
- m_xFormatsSupplier.set(xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormatsSupplier"))),uno::UNO_QUERY);
+ m_xFormatsSupplier.set(xProp->getPropertyValue(::rtl::OUString("NumberFormatsSupplier")),uno::UNO_QUERY);
}
}
return m_xFormatsSupplier;
@@ -364,7 +364,7 @@ void SAL_CALL OFormattedField::setSize( const awt::Size& aSize ) throw (beans::P
// XShapeDescriptor
::rtl::OUString SAL_CALL OFormattedField::getShapeType( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape"));
+ return ::rtl::OUString("com.sun.star.drawing.ControlShape");
}
// -----------------------------------------------------------------------------
// =============================================================================
diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx
index 4065403d4918..36bbd10b703e 100644
--- a/reportdesign/source/core/api/Function.cxx
+++ b/reportdesign/source/core/api/Function.cxx
@@ -64,7 +64,7 @@ void SAL_CALL OFunction::dispose() throw(uno::RuntimeException)
// -----------------------------------------------------------------------------
::rtl::OUString OFunction::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OFunction"));
+ return ::rtl::OUString("com.sun.star.comp.report.OFunction");
}
//--------------------------------------------------------------------------
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index 5e2288ffd14a..ba056faf96ba 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -80,7 +80,7 @@ IMPLEMENT_FORWARD_XINTERFACE2(OGroup,GroupBase,GroupPropertySet)
//--------------------------------------------------------------------------
::rtl::OUString SAL_CALL OGroup::getImplementationName( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.Group"));
+ return ::rtl::OUString("com.sun.star.comp.report.Group");
}
//------------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString> OGroup::getSupportedServiceNames_Static(void) throw( uno::RuntimeException )
@@ -193,7 +193,7 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getFooter() throw (container
void SAL_CALL OGroup::setGroupOn( ::sal_Int16 _groupon ) throw (lang::IllegalArgumentException, uno::RuntimeException)
{
if ( _groupon < report::GroupOn::DEFAULT || _groupon > report::GroupOn::INTERVAL )
- throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star::report::GroupOn"))
+ throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::GroupOn")
,*this
,1
,m_xContext);
@@ -220,7 +220,7 @@ void SAL_CALL OGroup::setGroupInterval( ::sal_Int32 _groupinterval ) throw (uno:
void SAL_CALL OGroup::setKeepTogether( ::sal_Int16 _keeptogether ) throw (lang::IllegalArgumentException, uno::RuntimeException)
{
if ( _keeptogether < report::KeepTogether::NO || _keeptogether > report::KeepTogether::WITH_FIRST_DETAIL )
- throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star::report::KeepTogether"))
+ throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::KeepTogether")
,*this
,1
,m_xContext);
diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx
index 99081f7159c7..d083e8d9da2c 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -173,7 +173,7 @@ void SAL_CALL OImageControl::dispose() throw(uno::RuntimeException)
// -----------------------------------------------------------------------------
::rtl::OUString OImageControl::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OImageControl"));
+ return ::rtl::OUString("com.sun.star.comp.report.OImageControl");
}
//--------------------------------------------------------------------------
@@ -458,7 +458,7 @@ void SAL_CALL OImageControl::setSize( const awt::Size& aSize ) throw (beans::Pro
// XShapeDescriptor
::rtl::OUString SAL_CALL OImageControl::getShapeType( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape"));
+ return ::rtl::OUString("com.sun.star.drawing.ControlShape");
}
// -----------------------------------------------------------------------------
::sal_Int16 SAL_CALL OImageControl::getScaleMode() throw (uno::RuntimeException)
diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx
index 33af30cbc1d0..4f87302f31de 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -83,11 +83,11 @@ OFormatProperties::OFormatProperties()
SvtLinguConfig aLinguConfig;
using namespace ::com::sun::star::i18n::ScriptType;
- aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale"))) >>= aCharLocale;
+ aLinguConfig.GetProperty(::rtl::OUString("DefaultLocale")) >>= aCharLocale;
LanguageType eCurLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aCharLocale).getLanguageType(false), LATIN);
- aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale_CJK"))) >>= aCharLocaleAsian;
+ aLinguConfig.GetProperty(::rtl::OUString("DefaultLocale_CJK")) >>= aCharLocaleAsian;
LanguageType eCurLangCJK = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aCharLocaleAsian).getLanguageType(false), ASIAN);
- aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale_CTL"))) >>= aCharLocaleComplex;
+ aLinguConfig.GetProperty(::rtl::OUString("DefaultLocale_CTL")) >>= aCharLocaleComplex;
LanguageType eCurLangCTL = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aCharLocaleComplex).getLanguageType(false), COMPLEX);
Font aLatin,aCJK,aCTL;
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 09bf83fbdc74..c4cf461c3281 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -209,15 +209,15 @@ void lcl_setModelReadOnly(const uno::Reference< embed::XStorage >& _xStorage,::b
uno::Reference<beans::XPropertySet> xProp(_xStorage,uno::UNO_QUERY);
sal_Int32 nOpenMode = embed::ElementModes::READ;
if ( xProp.is() )
- xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OpenMode"))) >>= nOpenMode;
+ xProp->getPropertyValue(::rtl::OUString("OpenMode")) >>= nOpenMode;
_rModel->SetReadOnly((nOpenMode & embed::ElementModes::WRITE) != embed::ElementModes::WRITE);
}
void lcl_stripLoadArguments( ::comphelper::MediaDescriptor& _rDescriptor, uno::Sequence< beans::PropertyValue >& _rArgs )
{
- _rDescriptor.erase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StatusIndicator" ) ) );
- _rDescriptor.erase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ) ) );
- _rDescriptor.erase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Model" ) ) );
+ _rDescriptor.erase( ::rtl::OUString( "StatusIndicator" ) );
+ _rDescriptor.erase( ::rtl::OUString( "InteractionHandler" ) );
+ _rDescriptor.erase( ::rtl::OUString( "Model" ) );
_rDescriptor >> _rArgs;
}
// -----------------------------------------------------------------------------
@@ -515,13 +515,13 @@ namespace
{
uno::Sequence < beans::PropertyValue > aArgs( 3);
sal_Int32 nLen = 0;
- aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
+ aArgs[nLen].Name = ::rtl::OUString("AsTemplate");
aArgs[nLen++].Value <<= sal_False;
- aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
+ aArgs[nLen].Name = ::rtl::OUString("ReadOnly");
aArgs[nLen++].Value <<= sal_True;
- aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hidden"));
+ aArgs[nLen].Name = ::rtl::OUString("Hidden");
aArgs[nLen++].Value <<= sal_True;
::comphelper::MimeConfigurationHelper aHelper(m_xContext);
@@ -750,8 +750,8 @@ void OReportDefinition::init()
m_pImpl->m_pReportModel->SetScaleUnit( MAP_100TH_MM );
SdrLayerAdmin& rAdmin = m_pImpl->m_pReportModel->GetLayerAdmin();
rAdmin.NewStandardLayer(RPT_LAYER_FRONT);
- rAdmin.NewLayer(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("back")), RPT_LAYER_BACK);
- rAdmin.NewLayer(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HiddenLayer")), RPT_LAYER_HIDDEN);
+ rAdmin.NewLayer(rtl::OUString("back"), RPT_LAYER_BACK);
+ rAdmin.NewLayer(rtl::OUString("HiddenLayer"), RPT_LAYER_HIDDEN);
m_pImpl->m_pUndoManager = new ::dbaui::UndoManager( *this, m_aMutex );
m_pImpl->m_pReportModel->SetSdrUndoManager( &m_pImpl->m_pUndoManager->GetSfxUndoManager() );
@@ -764,9 +764,9 @@ void OReportDefinition::init()
if ( xStorProps.is())
{
::rtl::OUString sMediaType;
- xStorProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType"))) >>= sMediaType;
+ xStorProps->getPropertyValue( ::rtl::OUString("MediaType")) >>= sMediaType;
if ( sMediaType.isEmpty() )
- xStorProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")),uno::makeAny(MIMETYPE_OASIS_OPENDOCUMENT_REPORT));
+ xStorProps->setPropertyValue( ::rtl::OUString("MediaType"),uno::makeAny(MIMETYPE_OASIS_OPENDOCUMENT_REPORT));
}
m_pImpl->m_pObjectContainer.reset( new comphelper::EmbeddedObjectContainer(m_pImpl->m_xStorage , static_cast<cppu::OWeakObject*>(this) ) );
}
@@ -784,7 +784,7 @@ void SAL_CALL OReportDefinition::dispose() throw(uno::RuntimeException)
// -----------------------------------------------------------------------------
void SAL_CALL OReportDefinition::disposing()
{
- notifyEvent(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnUnload")));
+ notifyEvent(::rtl::OUString("OnUnload"));
uno::Reference< frame::XModel > xHoldAlive( this );
@@ -837,7 +837,7 @@ void SAL_CALL OReportDefinition::disposing()
// -----------------------------------------------------------------------------
::rtl::OUString OReportDefinition::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OReportDefinition"));
+ return ::rtl::OUString("com.sun.star.comp.report.OReportDefinition");
}
//--------------------------------------------------------------------------
@@ -926,7 +926,7 @@ void SAL_CALL OReportDefinition::setCaption( const ::rtl::OUString& _caption ) t
void SAL_CALL OReportDefinition::setGroupKeepTogether( ::sal_Int16 _groupkeeptogether ) throw (uno::RuntimeException)
{
if ( _groupkeeptogether < report::GroupKeepTogether::PER_PAGE || _groupkeeptogether > report::GroupKeepTogether::PER_COLUMN )
- throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star::report::GroupKeepTogether"))
+ throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::GroupKeepTogether")
,*this
,1
,m_aProps->m_xContext);
@@ -942,7 +942,7 @@ void SAL_CALL OReportDefinition::setGroupKeepTogether( ::sal_Int16 _groupkeeptog
void SAL_CALL OReportDefinition::setPageHeaderOption( ::sal_Int16 _pageheaderoption ) throw (uno::RuntimeException)
{
if ( _pageheaderoption < report::ReportPrintOption::ALL_PAGES || _pageheaderoption > report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER )
- throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star::report::ReportPrintOption"))
+ throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::ReportPrintOption")
,*this
,1
,m_aProps->m_xContext);
@@ -958,7 +958,7 @@ void SAL_CALL OReportDefinition::setPageHeaderOption( ::sal_Int16 _pageheaderopt
void SAL_CALL OReportDefinition::setPageFooterOption( ::sal_Int16 _pagefooteroption ) throw (uno::RuntimeException)
{
if ( _pagefooteroption < report::ReportPrintOption::ALL_PAGES || _pagefooteroption > report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER )
- throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star::report::ReportPrintOption"))
+ throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::ReportPrintOption")
,*this
,1
,m_aProps->m_xContext);
@@ -985,7 +985,7 @@ void SAL_CALL OReportDefinition::setCommand( const ::rtl::OUString& _command ) t
void SAL_CALL OReportDefinition::setCommandType( ::sal_Int32 _commandtype ) throw (uno::RuntimeException)
{
if ( _commandtype < sdb::CommandType::TABLE || _commandtype > sdb::CommandType::COMMAND )
- throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star::sdb::CommandType"))
+ throwIllegallArgumentException(::rtl::OUString("com::sun::star::sdb::CommandType")
,*this
,1
,m_aProps->m_xContext);
@@ -1293,11 +1293,11 @@ void SAL_CALL OReportDefinition::close( ::sal_Bool _bDeliverOwnership ) throw (u
void OReportDefinition::fillArgs(::comphelper::MediaDescriptor& _aDescriptor)
{
uno::Sequence<beans::PropertyValue> aComponentData;
- aComponentData = _aDescriptor.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ComponentData")),aComponentData);
+ aComponentData = _aDescriptor.getUnpackedValueOrDefault(::rtl::OUString("ComponentData"),aComponentData);
if ( aComponentData.getLength() && (!m_pImpl->m_xActiveConnection.is() || !m_pImpl->m_xNumberFormatsSupplier.is()) )
{
::comphelper::SequenceAsHashMap aComponentDataMap( aComponentData );
- m_pImpl->m_xActiveConnection = aComponentDataMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")),m_pImpl->m_xActiveConnection);
+ m_pImpl->m_xActiveConnection = aComponentDataMap.getUnpackedValueOrDefault(::rtl::OUString("ActiveConnection"),m_pImpl->m_xActiveConnection);
m_pImpl->m_xNumberFormatsSupplier = dbtools::getNumberFormats(m_pImpl->m_xActiveConnection);
}
if ( !m_pImpl->m_xNumberFormatsSupplier.is() )
@@ -1306,7 +1306,7 @@ void OReportDefinition::fillArgs(::comphelper::MediaDescriptor& _aDescriptor)
}
lcl_stripLoadArguments( _aDescriptor, m_pImpl->m_aArgs );
::rtl::OUString sCaption;
- sCaption = _aDescriptor.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentTitle")),sCaption);
+ sCaption = _aDescriptor.getUnpackedValueOrDefault(::rtl::OUString("DocumentTitle"),sCaption);
setCaption(sCaption);
}
// -----------------------------------------------------------------------------
@@ -1395,7 +1395,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference<
::comphelper::MediaDescriptor aDescriptor( _aMediaDescriptor );
fillArgs(aDescriptor);
- aDescriptor.createItemIfMissing(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Storage")),uno::makeAny(_xStorageToLoadFrom));
+ aDescriptor.createItemIfMissing(::rtl::OUString("Storage"),uno::makeAny(_xStorageToLoadFrom));
uno::Sequence< uno::Any > aDelegatorArguments(_aMediaDescriptor.getLength());
uno::Any* pIter = aDelegatorArguments.getArray();
@@ -1407,7 +1407,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference<
sal_Int32 nPos = aDelegatorArguments.getLength();
aDelegatorArguments.realloc(nPos+1);
beans::PropertyValue aPropVal;
- aPropVal.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Storage"));
+ aPropVal.Name = ::rtl::OUString("Storage");
aPropVal.Value <<= _xStorageToLoadFrom;
aDelegatorArguments[nPos] <<= aPropVal;
@@ -1415,7 +1415,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference<
rptui::OXUndoEnvironment::OUndoEnvLock aLock(rEnv);
{
uno::Reference< document::XFilter > xFilter(
- m_aProps->m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OReportFilter")),aDelegatorArguments,m_aProps->m_xContext),
+ m_aProps->m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(::rtl::OUString("com.sun.star.comp.report.OReportFilter"),aDelegatorArguments,m_aProps->m_xContext),
uno::UNO_QUERY_THROW );
uno::Reference< document::XImporter> xImporter(xFilter,uno::UNO_QUERY_THROW);
@@ -1485,14 +1485,14 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) );
SvtSaveOptions aSaveOpt;
- xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting")), uno::makeAny(aSaveOpt.IsPrettyPrinting()));
+ xInfoSet->setPropertyValue(rtl::OUString("UsePrettyPrinting"), uno::makeAny(aSaveOpt.IsPrettyPrinting()));
if ( aSaveOpt.IsSaveRelFSys() )
{
const ::rtl::OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),::rtl::OUString()) );
- xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI")), uno::makeAny(sVal));
+ xInfoSet->setPropertyValue(rtl::OUString("BaseURI"), uno::makeAny(sVal));
}
- const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HierarchicalDocumentName")),::rtl::OUString()) );
- xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")), uno::makeAny(sHierarchicalDocumentName));
+ const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString("HierarchicalDocumentName"),::rtl::OUString()) );
+ xInfoSet->setPropertyValue(rtl::OUString("StreamRelPath"), uno::makeAny(sHierarchicalDocumentName));
sal_Int32 nArgsLen = aDelegatorArguments.getLength();
@@ -1515,7 +1515,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
uno::Reference<XComponent> xCom(static_cast<OWeakObject*>(this),uno::UNO_QUERY);
if( !bErr )
{
- xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")), uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("settings.xml"))));
+ xInfoSet->setPropertyValue(rtl::OUString("StreamName"), uno::makeAny(::rtl::OUString("settings.xml")));
if( !WriteThroughComponent(
xCom, "settings.xml",
"com.sun.star.comp.report.XMLSettingsExporter",
@@ -1524,14 +1524,14 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
if( !bWarn )
{
bWarn = sal_True;
- sWarnFile = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("settings.xml"));
+ sWarnFile = ::rtl::OUString("settings.xml");
}
}
}
if( !bErr )
{
- xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")), uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("meta.xml"))));
+ xInfoSet->setPropertyValue(rtl::OUString("StreamName"), uno::makeAny(::rtl::OUString("meta.xml")));
if( !WriteThroughComponent(
xCom, "meta.xml",
"com.sun.star.comp.report.XMLMetaExporter",
@@ -1540,14 +1540,14 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
if( !bWarn )
{
bWarn = sal_True;
- sWarnFile = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("meta.xml"));
+ sWarnFile = ::rtl::OUString("meta.xml");
}
}
}
if( !bErr )
{
- xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")), uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("styles.xml"))));
+ xInfoSet->setPropertyValue(rtl::OUString("StreamName"), uno::makeAny(::rtl::OUString("styles.xml")));
if( !WriteThroughComponent(
xCom, "styles.xml",
"com.sun.star.comp.report.XMLStylesExporter",
@@ -1556,21 +1556,21 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
if( !bWarn )
{
bWarn = sal_True;
- sWarnFile = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("styles.xml"));
+ sWarnFile = ::rtl::OUString("styles.xml");
}
}
}
if ( !bErr )
{
- xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")), uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml"))));
+ xInfoSet->setPropertyValue(rtl::OUString("StreamName"), uno::makeAny(::rtl::OUString("content.xml")));
if( !WriteThroughComponent(
xCom, "content.xml",
"com.sun.star.comp.report.ExportFilter",
aDelegatorArguments, aProps, _xStorageToSaveTo ) )
{
bErr = sal_True;
- sErrFile = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml"));
+ sErrFile = ::rtl::OUString("content.xml");
}
}
@@ -1844,7 +1844,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue
{
if ( i == nLastOpenMode )
throw lang::WrappedTargetException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "An error occurred while creating the document storage." ) ),
+ ::rtl::OUString( "An error occurred while creating the document storage." ),
// TODO: resource
*this,
::cppu::getCaughtException()
@@ -1968,7 +1968,7 @@ void SAL_CALL OReportDefinition::setModified( ::sal_Bool _bModified ) throw (bea
lang::EventObject aEvent(*this);
aGuard.clear();
m_pImpl->m_aModifyListeners.notifyEach(&util::XModifyListener::modified,aEvent);
- notifyEvent(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnModifyChanged")));
+ notifyEvent(::rtl::OUString("OnModifyChanged"));
}
}
// -----------------------------------------------------------------------------
@@ -2233,14 +2233,14 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co
if ( aServiceSpecifier.indexOf( "com.sun.star.report." ) == 0 )
{
if ( aServiceSpecifier == SERVICE_SHAPE )
- xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape")) ),uno::UNO_QUERY_THROW);
+ xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString("com.sun.star.drawing.CustomShape") ),uno::UNO_QUERY_THROW);
else if ( aServiceSpecifier == SERVICE_FORMATTEDFIELD
|| aServiceSpecifier == SERVICE_FIXEDTEXT
|| aServiceSpecifier == SERVICE_FIXEDLINE
|| aServiceSpecifier == SERVICE_IMAGECONTROL )
- xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")) ),uno::UNO_QUERY_THROW);
+ xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString("com.sun.star.drawing.ControlShape") ),uno::UNO_QUERY_THROW);
else
- xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) ),uno::UNO_QUERY_THROW);
+ xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString("com.sun.star.drawing.OLE2Shape") ),uno::UNO_QUERY_THROW);
}
else if ( aServiceSpecifier.indexOf( "com.sun.star.form.component." ) == 0 )
{
@@ -2252,10 +2252,10 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co
)
{
uno::Reference< style::XStyle> xStyle = new OStyle();
- xStyle->setName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Default")));
+ xStyle->setName(::rtl::OUString("Default"));
uno::Reference<beans::XPropertySet> xProp(xStyle,uno::UNO_QUERY);
::rtl::OUString sTray;
- xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrinterPaperTray")))>>= sTray;
+ xProp->getPropertyValue(::rtl::OUString("PrinterPaperTray"))>>= sTray;
return xStyle.get();
}
@@ -2349,25 +2349,25 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OReportDefinition::getAvailableService
{
static const ::rtl::OUString aSvxComponentServiceNameList[] =
{
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.PageStyle")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.GraphicStyle")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.FrameStyle")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportEmbeddedObjectResolver")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportEmbeddedObjectResolver")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportGraphicObjectResolver")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportGraphicObjectResolver")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.DataProvider")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.NamespaceMap")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.Settings")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GradientTable")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.HatchTable")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.BitmapTable")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TransparencyGradientTable")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DashTable")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.MarkerTable"))
+ ::rtl::OUString("com.sun.star.form.component.FixedText"),
+ ::rtl::OUString("com.sun.star.form.component.DatabaseImageControl"),
+ ::rtl::OUString("com.sun.star.style.PageStyle"),
+ ::rtl::OUString("com.sun.star.style.GraphicStyle"),
+ ::rtl::OUString("com.sun.star.style.FrameStyle"),
+ ::rtl::OUString("com.sun.star.drawing.Defaults"),
+ ::rtl::OUString("com.sun.star.document.ImportEmbeddedObjectResolver"),
+ ::rtl::OUString("com.sun.star.document.ExportEmbeddedObjectResolver"),
+ ::rtl::OUString("com.sun.star.document.ImportGraphicObjectResolver"),
+ ::rtl::OUString("com.sun.star.document.ExportGraphicObjectResolver"),
+ ::rtl::OUString("com.sun.star.chart2.data.DataProvider"),
+ ::rtl::OUString("com.sun.star.xml.NamespaceMap"),
+ ::rtl::OUString("com.sun.star.document.Settings"),
+ ::rtl::OUString("com.sun.star.drawing.GradientTable"),
+ ::rtl::OUString("com.sun.star.drawing.HatchTable"),
+ ::rtl::OUString("com.sun.star.drawing.BitmapTable"),
+ ::rtl::OUString("com.sun.star.drawing.TransparencyGradientTable"),
+ ::rtl::OUString("com.sun.star.drawing.DashTable"),
+ ::rtl::OUString("com.sun.star.drawing.MarkerTable")
};
static const sal_uInt16 nSvxComponentServiceNameListCount = sizeof(aSvxComponentServiceNameList) / sizeof ( aSvxComponentServiceNameList[0] );
@@ -2424,7 +2424,7 @@ void SAL_CALL OReportDefinition::setSize( const awt::Size& aSize ) throw (beans:
// XShapeDescriptor
::rtl::OUString SAL_CALL OReportDefinition::getShapeType( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape"));
+ return ::rtl::OUString("com.sun.star.drawing.OLE2Shape");
}
// -----------------------------------------------------------------------------
typedef ::cppu::WeakImplHelper2< container::XNameContainer,
@@ -2571,18 +2571,18 @@ uno::Reference< container::XNameAccess > SAL_CALL OReportDefinition::getStyleFam
uno::Reference< container::XNameContainer> xStyles(m_pImpl->m_xStyles,uno::UNO_QUERY);
uno::Reference< container::XNameContainer> xPageStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL)));
- xStyles->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyles")),uno::makeAny(xPageStyles));
- uno::Reference< style::XStyle> xPageStyle(createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.PageStyle"))),uno::UNO_QUERY);
+ xStyles->insertByName(::rtl::OUString("PageStyles"),uno::makeAny(xPageStyles));
+ uno::Reference< style::XStyle> xPageStyle(createInstance(::rtl::OUString("com.sun.star.style.PageStyle")),uno::UNO_QUERY);
xPageStyles->insertByName(xPageStyle->getName(),uno::makeAny(xPageStyle));
uno::Reference< container::XNameContainer> xFrameStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL)));
- xStyles->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameStyles")),uno::makeAny(xFrameStyles));
- uno::Reference< style::XStyle> xFrameStyle(createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.FrameStyle"))),uno::UNO_QUERY);
+ xStyles->insertByName(::rtl::OUString("FrameStyles"),uno::makeAny(xFrameStyles));
+ uno::Reference< style::XStyle> xFrameStyle(createInstance(::rtl::OUString("com.sun.star.style.FrameStyle")),uno::UNO_QUERY);
xFrameStyles->insertByName(xFrameStyle->getName(),uno::makeAny(xFrameStyle));
uno::Reference< container::XNameContainer> xGraphicStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL)));
- xStyles->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("graphics")),uno::makeAny(xGraphicStyles));
- uno::Reference< style::XStyle> xGraphicStyle(createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.GraphicStyle"))),uno::UNO_QUERY);
+ xStyles->insertByName(::rtl::OUString("graphics"),uno::makeAny(xGraphicStyles));
+ uno::Reference< style::XStyle> xGraphicStyle(createInstance(::rtl::OUString("com.sun.star.style.GraphicStyle")),uno::UNO_QUERY);
xGraphicStyles->insertByName(xGraphicStyle->getName(),uno::makeAny(xGraphicStyle));
}
return m_pImpl->m_xStyles;
@@ -2698,7 +2698,7 @@ uno::Reference< frame::XUntitledNumbers > OReportDefinition::impl_getUntitledHel
m_pImpl->m_xNumberedControllers = uno::Reference< frame::XUntitledNumbers >(static_cast< ::cppu::OWeakObject* >(pHelper), uno::UNO_QUERY_THROW);
pHelper->setOwner (xThis);
- pHelper->setUntitledPrefix (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" : ")));
+ pHelper->setUntitledPrefix (::rtl::OUString(" : "));
}
return m_pImpl->m_xNumberedControllers;
@@ -2853,8 +2853,8 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL OReportDefinition::getTransfe
{
uno::Sequence< datatransfer::DataFlavor > aRet(1);
- aRet[0] = datatransfer::DataFlavor( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/png")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PNG")),
+ aRet[0] = datatransfer::DataFlavor( ::rtl::OUString("image/png"),
+ ::rtl::OUString("PNG"),
::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
return aRet;
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index 38b529baeed8..4a31c6b44bb7 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -89,7 +89,7 @@ void SAL_CALL OReportEngineJFree::dispose() throw(uno::RuntimeException)
// -----------------------------------------------------------------------------
::rtl::OUString OReportEngineJFree::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OReportEngineJFree"));
+ return ::rtl::OUString("com.sun.star.comp.report.OReportEngineJFree");
}
//--------------------------------------------------------------------------
@@ -190,9 +190,9 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task
uno::Sequence< beans::NamedValue > aConvertedProperties(8);
sal_Int32 nPos = 0;
- aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStorage"));
+ aConvertedProperties[nPos].Name = ::rtl::OUString("InputStorage");
aConvertedProperties[nPos++].Value <<= xTemp;
- aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutputStorage"));
+ aConvertedProperties[nPos].Name = ::rtl::OUString("OutputStorage");
::rtl::OUString sFileURL;
String sName = m_xReport->getCaption();
@@ -304,15 +304,15 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive
{
uno::Sequence < beans::PropertyValue > aArgs( _bHidden ? 3 : 2 );
sal_Int32 nLen = 0;
- aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
+ aArgs[nLen].Name = ::rtl::OUString("AsTemplate");
aArgs[nLen++].Value <<= sal_False;
- aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
+ aArgs[nLen].Name = ::rtl::OUString("ReadOnly");
aArgs[nLen++].Value <<= sal_True;
if ( _bHidden )
{
- aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hidden"));
+ aArgs[nLen].Name = ::rtl::OUString("Hidden");
aArgs[nLen++].Value <<= sal_True;
}
diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx
index 12788fd0491e..265ed3e6121b 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -177,7 +177,7 @@ void SAL_CALL OSection::disposing()
//--------------------------------------------------------------------------
::rtl::OUString SAL_CALL OSection::getImplementationName( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.Section"));
+ return ::rtl::OUString("com.sun.star.comp.report.Section");
}
//------------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString> OSection::getSupportedServiceNames_Static(void) throw( uno::RuntimeException )
@@ -317,7 +317,7 @@ void OSection::checkNotPageHeaderFooter()
void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
{
if ( _forcenewpage < report::ForceNewPage::NONE || _forcenewpage > report::ForceNewPage::BEFORE_AFTER_SECTION )
- throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star::report::ForceNewPage"))
+ throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::ForceNewPage")
,*this
,1
,m_xContext);
@@ -335,7 +335,7 @@ void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage ) throw (lang
void SAL_CALL OSection::setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
{
if ( _newroworcol < report::ForceNewPage::NONE || _newroworcol > report::ForceNewPage::BEFORE_AFTER_SECTION )
- throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star::report::ForceNewPage"))
+ throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::ForceNewPage")
,*this
,1
,m_xContext);
@@ -427,11 +427,11 @@ const ::std::vector< ::rtl::OUString >& lcl_getControlModelMap()
static ::std::vector< ::rtl::OUString > s_sControlModels;
if ( s_sControlModels.empty() )
{
- s_sControlModels.push_back( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FixedText")) );
- s_sControlModels.push_back( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FixedLine")) );
- s_sControlModels.push_back( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageControl")) );
- s_sControlModels.push_back( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormattedField")) );
- s_sControlModels.push_back( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Shape")) );
+ s_sControlModels.push_back( ::rtl::OUString("FixedText") );
+ s_sControlModels.push_back( ::rtl::OUString("FixedLine") );
+ s_sControlModels.push_back( ::rtl::OUString("ImageControl") );
+ s_sControlModels.push_back( ::rtl::OUString("FormattedField") );
+ s_sControlModels.push_back( ::rtl::OUString("Shape") );
}
return s_sControlModels;
@@ -450,19 +450,19 @@ uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportCompon
switch( aFind - aRet.begin() )
{
case 0:
- xRet.set(xFac->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText"))),uno::UNO_QUERY);
+ xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.form.component.FixedText")),uno::UNO_QUERY);
break;
case 1:
- xRet.set(xFac->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel"))),uno::UNO_QUERY);
+ xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.awt.UnoControlFixedLineModel")),uno::UNO_QUERY);
break;
case 2:
- xRet.set(xFac->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl"))),uno::UNO_QUERY);
+ xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.form.component.DatabaseImageControl")),uno::UNO_QUERY);
break;
case 3:
- xRet.set(xFac->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField"))),uno::UNO_QUERY);
+ xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.form.component.FormattedField")),uno::UNO_QUERY);
break;
case 4:
- xRet.set(xFac->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape"))),uno::UNO_QUERY);
+ xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.drawing.ControlShape")),uno::UNO_QUERY);
break;
default:
break;
diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index d57fb95e278c..c875df30e1a0 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -120,7 +120,7 @@ void SAL_CALL OShape::dispose() throw(uno::RuntimeException)
// -----------------------------------------------------------------------------
::rtl::OUString OShape::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.Shape"));
+ return ::rtl::OUString("com.sun.star.comp.report.Shape");
}
//--------------------------------------------------------------------------
@@ -414,7 +414,7 @@ void SAL_CALL OShape::setSize( const awt::Size& aSize ) throw (beans::PropertyVe
// XShapeDescriptor
::rtl::OUString SAL_CALL OShape::getShapeType( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape"));
+ return ::rtl::OUString("com.sun.star.drawing.CustomShape");
}
// -----------------------------------------------------------------------------
::sal_Int32 SAL_CALL OShape::getZOrder() throw (uno::RuntimeException)
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index 137278a3b6b2..9e44dc25910c 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -104,7 +104,7 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb
::rtl::OUString sName;
xObj = pObj->GetModel()->GetPersist()->getEmbeddedObjectContainer().CreateEmbeddedObject(
::comphelper::MimeConfigurationHelper::GetSequenceClassIDRepresentation(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("80243D39-6741-46C5-926E-069164FF87BB"))), sName );
+ ::rtl::OUString("80243D39-6741-46C5-926E-069164FF87BB")), sName );
OSL_ENSURE(xObj.is(),"Embedded Object could not be created!");
/**************************************************
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index b951698d365c..05af0253be91 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -99,7 +99,7 @@ sal_uInt16 OObjectBase::getObjectType(const uno::Reference< report::XReportCompo
return OBJ_DLG_IMAGECONTROL;
if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD ))
return OBJ_DLG_FORMATTEDFIELD;
- if ( xServiceInfo->supportsService( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) ) )
+ if ( xServiceInfo->supportsService( ::rtl::OUString("com.sun.star.drawing.OLE2Shape") ) )
return OBJ_OLE2;
if ( xServiceInfo->supportsService( SERVICE_SHAPE ))
return OBJ_CUSTOMSHAPE;
@@ -119,7 +119,7 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon
case OBJ_DLG_FIXEDTEXT:
{
OUnoObject* pUnoObj = new OUnoObject( _xComponent
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText"))
+ ,::rtl::OUString("com.sun.star.form.component.FixedText")
,OBJ_DLG_FIXEDTEXT);
pNewObj = pUnoObj;
@@ -130,18 +130,18 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon
break;
case OBJ_DLG_IMAGECONTROL:
pNewObj = new OUnoObject(_xComponent
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl"))
+ ,::rtl::OUString("com.sun.star.form.component.DatabaseImageControl")
,OBJ_DLG_IMAGECONTROL);
break;
case OBJ_DLG_FORMATTEDFIELD:
pNewObj = new OUnoObject( _xComponent
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField"))
+ ,::rtl::OUString("com.sun.star.form.component.FormattedField")
,OBJ_DLG_FORMATTEDFIELD);
break;
case OBJ_DLG_HFIXEDLINE:
case OBJ_DLG_VFIXEDLINE:
pNewObj = new OUnoObject( _xComponent
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel"))
+ ,::rtl::OUString("com.sun.star.awt.UnoControlFixedLineModel")
,nType);
break;
case OBJ_CUSTOMSHAPE:
@@ -293,7 +293,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
if ( s_aNameMap.empty() )
{
::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
- s_aNameMap.insert(TPropertyNamePair::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")),TPropertyConverter(PROPERTY_CONTROLBACKGROUND,aNoConverter)));
+ s_aNameMap.insert(TPropertyNamePair::value_type(::rtl::OUString("FillColor"),TPropertyConverter(PROPERTY_CONTROLBACKGROUND,aNoConverter)));
s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aNoConverter)));
}
return s_aNameMap;
@@ -654,7 +654,7 @@ void OUnoObject::impl_initializeModel_nothrow()
if ( xFormatted.is() )
{
const Reference< XPropertySet > xModelProps( GetUnoControlModel(), UNO_QUERY_THROW );
- const ::rtl::OUString sTreatAsNumberProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TreatAsNumber" ) );
+ const ::rtl::OUString sTreatAsNumberProperty = ::rtl::OUString( "TreatAsNumber" );
xModelProps->setPropertyValue( sTreatAsNumberProperty, makeAny( sal_False ) );
xModelProps->setPropertyValue( PROPERTY_VERTICALALIGN,m_xReportComponent->getPropertyValue(PROPERTY_VERTICALALIGN));
}
@@ -826,7 +826,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
::rtl::OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj)
{
sal_uInt16 nResId = 0;
- ::rtl::OUString aDefaultName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HERE WE HAVE TO INSERT OUR NAME!"));
+ ::rtl::OUString aDefaultName = ::rtl::OUString("HERE WE HAVE TO INSERT OUR NAME!");
if ( _pObj->supportsService( SERVICE_FIXEDTEXT ) )
{
nResId = RID_STR_CLASS_FIXEDTEXT;
@@ -1191,7 +1191,7 @@ void OOle2Obj::impl_createDataProvider_nothrow(const uno::Reference< frame::XMod
if( xReceiver.is() )
{
uno::Reference< lang::XMultiServiceFactory> xFac(_xModel,uno::UNO_QUERY);
- uno::Reference< chart2::data::XDatabaseDataProvider > xDataProvider( xFac->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.DataProvider"))),uno::UNO_QUERY);
+ uno::Reference< chart2::data::XDatabaseDataProvider > xDataProvider( xFac->createInstance(::rtl::OUString("com.sun.star.chart2.data.DataProvider")),uno::UNO_QUERY);
xReceiver->attachDataProvider( xDataProvider.get() );
}
}
@@ -1214,7 +1214,7 @@ void OOle2Obj::initializeOle()
{
uno::Reference< beans::XPropertySet > xChartProps( xCompSupp->getComponent(), uno::UNO_QUERY );
if ( xChartProps.is() )
- xChartProps->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate")),uno::makeAny(util::DateTime(0,0,0,0,1,1,1900)));
+ xChartProps->setPropertyValue(::rtl::OUString("NullDate"),uno::makeAny(util::DateTime(0,0,0,0,1,1,1900)));
}
}
}
@@ -1241,7 +1241,7 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel)
pRptModel->GetUndoEnv().AddElement(lcl_getDataProvider(xObj));
::comphelper::NamedValueCollection aArgs;
- aArgs.put( "CellRangeRepresentation", uno::makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "all" ) ) ) );
+ aArgs.put( "CellRangeRepresentation", uno::makeAny( ::rtl::OUString( "all" ) ) );
aArgs.put( "HasCategories", uno::makeAny( sal_True ) );
aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) );
aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) );
@@ -1255,7 +1255,7 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel)
uno::Reference< style::XStyle> getUsedStyle(const uno::Reference< report::XReportDefinition>& _xReport)
{
uno::Reference<container::XNameAccess> xStyles = _xReport->getStyleFamilies();
- uno::Reference<container::XNameAccess> xPageStyles(xStyles->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyles"))),uno::UNO_QUERY);
+ uno::Reference<container::XNameAccess> xPageStyles(xStyles->getByName(::rtl::OUString("PageStyles")),uno::UNO_QUERY);
uno::Reference< style::XStyle> xReturn;
uno::Sequence< ::rtl::OUString> aSeq = xPageStyles->getElementNames();
diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx
index 118ef5012a5b..1f25cb715e88 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.cxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.cxx
@@ -147,10 +147,10 @@ namespace rptui
for ( sal_Int32 i=0; i<nCount; ++i )
{
xColumn.set( _rxColumns->getByIndex( i ), UNO_QUERY_THROW );
- OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= aField.sName );
- OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ) ) ) >>= aField.nDataType );
- OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scale" ) ) ) >>= aField.nScale );
- OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsCurrency" ) ) ) >>= aField.bIsCurrency );
+ OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( "Name" ) ) >>= aField.sName );
+ OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= aField.nDataType );
+ OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( "Scale" ) ) >>= aField.nScale );
+ OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( "IsCurrency" ) ) >>= aField.bIsCurrency );
_inout_rFields.push_back( aField );
}
}
diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx
index 72408c52d3a5..62c17447fd12 100644
--- a/reportdesign/source/filter/xml/dbloader2.cxx
+++ b/reportdesign/source/filter/xml/dbloader2.cxx
@@ -49,13 +49,13 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon
{
::comphelper::SequenceAsHashMap aTemp(Descriptor);
- ::rtl::OUString sTemp = aTemp.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")),::rtl::OUString());
+ ::rtl::OUString sTemp = aTemp.getUnpackedValueOrDefault(::rtl::OUString("URL"),::rtl::OUString());
if ( !sTemp.isEmpty() )
{
INetURLObject aURL(sTemp);
if ( aURL.GetExtension().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("orp")) )
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBaseReport"));
+ return ::rtl::OUString("StarBaseReport");
else
{
try
@@ -64,9 +64,9 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon
if ( xProp.is() )
{
::rtl::OUString sMediaType;
- xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ) >>= sMediaType;
+ xProp->getPropertyValue( ::rtl::OUString("MediaType") ) >>= sMediaType;
if ( sMediaType == MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII )
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBaseReport"));
+ return ::rtl::OUString("StarBaseReport");
::comphelper::disposeComponent(xProp);
}
}
@@ -107,7 +107,7 @@ Sequence< ::rtl::OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames
Sequence< ::rtl::OUString > ORptTypeDetection::getSupportedServiceNames_Static(void) throw( RuntimeException )
{
Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExtendedTypeDetection"));
+ aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.document.ExtendedTypeDetection");
return aSNS;
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx
index ea6623d2f9d7..33dcfe8769f5 100644
--- a/reportdesign/source/filter/xml/dbloader2.hxx
+++ b/reportdesign/source/filter/xml/dbloader2.hxx
@@ -80,7 +80,7 @@ public:
// static methods
static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException )
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.ORptTypeDetection"));
+ return ::rtl::OUString("com.sun.star.comp.report.ORptTypeDetection");
}
static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException );
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index 87df50d2b6ab..650b1c49cc46 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -204,7 +204,7 @@ void OXMLCell::EndElement()
Reference<XMultiServiceFactory> xFactor(rImport.GetModel(),uno::UNO_QUERY);
uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD);
Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY);
- xControl->setDataField(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:")) + m_sText);
+ xControl->setDataField(::rtl::OUString("rpt:") + m_sText);
OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
setComponent(xControl.get());
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 781c71304269..47327352352c 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -78,13 +78,13 @@ namespace rptxml
//---------------------------------------------------------------------
::rtl::OUString ORptExportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLSettingsExporter"));
+ return ::rtl::OUString("com.sun.star.comp.report.XMLSettingsExporter");
}
//---------------------------------------------------------------------
Sequence< ::rtl::OUString > ORptExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter");
return aSupported;
}
//---------------------------------------------------------------------
@@ -95,13 +95,13 @@ namespace rptxml
//---------------------------------------------------------------------
::rtl::OUString ORptContentExportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLContentExporter"));
+ return ::rtl::OUString("com.sun.star.comp.report.XMLContentExporter");
}
//---------------------------------------------------------------------
Sequence< ::rtl::OUString > ORptContentExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter");
return aSupported;
}
@@ -114,13 +114,13 @@ namespace rptxml
//---------------------------------------------------------------------
::rtl::OUString ORptStylesExportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLStylesExporter"));
+ return ::rtl::OUString("com.sun.star.comp.report.XMLStylesExporter");
}
//---------------------------------------------------------------------
Sequence< ::rtl::OUString > ORptStylesExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter");
return aSupported;
}
@@ -132,13 +132,13 @@ namespace rptxml
//---------------------------------------------------------------------
::rtl::OUString ORptMetaExportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLMetaExporter"));
+ return ::rtl::OUString("com.sun.star.comp.report.XMLMetaExporter");
}
//---------------------------------------------------------------------
Sequence< ::rtl::OUString > ORptMetaExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter");
return aSupported;
}
@@ -150,13 +150,13 @@ namespace rptxml
//---------------------------------------------------------------------
::rtl::OUString ODBFullExportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLFullExporter"));
+ return ::rtl::OUString("com.sun.star.comp.report.XMLFullExporter");
}
//---------------------------------------------------------------------
Sequence< ::rtl::OUString > ODBFullExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter");
return aSupported;
}
@@ -311,7 +311,7 @@ Reference< XInterface > ORptExport::create(Reference< XComponentContext > const
// -----------------------------------------------------------------------------
::rtl::OUString ORptExport::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.ExportFilter"));
+ return ::rtl::OUString("com.sun.star.comp.report.ExportFilter");
}
//--------------------------------------------------------------------------
@@ -323,7 +323,7 @@ Reference< XInterface > ORptExport::create(Reference< XComponentContext > const
uno::Sequence< ::rtl::OUString > ORptExport::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aServices(1);
- aServices.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter"));
+ aServices.getArray()[0] = ::rtl::OUString("com.sun.star.document.ExportFilter");
return aServices;
}
@@ -1440,12 +1440,12 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor
static const ::rtl::OUString s_sCurrent(RTL_CONSTASCII_USTRINGPARAM("current"));
AddAttribute(XML_NAMESPACE_TEXT, XML_SELECT_PAGE, s_sCurrent );
SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_NUMBER, sal_False, sal_False);
- Characters(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1")));
+ Characters(::rtl::OUString("1"));
}
else if ( sToken == s_sPageCount )
{
SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_COUNT, sal_False, sal_False);
- Characters(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1")));
+ Characters(::rtl::OUString("1"));
}
else
{
@@ -1497,7 +1497,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvXMLElementExport> pSubDocument;
SAL_WNODEPRECATED_DECLARATIONS_POP
- uno::Reference< frame::XModel> xModel(xShape->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model"))),uno::UNO_QUERY);
+ uno::Reference< frame::XModel> xModel(xShape->getPropertyValue(::rtl::OUString("Model")),uno::UNO_QUERY);
if ( xModel.is() ) // special handling for chart object
{
pSubDocument.reset(new SvXMLElementExport(*this,XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT, sal_False, sal_False));
@@ -1531,55 +1531,55 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
switch(nGroupOn)
{
case report::GroupOn::PREFIX_CHARACTERS:
- sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LEFT"));
- sPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";")) + ::rtl::OUString::valueOf(xGroup->getGroupInterval());
+ sFunction = ::rtl::OUString("LEFT");
+ sPrefix = ::rtl::OUString(";") + ::rtl::OUString::valueOf(xGroup->getGroupInterval());
break;
case report::GroupOn::YEAR:
- sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YEAR"));
+ sFunction = ::rtl::OUString("YEAR");
break;
case report::GroupOn::QUARTAL:
- sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INT((MONTH"));
+ sFunction = ::rtl::OUString("INT((MONTH");
sPostfix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-1)/3)+1"));
- sFunctionName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("QUARTAL_")) + sExpression;
+ sFunctionName = ::rtl::OUString("QUARTAL_") + sExpression;
break;
case report::GroupOn::MONTH:
- sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MONTH"));
+ sFunction = ::rtl::OUString("MONTH");
break;
case report::GroupOn::WEEK:
- sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WEEK"));
+ sFunction = ::rtl::OUString("WEEK");
break;
case report::GroupOn::DAY:
- sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DAY"));
+ sFunction = ::rtl::OUString("DAY");
break;
case report::GroupOn::HOUR:
- sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HOUR"));
+ sFunction = ::rtl::OUString("HOUR");
break;
case report::GroupOn::MINUTE:
- sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MINUTE"));
+ sFunction = ::rtl::OUString("MINUTE");
break;
case report::GroupOn::INTERVAL:
{
- sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INT"));
+ sFunction = ::rtl::OUString("INT");
uno::Reference< XFunction> xCountFunction = xFunctions->createFunction();
- xCountFunction->setInitialFormula(beans::Optional< ::rtl::OUString>(sal_True,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:0"))));
- ::rtl::OUString sCountName = sFunction + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_count_")) + sExpression;
+ xCountFunction->setInitialFormula(beans::Optional< ::rtl::OUString>(sal_True,::rtl::OUString("rpt:0")));
+ ::rtl::OUString sCountName = sFunction + ::rtl::OUString("_count_") + sExpression;
xCountFunction->setName(sCountName);
- xCountFunction->setFormula(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[")) + sCountName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("] + 1")));
+ xCountFunction->setFormula(::rtl::OUString("rpt:[") + sCountName + ::rtl::OUString("] + 1"));
exportFunction(xCountFunction);
sExpression = sCountName;
// The reference to sCountName in the formula of sFunctionName refers to the *old* value
// so we need to expand the the formula of sCountName
sPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" + 1) / ")) + ::rtl::OUString::valueOf(xGroup->getGroupInterval());
- sFunctionName = sFunction + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + sExpression;
- sFunction = sFunction + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("("));
- sInitialFormula = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:0"));
+ sFunctionName = sFunction + ::rtl::OUString("_") + sExpression;
+ sFunction = sFunction + ::rtl::OUString("(");
+ sInitialFormula = ::rtl::OUString("rpt:0");
}
break;
default:
;
}
if ( sFunctionName.isEmpty() )
- sFunctionName = sFunction + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + sExpression;
+ sFunctionName = sFunction + ::rtl::OUString("_") + sExpression;
if ( !sFunction.isEmpty() )
{
sal_Unicode pReplaceChars[] = { '(',')',';',',','+','-','[',']','/','*'};
@@ -1589,10 +1589,10 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
xFunction->setName(sFunctionName);
if ( !sInitialFormula.isEmpty() )
xFunction->setInitialFormula(beans::Optional< ::rtl::OUString>(sal_True, sInitialFormula));
- sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:")) + sFunction;
- sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(["));
+ sFunction = ::rtl::OUString("rpt:") + sFunction;
+ sFunction += ::rtl::OUString("([");
sFunction += sExpression;
- sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]"));
+ sFunction += ::rtl::OUString("]");
if ( !sPrefix.isEmpty() )
sFunction += sPrefix;
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 94b44f9288ee..5762acc5d6e6 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -66,7 +66,7 @@ void lcl_correctCellAddress(const ::rtl::OUString & _sName, const uno::Reference
if ( nPos != -1 )
{
sCellAddress = sCellAddress.copy(0,nPos);
- sCellAddress += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$65535"));
+ sCellAddress += ::rtl::OUString("$65535");
pList->RemoveAttribute(_sName);
pList->AddAttribute(_sName,sCellAddress);
}
@@ -117,14 +117,14 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ExportDocumentHandler::getSupportedSer
//------------------------------------------------------------------------
::rtl::OUString ExportDocumentHandler::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.ExportDocumentHandler"));
+ return ::rtl::OUString("com.sun.star.comp.report.ExportDocumentHandler");
}
//------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > ExportDocumentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ExportDocumentHandler"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.report.ExportDocumentHandler");
return aSupported;
}
@@ -182,7 +182,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
m_xDelegatee->startElement(sTableCalc,NULL);
pList = new SvXMLAttributeList();
uno::Reference< xml::sax::XAttributeList > xNullAttr = pList;
- pList->AddAttribute(lcl_createAttribute(XML_NP_TABLE,XML_DATE_VALUE),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1900-01-01")));
+ pList->AddAttribute(lcl_createAttribute(XML_NP_TABLE,XML_DATE_VALUE),::rtl::OUString("1900-01-01"));
const ::rtl::OUString sNullDate = lcl_createAttribute(XML_NP_TABLE,XML_NULL_DATE);
m_xDelegatee->startElement(sNullDate,xNullAttr);
@@ -216,7 +216,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
else if ( _sName == "chart:plot-area" )
{
SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs);
- pList->RemoveAttribute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("table:cell-range-address")));
+ pList->RemoveAttribute(::rtl::OUString("table:cell-range-address"));
}
else if ( _sName == "chart:categories" )
{
@@ -306,8 +306,8 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any >
{
::osl::MutexGuard aGuard(m_aMutex);
comphelper::SequenceAsHashMap aArgs(_aArguments);
- m_xDelegatee = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentHandler")),m_xDelegatee);
- m_xModel = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model")),m_xModel);
+ m_xDelegatee = aArgs.getUnpackedValueOrDefault(::rtl::OUString("DocumentHandler"),m_xDelegatee);
+ m_xModel = aArgs.getUnpackedValueOrDefault(::rtl::OUString("Model"),m_xModel);
OSL_ENSURE(m_xDelegatee.is(),"No document handler avialable!");
if ( !m_xDelegatee.is() || !m_xModel.is() )
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 01afab511ff3..523d4f6f4319 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -92,7 +92,7 @@ void OXMLCharContent::InsertControlCharacter(sal_Int16 _nControl)
switch( _nControl )
{
case ControlCharacter::LINE_BREAK:
- m_pFixedContent->Characters(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")));
+ m_pFixedContent->Characters(::rtl::OUString("\n"));
break;
default:
OSL_FAIL("Not supported control character");
@@ -189,7 +189,7 @@ void OXMLFixedContent::EndElement()
{
uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD);
Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY);
- xControl->setDataField(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:")) + m_sPageText);
+ xControl->setDataField(::rtl::OUString("rpt:") + m_sPageText);
OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
m_pInP->m_xComponent = xControl.get();
m_xComponent = xControl.get();
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 90bcba28d0d2..240a03830c16 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -125,7 +125,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
const ::rtl::OUString sFormula = sCompleteFormula.getToken(0,'(',nIndex);
::sal_Int16 nGroupOn = report::GroupOn::DEFAULT;
- if ( sFormula ==::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:LEFT")))
+ if ( sFormula ==::rtl::OUString("rpt:LEFT"))
{
nGroupOn = report::GroupOn::PREFIX_CHARACTERS;
::rtl::OUString sInterval = sCompleteFormula.getToken(1,';',nIndex);
@@ -133,30 +133,30 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
sInterval = sInterval.getToken(0,')',nIndex);
m_xGroup->setGroupInterval(sInterval.toInt32());
}
- else if ( sFormula == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:YEAR")))
+ else if ( sFormula == ::rtl::OUString("rpt:YEAR"))
nGroupOn = report::GroupOn::YEAR;
- else if ( sFormula == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:MONTH")))
+ else if ( sFormula == ::rtl::OUString("rpt:MONTH"))
{
nGroupOn = report::GroupOn::MONTH;
}
- else if ( sCompleteFormula.matchIgnoreAsciiCase(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:INT((MONTH")),0)
+ else if ( sCompleteFormula.matchIgnoreAsciiCase(::rtl::OUString("rpt:INT((MONTH"),0)
&& sCompleteFormula.endsWithIgnoreAsciiCaseAsciiL("-1)/3)+1",8) )
{
nGroupOn = report::GroupOn::QUARTAL;
}
- else if ( sFormula ==::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:WEEK")))
+ else if ( sFormula ==::rtl::OUString("rpt:WEEK"))
nGroupOn = report::GroupOn::WEEK;
- else if ( sFormula ==::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:DAY")))
+ else if ( sFormula ==::rtl::OUString("rpt:DAY"))
nGroupOn = report::GroupOn::DAY;
- else if ( sFormula ==::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:HOUR")))
+ else if ( sFormula ==::rtl::OUString("rpt:HOUR"))
nGroupOn = report::GroupOn::HOUR;
- else if ( sFormula ==::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:MINUTE")))
+ else if ( sFormula ==::rtl::OUString("rpt:MINUTE"))
nGroupOn = report::GroupOn::MINUTE;
- else if ( sFormula ==::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:INT")))
+ else if ( sFormula ==::rtl::OUString("rpt:INT"))
{
nGroupOn = report::GroupOn::INTERVAL;
_rImport.removeFunction(sExpression);
- sExpression = sExpression.copy(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INT_count_")).getLength());
+ sExpression = sExpression.copy(::rtl::OUString("INT_count_").getLength());
nIndex = 0;
::rtl::OUString sInterval = sCompleteFormula.getToken(1,'/',nIndex);
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index 3892346c5997..51ea7ebb5303 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -87,14 +87,14 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ImportDocumentHandler::getSupportedSer
//------------------------------------------------------------------------
::rtl::OUString ImportDocumentHandler::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.ImportDocumentHandler"));
+ return ::rtl::OUString("com.sun.star.comp.report.ImportDocumentHandler");
}
//------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > ImportDocumentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ImportDocumentHandler"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.report.ImportDocumentHandler");
return aSupported;
}
@@ -117,7 +117,7 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException,
{
// this fills the chart again
::comphelper::NamedValueCollection aArgs;
- aArgs.put( "CellRangeRepresentation", ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("all")) );
+ aArgs.put( "CellRangeRepresentation", ::rtl::OUString("all") );
aArgs.put( "HasCategories", uno::makeAny( sal_True ) );
aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) );
aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) );
@@ -270,7 +270,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
SvXMLAttributeList* pList = new SvXMLAttributeList();
xNewAttribs = pList;
pList->AppendAttributeList(_xAttrList);
- pList->AddAttribute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("table:cell-range-address")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("local-table.$A$1:.$Z$65536")));
+ pList->AddAttribute(::rtl::OUString("table:cell-range-address"),::rtl::OUString("local-table.$A$1:.$Z$65536"));
}
@@ -328,8 +328,8 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any >
{
::osl::MutexGuard aGuard(m_aMutex);
comphelper::SequenceAsHashMap aArgs(_aArguments);
- m_xDelegatee = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentHandler")),m_xDelegatee);
- m_xModel = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model")),m_xModel);
+ m_xDelegatee = aArgs.getUnpackedValueOrDefault(::rtl::OUString("DocumentHandler"),m_xDelegatee);
+ m_xModel = aArgs.getUnpackedValueOrDefault(::rtl::OUString("Model"),m_xModel);
OSL_ENSURE(m_xDelegatee.is(),"No document handler avialable!");
if ( !m_xDelegatee.is() || !m_xModel.is() )
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index c6da98c813c1..14d8a4ee9f56 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -78,7 +78,7 @@ OControlStyleContext::OControlStyleContext( ORptFilter& rImport,
const Reference< XAttributeList > & xAttrList,
SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle ) :
XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ),
- sNumberFormat(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormat"))),
+ sNumberFormat(rtl::OUString("NumberFormat")),
pStyles(&rStyles),
m_nNumberFormat(-1),
m_rImport(rImport),
@@ -319,7 +319,7 @@ Reference < XNameContainer >
xStyles.set(m_xTableStyles);
else
sName =
- ::rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TableStyles" ) ));
+ ::rtl::OUString( rtl::OUString( "TableStyles" ));
}
break;
case XML_STYLE_FAMILY_TABLE_CELL:
@@ -328,7 +328,7 @@ Reference < XNameContainer >
xStyles.set(m_xCellStyles);
else
sName =
- ::rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CellStyles" ) ));
+ ::rtl::OUString( rtl::OUString( "CellStyles" ));
}
break;
case XML_STYLE_FAMILY_TABLE_COLUMN:
@@ -337,7 +337,7 @@ Reference < XNameContainer >
xStyles.set(m_xColumnStyles);
else
sName =
- ::rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ColumnStyles" ) ));
+ ::rtl::OUString( rtl::OUString( "ColumnStyles" ));
}
break;
case XML_STYLE_FAMILY_TABLE_ROW:
@@ -346,7 +346,7 @@ Reference < XNameContainer >
xStyles.set(m_xRowStyles);
else
sName =
- ::rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowStyles" ) ));
+ ::rtl::OUString( rtl::OUString( "RowStyles" ));
}
break;
case XML_STYLE_FAMILY_SD_GRAPHICS_ID:
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 71c8e679c577..b557e839af7f 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -247,7 +247,7 @@ sal_Int32 ReadThroughComponent(
xDocStream = xStorage->openStreamElement( sStreamName, embed::ElementModes::READ );
uno::Reference< beans::XPropertySet > xProps( xDocStream, uno::UNO_QUERY_THROW );
- xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) ) >>= bEncrypted;
+ xProps->getPropertyValue( ::rtl::OUString("Encrypted") ) >>= bEncrypted;
}
catch (const packages::WrongPasswordException&)
{
@@ -408,7 +408,7 @@ uno::Reference< XInterface > ORptFilter::create(uno::Reference< XComponentContex
// -----------------------------------------------------------------------------
::rtl::OUString ORptFilter::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.OReportFilter"));
+ return ::rtl::OUString("com.sun.star.comp.report.OReportFilter");
}
//--------------------------------------------------------------------------
@@ -535,8 +535,8 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
uno::UNO_QUERY );
uno::Reference< lang::XMultiServiceFactory > xReportServiceFactory( m_xReportDefinition, uno::UNO_QUERY);
- aArgs[0] <<= beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Storage")),uno::makeAny(xStorage));
- xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportEmbeddedObjectResolver")),aArgs) , uno::UNO_QUERY);
+ aArgs[0] <<= beans::NamedValue(::rtl::OUString("Storage"),uno::makeAny(xStorage));
+ xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments(::rtl::OUString("com.sun.star.document.ImportEmbeddedObjectResolver"),aArgs) , uno::UNO_QUERY);
static const ::rtl::OUString s_sOld(RTL_CONSTASCII_USTRINGPARAM("OldFormat"));
static comphelper::PropertyMapEntry pMap[] =
@@ -551,9 +551,9 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
::comphelper::MediaDescriptor aDescriptor(rDescriptor);
uno::Reference<beans::XPropertySet> xProp = comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap));
const ::rtl::OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),::rtl::OUString()) );
- xProp->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI")), uno::makeAny(sVal));
- const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HierarchicalDocumentName")),::rtl::OUString()) );
- xProp->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")), uno::makeAny(sHierarchicalDocumentName));
+ xProp->setPropertyValue(rtl::OUString("BaseURI"), uno::makeAny(sVal));
+ const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString("HierarchicalDocumentName"),::rtl::OUString()) );
+ xProp->setPropertyValue(rtl::OUString("StreamRelPath"), uno::makeAny(sHierarchicalDocumentName));
uno::Reference<XComponent> xModel(GetModel(),UNO_QUERY);
static const ::rtl::OUString s_sMeta(RTL_CONSTASCII_USTRINGPARAM("meta.xml"));
@@ -582,7 +582,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
if ( nRet == 0 )
{
- xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("settings.xml"))));
+ xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString("settings.xml")));
nRet = ReadThroughComponent( xStorage
,xModel
,"settings.xml"
@@ -596,7 +596,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
}
if ( nRet == 0 )
{
- xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("styles.xml"))));
+ xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString("styles.xml")));
nRet = ReadThroughComponent(xStorage
,xModel
,"styles.xml"
@@ -610,7 +610,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
if ( nRet == 0 )
{
- xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml"))));
+ xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString("content.xml")));
nRet = ReadThroughComponent( xStorage
,xModel
,"content.xml"
@@ -674,7 +674,7 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix,
const SvXMLStylesContext* pAutoStyles = GetAutoStyles();
if ( pAutoStyles )
{
- XMLPropStyleContext* pAutoStyle = PTR_CAST(XMLPropStyleContext,pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_PAGE_MASTER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pm1"))));
+ XMLPropStyleContext* pAutoStyle = PTR_CAST(XMLPropStyleContext,pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_PAGE_MASTER,::rtl::OUString("pm1")));
if ( pAutoStyle )
{
pAutoStyle->FillPropertySet(getReportDefinition().get());
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 41e74f2b2768..61a6f1741257 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -65,7 +65,7 @@ ConditionField::ConditionField( Condition* _pParent, const ResId& _rResId ) : Ed
m_pSubEdit->EnableRTL( sal_False );
m_pSubEdit->SetPosPixel( Point() );
- m_aFormula.SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("...")));
+ m_aFormula.SetText(::rtl::OUString("..."));
m_aFormula.SetClickHdl( LINK( this, ConditionField, OnFormula ) );
m_aFormula.Show();
m_pSubEdit->Show();
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index 38e2ec561268..aa393881f7c2 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -182,7 +182,7 @@ short ODateTimeDialog::Execute()
uno::Reference< beans::XPropertySet> xFormSet = _xFormats->getByKey(_nNumberFormatKey);
OSL_ENSURE(xFormSet.is(),"XPropertySet is null!");
::rtl::OUString sFormat;
- xFormSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormatString"))) >>= sFormat;
+ xFormSet->getPropertyValue(::rtl::OUString("FormatString")) >>= sFormat;
double nValue = 0;
if ( _bTime )
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index af7aa178936a..61b9dcbc3293 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -53,7 +53,7 @@ FormulaDialog::FormulaDialog(Window* pParent
,m_pAddField(NULL)
,m_xRowSet(_xRowSet)
,m_pEdit(NULL)
- ,m_sFormula(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")))
+ ,m_sFormula(::rtl::OUString("="))
,m_nStart(0)
,m_nEnd(1)
{
@@ -64,7 +64,7 @@ FormulaDialog::FormulaDialog(Window* pParent
else
m_sFormula = _sFormula;
}
- m_xParser.set(_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.libreoffice.report.pentaho.SOFormulaParser"))),uno::UNO_QUERY);
+ m_xParser.set(_xServiceFactory->createInstance(::rtl::OUString("org.libreoffice.report.pentaho.SOFormulaParser")),uno::UNO_QUERY);
if ( m_xParser.is() )
m_xOpCodeMapper = m_xParser->getFormulaOpCodeMapper();
fill();
@@ -225,7 +225,7 @@ IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow* ,_pAddFieldDlg)
aDescriptor[ ::svx::daColumnName ] >>= sName;
if ( !sName.isEmpty() )
{
- sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("[")) + sName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]"));
+ sName = ::rtl::OUString("[") + sName + ::rtl::OUString("]");
m_pEdit->SetText(sName);
}
}
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index a60c093aced1..9680fb8584ca 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -89,7 +89,7 @@ sal_uInt16 lcl_getImageId(const uno::Reference< report::XReportComponent>& _xEle
uno::Reference< report::XReportControlModel> xReportModel(_xElement,uno::UNO_QUERY);
if ( xFixedText.is() )
{
- sName.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" : ")));
+ sName.append(::rtl::OUString(" : "));
sName.append(xFixedText->getLabel());
}
else if ( xReportModel.is() && _xElement->getPropertySetInfo()->hasPropertyByName(PROPERTY_DATAFIELD) )
@@ -97,7 +97,7 @@ sal_uInt16 lcl_getImageId(const uno::Reference< report::XReportComponent>& _xEle
ReportFormula aFormula( xReportModel->getDataField() );
if ( aFormula.isValid() )
{
- sName.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" : ")));
+ sName.append(::rtl::OUString(" : "));
sName.append( aFormula.getUndecoratedContent() );
}
}
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 7ff0af1af88c..9de12edf5fb6 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -63,7 +63,7 @@ DataProviderHandler::DataProviderHandler(uno::Reference< uno::XComponentContext
{
try
{
- m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.FormComponentPropertyHandler")),m_xContext),uno::UNO_QUERY_THROW);
+ m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW);
m_xTypeConverter.set(script::Converter::create(m_xContext));
}catch(const uno::Exception &)
@@ -92,14 +92,14 @@ uno::Sequence< ::rtl::OUString > SAL_CALL DataProviderHandler::getSupportedServi
//------------------------------------------------------------------------
::rtl::OUString DataProviderHandler::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.DataProviderHandler"));
+ return ::rtl::OUString("com.sun.star.comp.report.DataProviderHandler");
}
//------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > DataProviderHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.inspection.DataProviderHandler"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.report.inspection.DataProviderHandler");
return aSupported;
}
@@ -149,7 +149,7 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface
}
}
m_xDataProvider.set(m_xFormComponent,uno::UNO_QUERY);
- m_xReportComponent.set( xNameCont->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ReportComponent" ) ) ), uno::UNO_QUERY );
+ m_xReportComponent.set( xNameCont->getByName( ::rtl::OUString( "ReportComponent" ) ), uno::UNO_QUERY );
if ( m_xDataProvider.is() )
{
::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
@@ -198,7 +198,7 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const ::rtl::OUString &
// for(;pChartTypeIter != pChartTypeEnd;++pChartTypeIter)
// {
// sChartTypes += (*pChartTypeIter)->getChartType();
- // sChartTypes += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
+ // sChartTypes += ::rtl::OUString(";");
// }
// }
// aPropertyValue;// <<= sChartTypes;
@@ -241,12 +241,12 @@ void DataProviderHandler::impl_updateChartTitle_throw(const uno::Any& _aValue)
uno::Reference<chart2::XTitle> xTitle = xTitled->getTitleObject();
if ( !xTitle.is() )
{
- xTitle.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.Title")),m_xContext),uno::UNO_QUERY);
+ xTitle.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.chart2.Title"),m_xContext),uno::UNO_QUERY);
xTitled->setTitleObject(xTitle);
}
if ( xTitle.is() )
{
- uno::Reference< chart2::XFormattedString> xFormatted(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.FormattedString")),m_xContext),uno::UNO_QUERY);
+ uno::Reference< chart2::XFormattedString> xFormatted(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.chart2.FormattedString"),m_xContext),uno::UNO_QUERY);
::rtl::OUString sStr;
_aValue>>= sStr;
xFormatted->setString(sStr);
@@ -288,9 +288,9 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co
if ( nId != -1 )
{
aOut.Category = ((m_pInfoService->getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ?
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Data"))
+ ::rtl::OUString("Data")
:
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("General"));
+ ::rtl::OUString("General");
aOut.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nId ) );
aOut.DisplayName = m_pInfoService->getPropertyTranslation(nId);
}
@@ -454,7 +454,7 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const ::rtl::OUStrin
sal_Bool bModified = xReport->isModified();
// this fills the chart again
::comphelper::NamedValueCollection aArgs;
- aArgs.put( "CellRangeRepresentation", uno::makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "all" ) ) ) );
+ aArgs.put( "CellRangeRepresentation", uno::makeAny( ::rtl::OUString( "all" ) ) );
aArgs.put( "HasCategories", uno::makeAny( sal_True ) );
aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) );
aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) );
@@ -494,29 +494,29 @@ bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutex
{
uno::Sequence<uno::Any> aSeq(6);
beans::PropertyValue aParam;
- aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow"));
- aParam.Value <<= m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow")));
+ aParam.Name = ::rtl::OUString("ParentWindow");
+ aParam.Value <<= m_xContext->getValueByName( ::rtl::OUString("DialogParentWindow"));
aSeq[0] <<= aParam;
- aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Detail"));
+ aParam.Name = ::rtl::OUString("Detail");
aParam.Value <<= m_xDataProvider;
aSeq[1] <<= aParam;
- aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Master"));
+ aParam.Name = ::rtl::OUString("Master");
aParam.Value <<= m_xReportComponent->getSection()->getReportDefinition();
aSeq[2] <<= aParam;
- aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Explanation"));
+ aParam.Name = ::rtl::OUString("Explanation");
aParam.Value <<= ::rtl::OUString(String(ModuleRes(RID_STR_EXPLANATION)));
aSeq[3] <<= aParam;
- aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DetailLabel"));
+ aParam.Name = ::rtl::OUString("DetailLabel");
aParam.Value <<= ::rtl::OUString(String(ModuleRes(RID_STR_DETAILLABEL)));
aSeq[4] <<= aParam;
- aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MasterLabel"));
+ aParam.Name = ::rtl::OUString("MasterLabel");
aParam.Value <<= ::rtl::OUString(String(ModuleRes(RID_STR_MASTERLABEL)));
aSeq[5] <<= aParam;
uno::Reference< ui::dialogs::XExecutableDialog > xDialog(
m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.MasterDetailLinkDialog")),aSeq
+ ::rtl::OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog"),aSeq
, m_xContext), uno::UNO_QUERY);
_rClearBeforeDialog.clear();
@@ -527,16 +527,16 @@ bool DataProviderHandler::impl_dialogChartType_nothrow( ::osl::ClearableMutexGua
{
uno::Sequence<uno::Any> aSeq(2);
beans::PropertyValue aParam;
- aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow"));
- aParam.Value <<= m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow")));
+ aParam.Name = ::rtl::OUString("ParentWindow");
+ aParam.Value <<= m_xContext->getValueByName( ::rtl::OUString("DialogParentWindow"));
aSeq[0] <<= aParam;
- aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ChartModel"));
+ aParam.Name = ::rtl::OUString("ChartModel");
aParam.Value <<= m_xChartModel;
aSeq[1] <<= aParam;
uno::Reference< ui::dialogs::XExecutableDialog > xDialog(
m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.ChartTypeDialog")),aSeq
+ ::rtl::OUString("com.sun.star.comp.chart2.ChartTypeDialog"),aSeq
, m_xContext), uno::UNO_QUERY);
_rClearBeforeDialog.clear();
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index ea5b96c627c7..0cc6aa8e42ac 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -95,14 +95,14 @@ namespace rptui
//------------------------------------------------------------------------
::rtl::OUString DefaultComponentInspectorModel::getImplementationName_Static( ) throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.DefaultComponentInspectorModel"));
+ return ::rtl::OUString("com.sun.star.comp.report.DefaultComponentInspectorModel");
}
//------------------------------------------------------------------------
Sequence< ::rtl::OUString > DefaultComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException)
{
Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.inspection.DefaultComponentInspectorModel"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.report.inspection.DefaultComponentInspectorModel");
return aSupported;
}
@@ -255,7 +255,7 @@ namespace rptui
if ( !m_xComponent.is() )
try
{
- m_xComponent.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.DefaultFormComponentInspectorModel")),m_xContext),UNO_QUERY_THROW);
+ m_xComponent.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.form.inspection.DefaultFormComponentInspectorModel"),m_xContext),UNO_QUERY_THROW);
}
catch(const Exception &)
{
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 97b946b26580..c06edad3aec6 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -140,7 +140,7 @@ struct PropertyCompare : public ::std::binary_function< beans::Property, OUStrin
OUString lcl_getQuotedFunctionName(const OUString& _sFunction)
{
OUString sQuotedFunctionName(RTL_CONSTASCII_USTRINGPARAM("["));
- sQuotedFunctionName += _sFunction + OUString(RTL_CONSTASCII_USTRINGPARAM("]"));
+ sQuotedFunctionName += _sFunction + OUString("]");
return sQuotedFunctionName;
}
// -----------------------------------------------------------------------------
@@ -248,7 +248,7 @@ GeometryHandler::GeometryHandler(uno::Reference< uno::XComponentContext > const
try
{
const uno::Reference< lang::XMultiComponentFactory > xFac = m_xContext->getServiceManager();
- m_xFormComponentHandler.set(xFac->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.FormComponentPropertyHandler")),m_xContext),uno::UNO_QUERY_THROW);
+ m_xFormComponentHandler.set(xFac->createInstanceWithContext(OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW);
m_xTypeConverter.set(script::Converter::create(context));
loadDefaultFunctions();
}
@@ -282,14 +282,14 @@ uno::Sequence< OUString > SAL_CALL GeometryHandler::getSupportedServiceNames( )
//------------------------------------------------------------------------
OUString GeometryHandler::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.GeometryHandler"));
+ return OUString("com.sun.star.comp.report.GeometryHandler");
}
//------------------------------------------------------------------------
uno::Sequence< OUString > GeometryHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException)
{
uno::Sequence< OUString > aSupported(1);
- aSupported[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.inspection.GeometryHandler"));
+ aSupported[0] = OUString("com.sun.star.report.inspection.GeometryHandler");
return aSupported;
}
@@ -345,7 +345,7 @@ void SAL_CALL GeometryHandler::inspect( const uno::Reference< uno::XInterface >
m_xReportComponent->removePropertyChangeListener(PROPERTY_DATAFIELD,static_cast< beans::XPropertyChangeListener* >( this ));
const uno::Reference< container::XNameContainer > xObjectAsContainer( _rxInspectee, uno::UNO_QUERY );
- m_xReportComponent.set( xObjectAsContainer->getByName( OUString( RTL_CONSTASCII_USTRINGPARAM( "ReportComponent" ) ) ), uno::UNO_QUERY );
+ m_xReportComponent.set( xObjectAsContainer->getByName( OUString( "ReportComponent" ) ), uno::UNO_QUERY );
const OUString sRowSet(RTL_CONSTASCII_USTRINGPARAM("RowSet"));
if ( xObjectAsContainer->hasByName( sRowSet ) )
@@ -861,9 +861,9 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
if ( nId != -1 )
{
aOut.Category = ((m_pInfoService->getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ?
- OUString(RTL_CONSTASCII_USTRINGPARAM("Data"))
+ OUString("Data")
:
- OUString(RTL_CONSTASCII_USTRINGPARAM("General"));
+ OUString("General");
aOut.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nId ) );
aOut.DisplayName = m_pInfoService->getPropertyTranslation(nId);
}
@@ -880,7 +880,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
xNumericControl->setDecimalDigits( 2 );
xNumericControl->setValueUnit( util::MeasureUnit::MM_100TH );
uno::Reference< drawing::XShapeDescriptor> xShapeDesc(m_xReportComponent,uno::UNO_QUERY);
- bool bSetMin = !xShapeDesc.is() || xShapeDesc->getShapeType() != OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape"));
+ bool bSetMin = !xShapeDesc.is() || xShapeDesc->getShapeType() != OUString("com.sun.star.drawing.CustomShape");
if ( bSetMin )
xNumericControl->setMinValue(beans::Optional<double>(sal_True,0.0));
if ( nDisplayUnit != -1 )
@@ -974,14 +974,14 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
{
case PROPERTY_ID_FORCENEWPAGE:
case PROPERTY_ID_NEWROWORCOL:
- aPropertyValue = getConstantValue(sal_False,RID_STR_FORCENEWPAGE_CONST,_rControlValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ForceNewPage")),PropertyName);
+ aPropertyValue = getConstantValue(sal_False,RID_STR_FORCENEWPAGE_CONST,_rControlValue,OUString("com.sun.star.report.ForceNewPage"),PropertyName);
break;
case PROPERTY_ID_GROUPKEEPTOGETHER:
- aPropertyValue = getConstantValue(sal_False,RID_STR_GROUPKEEPTOGETHER_CONST,_rControlValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.GroupKeepTogether")),PropertyName);
+ aPropertyValue = getConstantValue(sal_False,RID_STR_GROUPKEEPTOGETHER_CONST,_rControlValue,OUString("com.sun.star.report.GroupKeepTogether"),PropertyName);
break;
case PROPERTY_ID_PAGEHEADEROPTION:
case PROPERTY_ID_PAGEFOOTEROPTION:
- aPropertyValue = getConstantValue(sal_False,RID_STR_REPORTPRINTOPTION_CONST,_rControlValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ReportPrintOption")),PropertyName);
+ aPropertyValue = getConstantValue(sal_False,RID_STR_REPORTPRINTOPTION_CONST,_rControlValue,OUString("com.sun.star.report.ReportPrintOption"),PropertyName);
break;
case PROPERTY_ID_BACKCOLOR:
case PROPERTY_ID_CONTROLBACKGROUND:
@@ -995,7 +995,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
case PROPERTY_ID_KEEPTOGETHER:
if ( uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is())
{
- aPropertyValue = getConstantValue(sal_False,RID_STR_KEEPTOGETHER_CONST,_rControlValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.KeepTogether")),PropertyName);
+ aPropertyValue = getConstantValue(sal_False,RID_STR_KEEPTOGETHER_CONST,_rControlValue,OUString("com.sun.star.report.KeepTogether"),PropertyName);
break;
}
// run through
@@ -1139,19 +1139,19 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper
break;
case PROPERTY_ID_FORCENEWPAGE:
case PROPERTY_ID_NEWROWORCOL:
- aControlValue = getConstantValue(sal_True,RID_STR_FORCENEWPAGE_CONST,aPropertyValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ForceNewPage")),PropertyName);
+ aControlValue = getConstantValue(sal_True,RID_STR_FORCENEWPAGE_CONST,aPropertyValue,OUString("com.sun.star.report.ForceNewPage"),PropertyName);
break;
case PROPERTY_ID_GROUPKEEPTOGETHER:
- aControlValue = getConstantValue(sal_True,RID_STR_GROUPKEEPTOGETHER_CONST,aPropertyValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.GroupKeepTogether")),PropertyName);
+ aControlValue = getConstantValue(sal_True,RID_STR_GROUPKEEPTOGETHER_CONST,aPropertyValue,OUString("com.sun.star.report.GroupKeepTogether"),PropertyName);
break;
case PROPERTY_ID_PAGEHEADEROPTION:
case PROPERTY_ID_PAGEFOOTEROPTION:
- aControlValue = getConstantValue(sal_True,RID_STR_REPORTPRINTOPTION_CONST,aPropertyValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ReportPrintOption")),PropertyName);
+ aControlValue = getConstantValue(sal_True,RID_STR_REPORTPRINTOPTION_CONST,aPropertyValue,OUString("com.sun.star.report.ReportPrintOption"),PropertyName);
break;
case PROPERTY_ID_KEEPTOGETHER:
if ( uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is())
{
- aControlValue = getConstantValue(sal_True,RID_STR_KEEPTOGETHER_CONST,aPropertyValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.KeepTogether")),PropertyName);
+ aControlValue = getConstantValue(sal_True,RID_STR_KEEPTOGETHER_CONST,aPropertyValue,OUString("com.sun.star.report.KeepTogether"),PropertyName);
break;
}
// run through
@@ -1302,7 +1302,7 @@ uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedPropertie
,PROPERTY_VISIBLE
,PROPERTY_PAGEHEADEROPTION
,PROPERTY_PAGEFOOTEROPTION
- ,OUString(RTL_CONSTASCII_USTRINGPARAM("ControlLabel"))
+ ,OUString("ControlLabel")
,PROPERTY_POSITIONX
,PROPERTY_POSITIONY
,PROPERTY_WIDTH
@@ -1417,7 +1417,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
::osl::ClearableMutexGuard aGuard( m_aMutex );
inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled;
- const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY);
+ const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString("DialogParentWindow")) ,uno::UNO_QUERY);
const uno::Reference< report::XReportControlFormat> xReportControlFormat(m_xReportComponent,uno::UNO_QUERY);
aGuard.clear();
@@ -1439,7 +1439,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
OUString sFormula;
m_xReportComponent->getPropertyValue(PropertyName) >>= sFormula;
- const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY);
+ const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString("DialogParentWindow")) ,uno::UNO_QUERY);
uno::Reference< uno::XComponentContext > xContext = m_xContext;
uno::Reference< beans::XPropertySet > xRowSet( m_xRowSet,uno::UNO_QUERY);
aGuard.clear();
@@ -1457,7 +1457,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
::osl::ClearableMutexGuard aGuard( m_aMutex );
inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled;
- const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY);
+ const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString("DialogParentWindow")) ,uno::UNO_QUERY);
const uno::Reference< report::XShape> xShape(m_xReportComponent,uno::UNO_QUERY);
aGuard.clear();
@@ -1574,15 +1574,15 @@ bool GeometryHandler::impl_dialogFilter_nothrow( OUString& _out_rSelectedClause,
try
{
xFactory = m_xContext->getServiceManager();
- xInspectorWindow.set(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY);
- uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) ,uno::UNO_QUERY);
+ xInspectorWindow.set(m_xContext->getValueByName( OUString("DialogParentWindow")) ,uno::UNO_QUERY);
+ uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName( OUString("ActiveConnection")) ,uno::UNO_QUERY);
if ( !xCon.is() )
return false;
uno::Reference< beans::XPropertySet> xRowSetProp(m_xRowSet,uno::UNO_QUERY);
if ( !m_xRowSet.is() )
{
- m_xRowSet.set(xFactory->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.RowSet")),m_xContext),uno::UNO_QUERY);
+ m_xRowSet.set(xFactory->createInstanceWithContext(OUString("com.sun.star.sdb.RowSet"),m_xContext),uno::UNO_QUERY);
xRowSetProp.set(m_xRowSet,uno::UNO_QUERY);
xRowSetProp->setPropertyValue(PROPERTY_ACTIVECONNECTION,uno::makeAny(xCon));
::comphelper::copyProperties(m_xReportComponent,xRowSetProp);
@@ -1910,10 +1910,10 @@ void GeometryHandler::loadDefaultFunctions()
m_aCounterFunction.m_bPreEvaluated = sal_False;
m_aCounterFunction.m_bDeepTraversing = sal_False;
m_aCounterFunction.m_sName = String(ModuleRes(RID_STR_F_COUNTER));
- m_aCounterFunction.m_sFormula = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%FunctionName] + 1"));
+ m_aCounterFunction.m_sFormula = OUString("rpt:[%FunctionName] + 1");
m_aCounterFunction.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*[:digit:]*"));
m_aCounterFunction.m_sInitialFormula.IsPresent = sal_True;
- m_aCounterFunction.m_sInitialFormula.Value = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:1"));
+ m_aCounterFunction.m_sInitialFormula.Value = OUString("rpt:1");
DefaultFunction aDefault;
aDefault.m_bDeepTraversing = sal_False;
@@ -1921,24 +1921,24 @@ void GeometryHandler::loadDefaultFunctions()
aDefault.m_bPreEvaluated = sal_True;
aDefault.m_sName = String(ModuleRes(RID_STR_F_ACCUMULATION));
- aDefault.m_sFormula = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%Column] + [%FunctionName]"));
+ aDefault.m_sFormula = OUString("rpt:[%Column] + [%FunctionName]");
aDefault.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]"));
aDefault.m_sInitialFormula.IsPresent = sal_True;
- aDefault.m_sInitialFormula.Value = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%Column]"));
+ aDefault.m_sInitialFormula.Value = OUString("rpt:[%Column]");
m_aDefaultFunctions.push_back(aDefault);
aDefault.m_sName = String(ModuleRes(RID_STR_F_MINIMUM));
aDefault.m_sFormula = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF([%Column] < [%FunctionName];[%Column];[%FunctionName])"));
aDefault.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*<[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)"));
aDefault.m_sInitialFormula.IsPresent = sal_True;
- aDefault.m_sInitialFormula.Value = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%Column]"));
+ aDefault.m_sInitialFormula.Value = OUString("rpt:[%Column]");
m_aDefaultFunctions.push_back(aDefault);
aDefault.m_sName = String(ModuleRes(RID_STR_F_MAXIMUM));
aDefault.m_sFormula = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF([%Column] > [%FunctionName];[%Column];[%FunctionName])"));
aDefault.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*>[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)"));
aDefault.m_sInitialFormula.IsPresent = sal_True;
- aDefault.m_sInitialFormula.Value = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%Column]"));
+ aDefault.m_sInitialFormula.Value = OUString("rpt:[%Column]");
m_aDefaultFunctions.push_back(aDefault);
}
}
@@ -2054,7 +2054,7 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rF
_rFieldNames.realloc(0);
try
{
- uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY);
+ uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString("DialogParentWindow")) ,uno::UNO_QUERY);
Window* pInspectorWindow = VCLUnoHelper::GetWindow( xInspectorWindow );
WaitObject aWaitCursor( pInspectorWindow );
@@ -2068,7 +2068,7 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rF
OUString sObjectName;
OSL_VERIFY( xFormSet->getPropertyValue( PROPERTY_COMMAND ) >>= sObjectName );
// when there is no command we don't need to ask for columns
- uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) ,uno::UNO_QUERY);
+ uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName( OUString("ActiveConnection")) ,uno::UNO_QUERY);
if ( !sObjectName.isEmpty() && xCon.is() )
{
sal_Int32 nObjectType = sdb::CommandType::COMMAND;
diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
index ac86218f4e31..8c9fdd892029 100644
--- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
+++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
@@ -45,7 +45,7 @@ ReportComponentHandler::ReportComponentHandler(uno::Reference< uno::XComponentCo
{
try
{
- m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.FormComponentPropertyHandler")),m_xContext),uno::UNO_QUERY_THROW);
+ m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW);
}catch(const uno::Exception &)
{
@@ -73,14 +73,14 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ReportComponentHandler::getSupportedSe
//------------------------------------------------------------------------
::rtl::OUString ReportComponentHandler::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.ReportComponentHandler"));
+ return ::rtl::OUString("com.sun.star.comp.report.ReportComponentHandler");
}
//------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > ReportComponentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.inspection.ReportComponentHandler"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.report.inspection.ReportComponentHandler");
return aSupported;
}
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index 93f25514cf28..783cdb04c665 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -244,38 +244,38 @@ namespace rptui
uno::Sequence< beans::Property > aProps = _xFormComponentHandler->getSupportedProperties();
static const OUString pExcludeProperties[] =
{
- OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("Printable")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("WordBreak")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("MultiLine")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("Tag")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("HelpText")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("HelpURL")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("MaxTextLen")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("Tabstop")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("TabIndex")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("ValueMin")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("ValueMax")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("Spin")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("SpinValue")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("SpinValueMin")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("SpinValueMax")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultSpinValue")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("SpinIncrement")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("Repeat")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("RepeatDelay")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("ControlLabel")), /// TODO: has to be checked
- OUString(RTL_CONSTASCII_USTRINGPARAM("LabelControl")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), // comment this out if you want to have title feature for charts
+ OUString("Enabled"),
+ OUString("Printable"),
+ OUString("WordBreak"),
+ OUString("MultiLine"),
+ OUString("Tag"),
+ OUString("HelpText"),
+ OUString("HelpURL"),
+ OUString("MaxTextLen"),
+ OUString("ReadOnly"),
+ OUString("Tabstop"),
+ OUString("TabIndex"),
+ OUString("ValueMin"),
+ OUString("ValueMax"),
+ OUString("Spin"),
+ OUString("SpinValue"),
+ OUString("SpinValueMin"),
+ OUString("SpinValueMax"),
+ OUString("DefaultSpinValue"),
+ OUString("SpinIncrement"),
+ OUString("Repeat"),
+ OUString("RepeatDelay"),
+ OUString("ControlLabel"), /// TODO: has to be checked
+ OUString("LabelControl"),
+ OUString("Title"), // comment this out if you want to have title feature for charts
PROPERTY_MAXTEXTLEN,
PROPERTY_EFFECTIVEDEFAULT,
PROPERTY_EFFECTIVEMAX,
PROPERTY_EFFECTIVEMIN,
- OUString(RTL_CONSTASCII_USTRINGPARAM("HideInactiveSelection")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("SubmitAction")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("InputRequired")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("VerticalAlign")),
+ OUString("HideInactiveSelection"),
+ OUString("SubmitAction"),
+ OUString("InputRequired"),
+ OUString("VerticalAlign"),
PROPERTY_ALIGN,
PROPERTY_EMPTY_IS_NULL,
PROPERTY_FILTERPROPOSAL
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 4348e9f343ca..704beb06179b 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -445,11 +445,11 @@ namespace
// create an AWT font
awt::FontDescriptor aAwtFont;
lcl_initAwtFont( _rOriginalControlFont, _rItemSet, aAwtFont,ITEMID_FONT,ITEMID_FONTHEIGHT,ITEMID_POSTURE, ITEMID_WEIGHT);
- lcl_pushBack( _out_rProperties, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Font")), uno::makeAny( aAwtFont ) );
+ lcl_pushBack( _out_rProperties, ::rtl::OUString("Font"), uno::makeAny( aAwtFont ) );
lcl_initAwtFont( _rOriginalControlFontAsian, _rItemSet, aAwtFont,ITEMID_FONT_ASIAN,ITEMID_FONTHEIGHT_ASIAN,ITEMID_POSTURE_ASIAN, ITEMID_WEIGHT_ASIAN);
- lcl_pushBack( _out_rProperties, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontAsian")), uno::makeAny( aAwtFont ) );
+ lcl_pushBack( _out_rProperties, ::rtl::OUString("FontAsian"), uno::makeAny( aAwtFont ) );
lcl_initAwtFont( _rOriginalControlFontComplex, _rItemSet, aAwtFont,ITEMID_FONT_COMPLEX,ITEMID_FONTHEIGHT_COMPLEX,ITEMID_POSTURE_COMPLEX, ITEMID_WEIGHT_COMPLEX);
- lcl_pushBack( _out_rProperties, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontComplex")), uno::makeAny( aAwtFont ) );
+ lcl_pushBack( _out_rProperties, ::rtl::OUString("FontComplex"), uno::makeAny( aAwtFont ) );
// properties which cannot be represented in an AWT font need to be preserved directly
if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_SHADOWED,sal_True,&pItem) && pItem->ISA(SvxShadowedItem))
@@ -1023,7 +1023,7 @@ bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula
xServiceFactory.set(xFactory,uno::UNO_QUERY);
Window* pParent = VCLUnoHelper::GetWindow( _xInspectorWindow );
- uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.libreoffice.report.pentaho.SOFunctionManager")),_xContext),uno::UNO_QUERY);
+ uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext(::rtl::OUString("org.libreoffice.report.pentaho.SOFunctionManager"),_xContext),uno::UNO_QUERY);
if ( xMgr.is() )
{
::boost::shared_ptr< formula::IFunctionManager > pFormulaManager(new FunctionManager(xMgr) );
@@ -1036,7 +1036,7 @@ bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula
xub_StrLen nIndex = 0;
if ( sFormula.GetChar(0) == '=' )
nIndex = 1;
- _in_out_rFormula = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:")) + sFormula.Copy(nIndex);
+ _in_out_rFormula = ::rtl::OUString("rpt:") + sFormula.Copy(nIndex);
}
}
}
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index 1337dd79b3aa..c0ebbdbd9e1a 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -47,13 +47,13 @@ namespace rptui
//------------------------------------------------------------------------------
::rtl::OUString OStatusbarController::getImplementationName_Static() throw( RuntimeException )
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.comp.StatusbarController"));
+ return ::rtl::OUString("com.sun.star.report.comp.StatusbarController");
}
//------------------------------------------------------------------------------
Sequence< ::rtl::OUString> OStatusbarController::getSupportedServiceNames_Static(void) throw( RuntimeException )
{
Sequence< ::rtl::OUString> aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.StatusbarController"));
+ aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.frame.StatusbarController");
return aSupported;
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index 33b8ccbff73b..36b143b0182b 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -67,13 +67,13 @@ namespace rptui
//------------------------------------------------------------------------------
::rtl::OUString OToolboxController::getImplementationName_Static() throw( RuntimeException )
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.comp.ReportToolboxController"));
+ return ::rtl::OUString("com.sun.star.report.comp.ReportToolboxController");
}
//------------------------------------------------------------------------------
Sequence< ::rtl::OUString> OToolboxController::getSupportedServiceNames_Static(void) throw( RuntimeException )
{
Sequence< ::rtl::OUString> aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ReportToolboxController"));
+ aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.report.ReportToolboxController");
return aSupported;
}
// -----------------------------------------------------------------------------
@@ -150,48 +150,48 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments
}
if ( m_aCommandURL == ".uno:BasicShapes" )
{
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:BasicShapes")),sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:BasicShapes"),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_BASIC,m_nToolBoxId,*pToolBox));
}
else if ( m_aCommandURL == ".uno:SymbolShapes" )
{
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SymbolShapes")),sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:SymbolShapes"),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_SYMBOL,m_nToolBoxId,*pToolBox));
}
else if ( m_aCommandURL == ".uno:ArrowShapes" )
{
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:ArrowShapes")),sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:ArrowShapes"),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_ARROW,m_nToolBoxId,*pToolBox));
}
else if ( m_aCommandURL == ".uno:FlowChartShapes" )
{
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FlowChartShapes")),sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:FlowChartShapes"),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_FLOWCHART,m_nToolBoxId,*pToolBox));
}
else if ( m_aCommandURL == ".uno:CalloutShapes" )
{
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CalloutShapes")),sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:CalloutShapes"),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_CALLOUT,m_nToolBoxId,*pToolBox));
}
else if ( m_aCommandURL == ".uno:StarShapes" )
{
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:StarShapes")),sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:StarShapes"),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_STAR,m_nToolBoxId,*pToolBox));
}
else if ( m_aCommandURL == ".uno:CharFontName" )
{
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CharFontName")),sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:CharFontName"),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxFontNameToolBoxControl/*SvxStyleToolBoxControl*/(m_nSlotId = SID_ATTR_CHAR_FONT,m_nToolBoxId,*pToolBox));
}
else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:FontColor")) || m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Color")) )
{
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FontColor")),sal_True));
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Color")),sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:FontColor"),sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:Color"),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxColorExtToolBoxControl(m_nSlotId = SID_ATTR_CHAR_COLOR2,m_nToolBoxId,*pToolBox));
}
else
{
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:BackgroundColor")),sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:BackgroundColor"),sal_True));
m_pToolbarController = TToolbarHelper::createFromQuery(new SvxColorToolBoxControl(m_nSlotId = SID_BACKGROUND_COLOR,m_nToolBoxId,*pToolBox));
}
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 8d1fdd31e75d..c8b4a2c5aba9 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -265,13 +265,13 @@ static void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs,
//------------------------------------------------------------------------------
::rtl::OUString OReportController::getImplementationName_Static() throw( RuntimeException )
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.comp.ReportDesign"));
+ return ::rtl::OUString("com.sun.star.report.comp.ReportDesign");
}
//------------------------------------------------------------------------------
Sequence< ::rtl::OUString> OReportController::getSupportedServiceNames_Static(void) throw( RuntimeException )
{
Sequence< ::rtl::OUString> aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ReportDesign"));
+ aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.ReportDesign");
return aSupported;
}
//-------------------------------------------------------------------------
@@ -314,9 +314,9 @@ OReportController::OReportController(Reference< XComponentContext > const & xCon
m_pReportControllerObserver = new OXReportControllerObserver(*this);
m_pReportControllerObserver->acquire();
- m_sMode = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal"));
+ m_sMode = ::rtl::OUString("normal");
DBG_CTOR( rpt_OReportController,NULL);
- registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZoomValue")),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(static_cast< sal_Int16*>(0)));
+ registerProperty(::rtl::OUString("ZoomValue"),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(static_cast< sal_Int16*>(0)));
}
// -----------------------------------------------------------------------------
@@ -1368,22 +1368,22 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
switch(_nId)
{
case SID_DRAWTBX_CS_SYMBOL:
- sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("smiley"));
+ sType = ::rtl::OUString("smiley");
break;
case SID_DRAWTBX_CS_ARROW:
- sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("left-right-arrow"));
+ sType = ::rtl::OUString("left-right-arrow");
break;
case SID_DRAWTBX_CS_FLOWCHART:
- sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("flowchart-internal-storage"));
+ sType = ::rtl::OUString("flowchart-internal-storage");
break;
case SID_DRAWTBX_CS_CALLOUT:
- sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("round-rectangular-callout"));
+ sType = ::rtl::OUString("round-rectangular-callout");
break;
case SID_DRAWTBX_CS_STAR:
- sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("star5"));
+ sType = ::rtl::OUString("star5");
break;
default:
- sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diamond"));
+ sType = ::rtl::OUString("diamond");
}
}
else
@@ -1687,7 +1687,7 @@ void OReportController::impl_initialize( )
UndoSuppressor aSuppressUndo( getUndoManager() );
::comphelper::NamedValueCollection aArgs(getModel()->getArgs());
- setMode(aArgs.getOrDefault("Mode", ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal"))));
+ setMode(aArgs.getOrDefault("Mode", ::rtl::OUString("normal")));
listen(true);
setEditable( !m_aReportModel->IsReadOnly() );
@@ -1696,7 +1696,7 @@ void OReportController::impl_initialize( )
::comphelper::MediaDescriptor aDescriptor( m_xReportDefinition->getArgs() );
::rtl::OUString sHierarchicalDocumentName;
- sHierarchicalDocumentName = aDescriptor.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HierarchicalDocumentName")),sHierarchicalDocumentName);
+ sHierarchicalDocumentName = aDescriptor.getUnpackedValueOrDefault(::rtl::OUString("HierarchicalDocumentName"),sHierarchicalDocumentName);
if ( sHierarchicalDocumentName.isEmpty() && getConnection().is() )
{
@@ -1747,7 +1747,7 @@ void OReportController::impl_initialize( )
if ( m_bShowProperties && m_nPageNum == -1 )
{
- m_sLastActivePage = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Data"));
+ m_sLastActivePage = ::rtl::OUString("Data");
getDesignView()->setCurrentPage(m_sLastActivePage);
uno::Sequence< beans::PropertyValue> aArgs;
executeUnChecked(SID_SELECT_REPORT,aArgs);
@@ -2111,14 +2111,14 @@ void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _
if ( _xLayoutManager.is() )
{
static const ::rtl::OUString s_sMenu[] = {
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/statusbar/statusbar"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/reportcontrols"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/drawbar"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/Formatting"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/alignmentbar"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/sectionalignmentbar"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/resizebar"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/sectionshrinkbar"))
+ ::rtl::OUString("private:resource/statusbar/statusbar")
+ ,::rtl::OUString("private:resource/toolbar/reportcontrols")
+ ,::rtl::OUString("private:resource/toolbar/drawbar")
+ ,::rtl::OUString("private:resource/toolbar/Formatting")
+ ,::rtl::OUString("private:resource/toolbar/alignmentbar")
+ ,::rtl::OUString("private:resource/toolbar/sectionalignmentbar")
+ ,::rtl::OUString("private:resource/toolbar/resizebar")
+ ,::rtl::OUString("private:resource/toolbar/sectionshrinkbar")
};
for (size_t i = 0; i< sizeof(s_sMenu)/sizeof(s_sMenu[0]); ++i)
{
@@ -2799,10 +2799,10 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) throw(
if ( getView() )
{
util::URL aCommand;
- aCommand.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ) ) + *commandName;
+ aCommand.Complete = ::rtl::OUString( ".uno:" ) + *commandName;
Sequence< PropertyValue > aCommandArgs(1);
- aCommandArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value" ) );
+ aCommandArgs[0].Name = ::rtl::OUString( "Value" );
aCommandArgs[0].Value = rCommandValue;
executeUnChecked( aCommand, aCommandArgs );
@@ -2890,7 +2890,7 @@ uno::Reference<frame::XModel> OReportController::executeReport()
if ( !m_bShowProperties )
executeUnChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< beans::PropertyValue>());
- m_sLastActivePage = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Data"));
+ m_sLastActivePage = ::rtl::OUString("Data");
getDesignView()->setCurrentPage(m_sLastActivePage);
nCommand = SID_SELECT_REPORT;
}
@@ -3150,7 +3150,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
xShapeProp.set(pNewControl->getUnoShape(),uno::UNO_QUERY);
::rtl::OUString sCustomShapeType = getDesignView()->GetInsertObjString();
if ( sCustomShapeType.isEmpty() )
- sCustomShapeType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diamond"));
+ sCustomShapeType = ::rtl::OUString("diamond");
pSectionWindow->getReportSection().createDefault(sCustomShapeType,pNewControl);
pNewControl->SetLogicRect(Rectangle(3000,500,6000,3500)); // switch height and width
}
@@ -3334,7 +3334,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
}
::svx::ODataAccessDescriptor aDescriptor(aValue);
SequenceAsHashMap aMap(aValue);
- uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Section")),xCurrentSection);
+ uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault(::rtl::OUString("Section"),xCurrentSection);
uno::Reference<report::XReportDefinition> xReportDefinition = xSection->getReportDefinition();
getDesignView()->setMarked(xSection,sal_True);
@@ -3346,7 +3346,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
aPos.X = nLeftMargin;
// LLA: new feature, add the Label in dependency of the given DND_ACTION one section up, normal or one section down
- sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DNDAction")), sal_Int8(0));
+ sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault(::rtl::OUString("DNDAction"), sal_Int8(0));
pSectionWindow[1] = pSectionWindow[0];
sal_Bool bLabelAboveTextField = nDNDAction == DND_ACTION_COPY;
if ( bLabelAboveTextField || nDNDAction == DND_ACTION_LINK )
@@ -3419,7 +3419,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
{
uno::Reference< beans::XPropertySet > xParamCol( xParams->getByIndex(i), uno::UNO_QUERY_THROW );
::rtl::OUString sParamName;
- OSL_VERIFY( xParamCol->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sParamName );
+ OSL_VERIFY( xParamCol->getPropertyValue( ::rtl::OUString( "Name" ) ) >>= sParamName );
if ( sParamName == sColumnName )
{
xField = xParamCol;
@@ -4066,8 +4066,8 @@ void SAL_CALL OReportController::setMode( const ::rtl::OUString& aMode ) throw (
}
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OReportController::getSupportedModes( ) throw (::com::sun::star::uno::RuntimeException)
{
- static ::rtl::OUString s_sModes[] = { ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("remote")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal")) };
+ static ::rtl::OUString s_sModes[] = { ::rtl::OUString("remote"),
+ ::rtl::OUString("normal") };
return uno::Sequence< ::rtl::OUString> (&s_sModes[0],sizeof(s_sModes)/sizeof(s_sModes[0]));
}
::sal_Bool SAL_CALL OReportController::supportsMode( const ::rtl::OUString& aMode ) throw (::com::sun::star::uno::RuntimeException)
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 40a8433178c8..13eb3a5e5454 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -492,7 +492,7 @@ void OReportSection::Command( const CommandEvent& _rCEvt )
if ( nId == SID_ATTR_CHAR_COLOR_BACKGROUND )
{
aArgs.realloc(1);
- aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Selection"));
+ aArgs[0].Name = ::rtl::OUString("Selection");
aArgs[0].Value <<= m_xSection;
}
rController.executeChecked(nId,aArgs);
@@ -833,10 +833,10 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt )
aCurrent[nLength].Name = PROPERTY_POSITION;
aCurrent[nLength++].Value <<= AWTPoint(aDropPos);
// give also the DND Action (Shift|Ctrl) Key to really say what we want
- aCurrent[nLength].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DNDAction"));
+ aCurrent[nLength].Name = ::rtl::OUString("DNDAction");
aCurrent[nLength++].Value <<= _rEvt.mnAction;
- aCurrent[nLength].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Section"));
+ aCurrent[nLength].Name = ::rtl::OUString("Section");
aCurrent[nLength++].Value <<= getSection();
pIter->Value <<= aCurrent;
}
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 5440a78fee2f..39bb7e9a8a0f 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -1017,7 +1017,7 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _
if ( &rView != &_rSection )
{
- SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")));
+ SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString("com.sun.star.form.component.FixedText"));
if (pNewObj)
{
pNewObj->SetLogicRect(_aRect);
diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx
index b2da2c0ffff1..9d7f52c31f9c 100644
--- a/reportdesign/source/ui/report/dlgedfac.cxx
+++ b/reportdesign/source/ui/report/dlgedfac.cxx
@@ -54,24 +54,24 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
{
case OBJ_DLG_FIXEDTEXT:
pObjFactory->pNewObj = new OUnoObject( SERVICE_FIXEDTEXT
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText"))
+ ,::rtl::OUString("com.sun.star.form.component.FixedText")
,OBJ_DLG_FIXEDTEXT);
break;
case OBJ_DLG_IMAGECONTROL:
pObjFactory->pNewObj = new OUnoObject( SERVICE_IMAGECONTROL
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl"))
+ ,::rtl::OUString("com.sun.star.form.component.DatabaseImageControl")
,OBJ_DLG_IMAGECONTROL);
break;
case OBJ_DLG_FORMATTEDFIELD:
pObjFactory->pNewObj = new OUnoObject( SERVICE_FORMATTEDFIELD
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField"))
+ ,::rtl::OUString("com.sun.star.form.component.FormattedField")
,OBJ_DLG_FORMATTEDFIELD);
break;
case OBJ_DLG_VFIXEDLINE:
case OBJ_DLG_HFIXEDLINE:
{
OUnoObject* pObj = new OUnoObject( SERVICE_FIXEDLINE
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel"))
+ ,::rtl::OUString("com.sun.star.awt.UnoControlFixedLineModel")
,pObjFactory->nIdentifier);
pObjFactory->pNewObj = pObj;
if ( pObjFactory->nIdentifier == OBJ_DLG_HFIXEDLINE )
@@ -88,7 +88,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
pObjFactory->pNewObj = new OOle2Obj(SERVICE_REPORTDEFINITION,OBJ_DLG_SUBREPORT);
break;
case OBJ_OLE2:
- pObjFactory->pNewObj = new OOle2Obj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.ChartDocument")),OBJ_OLE2);
+ pObjFactory->pNewObj = new OOle2Obj(::rtl::OUString("com.sun.star.chart2.ChartDocument"),OBJ_OLE2);
break;
default:
OSL_FAIL("Unknown object id");
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 3b044fa6d2c1..6805f5e496dc 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -182,7 +182,7 @@ sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt )
if ( m_pParent->GetMode() != RPTUI_READONLY )
{
uno::Sequence<beans::PropertyValue> aArgs(1);
- aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowProperties"));
+ aArgs[0].Name = ::rtl::OUString("ShowProperties");
aArgs[0].Value <<= sal_True;
m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->getController().executeUnChecked(SID_SHOW_PROPERTYBROWSER,aArgs);
m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView);
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 213a3985cd7a..73bfcd6aba6b 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -107,11 +107,11 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen
try
{
// create a frame wrapper for myself
- m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame"))), UNO_QUERY);
+ m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString("com.sun.star.frame.Frame")), UNO_QUERY);
if (m_xMeAsFrame.is())
{
m_xMeAsFrame->initialize( VCLUnoHelper::GetInterface ( this ) );
- m_xMeAsFrame->setName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("report property browser"))); // change name!
+ m_xMeAsFrame->setName(::rtl::OUString("report property browser")); // change name!
}
}
catch (Exception&)
@@ -129,9 +129,9 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen
{
::cppu::ContextEntry_Init aHandlerContextInfo[] =
{
- ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ), makeAny( m_pDesignView->getController().getModel() )),
- ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) ), makeAny( VCLUnoHelper::GetInterface ( this ) )),
- ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) ), makeAny( m_pDesignView->getController().getConnection() ) ),
+ ::cppu::ContextEntry_Init( ::rtl::OUString( "ContextDocument" ), makeAny( m_pDesignView->getController().getModel() )),
+ ::cppu::ContextEntry_Init( ::rtl::OUString( "DialogParentWindow" ), makeAny( VCLUnoHelper::GetInterface ( this ) )),
+ ::cppu::ContextEntry_Init( ::rtl::OUString( "ActiveConnection" ), makeAny( m_pDesignView->getController().getConnection() ) ),
};
m_xInspectorContext.set(
::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ),
@@ -199,9 +199,9 @@ PropBrw::~PropBrw()
uno::Reference<container::XNameContainer> xName(m_xInspectorContext,uno::UNO_QUERY);
if ( xName.is() )
{
- const ::rtl::OUString pProps[] = { ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) )
- , ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) )
- , ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) )};
+ const ::rtl::OUString pProps[] = { ::rtl::OUString( "ContextDocument" )
+ , ::rtl::OUString( "DialogParentWindow" )
+ , ::rtl::OUString( "ActiveConnection" )};
for (size_t i = 0; i < sizeof(pProps)/sizeof(pProps[0]); ++i)
xName->removeByName(pProps[i]);
}
@@ -348,7 +348,7 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface>
aName = String(ModuleRes(RID_STR_BRWTITLE_PROPERTIES));
uno::Reference< container::XNameContainer > xNameCont(_aObjects[0],uno::UNO_QUERY);
- Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReportComponent"))), UNO_QUERY );
+ Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName(::rtl::OUString("ReportComponent")), UNO_QUERY );
if ( xServiceInfo.is() )
{
sal_uInt16 nResId = 0;
@@ -419,9 +419,9 @@ uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(const uno::Referen
,const uno::Reference< uno::XInterface>& _xReportComponent)
{
uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast<Reference<XInterface> * >(NULL)));
- xNameCont->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormComponent")),uno::makeAny(_xFormComponent));
- xNameCont->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReportComponent")),uno::makeAny(_xReportComponent));
- xNameCont->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowSet"))
+ xNameCont->insertByName(::rtl::OUString("FormComponent"),uno::makeAny(_xFormComponent));
+ xNameCont->insertByName(::rtl::OUString("ReportComponent"),uno::makeAny(_xReportComponent));
+ xNameCont->insertByName(::rtl::OUString("RowSet")
,uno::makeAny(uno::Reference< uno::XInterface>(m_pDesignView->getController().getRowSet())));
return xNameCont.get();
@@ -534,7 +534,7 @@ void PropBrw::Update( OSectionView* pNewView )
uno::Reference< uno::XInterface> xTemp(m_pView->getReportSection()->getSection());
m_xLastSection = xTemp;
uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast<Reference<XInterface> * >(NULL)));
- xNameCont->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReportComponent")),uno::makeAny(xTemp));
+ xNameCont->insertByName(::rtl::OUString("ReportComponent"),uno::makeAny(xTemp));
xTemp = xNameCont;
implSetNewObject( uno::Sequence< uno::Reference< uno::XInterface> >(&xTemp,1) );
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 393e2e097b8c..de18023361ab 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -829,7 +829,7 @@ ERRTYPE RscCompiler::Link()
OUString sIlstUrl;
sIlstUrl = sRcUrl.copy(sRcUrl.lastIndexOf('/')+1);
sIlstUrl = sIlstUrl.copy(0,sIlstUrl.lastIndexOf('.'));
- sIlstUrl += OUString(RTL_CONSTASCII_USTRINGPARAM(".ilst"));
+ sIlstUrl += OUString(".ilst");
sIlstUrl = lcl_getAbsoluteUrl(sOilDirUrl, OUStringToOString(sIlstUrl, RTL_TEXTENCODING_UTF8));
aSysList = lcl_getSystemPath(sIlstUrl);
diff --git a/sal/inc/osl/socket_decl.hxx b/sal/inc/osl/socket_decl.hxx
index 822450db8f1c..70f8f8b44ba0 100644
--- a/sal/inc/osl/socket_decl.hxx
+++ b/sal/inc/osl/socket_decl.hxx
@@ -154,7 +154,7 @@ namespace osl
*/
static inline sal_Int32 SAL_CALL getServicePort(
const ::rtl::OUString& strServiceName,
- const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) );
+ const ::rtl::OUString & strProtocolName= ::rtl::OUString("tcp") );
};
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index d9505098c382..f233f9179d73 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -42,7 +42,7 @@
inline const rtl::OUString FPH_LOCAL_DIR_ENTRY()
{ return rtl::OUString(FPH_CHAR_PATH_SEPARATOR); }
inline const rtl::OUString FPH_PARENT_DIR_ENTRY()
- { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..")); }
+ { return rtl::OUString(".."); }
/*******************************************
* osl_systemPathRemoveSeparator
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx
index 70e8107aa79b..c156c37b9393 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -54,7 +54,7 @@ public:
rtl_math_ConversionStatus status;
sal_Int32 end;
double res = rtl::math::stringToDouble(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" +1.E01foo")),
+ rtl::OUString(" +1.E01foo"),
sal_Unicode('.'), sal_Unicode(','), &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH(" +1.E01")), end);
@@ -65,7 +65,7 @@ public:
rtl_math_ConversionStatus status;
sal_Int32 end;
double res = rtl::math::stringToDouble(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" +Efoo")),
+ rtl::OUString(" +Efoo"),
sal_Unicode('.'), sal_Unicode(','), &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), end);
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
index a3afaef25849..70ed7548e4d9 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
@@ -40,7 +40,7 @@ private:
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::ToString);
void test::oustringbuffer::ToString::testToString() {
- rtl::OUStringBuffer sb(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test string")));
+ rtl::OUStringBuffer sb(rtl::OUString("test string"));
rtl::OUString str = sb.toString();
CPPUNIT_ASSERT( str == "test string" );
// returned OUString must be independent from sb
diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx b/sal/qa/rtl/strings/test_oustring_compare.cxx
index 8b506b78d728..e3ad8dd9d4bf 100644
--- a/sal/qa/rtl/strings/test_oustring_compare.cxx
+++ b/sal/qa/rtl/strings/test_oustring_compare.cxx
@@ -50,16 +50,16 @@ void test::oustring::Compare::equalsIgnoreAsciiCaseAscii()
CPPUNIT_ASSERT(!rtl::OUString().equalsIgnoreAsciiCaseAscii("abc"));
CPPUNIT_ASSERT(!rtl::OUString().equalsIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM("abc")));
- CPPUNIT_ASSERT(!rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")).
+ CPPUNIT_ASSERT(!rtl::OUString("abc").
equalsIgnoreAsciiCaseAscii(""));
- CPPUNIT_ASSERT(!rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")).
+ CPPUNIT_ASSERT(!rtl::OUString("abc").
equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("")));
- CPPUNIT_ASSERT(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")).
+ CPPUNIT_ASSERT(rtl::OUString("abc").
equalsIgnoreAsciiCaseAscii("abc"));
- CPPUNIT_ASSERT(!rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abcd")).
+ CPPUNIT_ASSERT(!rtl::OUString("abcd").
equalsIgnoreAsciiCaseAscii("abc"));
- CPPUNIT_ASSERT(!rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")).
+ CPPUNIT_ASSERT(!rtl::OUString("abc").
equalsIgnoreAsciiCaseAscii("abcd"));
}
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index 873b5366f6a5..7dc8eb8ea25f 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -96,13 +96,13 @@ void test::oustring::StringLiterals::checkCtors()
CPPUNIT_ASSERT( VALID_CONVERSION( bad5[ 1 ] ));
// Check that contents are correct and equal to the case when RTL_CONSTASCII_USTRINGPARAM is used.
- CPPUNIT_ASSERT_EQUAL( rtl::OUString( "" ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" )));
- CPPUNIT_ASSERT_EQUAL( rtl::OUString( "ab" ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ab" )));
+ CPPUNIT_ASSERT_EQUAL( rtl::OUString( "" ), rtl::OUString( "" ));
+ CPPUNIT_ASSERT_EQUAL( rtl::OUString( "ab" ), rtl::OUString( "ab" ));
#if 0
// Also check that embedded \0 is included.
// In fact, allowing this is probably just trouble, so this now asserts.
- CPPUNIT_ASSERT_EQUAL( rtl::OUString( "\0" ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\0" )));
- CPPUNIT_ASSERT_EQUAL( rtl::OUString( "a\0b" ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "a\0b" )));
+ CPPUNIT_ASSERT_EQUAL( rtl::OUString( "\0" ), rtl::OUString( "\0" ));
+ CPPUNIT_ASSERT_EQUAL( rtl::OUString( "a\0b" ), rtl::OUString( "a\0b" ));
#endif
}
diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx
index ec29c8097d27..005a7a75388a 100644
--- a/sal/qa/rtl/uri/rtl_testuri.cxx
+++ b/sal/qa/rtl/uri/rtl_testuri.cxx
@@ -246,7 +246,7 @@ void Test::test_Uri() {
// Check UTF-8 handling:
- aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%E0%83%BF"));
+ aText1 = rtl::OUString("%E0%83%BF");
// \U+00FF encoded with three instead of two bytes
aText2 = aText1;
CPPUNIT_ASSERT_MESSAGE(
@@ -256,7 +256,7 @@ void Test::test_Uri() {
RTL_TEXTENCODING_UTF8)
== aText2));
- aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%EF%BF%BF"));
+ aText1 = rtl::OUString("%EF%BF%BF");
// \U+FFFF is no legal character
aText2 = aText1;
CPPUNIT_ASSERT_MESSAGE(
@@ -268,7 +268,7 @@ void Test::test_Uri() {
// Check IURI handling:
- aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%30%C3%BF"));
+ aText1 = rtl::OUString("%30%C3%BF");
aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("%30"));
aBuffer.append(static_cast< sal_Unicode >(0x00FF));
aText2 = aBuffer.makeStringAndClear();
@@ -279,8 +279,8 @@ void Test::test_Uri() {
// Check modified rtl_UriCharClassUnoParamValue (removed '[' and ']'):
- aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]%5B%5D"));
- aText2 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%5B%5D%5B%5D"));
+ aText1 = rtl::OUString("[]%5B%5D");
+ aText2 = rtl::OUString("%5B%5D%5B%5D");
CPPUNIT_ASSERT_MESSAGE(
"failure 19",
(rtl::Uri::encode(
@@ -381,7 +381,7 @@ void Test::test_Uri() {
{
sal_Unicode const aText1U[] = { ' ', '!', 0x0401, 0x045F, 0 };
aText1 = rtl::OUString(aText1U);
- aText2 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%20!%A1%FF"));
+ aText2 = rtl::OUString("%20!%A1%FF");
CPPUNIT_ASSERT_MESSAGE(
"failure 20",
(rtl::Uri::encode(
@@ -415,8 +415,7 @@ void Test::test_Uri() {
{
sal_Unicode const aText1U[] = { ' ', '!', 0x028A, 0xD849, 0xDD13, 0 };
aText1 = rtl::OUString(aText1U);
- aText2 = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("%20!%81%30%B1%33%95%39%C5%37"));
+ aText2 = rtl::OUString("%20!%81%30%B1%33%95%39%C5%37");
CPPUNIT_ASSERT_MESSAGE(
"failure 22",
(rtl::Uri::encode(
@@ -444,7 +443,7 @@ void Test::test_Uri() {
== aText2));
}
{
- aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%20%C4%80%FF"));
+ aText1 = rtl::OUString("%20%C4%80%FF");
aText2 = rtl::OUString();
CPPUNIT_ASSERT_MESSAGE(
"failure 24",
@@ -453,7 +452,7 @@ void Test::test_Uri() {
== aText2));
}
{
- aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%81 "));
+ aText1 = rtl::OUString("%81 ");
aText2 = rtl::OUString();
CPPUNIT_ASSERT_MESSAGE(
"failure 25",
@@ -462,7 +461,7 @@ void Test::test_Uri() {
== aText2));
}
{
- aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%81%20"));
+ aText1 = rtl::OUString("%81%20");
aText2 = rtl::OUString();
CPPUNIT_ASSERT_MESSAGE(
"failure 26",
@@ -471,7 +470,7 @@ void Test::test_Uri() {
== aText2));
}
{
- aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%81%30%B1%33"));
+ aText1 = rtl::OUString("%81%30%B1%33");
sal_Unicode const aText2U[] = { 0x028A, 0 };
aText2 = rtl::OUString(aText2U);
CPPUNIT_ASSERT_MESSAGE(
@@ -481,7 +480,7 @@ void Test::test_Uri() {
== aText2));
}
{
- aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%810%B13"));
+ aText1 = rtl::OUString("%810%B13");
sal_Unicode const aText2U[] = { 0x028A, 0 };
aText2 = rtl::OUString(aText2U);
CPPUNIT_ASSERT_MESSAGE(
@@ -494,8 +493,8 @@ void Test::test_Uri() {
// Check rtl_UriEncodeStrictKeepEscapes mode:
{
- aText1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%%ea%c3%aa"));
- aText2 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%25%EA%C3%AA"));
+ aText1 = rtl::OUString("%%ea%c3%aa");
+ aText2 = rtl::OUString("%25%EA%C3%AA");
CPPUNIT_ASSERT_MESSAGE(
"failure 29",
(rtl::Uri::encode(
@@ -506,7 +505,7 @@ void Test::test_Uri() {
{
sal_Unicode const aText1U[] = { 0x00EA, 0 };
aText1 = rtl::OUString(aText1U);
- aText2 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%C3%AA"));
+ aText2 = rtl::OUString("%C3%AA");
CPPUNIT_ASSERT_MESSAGE(
"failure 30",
(rtl::Uri::encode(
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 84d1b58b450b..d3dadcb50d1c 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -105,8 +105,7 @@ rtl::OUString recursivelyExpandMacros(
if (requestStack->file == requestFile &&
requestStack->key == requestKey)
{
- return rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("***RECURSION DETECTED***"));
+ return rtl::OUString("***RECURSION DETECTED***");
}
}
ExpandRequestLink link = { requestStack, requestFile, requestKey };
@@ -267,7 +266,7 @@ static OUString & getIniFileName_Impl()
resolvePathnameUrl(&fileName);
#else
if(getFromCommandLineArgs(
- OUString(RTL_CONSTASCII_USTRINGPARAM("INIFILENAME")), &fileName))
+ OUString("INIFILENAME"), &fileName))
{
resolvePathnameUrl(&fileName);
}
@@ -459,8 +458,7 @@ struct FundamentalIniData {
ini =
((static_cast< Bootstrap_Impl * >(get_static_bootstrap_handle())->
getValue(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("URE_BOOTSTRAP")),
+ rtl::OUString("URE_BOOTSTRAP"),
&uri.pData, 0, LOOKUP_MODE_NORMAL, false, 0)) &&
resolvePathnameUrl(&uri))
? rtl_bootstrap_args_open(uri.pData) : NULL;
diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx
index 02e71829ce0c..9edd087ca335 100644
--- a/sal/rtl/uri.cxx
+++ b/sal/rtl/uri.cxx
@@ -723,8 +723,7 @@ sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef,
{
rtl::OUString aMessage(pBaseUriRef);
aMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- " does not start with a scheme component"));
+ " does not start with a scheme component");
rtl_uString_assign(pException,
const_cast< rtl::OUString & >(aMessage).pData);
return false;
@@ -734,8 +733,7 @@ sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef,
{
rtl::OUString aMessage(pBaseUriRef);
aMessage += rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "path component does not start with slash"));
+ "path component does not start with slash");
rtl_uString_assign(pException, aMessage.pData);
return false;
}
diff --git a/sal/test/testbootstrap.cxx b/sal/test/testbootstrap.cxx
index b77e684138ca..5de39f01de26 100644
--- a/sal/test/testbootstrap.cxx
+++ b/sal/test/testbootstrap.cxx
@@ -56,7 +56,7 @@ int main( int argc, char *argv[] )
OUString iniName;
- Bootstrap::get(OUString(RTL_CONSTASCII_USTRINGPARAM("iniName")), iniName, OUString());
+ Bootstrap::get(OUString("iniName"), iniName, OUString());
#if OSL_DEBUG_LEVEL > 1
if(iniName.getLength())
@@ -76,7 +76,7 @@ int main( int argc, char *argv[] )
sal_Bool useDefault;
OUString aDummy;
- useDefault = bootstrap.getFrom(OUString(RTL_CONSTASCII_USTRINGPARAM("USEDEFAULT")), aDummy);
+ useDefault = bootstrap.getFrom(OUString("USEDEFAULT"), aDummy);
sal_Bool result = sal_False;
sal_Bool found = sal_True;
@@ -105,12 +105,12 @@ int main( int argc, char *argv[] )
fprintf(stderr, "bootstrap parameter couldn't be found\n");
// test the default case
- name = OUString( RTL_CONSTASCII_USTRINGPARAM( "no_one_has_set_this_name" ) );
+ name = OUString( "no_one_has_set_this_name" );
OSL_ASSERT( ! bootstrap.getFrom( name, value ) );
result = result && !bootstrap.getFrom( name, value );
- myDefault = OUString( RTL_CONSTASCII_USTRINGPARAM( "1" ) );
- OUString myDefault2 = OUString( RTL_CONSTASCII_USTRINGPARAM( "2" ) );
+ myDefault = OUString( "1" );
+ OUString myDefault2 = OUString( "2" );
bootstrap.getFrom( name, value, myDefault );
OSL_ASSERT( value == myDefault );
diff --git a/sal/test/unloading/unloadTest.cxx b/sal/test/unloading/unloadTest.cxx
index 8733eebba23e..39ced7a05af9 100644
--- a/sal/test/unloading/unloadTest.cxx
+++ b/sal/test/unloading/unloadTest.cxx
@@ -88,7 +88,7 @@ int main(int argc, char* argv[])
// Test if the servicemanager can be created and if the sample libs
// can be loaded
// Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
-// OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
+// OUString("applicat.rdb"));
// if( !serviceManager.is())
// {
// printf("\n ####################################################\n"
@@ -120,7 +120,7 @@ int main(int argc, char* argv[])
// }
// //destroy servicemanager
// Reference<XPropertySet> xSet( serviceManager, UNO_QUERY);
-// Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+// Any any_prop= xSet->getPropertyValue( OUString("DefaultContext"));
// Reference<XComponentContext> xContext;
// any_prop >>= xContext;
// Reference<XComponent> xComponent( xContext, UNO_QUERY);
@@ -179,7 +179,7 @@ sal_Bool test1()
OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1));
{
Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
- OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
+ OUString("applicat.rdb"));
Reference<XInterface> xint= serviceManager->createInstance( OUString(
RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1)));
@@ -189,7 +189,7 @@ sal_Bool test1()
xint=0;
Reference<XPropertySet> xSet( serviceManager, UNO_QUERY);
- Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+ Any any_prop= xSet->getPropertyValue( OUString("DefaultContext"));
Reference<XComponentContext> xContext;
any_prop >>= xContext;
Reference<XComponent> xComponent( xContext, UNO_QUERY);
@@ -216,7 +216,7 @@ sal_Bool test2()
OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1));
{
Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
- OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
+ OUString("applicat.rdb"));
Reference<XInterface> xint= serviceManager->createInstance( OUString(
RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1)));
@@ -233,7 +233,7 @@ sal_Bool test2()
rtl_registerModuleForUnloading(mod3);
// ----------------------------------------------------------
Reference<XPropertySet> xSet( serviceManager, UNO_QUERY);
- Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+ Any any_prop= xSet->getPropertyValue( OUString("DefaultContext"));
Reference<XComponentContext> xContext;
any_prop >>= xContext;
Reference<XComponent> xComponent( xContext, UNO_QUERY);
@@ -261,7 +261,7 @@ sal_Bool test3()
OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1));
{
Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
- OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
+ OUString("applicat.rdb"));
Reference<XInterface> xint= serviceManager->createInstance( OUString(
RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1)));
@@ -277,7 +277,7 @@ sal_Bool test3()
rtl_registerModuleForUnloading(mod2);
// ----------------------------------------------------------
Reference<XPropertySet> xSet( serviceManager, UNO_QUERY);
- Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+ Any any_prop= xSet->getPropertyValue( OUString("DefaultContext"));
Reference<XComponentContext> xContext;
any_prop >>= xContext;
Reference<XComponent> xComponent( xContext, UNO_QUERY);
@@ -309,7 +309,7 @@ sal_Bool test4()
OUString lib2Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY2));
{
Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
- OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
+ OUString("applicat.rdb"));
Reference<XInterface> xint= serviceManager->createInstance( OUString(
RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1)));
@@ -325,7 +325,7 @@ sal_Bool test4()
//-----------------------------------------------------------
// ----------------------------------------------------------
Reference<XPropertySet> xSet( serviceManager, UNO_QUERY);
- Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+ Any any_prop= xSet->getPropertyValue( OUString("DefaultContext"));
Reference<XComponentContext> xContext;
any_prop >>= xContext;
Reference<XComponent> xComponent( xContext, UNO_QUERY);
@@ -357,7 +357,7 @@ sal_Bool test5()
OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
{
Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
- OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
+ OUString("applicat.rdb"));
//-----------------------------------------------------------
Reference<XInterface> xint= serviceManager->createInstance( OUString(
@@ -381,7 +381,7 @@ sal_Bool test5()
// get rid of the service manager
Reference<XPropertySet> xSet( serviceManager, UNO_QUERY);
- Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+ Any any_prop= xSet->getPropertyValue( OUString("DefaultContext"));
Reference<XComponentContext> xContext;
any_prop >>= xContext;
Reference<XComponent> xComponent( xContext, UNO_QUERY);
@@ -426,7 +426,7 @@ sal_Bool test6()
OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
{
Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
- OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
+ OUString("applicat.rdb"));
Reference<XInterface> xint= serviceManager->createInstance( OUString(
RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1)));
@@ -436,7 +436,7 @@ sal_Bool test6()
// get rid of the service manager
Reference<XPropertySet> xSet( serviceManager, UNO_QUERY);
- Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+ Any any_prop= xSet->getPropertyValue( OUString("DefaultContext"));
Reference<XComponentContext> xContext;
any_prop >>= xContext;
Reference<XComponent> xComponent( xContext, UNO_QUERY);
@@ -530,7 +530,7 @@ sal_Bool test8()
{
Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
- OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
+ OUString("applicat.rdb"));
Reference<XContentEnumerationAccess> xContent( serviceManager, UNO_QUERY);
Reference<XEnumeration> xenum= xContent->createContentEnumeration(
OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME4)));
@@ -580,7 +580,7 @@ sal_Bool test8()
// get rid of the service manager
Reference<XPropertySet> xSet( serviceManager, UNO_QUERY);
- Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+ Any any_prop= xSet->getPropertyValue( OUString("DefaultContext"));
Reference<XComponentContext> xContext;
any_prop >>= xContext;
Reference<XComponent> xComponent( xContext, UNO_QUERY);
@@ -616,7 +616,7 @@ sal_Bool test9()
OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1));
Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
- OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
+ OUString("applicat.rdb"));
Reference<XInterface> xint= serviceManager->createInstance( OUString(
RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1)));
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 6293c8505933..a66eb1857989 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -776,7 +776,7 @@ bool Converter::convertDuration(double& rfTime,
nSecs = nTemp;
nTemp = 0;
bIsFraction = true;
- sDoubleStr = OUString(RTL_CONSTASCII_USTRINGPARAM("0."));
+ sDoubleStr = OUString("0.");
}
else if ( c == sal_Unicode('S') )
{
@@ -784,7 +784,7 @@ bool Converter::convertDuration(double& rfTime,
{
nSecs = nTemp;
nTemp = 0;
- sDoubleStr = OUString(RTL_CONSTASCII_USTRINGPARAM("0.0"));
+ sDoubleStr = OUString("0.0");
}
}
else
diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index 37cf3d06394a..314e60b007d8 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -33,7 +33,7 @@ FastSerializerHelper::FastSerializerHelper(const Reference< io::XOutputStream >&
{
Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext(), UNO_SET_THROW );
Reference< lang::XMultiComponentFactory > xFactory( xContext->getServiceManager(), UNO_SET_THROW );
- mxTokenHandler.set( xFactory->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.FastTokenHandler") ), xContext ), UNO_QUERY_THROW );
+ mxTokenHandler.set( xFactory->createInstanceWithContext( rtl::OUString( "com.sun.star.xml.sax.FastTokenHandler"), xContext ), UNO_QUERY_THROW );
mpSerializer->setFastTokenHandler( mxTokenHandler );
mpSerializer->setOutputStream( xOutputStream );
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index da29b141f94e..85d4801519b7 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -109,86 +109,86 @@ void ScMacrosTest::testVba()
{
TestMacroInfo testInfo[] = {
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestAddress.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("TestAddress."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vba.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document")),
+ rtl::OUString("vba."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document"),
},
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MiscRangeTests.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("MiscRangeTests."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bytearraystring.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacro.test?language=Basic&location=document"))
+ rtl::OUString("bytearraystring."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacro.test?language=Basic&location=document")
},
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoFilter.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("AutoFilter."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CalcFont.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("CalcFont."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestIntersection.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("TestIntersection."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestUnion.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("TestUnion."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("range-4.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("range-4."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges-3.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("Ranges-3."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestCalc_Rangetest.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("TestCalc_Rangetest."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestCalc_Rangetest2.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("TestCalc_Rangetest2."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
#if FIXRANGEADDRESSING
//ScVbaRange::getRangeForName()/getScRangeListForAddress() seems to get confused
//about the addressing mode of the document vs the addressing mode of a named
//range ( need to fix that )
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges-2.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("Ranges-2."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
#endif
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pagesetup.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("pagesetup."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Window.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("Window."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("window2.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("window2."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageBreaks.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("PageBreaks."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Shapes.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("Shapes."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
#if VBA_TEST_WORKING
{
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges.")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+ rtl::OUString("Ranges."),
+ rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
#endif
};
diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx
index 174debde8160..d404d335c97c 100644
--- a/sc/qa/extras/regression-test.cxx
+++ b/sc/qa/extras/regression-test.cxx
@@ -164,8 +164,7 @@ void ScChartRegressionTest::setUp()
// This is a bit of a fudge, we do this to ensure that ScGlobals::ensure,
// which is a private symbol to us, gets called
m_xCalcComponent =
- getMultiServiceFactory()->createInstance(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.SpreadsheetDocument")));
+ getMultiServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.Calc.SpreadsheetDocument"));
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) );
}
diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx
index fdbd7486eef6..d5971c0033a2 100644
--- a/sc/qa/extras/scannotationobj.cxx
+++ b/sc/qa/extras/scannotationobj.cxx
@@ -98,7 +98,7 @@ uno::Reference< uno::XInterface > ScAnnontationObj::init()
// get the test file
rtl::OUString aFileURL;
- createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAnnotationObj.ods")), aFileURL);
+ createFileURL(rtl::OUString("ScAnnotationObj.ods"), aFileURL);
if(!mxComponent.is())
mxComponent = loadFromDesktop(aFileURL);
CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is());
diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx
index 2c3694aa520a..62d662672352 100644
--- a/sc/qa/extras/scannotationsobj.cxx
+++ b/sc/qa/extras/scannotationsobj.cxx
@@ -87,7 +87,7 @@ uno::Reference< uno::XInterface > ScAnnontationsObj::init()
{
// get the test file
rtl::OUString aFileURL;
- createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAnnotationObj.ods")), aFileURL);
+ createFileURL(rtl::OUString("ScAnnotationObj.ods"), aFileURL);
if(!mxComponent.is())
mxComponent = loadFromDesktop(aFileURL);
CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is());
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index 97366dec287f..a65a04878b9a 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -80,8 +80,8 @@ uno::Reference< lang::XComponent > ScCellRangeObj::mxComponent;
ScCellRangeObj::ScCellRangeObj():
UnoApiTest("/sc/qa/extras/testdocuments"),
- apitest::XSearchable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("15")), 1),
- apitest::XReplaceable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("15")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("35")))
+ apitest::XSearchable(rtl::OUString("15"), 1),
+ apitest::XReplaceable(rtl::OUString("15"), rtl::OUString("35"))
{
}
diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx
index c122e4fac742..a54716720883 100644
--- a/sc/qa/extras/scdatabaserangeobj.cxx
+++ b/sc/qa/extras/scdatabaserangeobj.cxx
@@ -80,7 +80,7 @@ uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const rtl::OUString&
uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW);
uno::Reference< beans::XPropertySet > xPropSet(xDoc, UNO_QUERY_THROW);
- uno::Reference< container::XNameAccess > xNameAccess( xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DatabaseRanges"))), UNO_QUERY_THROW);
+ uno::Reference< container::XNameAccess > xNameAccess( xPropSet->getPropertyValue(rtl::OUString("DatabaseRanges")), UNO_QUERY_THROW);
uno::Reference< sheet::XDatabaseRange > xDBRange( xNameAccess->getByName(rDBName), UNO_QUERY_THROW);
CPPUNIT_ASSERT(xDBRange.is());
return xDBRange;
diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx
index ccc7417638da..c52952eeff4f 100644
--- a/sc/qa/extras/scdatapilotfieldobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldobj.cxx
@@ -76,7 +76,7 @@ ScDataPilotFieldObj::ScDataPilotFieldObj()
uno::Reference< uno::XInterface > ScDataPilotFieldObj::init()
{
rtl::OUString aFileURL;
- createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("scdatapilotfieldobj.ods")), aFileURL);
+ createFileURL(rtl::OUString("scdatapilotfieldobj.ods"), aFileURL);
if(!mxComponent.is())
mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
CPPUNIT_ASSERT(mxComponent.is());
@@ -92,7 +92,7 @@ uno::Reference< uno::XInterface > ScDataPilotFieldObj::init()
CPPUNIT_ASSERT(xDPT.is());
uno::Sequence<rtl::OUString> aElementNames = xDPT->getElementNames();
- uno::Reference< sheet::XDataPilotDescriptor > xDPDsc(xDPT->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilot1"))),UNO_QUERY_THROW);
+ uno::Reference< sheet::XDataPilotDescriptor > xDPDsc(xDPT->getByName(rtl::OUString("DataPilot1")),UNO_QUERY_THROW);
CPPUNIT_ASSERT(xDPDsc.is());
uno::Reference< container::XIndexAccess > xIA( xDPDsc->getDataPilotFields(), UNO_QUERY_THROW);
uno::Reference< uno::XInterface > xReturnValue( xIA->getByIndex(0), UNO_QUERY_THROW);
diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx
index 1e9f2a873bad..05a7572d411c 100644
--- a/sc/qa/extras/scdatapilottableobj.cxx
+++ b/sc/qa/extras/scdatapilottableobj.cxx
@@ -84,7 +84,7 @@ uno::Reference< lang::XComponent > ScDataPilotTableObj::mxComponent;
ScDataPilotTableObj::ScDataPilotTableObj()
: UnoApiTest("/sc/qa/extras/testdocuments"),
- apitest::XNamed(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilotTable")))
+ apitest::XNamed(rtl::OUString("DataPilotTable"))
{
}
@@ -112,7 +112,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::init()
uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables();
CPPUNIT_ASSERT(xDPT.is());
- uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilotTable"))),UNO_QUERY_THROW);
+ uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString("DataPilotTable")),UNO_QUERY_THROW);
CPPUNIT_ASSERT(xDPTable.is());
return xDPTable;
@@ -128,7 +128,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::getSheets()
uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2()
{
rtl::OUString aFileURL;
- createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScDataPilotTableObj.ods")), aFileURL);
+ createFileURL(rtl::OUString("ScDataPilotTableObj.ods"), aFileURL);
if(!mxComponent.is())
mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
CPPUNIT_ASSERT(mxComponent.is());
@@ -149,7 +149,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2()
uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables();
CPPUNIT_ASSERT(xDPT.is());
- uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilotTable2"))),UNO_QUERY_THROW);
+ uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString("DataPilotTable2")),UNO_QUERY_THROW);
CPPUNIT_ASSERT(xDPTable.is());
return xDPTable;
diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx
index 167e3b290045..13384e83bd39 100644
--- a/sc/qa/extras/scmodelobj.cxx
+++ b/sc/qa/extras/scmodelobj.cxx
@@ -44,7 +44,7 @@ uno::Reference< lang::XComponent > ScModelObj::mxComponent;
uno::Reference< uno::XInterface > ScModelObj::init()
{
rtl::OUString aFileURL;
- createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScModelObj.ods")), aFileURL);
+ createFileURL(rtl::OUString("ScModelObj.ods"), aFileURL);
if(!mxComponent.is())
mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
CPPUNIT_ASSERT(mxComponent.is());
diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx
index 95e2b0f75e25..8403c051b076 100644
--- a/sc/qa/extras/scnamedrangeobj.cxx
+++ b/sc/qa/extras/scnamedrangeobj.cxx
@@ -74,7 +74,7 @@ uno::Reference< lang::XComponent > ScNamedRangeObj::mxComponent;
ScNamedRangeObj::ScNamedRangeObj():
UnoApiTest("/sc/qa/extras/testdocuments"),
- apitest::XNamed(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NamedRange"))),
+ apitest::XNamed(rtl::OUString("NamedRange")),
apitest::XCellRangeReferrer(table::CellRangeAddress(0,1,7,1,7))
{
}
@@ -82,7 +82,7 @@ ScNamedRangeObj::ScNamedRangeObj():
uno::Reference< sheet::XNamedRanges > ScNamedRangeObj::init_impl()
{
rtl::OUString aFileURL;
- createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScNamedRangeObj.ods")), aFileURL);
+ createFileURL(rtl::OUString("ScNamedRangeObj.ods"), aFileURL);
if(!mxComponent.is())
mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
CPPUNIT_ASSERT(mxComponent.is());
@@ -106,7 +106,7 @@ uno::Reference< sheet::XNamedRange> ScNamedRangeObj::getNamedRange(const rtl::OU
uno::Reference< uno::XInterface > ScNamedRangeObj::init()
{
- return getNamedRange(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NamedRange")));
+ return getNamedRange(rtl::OUString("NamedRange"));
}
void ScNamedRangeObj::setUp()
diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx
index d921932c0900..b52962d85115 100644
--- a/sc/qa/extras/scnamedrangesobj.cxx
+++ b/sc/qa/extras/scnamedrangesobj.cxx
@@ -70,7 +70,7 @@ ScNamedRangesObj::ScNamedRangesObj()
uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet)
{
rtl::OUString aFileURL;
- createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScNamedRangeObj.ods")), aFileURL);
+ createFileURL(rtl::OUString("ScNamedRangeObj.ods"), aFileURL);
if(!mxComponent.is())
mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
CPPUNIT_ASSERT(mxComponent.is());
diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx
index f55178bd1e09..4e7f1540c528 100644
--- a/sc/qa/extras/scoutlineobj.cxx
+++ b/sc/qa/extras/scoutlineobj.cxx
@@ -73,7 +73,7 @@ uno::Reference< uno::XInterface > ScOutlineObj::init()
{
// get the test file
rtl::OUString aFileURL;
- createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScOutlineObj.ods")), aFileURL);
+ createFileURL(rtl::OUString("ScOutlineObj.ods"), aFileURL);
if(!mxComponent.is())
mxComponent = loadFromDesktop(aFileURL);
CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is());
diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx
index e10df62997d6..f41d2ac3d83e 100644
--- a/sc/qa/extras/sctablesheetobj.cxx
+++ b/sc/qa/extras/sctablesheetobj.cxx
@@ -65,8 +65,8 @@ uno::Reference< lang::XComponent > ScTableSheetObj::mxComponent;
ScTableSheetObj::ScTableSheetObj():
UnoApiTest("/sc/qa/extras/testdocuments"),
- apitest::XSearchable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test")), 4),
- apitest::XReplaceable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("searchReplaceString")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("replaceReplaceString")))
+ apitest::XSearchable(rtl::OUString("test"), 4),
+ apitest::XReplaceable(rtl::OUString("searchReplaceString"), rtl::OUString("replaceReplaceString"))
{
}
@@ -74,7 +74,7 @@ ScTableSheetObj::ScTableSheetObj():
uno::Reference< uno::XInterface > ScTableSheetObj::init()
{
rtl::OUString aFileURL;
- createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScTableSheetObj.ods")), aFileURL);
+ createFileURL(rtl::OUString("ScTableSheetObj.ods"), aFileURL);
if(!mxComponent.is())
mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
CPPUNIT_ASSERT(mxComponent.is());
diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx
index a1e97d5a73e8..cfc771c7b0a9 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -75,7 +75,7 @@ sal_Int32 ScTableSheetsObj::nTest = 0;
ScTableSheetsObj::ScTableSheetsObj():
UnoApiTest("/sc/qa/extras/testdocuments"),
- apitest::XNameContainer(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sheet2")))
+ apitest::XNameContainer(rtl::OUString("Sheet2"))
{
}
@@ -98,7 +98,7 @@ uno::Reference< lang::XComponent > ScTableSheetsObj::loadFromDesktop(const rtl::
uno::Reference< uno::XInterface > ScTableSheetsObj::init()
{
rtl::OUString aFileURL;
- createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rangenamessrc.ods")), aFileURL);
+ createFileURL(rtl::OUString("rangenamessrc.ods"), aFileURL);
if(!mxComponent.is())
mxComponent = loadFromDesktop(aFileURL);
CPPUNIT_ASSERT(mxComponent.is());
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 67db72eee7c4..3b23c60f19d5 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -131,16 +131,16 @@ bool ScFiltersTest::load(const OUString &rFilter, const OUString &rURL,
void ScFiltersTest::testCVEs()
{
#ifndef DISABLE_CVE_TESTS
- testDir(OUString(RTL_CONSTASCII_USTRINGPARAM("Quattro Pro 6.0")),
+ testDir(OUString("Quattro Pro 6.0"),
getURLFromSrc("/sc/qa/unit/data/qpro/"), OUString());
//warning, the current "sylk filter" in sc (docsh.cxx) automatically
//chains on failure on trying as csv, rtf, etc. so "success" may
//not indicate that it imported as .slk.
- testDir(OUString(RTL_CONSTASCII_USTRINGPARAM("SYLK")),
+ testDir(OUString("SYLK"),
getURLFromSrc("/sc/qa/unit/data/slk/"), OUString());
- testDir(OUString(RTL_CONSTASCII_USTRINGPARAM("MS Excel 97")),
+ testDir(OUString("MS Excel 97"),
getURLFromSrc("/sc/qa/unit/data/xls/"), OUString());
#endif
}
@@ -209,16 +209,16 @@ void testRangeNameImpl(ScDocument* pDoc)
{
//check one range data per sheet and one global more detailed
//add some more checks here
- ScRangeData* pRangeData = pDoc->GetRangeName()->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("GLOBAL1")));
+ ScRangeData* pRangeData = pDoc->GetRangeName()->findByUpperName(OUString("GLOBAL1"));
CPPUNIT_ASSERT_MESSAGE("range name Global1 not found", pRangeData);
double aValue;
pDoc->GetValue(1,0,0,aValue);
CPPUNIT_ASSERT_MESSAGE("range name Global1 should reference Sheet1.A1", aValue == 1);
- pRangeData = pDoc->GetRangeName(0)->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("LOCAL1")));
+ pRangeData = pDoc->GetRangeName(0)->findByUpperName(OUString("LOCAL1"));
CPPUNIT_ASSERT_MESSAGE("range name Sheet1.Local1 not found", pRangeData);
pDoc->GetValue(1,2,0,aValue);
CPPUNIT_ASSERT_MESSAGE("range name Sheet1.Local1 should reference Sheet1.A3", aValue == 3);
- pRangeData = pDoc->GetRangeName(1)->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("LOCAL2")));
+ pRangeData = pDoc->GetRangeName(1)->findByUpperName(OUString("LOCAL2"));
CPPUNIT_ASSERT_MESSAGE("range name Sheet2.Local2 not found", pRangeData);
//check for correct results for the remaining formulas
pDoc->GetValue(1,1,0, aValue);
@@ -262,9 +262,9 @@ void testContentImpl(ScDocument* pDoc, sal_Int32 nFormat ) //same code for ods,
OUString aString = pDoc->GetString(1, 0, 0);
//check string import
- CPPUNIT_ASSERT_MESSAGE("string imported not correctly", aString == OUString(RTL_CONSTASCII_USTRINGPARAM("String1")));
+ CPPUNIT_ASSERT_MESSAGE("string imported not correctly", aString == OUString("String1"));
aString = pDoc->GetString(1, 1, 0);
- CPPUNIT_ASSERT_MESSAGE("string not imported correctly", aString == OUString(RTL_CONSTASCII_USTRINGPARAM("String2")));
+ CPPUNIT_ASSERT_MESSAGE("string not imported correctly", aString == OUString("String2"));
//check basic formula import
pDoc->GetValue(2,0,0,fValue);
@@ -462,8 +462,7 @@ void ScFiltersTest::setUp()
// This is a bit of a fudge, we do this to ensure that ScGlobals::ensure,
// which is a private symbol to us, gets called
m_xCalcComponent =
- getMultiServiceFactory()->createInstance(OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.SpreadsheetDocument")));
+ getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Calc.SpreadsheetDocument"));
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
}
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 0d77c0b0e67a..5325bbc37850 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -217,7 +217,7 @@ public:
SfxFilter* pExportFilter = new SfxFilter(
rFilter,
OUString(), nFormatType, nExportFormat, rTypeName, 0, OUString(),
- rUserData, OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc*")) );
+ rUserData, OUString("private:factory/scalc*") );
pExportFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT);
aStoreMedium.SetFilter(pExportFilter);
pShell->DoSaveAs( aStoreMedium );
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index 621a6d77f8c5..d7998a78e28a 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -76,7 +76,7 @@ ScDocShellRef ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const OUSt
SfxFilter* pExportFilter = new SfxFilter(
rFilter,
OUString(), nFormatType, nExportFormat, rTypeName, 0, OUString(),
- rUserData, OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc*")) );
+ rUserData, OUString("private:factory/scalc*") );
pExportFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT);
aStoreMedium.SetFilter(pExportFilter);
SfxItemSet* pExportSet = aStoreMedium.GetItemSet();
@@ -212,8 +212,7 @@ void ScExportTest::setUp()
// This is a bit of a fudge, we do this to ensure that ScGlobals::ensure,
// which is a private symbol to us, gets called
m_xCalcComponent =
- getMultiServiceFactory()->createInstance(OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.SpreadsheetDocument")));
+ getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Calc.SpreadsheetDocument"));
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
}
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index cdaaa3e8c777..0bb7645944e5 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -239,16 +239,16 @@ void testRangeNameImpl(ScDocument* pDoc)
{
//check one range data per sheet and one global more detailed
//add some more checks here
- ScRangeData* pRangeData = pDoc->GetRangeName()->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("GLOBAL1")));
+ ScRangeData* pRangeData = pDoc->GetRangeName()->findByUpperName(OUString("GLOBAL1"));
CPPUNIT_ASSERT_MESSAGE("range name Global1 not found", pRangeData);
double aValue;
pDoc->GetValue(1,0,0,aValue);
CPPUNIT_ASSERT_EQUAL_MESSAGE("range name Global1 should reference Sheet1.A1", 1.0, aValue);
- pRangeData = pDoc->GetRangeName(0)->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("LOCAL1")));
+ pRangeData = pDoc->GetRangeName(0)->findByUpperName(OUString("LOCAL1"));
CPPUNIT_ASSERT_MESSAGE("range name Sheet1.Local1 not found", pRangeData);
pDoc->GetValue(1,2,0,aValue);
CPPUNIT_ASSERT_EQUAL_MESSAGE("range name Sheet1.Local1 should reference Sheet1.A3", 3.0, aValue);
- pRangeData = pDoc->GetRangeName(1)->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("LOCAL2")));
+ pRangeData = pDoc->GetRangeName(1)->findByUpperName(OUString("LOCAL2"));
CPPUNIT_ASSERT_MESSAGE("range name Sheet2.Local2 not found", pRangeData);
pDoc->GetValue(1,1,1,aValue);
CPPUNIT_ASSERT_EQUAL_MESSAGE("range name Sheet2.Local2 should reference Sheet2.A2", 7.0, aValue);
@@ -323,7 +323,7 @@ void ScFiltersTest::testHardRecalcODS()
//test hard recalc: document has an incorrect cached formula result
//hard recalc should have updated to the correct result
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("hard-recalc.")), aCSVFileName);
+ createCSVPath(OUString("hard-recalc."), aCSVFileName);
testFile(aCSVFileName, pDoc, 0);
xDocSh->DoClose();
@@ -339,16 +339,16 @@ void ScFiltersTest::testFunctionsODS()
OUString aCSVFileName;
//test logical functions
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("logical-functions.")), aCSVFileName);
+ createCSVPath(OUString("logical-functions."), aCSVFileName);
testFile(aCSVFileName, pDoc, 0);
//test spreadsheet functions
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("spreadsheet-functions.")), aCSVFileName);
+ createCSVPath(OUString("spreadsheet-functions."), aCSVFileName);
testFile(aCSVFileName, pDoc, 1);
//test mathematical functions
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("mathematical-functions.")), aCSVFileName);
+ createCSVPath(OUString("mathematical-functions."), aCSVFileName);
testFile(aCSVFileName, pDoc, 2, PureString);
//test information functions
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("information-functions.")), aCSVFileName);
+ createCSVPath(OUString("information-functions."), aCSVFileName);
testFile(aCSVFileName, pDoc, 3);
xDocSh->DoClose();
@@ -364,16 +364,16 @@ void ScFiltersTest::testCachedFormulaResultsODS()
OUString aCSVFileName;
//test cached formula results of logical functions
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("logical-functions.")), aCSVFileName);
+ createCSVPath(OUString("logical-functions."), aCSVFileName);
testFile(aCSVFileName, pDoc, 0);
//test cached formula results of spreadsheet functions
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("spreadsheet-functions.")), aCSVFileName);
+ createCSVPath(OUString("spreadsheet-functions."), aCSVFileName);
testFile(aCSVFileName, pDoc, 1);
//test cached formula results of mathematical functions
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("mathematical-functions.")), aCSVFileName);
+ createCSVPath(OUString("mathematical-functions."), aCSVFileName);
testFile(aCSVFileName, pDoc, 2, PureString);
//test cached formula results of information functions
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("information-functions.")), aCSVFileName);
+ createCSVPath(OUString("information-functions."), aCSVFileName);
testFile(aCSVFileName, pDoc, 3);
xDocSh->DoClose();
@@ -537,7 +537,7 @@ void testFormats_Impl(ScFiltersTest* pFiltersTest, ScDocument* pDoc, sal_Int32 n
{
//test Sheet1 with csv file
OUString aCSVFileName;
- pFiltersTest->createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("numberFormat.")), aCSVFileName);
+ pFiltersTest->createCSVPath(OUString("numberFormat."), aCSVFileName);
testFile(aCSVFileName, pDoc, 0, PureString);
//need to test the color of B3
//it's not a font color!
@@ -609,7 +609,7 @@ void testFormats_Impl(ScFiltersTest* pFiltersTest, ScDocument* pDoc, sal_Int32 n
//test Sheet3 only for ods
if ( nFormat == ODS || nFormat == XLSX )
{
- pFiltersTest->createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("conditionalFormatting.")), aCSVFileName);
+ pFiltersTest->createCSVPath(OUString("conditionalFormatting."), aCSVFileName);
testCondFile(aCSVFileName, pDoc, 2);
// test parent cell style import ( fdo#55198 )
if ( nFormat == XLSX )
@@ -692,7 +692,7 @@ void ScFiltersTest::testMatrixODS()
ScDocument* pDoc = xDocSh->GetDocument();
OUString aCSVFileName;
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("matrix.")), aCSVFileName);
+ createCSVPath(OUString("matrix."), aCSVFileName);
testFile(aCSVFileName, pDoc, 0);
xDocSh->DoClose();
@@ -707,7 +707,7 @@ void ScFiltersTest::testMatrixXLS()
ScDocument* pDoc = xDocSh->GetDocument();
OUString aCSVFileName;
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("matrix.")), aCSVFileName);
+ createCSVPath(OUString("matrix."), aCSVFileName);
testFile(aCSVFileName, pDoc, 0);
xDocSh->DoClose();
@@ -903,7 +903,7 @@ void ScFiltersTest::testBugFixesODS()
{
// fdo#40967
OUString aCSVFileName;
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("bugFix_Sheet2.")), aCSVFileName);
+ createCSVPath(OUString("bugFix_Sheet2."), aCSVFileName);
testFile(aCSVFileName, pDoc, 1);
}
@@ -976,7 +976,7 @@ void ScFiltersTest::testMergedCellsODS()
//check sheet1 content
OUString aCSVFileName1;
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("merged1.")), aCSVFileName1);
+ createCSVPath(OUString("merged1."), aCSVFileName1);
testFile(aCSVFileName1, pDoc, 0);
//check sheet1 merged cells
@@ -986,7 +986,7 @@ void ScFiltersTest::testMergedCellsODS()
//check sheet2 content
OUString aCSVFileName2;
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("merged2.")), aCSVFileName2);
+ createCSVPath(OUString("merged2."), aCSVFileName2);
testFile(aCSVFileName2, pDoc, 1);
//check sheet2 merged cells
@@ -1002,12 +1002,12 @@ void ScFiltersTest::testRepeatedColumnsODS()
//text
OUString aCSVFileName1;
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("repeatedColumns1.")), aCSVFileName1);
+ createCSVPath(OUString("repeatedColumns1."), aCSVFileName1);
testFile(aCSVFileName1, pDoc, 0);
//numbers
OUString aCSVFileName2;
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("repeatedColumns2.")), aCSVFileName2);
+ createCSVPath(OUString("repeatedColumns2."), aCSVFileName2);
testFile(aCSVFileName2, pDoc, 1);
xDocSh->DoClose();
@@ -1140,11 +1140,11 @@ void ScFiltersTest::testDataValidityODS()
//check each sheet's content
OUString aCSVFileName1;
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("dataValidity1.")), aCSVFileName1);
+ createCSVPath(OUString("dataValidity1."), aCSVFileName1);
testFile(aCSVFileName1, pDoc, 0);
OUString aCSVFileName2;
- createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("dataValidity2.")), aCSVFileName2);
+ createCSVPath(OUString("dataValidity2."), aCSVFileName2);
testFile(aCSVFileName2, pDoc, 1);
xDocSh->DoClose();
@@ -1251,13 +1251,13 @@ void ScFiltersTest::testPassword_Impl(const OUString& aFileNameBase)
SfxFilter* aFilter = new SfxFilter(
aFilterName,
OUString(), aFileFormats[0].nFormatType, nFormat, aFilterType, 0, OUString(),
- OUString(), OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc*")) );
+ OUString(), OUString("private:factory/scalc*") );
aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT);
ScDocShellRef xDocSh = new ScDocShell;
SfxMedium* pMedium = new SfxMedium(aFileName, STREAM_STD_READWRITE);
SfxItemSet* pSet = pMedium->GetItemSet();
- pSet->Put(SfxStringItem(SID_PASSWORD, OUString(RTL_CONSTASCII_USTRINGPARAM("test"))));
+ pSet->Put(SfxStringItem(SID_PASSWORD, OUString("test")));
pMedium->SetFilter(aFilter);
if (!xDocSh->DoLoad(pMedium))
{
@@ -1795,7 +1795,7 @@ void ScFiltersTest::testColorScaleODS()
ScDocument* pDoc = xDocSh->GetDocument();
OUStringBuffer aBuffer(getSrcRootPath());
- aBuffer.append(m_aBaseString).append(OUString(RTL_CONSTASCII_USTRINGPARAM("/reference/")));
+ aBuffer.append(m_aBaseString).append(OUString("/reference/"));
testColorScale_Impl(pDoc, aBuffer.makeStringAndClear());
xDocSh->DoClose();
@@ -1821,7 +1821,7 @@ void ScFiltersTest::testColorScaleXLSX()
ScDocument* pDoc = xDocSh->GetDocument();
OUStringBuffer aBuffer(getSrcRootPath());
- aBuffer.append(m_aBaseString).append(OUString(RTL_CONSTASCII_USTRINGPARAM("/reference/")));
+ aBuffer.append(m_aBaseString).append(OUString("/reference/"));
testColorScale_Impl(pDoc, aBuffer.makeStringAndClear());
xDocSh->DoClose();
@@ -1974,8 +1974,7 @@ void ScFiltersTest::setUp()
// This is a bit of a fudge, we do this to ensure that ScGlobals::ensure,
// which is a private symbol to us, gets called
m_xCalcComponent =
- getMultiServiceFactory()->createInstance(OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.SpreadsheetDocument")));
+ getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Calc.SpreadsheetDocument"));
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
}
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index 75a2eb2b17fe..56afd712f7b1 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -3326,7 +3326,7 @@ static void lcl_getChartSubTitle(const Reference<XChartDocument>& xChartDoc,
return;
OUString aTitle;
- Any any = xProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("String")) );
+ Any any = xProp->getPropertyValue( OUString("String") );
if (any >>= aTitle)
rSubTitle = aTitle;
}
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index a3f4d3271f61..e7069cdae9cb 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -207,8 +207,8 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm )
return;
sax_fastparser::FSHelperPtr pSst = rStrm.CreateOutputStream(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "xl/sharedStrings.xml") ),
- OUString(RTL_CONSTASCII_USTRINGPARAM( "sharedStrings.xml" )),
+ OUString( "xl/sharedStrings.xml"),
+ OUString( "sharedStrings.xml" ),
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml",
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" );
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index ac9ca175c152..34304bfb6b67 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -3047,8 +3047,8 @@ XclExpXmlStyleSheet::XclExpXmlStyleSheet( const XclExpRoot& rRoot )
void XclExpXmlStyleSheet::SaveXml( XclExpXmlStream& rStrm )
{
sax_fastparser::FSHelperPtr aStyleSheet = rStrm.CreateOutputStream(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "xl/styles.xml") ),
- OUString(RTL_CONSTASCII_USTRINGPARAM( "styles.xml" )),
+ OUString( "xl/styles.xml"),
+ OUString( "styles.xml" ),
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml",
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" );
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 256287305959..89d55be8e2f4 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -1453,7 +1453,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject&
{
double fAngle = 180.0;
com::sun::star::beans::PropertyValue aTextRotateAngle;
- aTextRotateAngle.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "TextRotateAngle" ) );
+ aTextRotateAngle.Name = rtl::OUString( "TextRotateAngle" );
aTextRotateAngle.Value <<= fAngle;
SdrCustomShapeGeometryItem aGeometryItem((SdrCustomShapeGeometryItem&)pObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ));
aGeometryItem.SetPropertyValue( aTextRotateAngle );
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index 9305c90fede7..646abc13ee4c 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -705,7 +705,7 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm )
nScTab = rDoc.GetTableCount();
rDoc.MakeTable( nScTab );
- rtl::OUStringBuffer aDummyName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DPCache") ));
+ rtl::OUStringBuffer aDummyName(rtl::OUString("DPCache"));
if( maTabName.Len() > 0 )
aDummyName.append( '_' ).append( maTabName );
rtl::OUString aName = aDummyName.makeStringAndClear();
diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx
index cfc058e0bbe1..0c2f9c10b28a 100644
--- a/sc/source/filter/excel/xltoolbar.cxx
+++ b/sc/source/filter/excel/xltoolbar.cxx
@@ -62,12 +62,12 @@ MSOExcelCommandConvertor::MSOExcelCommandConvertor()
/*
// mso command id to ooo command string
// #FIXME and *HUNDREDS* of id's to added here
- msoToOOcmd[ 0x20b ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc") );
- msoToOOcmd[ 0x50 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Open") );
+ msoToOOcmd[ 0x20b ] = rtl::OUString(".uno:CloseDoc");
+ msoToOOcmd[ 0x50 ] = rtl::OUString(".uno:Open");
// mso tcid to ooo command string
// #FIXME and *HUNDREDS* of id's to added here
- tcidToOOcmd[ 0x9d9 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Print") );
+ tcidToOOcmd[ 0x9d9 ] = rtl::OUString(".uno:Print");
*/
}
@@ -180,7 +180,7 @@ bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelp
uno::Reference< beans::XPropertySet > xProps( xIndexContainer, uno::UNO_QUERY_THROW );
WString& name = tb.getName();
// set UI name for toolbar
- xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ), uno::makeAny( name.getString() ) );
+ xProps->setPropertyValue( rtl::OUString("UIName"), uno::makeAny( name.getString() ) );
rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() );
for ( std::vector< ScTBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it )
@@ -305,7 +305,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere
else
{
beans::PropertyValue aProp;
- aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ItemDescriptorContainer") );
+ aProp.Name = rtl::OUString("ItemDescriptorContainer");
aProp.Value <<= xMenuDesc;
props.push_back( aProp );
}
@@ -316,7 +316,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere
{
// insert spacer
uno::Sequence< beans::PropertyValue > sProps( 1 );
- sProps[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type") );
+ sProps[ 0 ].Name = rtl::OUString("Type");
sProps[ 0 ].Value = uno::makeAny( ui::ItemType::SEPARATOR_LINE );
toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) );
}
@@ -425,7 +425,7 @@ bool ScCTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh )
for ( std::vector<ScCTB>::iterator it = rCTB.begin(); it != it_end; ++it )
{
// for each customtoolbar
- CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument" ) ) ) );
+ CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString("com.sun.star.sheet.SpreadsheetDocument" ) ) );
helper.setMSOCommandMap( new MSOExcelCommandConvertor() );
// Ignore menu toolbars, excel doesn't ( afaics ) store
// menu customizations ( but you can have menus in a customtoolbar
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 916f7a2a7ef5..7982f1d378e5 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1398,7 +1398,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo )
if ( !pActEntry->bHasGraphic )
{ // ALT text only if not any image loaded
if (!pActEntry->aAltText.isEmpty())
- pActEntry->aAltText += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("; "));
+ pActEntry->aAltText += rtl::OUString("; ");
pActEntry->aAltText += rOption.GetString();
}
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index 70411f1b6674..eb33c39c04e0 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -203,7 +203,7 @@ void FormulaBuffer::createSharedFormula( const ::com::sun::star::table::CellAdd
rtl::OUString aName = rtl::OUStringBuffer().appendAscii( RTL_CONSTASCII_STRINGPARAM( "__shared_" ) ).
append( static_cast< sal_Int32 >( rAddress.Sheet + 1 ) ).
append( sal_Unicode( '_' ) ).append( nSharedId ).
- append( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_0") ) ).makeStringAndClear();
+ append( rtl::OUString("_0") ).makeStringAndClear();
ScRangeData* pScRangeData = createNamedRangeObject( aName, aTokens, 0 );
pScRangeData->SetType(RT_SHARED);
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 1c50a5cb1f9d..79a47fb378da 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1624,8 +1624,8 @@ void XclExpChangeTrack::Write()
static void lcl_WriteUserNamesXml( XclExpXmlStream& rWorkbookStrm )
{
sax_fastparser::FSHelperPtr pUserNames = rWorkbookStrm.CreateOutputStream(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "xl/revisions/userNames.xml" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM( "revisions/userNames.xml" )),
+ OUString( "xl/revisions/userNames.xml" ),
+ OUString( "revisions/userNames.xml" ),
rWorkbookStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.userNames+xml",
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/usernames" );
@@ -1648,8 +1648,8 @@ void XclExpChangeTrack::WriteXml( XclExpXmlStream& rWorkbookStrm )
lcl_WriteUserNamesXml( rWorkbookStrm );
sax_fastparser::FSHelperPtr pRevisionHeaders = rWorkbookStrm.CreateOutputStream(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "xl/revisions/revisionHeaders.xml" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM( "revisions/revisionHeaders.xml" )),
+ OUString( "xl/revisions/revisionHeaders.xml" ),
+ OUString( "revisions/revisionHeaders.xml" ),
rWorkbookStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.revisionHeaders+xml",
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/revisionHeaders" );
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
index 2b7bb8679489..a89a4827314d 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -76,27 +76,27 @@ rtl::OUString ScXMLExportDataPilot::getDPOperatorXML(
if (bUseRegularExpressions)
return GetXMLToken(XML_MATCH);
else
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("="));
+ return rtl::OUString("=");
}
case SC_NOT_EQUAL :
{
if (bUseRegularExpressions)
return GetXMLToken(XML_NOMATCH);
else
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("!="));
+ return rtl::OUString("!=");
}
case SC_BOTPERC :
return GetXMLToken(XML_BOTTOM_PERCENT);
case SC_BOTVAL :
return GetXMLToken(XML_BOTTOM_VALUES);
case SC_GREATER :
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">"));
+ return rtl::OUString(">");
case SC_GREATER_EQUAL :
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">="));
+ return rtl::OUString(">=");
case SC_LESS :
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<"));
+ return rtl::OUString("<");
case SC_LESS_EQUAL :
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<="));
+ return rtl::OUString("<=");
case SC_TOPPERC :
return GetXMLToken(XML_TOP_PERCENT);
case SC_TOPVAL :
@@ -104,7 +104,7 @@ rtl::OUString ScXMLExportDataPilot::getDPOperatorXML(
default:
OSL_FAIL("This FilterOperator is not supported.");
}
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("="));
+ return rtl::OUString("=");
}
void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, bool bIsCaseSensitive, bool bUseRegularExpressions)
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index c3abd40497eb..dade8e0d2144 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -397,21 +397,21 @@ private:
if (bRegExp)
return GetXMLToken(XML_MATCH);
else
- return OUString(RTL_CONSTASCII_USTRINGPARAM("="));
+ return OUString("=");
}
case SC_GREATER:
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">"));
+ return rtl::OUString(">");
case SC_GREATER_EQUAL:
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">="));
+ return rtl::OUString(">=");
case SC_LESS:
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<"));
+ return rtl::OUString("<");
case SC_LESS_EQUAL:
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<="));
+ return rtl::OUString("<=");
case SC_NOT_EQUAL:
if (bRegExp)
return GetXMLToken(XML_NOMATCH);
else
- return OUString(RTL_CONSTASCII_USTRINGPARAM("!="));
+ return OUString("!=");
case SC_TOPPERC:
return GetXMLToken(XML_TOP_PERCENT);
case SC_TOPVAL:
@@ -419,7 +419,7 @@ private:
default:
;
}
- return OUString(RTL_CONSTASCII_USTRINGPARAM("="));
+ return OUString("=");
}
class WriteSetItem : public std::unary_function<ScQueryEntry::Item, void>
@@ -472,7 +472,7 @@ private:
// Store the 1st value for backward compatibility.
const ScQueryEntry::Item& rItem = rItems.front();
mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE, rItem.maString);
- mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, OUString(RTL_CONSTASCII_USTRINGPARAM("=")));
+ mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, OUString("="));
SvXMLElementExport aElemC(mrExport, XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, true, true);
std::for_each(rItems.begin(), rItems.end(), WriteSetItem(mrExport));
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 5e5c2161ac1b..3ee937109f72 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -194,7 +194,7 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const
sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-decimal-number()"));
break;
case sheet::ValidationType_LIST :
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-in-list("));
+ sCondition += rtl::OUString("cell-content-is-in-list(");
sCondition += aValidation.sFormula1;
sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
break;
@@ -221,7 +221,7 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const
!aValidation.sFormula2.isEmpty())))
{
if (aValidation.aValidationType != sheet::ValidationType_TEXT_LEN)
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" and "));
+ sCondition += rtl::OUString(" and ");
if (aValidation.aOperator != sheet::ConditionOperator_BETWEEN &&
aValidation.aOperator != sheet::ConditionOperator_NOT_BETWEEN)
{
@@ -230,22 +230,22 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const
switch (aValidation.aOperator)
{
case sheet::ConditionOperator_EQUAL :
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("="));
+ sCondition += rtl::OUString("=");
break;
case sheet::ConditionOperator_GREATER :
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">"));
+ sCondition += rtl::OUString(">");
break;
case sheet::ConditionOperator_GREATER_EQUAL :
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">="));
+ sCondition += rtl::OUString(">=");
break;
case sheet::ConditionOperator_LESS :
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<"));
+ sCondition += rtl::OUString("<");
break;
case sheet::ConditionOperator_LESS_EQUAL :
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<="));
+ sCondition += rtl::OUString("<=");
break;
case sheet::ConditionOperator_NOT_EQUAL :
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("!="));
+ sCondition += rtl::OUString("!=");
break;
default:
{
@@ -259,19 +259,19 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const
if (aValidation.aValidationType == sheet::ValidationType_TEXT_LEN)
{
if (aValidation.aOperator == sheet::ConditionOperator_BETWEEN)
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-text-length-is-between("));
+ sCondition += rtl::OUString("cell-content-text-length-is-between(");
else
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-text-length-is-not-between("));
+ sCondition += rtl::OUString("cell-content-text-length-is-not-between(");
}
else
{
if (aValidation.aOperator == sheet::ConditionOperator_BETWEEN)
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-between("));
+ sCondition += rtl::OUString("cell-content-is-between(");
else
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-not-between("));
+ sCondition += rtl::OUString("cell-content-is-not-between(");
}
sCondition += aValidation.sFormula1;
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+ sCondition += rtl::OUString(",");
sCondition += aValidation.sFormula2;
sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
}
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx
index ed892944e65a..e53ca9a66205 100644
--- a/sc/source/filter/xml/xmlcoli.cxx
+++ b/sc/source/filter/xml/xmlcoli.cxx
@@ -157,7 +157,7 @@ void ScXMLTableColContext::EndElement()
// #i57915# ScXMLImport::SetStyleToRange can't handle empty style names.
// The default for a column if there is no attribute is the style "Default" (programmatic API name).
if ( sCellStyleName.isEmpty() )
- sCellStyleName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Default" ));
+ sCellStyleName = rtl::OUString( "Default" );
GetScImport().GetTables().AddColStyle(nColCount, sCellStyleName);
}
diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx
index a926e539c208..091b66fd3d5c 100644
--- a/sc/source/filter/xml/xmlcvali.cxx
+++ b/sc/source/filter/xml/xmlcvali.cxx
@@ -472,7 +472,7 @@ void ScXMLContentValidationContext::SetErrorMessage(const rtl::OUString& sTitle,
void ScXMLContentValidationContext::SetErrorMacro(const sal_Bool bExecute)
{
- sErrorMessageType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("macro"));
+ sErrorMessageType = rtl::OUString("macro");
bDisplayError = bExecute;
}
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 175a6c6af5c5..1d55a64526e9 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -213,7 +213,7 @@ OUString lcl_GetRawString( ScDocument* pDoc, const ScAddress& rPos )
OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLExporter" ) );
+ return rtl::OUString( "com.sun.star.comp.Calc.XMLExporter" );
}
uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw()
@@ -230,7 +230,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance(
OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLMetaExporter" ) );
+ return rtl::OUString( "com.sun.star.comp.Calc.XMLMetaExporter" );
}
uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw()
@@ -247,7 +247,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance(
OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLStylesExporter" ) );
+ return rtl::OUString( "com.sun.star.comp.Calc.XMLStylesExporter" );
}
uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw()
@@ -264,7 +264,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance(
OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLContentExporter" ) );
+ return rtl::OUString( "com.sun.star.comp.Calc.XMLContentExporter" );
}
uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw()
@@ -281,7 +281,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance
OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLSettingsExporter" ) );
+ return rtl::OUString( "com.sun.star.comp.Calc.XMLSettingsExporter" );
}
uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw()
@@ -300,7 +300,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstanc
OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisExporter" ) );
+ return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisExporter" );
}
uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw()
@@ -318,7 +318,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_createInstance(
OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisMetaExporter" ) );
+ return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisMetaExporter" );
}
uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw()
@@ -336,7 +336,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Meta_createInstance(
OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisStylesExporter" ) );
+ return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisStylesExporter" );
}
uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw()
@@ -354,7 +354,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Styles_createInstanc
OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisContentExporter" ) );
+ return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisContentExporter" );
}
uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw()
@@ -372,7 +372,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Content_createInstan
OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisSettingsExporter" ) );
+ return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisSettingsExporter" );
}
uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw()
@@ -420,12 +420,12 @@ sal_Int16 ScXMLExport::GetFieldUnit()
{
com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xProperties(
comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" )) ),
+ rtl::OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ),
com::sun::star::uno::UNO_QUERY);
if (xProperties.is())
{
sal_Int16 nFieldUnit = 0;
- if (xProperties->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Metric"))) >>= nFieldUnit)
+ if (xProperties->getPropertyValue(rtl::OUString("Metric")) >>= nFieldUnit)
return nFieldUnit;
}
return 0;
@@ -506,7 +506,7 @@ ScXMLExport::ScXMLExport(
// This name is reserved for the external ref cache tables. This
// should not conflict with user-defined styles since this name is
// used for a table style which is not available in the UI.
- sExternalRefTabStyleName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ta_extref"));
+ sExternalRefTabStyleName = rtl::OUString("ta_extref");
GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_TABLE, sExternalRefTabStyleName);
sAttrName = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_NAME));
@@ -801,11 +801,11 @@ void ScXMLExport::_ExportMeta()
CollectSharedData(nTableCount, nShapesCount);
uno::Sequence<beans::NamedValue> stats(3);
- stats[0] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableCount")),
+ stats[0] = beans::NamedValue(::rtl::OUString("TableCount"),
uno::makeAny(nTableCount));
- stats[1] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellCount")),
+ stats[1] = beans::NamedValue(::rtl::OUString("CellCount"),
uno::makeAny(nCellCount));
- stats[2] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectCount")),
+ stats[2] = beans::NamedValue(::rtl::OUString("ObjectCount"),
uno::makeAny(nShapesCount));
// update document statistics at the model
@@ -1058,7 +1058,7 @@ void ScXMLExport::ExportColumns(const sal_Int32 nTable, const table::CellRangeAd
void ScXMLExport::ExportExternalRefCacheStyles()
{
sal_Int32 nEntryIndex = GetCellStylesPropertySetMapper()->FindEntryIndex(
- "NumberFormat", XML_NAMESPACE_STYLE, OUString(RTL_CONSTASCII_USTRINGPARAM("data-style-name")));
+ "NumberFormat", XML_NAMESPACE_STYLE, OUString("data-style-name"));
if (nEntryIndex < 0)
// No entry index for the number format is found.
@@ -1072,7 +1072,7 @@ void ScXMLExport::ExportExternalRefCacheStyles()
// Export each unique number format used in the external ref cache.
vector<sal_uInt32> aNumFmts;
pRefMgr->getAllCachedNumberFormats(aNumFmts);
- const OUString aDefaultStyle = OUString(RTL_CONSTASCII_USTRINGPARAM("Default")).intern();
+ const OUString aDefaultStyle = OUString("Default").intern();
for (vector<sal_uInt32>::const_iterator itr = aNumFmts.begin(), itrEnd = aNumFmts.end();
itr != itrEnd; ++itr)
{
@@ -1755,7 +1755,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed )
uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY);
if (xMultiServiceFactory.is())
{
- uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.Defaults"))), uno::UNO_QUERY);
+ uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY);
if (xProperties.is())
aStylesExp.exportDefaultStyle(xProperties, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper);
if (pSharedData->HasShapes())
@@ -1769,7 +1769,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed )
uno::Reference <container::XNameAccess> xStylesFamilies(xStyleFamiliesSupplier->getStyleFamilies());
if (xStylesFamilies.is())
{
- uno::Reference <container::XIndexAccess> xCellStyles(xStylesFamilies->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellStyles"))), uno::UNO_QUERY);
+ uno::Reference <container::XIndexAccess> xCellStyles(xStylesFamilies->getByName(rtl::OUString("CellStyles")), uno::UNO_QUERY);
if (xCellStyles.is())
{
sal_Int32 nCount(xCellStyles->getCount());
@@ -1790,7 +1790,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed )
}
exportDataStyles();
- aStylesExp.exportStyleFamily(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellStyles")),
+ aStylesExp.exportStyleFamily(rtl::OUString("CellStyles"),
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper, false, XML_STYLE_FAMILY_TABLE_CELL);
SvXMLExport::_ExportStyles(bUsed);
@@ -3012,7 +3012,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape,
if (xShapeProps.is())
{
sal_Int32 nZOrder = 0;
- if (xShapeProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZOrder"))) >>= nZOrder)
+ if (xShapeProps->getPropertyValue(rtl::OUString("ZOrder")) >>= nZOrder)
{
rtl::OUStringBuffer sBuffer;
::sax::Converter::convertNumber(sBuffer, nZOrder);
@@ -4405,39 +4405,39 @@ void ScXMLExport::GetChangeTrackViewSettings(uno::Sequence<beans::PropertyValue>
beans::PropertyValue* pChangeProps(aChangeProps.getArray());
if (pChangeProps)
{
- pChangeProps[SC_SHOW_CHANGES].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChanges"));
+ pChangeProps[SC_SHOW_CHANGES].Name = rtl::OUString("ShowChanges");
pChangeProps[SC_SHOW_CHANGES].Value <<= pViewSettings->ShowChanges();
- pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowAcceptedChanges"));
+ pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Name = rtl::OUString("ShowAcceptedChanges");
pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Value <<= pViewSettings->IsShowAccepted();
- pChangeProps[SC_SHOW_REJECTED_CHANGES].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowRejectedChanges"));
+ pChangeProps[SC_SHOW_REJECTED_CHANGES].Name = rtl::OUString("ShowRejectedChanges");
pChangeProps[SC_SHOW_REJECTED_CHANGES].Value <<= pViewSettings->IsShowRejected();
- pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByDatetime"));
+ pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Name = rtl::OUString("ShowChangesByDatetime");
pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Value <<= pViewSettings->HasDate();
- pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByDatetimeMode"));
+ pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Name = rtl::OUString("ShowChangesByDatetimeMode");
pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Value <<= static_cast<sal_Int16>(pViewSettings->GetTheDateMode());
util::DateTime aDateTime;
ScXMLConverter::ConvertCoreToAPIDateTime(pViewSettings->GetTheFirstDateTime(), aDateTime);
- pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByDatetimeFirstDatetime"));
+ pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Name = rtl::OUString("ShowChangesByDatetimeFirstDatetime");
pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Value <<= aDateTime;
ScXMLConverter::ConvertCoreToAPIDateTime(pViewSettings->GetTheLastDateTime(), aDateTime);
- pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByDatetimeSecondDatetime"));
+ pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Name = rtl::OUString("ShowChangesByDatetimeSecondDatetime");
pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Value <<= aDateTime;
- pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByAuthor"));
+ pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Name = rtl::OUString("ShowChangesByAuthor");
pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Value <<= pViewSettings->HasAuthor();
- pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByAuthorName"));
+ pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Name = rtl::OUString("ShowChangesByAuthorName");
pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Value <<= rtl::OUString (pViewSettings->GetTheAuthorToShow());
- pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByComment"));
+ pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Name = rtl::OUString("ShowChangesByComment");
pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Value <<= pViewSettings->HasComment();
- pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByCommentText"));
+ pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Name = rtl::OUString("ShowChangesByCommentText");
pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Value <<= rtl::OUString (pViewSettings->GetTheComment());
- pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByRanges"));
+ pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Name = rtl::OUString("ShowChangesByRanges");
pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Value <<= pViewSettings->HasRange();
rtl::OUString sRangeList;
ScRangeStringConverter::GetStringFromRangeList(sRangeList, &(pViewSettings->GetTheRangeList()), GetDocument(), FormulaGrammar::CONV_OOO);
- pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByRangesList"));
+ pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Name = rtl::OUString("ShowChangesByRangesList");
pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Value <<= sRangeList;
- pProps[nChangePos].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TrackedChangesViewSettings"));
+ pProps[nChangePos].Name = rtl::OUString("TrackedChangesViewSettings");
pProps[nChangePos].Value <<= aChangeProps;
}
}
@@ -4460,13 +4460,13 @@ void ScXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& rProps)
{
Rectangle aRect(pEmbeddedObj->GetVisArea());
sal_uInt16 i(0);
- pProps[i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaTop"));
+ pProps[i].Name = rtl::OUString("VisibleAreaTop");
pProps[i].Value <<= static_cast<sal_Int32>(aRect.getY());
- pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaLeft"));
+ pProps[++i].Name = rtl::OUString("VisibleAreaLeft");
pProps[i].Value <<= static_cast<sal_Int32>(aRect.getX());
- pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaWidth"));
+ pProps[++i].Name = rtl::OUString("VisibleAreaWidth");
pProps[i].Value <<= static_cast<sal_Int32>(aRect.getWidth());
- pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaHeight"));
+ pProps[++i].Name = rtl::OUString("VisibleAreaHeight");
pProps[i].Value <<= static_cast<sal_Int32>(aRect.getHeight());
}
}
@@ -4485,7 +4485,7 @@ void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>&
uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY);
if (xMultiServiceFactory.is())
{
- uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.SpreadsheetSettings"))), uno::UNO_QUERY);
+ uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.comp.SpreadsheetSettings")), uno::UNO_QUERY);
if (xProperties.is())
SvXMLUnitConverter::convertPropertySet(rProps, xProperties);
@@ -4521,19 +4521,19 @@ void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>&
rProps.realloc(nCount + nPropsToAdd);
if (aTrackedChangesKey.getLength())
{
- rProps[nCount].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TrackedChangesProtectionKey"));
+ rProps[nCount].Name = rtl::OUString("TrackedChangesProtectionKey");
rProps[nCount].Value <<= aTrackedChangesKey.makeStringAndClear();
++nCount;
}
if( bVBACompat )
{
- rProps[nCount].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VBACompatibilityMode"));
+ rProps[nCount].Name = rtl::OUString("VBACompatibilityMode");
rProps[nCount].Value <<= bVBACompat;
++nCount;
}
if( xCodeNameAccess.is() )
{
- rProps[nCount].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScriptConfiguration"));
+ rProps[nCount].Name = rtl::OUString("ScriptConfiguration");
rProps[nCount].Value <<= xCodeNameAccess;
++nCount;
}
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 0d766521ea0f..c57810805c9f 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -107,7 +107,7 @@ using ::rtl::OUStringBuffer;
OUString SAL_CALL ScXMLImport_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisImporter" ) );
+ return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisImporter" );
}
uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw()
@@ -126,7 +126,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance(
OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisMetaImporter" ) );
+ return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisMetaImporter" );
}
uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw()
@@ -145,7 +145,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance(
OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisStylesImporter" ) );
+ return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisStylesImporter" );
}
uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw()
@@ -164,7 +164,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance(
OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisContentImporter" ) );
+ return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisContentImporter" );
}
uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw()
@@ -183,7 +183,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance(
OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisSettingsImporter" ) );
+ return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisSettingsImporter" );
}
uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw()
@@ -2566,7 +2566,7 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa
}
}
}
- uno::Reference <uno::XInterface> xInterface = xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.SpreadsheetSettings")));
+ uno::Reference <uno::XInterface> xInterface = xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.comp.SpreadsheetSettings"));
uno::Reference <beans::XPropertySet> xProperties(xInterface, uno::UNO_QUERY);
if (xProperties.is())
SvXMLUnitConverter::convertPropertySet(xProperties, aConfigProps);
@@ -2615,7 +2615,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri
{
rtl::OUString sErrorMessage(RTL_CONSTASCII_USTRINGPARAM("Fehler im Formatstring "));
sErrorMessage += sFormatString;
- sErrorMessage += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" an Position "));
+ sErrorMessage += rtl::OUString(" an Position ");
sErrorMessage += rtl::OUString::valueOf(rException.CheckPos);
uno::Sequence<rtl::OUString> aSeq(1);
aSeq[0] = sErrorMessage;
@@ -2746,7 +2746,7 @@ void ScXMLImport::AddStyleRange(const table::CellRangeAddress& rCellRange)
{
uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY);
if (xMultiServiceFactory.is())
- xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>(xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRanges"))), uno::UNO_QUERY));
+ xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.SheetCellRanges")), uno::UNO_QUERY));
OSL_ENSURE(xSheetCellRanges.is(), "didn't get SheetCellRanges");
}
@@ -2802,7 +2802,7 @@ void ScXMLImport::SetStyleToRanges()
if (xMultiServiceFactory.is())
xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>(
xMultiServiceFactory->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRanges"))),
+ rtl::OUString("com.sun.star.sheet.SheetCellRanges")),
uno::UNO_QUERY));
}
OSL_ENSURE(xSheetCellRanges.is(), "didn't get SheetCellRanges");
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index a74113bd6997..a0904fe90c1d 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -733,11 +733,11 @@ void ScXMLAutoStylePoolP::exportStyleContent(
aOperator == sheet::ConditionOperator_NOT_BETWEEN)
{
if (aOperator == sheet::ConditionOperator_BETWEEN)
- sCondition = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-between("));
+ sCondition = rtl::OUString("cell-content-is-between(");
else
- sCondition = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-not-between("));
+ sCondition = rtl::OUString("cell-content-is-not-between(");
sCondition += xSheetCondition->getFormula1();
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+ sCondition += rtl::OUString(",");
sCondition += xSheetCondition->getFormula2();
sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
}
@@ -747,22 +747,22 @@ void ScXMLAutoStylePoolP::exportStyleContent(
switch (aOperator)
{
case sheet::ConditionOperator_LESS:
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<"));
+ sCondition += rtl::OUString("<");
break;
case sheet::ConditionOperator_GREATER:
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">"));
+ sCondition += rtl::OUString(">");
break;
case sheet::ConditionOperator_LESS_EQUAL:
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<="));
+ sCondition += rtl::OUString("<=");
break;
case sheet::ConditionOperator_GREATER_EQUAL:
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">="));
+ sCondition += rtl::OUString(">=");
break;
case sheet::ConditionOperator_EQUAL:
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("="));
+ sCondition += rtl::OUString("=");
break;
case sheet::ConditionOperator_NOT_EQUAL:
- sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("!="));
+ sCondition += rtl::OUString("!=");
break;
default:
{
@@ -1080,7 +1080,7 @@ sal_Bool XmlScPropHdl_CellProtection::exportXML(
else if (aCellProtection.IsFormulaHidden && aCellProtection.IsLocked)
{
rStrExpValue = GetXMLToken(XML_PROTECTED);
- rStrExpValue += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
+ rStrExpValue += rtl::OUString(" ");
rStrExpValue += GetXMLToken(XML_FORMULA_HIDDEN);
bRetval = sal_True;
}
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index a29930b69daf..249173dec035 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -577,7 +577,7 @@ void XMLTableStyleContext::SetDefaults()
uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetImport().GetModel(), uno::UNO_QUERY);
if (xMultiServiceFactory.is())
{
- uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.Defaults"))), uno::UNO_QUERY);
+ uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY);
if (xProperties.is())
FillPropertySet(xProperties);
}
@@ -709,7 +709,7 @@ XMLTableStylesContext::XMLTableStylesContext( SvXMLImport& rImport,
const uno::Reference< XAttributeList > & xAttrList,
const bool bTempAutoStyles ) :
SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ),
- sCellStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CellStyle" ) )),
+ sCellStyleServiceName( rtl::OUString( "com.sun.star.style.CellStyle" )),
sColumnStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))),
sRowStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))),
sTableStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))),
@@ -800,7 +800,7 @@ uno::Reference < XNameContainer >
xStyles.set(xTableStyles);
else
sName =
- OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TableStyles" ) ));
+ OUString( rtl::OUString( "TableStyles" ));
}
break;
case XML_STYLE_FAMILY_TABLE_CELL:
@@ -809,7 +809,7 @@ uno::Reference < XNameContainer >
xStyles.set(xCellStyles);
else
sName =
- OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CellStyles" ) ));
+ OUString( rtl::OUString( "CellStyles" ));
}
break;
case XML_STYLE_FAMILY_TABLE_COLUMN:
@@ -818,7 +818,7 @@ uno::Reference < XNameContainer >
xStyles.set(xColumnStyles);
else
sName =
- OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ColumnStyles" ) ));
+ OUString( rtl::OUString( "ColumnStyles" ));
}
break;
case XML_STYLE_FAMILY_TABLE_ROW:
@@ -827,7 +827,7 @@ uno::Reference < XNameContainer >
xStyles.set(xRowStyles);
else
sName =
- OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowStyles" ) ));
+ OUString( rtl::OUString( "RowStyles" ));
}
break;
}
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 67e8167e3d87..2aca9fda70d4 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -137,7 +137,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
aParserInput.aInputStream = xDocStream->getInputStream();
uno::Reference < beans::XPropertySet > xSet( xDocStream, uno::UNO_QUERY );
- uno::Any aAny = xSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) );
+ uno::Any aAny = xSet->getPropertyValue( OUString("Encrypted") );
aAny >>= bEncrypted;
}
catch( const packages::WrongPasswordException& )
@@ -389,7 +389,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
{
sal_Int32 nProgressRange(1000000);
xStatusIndicator->start(ScGlobal::GetRscString(STR_LOAD_DOC), nProgressRange);
- xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ProgressRange")), uno::makeAny(nProgressRange));
+ xInfoSet->setPropertyValue(rtl::OUString("ProgressRange"), uno::makeAny(nProgressRange));
}
// Set base URI
@@ -410,11 +410,11 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
aName = pDocHierarchItem->GetValue();
}
else
- aName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "dummyObjectName" ));
+ aName = ::rtl::OUString( "dummyObjectName" );
if( !aName.isEmpty() )
{
- sPropName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath"));
+ sPropName = rtl::OUString("StreamRelPath");
xInfoSet->setPropertyValue( sPropName, uno::makeAny( aName ) );
}
}
@@ -528,9 +528,9 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles import start" );
nStylesRetval = ImportFromComponent(xServiceFactory, xModel, xXMLParser, aParserInput,
- bOasis ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisStylesImporter"))
- : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLStylesImporter")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("styles.xml")),
+ bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisStylesImporter")
+ : rtl::OUString("com.sun.star.comp.Calc.XMLStylesImporter"),
+ rtl::OUString("styles.xml"),
sEmpty, aStylesArgs, sal_True);
RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles import end" );
@@ -549,10 +549,10 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
RTL_LOGFILE_CONTEXT_TRACE( aLog, "content import start" );
nDocRetval = ImportFromComponent(xServiceFactory, xModel, xXMLParser, aParserInput,
- bOasis ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisContentImporter"))
- : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLContentImporter")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Content.xml")), aDocArgs,
+ bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisContentImporter")
+ : rtl::OUString("com.sun.star.comp.Calc.XMLContentImporter"),
+ rtl::OUString("content.xml"),
+ rtl::OUString("Content.xml"), aDocArgs,
sal_True);
RTL_LOGFILE_CONTEXT_TRACE( aLog, "content import end" );
@@ -610,14 +610,14 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
}
// Set Code Names
- uno::Any aAny = xInfoSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("ScriptConfiguration") ));
+ uno::Any aAny = xInfoSet->getPropertyValue(OUString("ScriptConfiguration"));
uno::Reference <container::XNameAccess> xCodeNameAccess;
if( aAny >>= xCodeNameAccess )
XMLCodeNameProvider::set( xCodeNameAccess, &rDoc );
// VBA compatibility
bool bVBACompat = false;
- if ( (xInfoSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("VBACompatibilityMode"))) >>= bVBACompat) && bVBACompat )
+ if ( (xInfoSet->getPropertyValue(OUString("VBACompatibilityMode")) >>= bVBACompat) && bVBACompat )
{
/* Set library container to VBA compatibility mode, this
forces loading the Basic project, which in turn creates the
@@ -625,7 +625,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
if ( xModelSet.is() ) try
{
uno::Reference< script::vba::XVBACompatibility > xVBACompat( xModelSet->getPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "BasicLibraries" ) ) ), uno::UNO_QUERY_THROW );
+ OUString( "BasicLibraries" ) ), uno::UNO_QUERY_THROW );
xVBACompat->setVBACompatibilityMode( sal_True );
}
catch( const uno::Exception& )
@@ -682,7 +682,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic
uno::Reference < beans::XPropertySet > xSet( xStream, uno::UNO_QUERY );
if (xSet.is())
{
- xSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny(sMediaType));
+ xSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(sMediaType));
OUString aUseCommonPassPropName( RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption") );
// advise storage impl to use common encryption
@@ -794,7 +794,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
SfxObjectShell* pObjSh = rDoc.GetDocumentShell();
uno::Sequence<beans::PropertyValue> aDescriptor(1);
beans::PropertyValue* pProps = aDescriptor.getArray();
- pProps[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ) );
+ pProps[0].Name = OUString( "FileName" );
pProps[0].Value <<= sFileName;
/** property map for export info set */
@@ -852,7 +852,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
if( !aName.isEmpty() )
{
- sPropName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath"));
+ sPropName = rtl::OUString("StreamRelPath");
xInfoSet->setPropertyValue( sPropName, uno::makeAny( aName ) );
}
}
@@ -873,7 +873,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
{
::rtl::OUString aVersion;
if (( xPropSet->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Version"))) >>= aVersion )
+ rtl::OUString("Version")) >>= aVersion )
&& !aVersion.equals(ODFVER_010_TEXT)
&& !aVersion.equals(ODFVER_011_TEXT) )
{
@@ -902,10 +902,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export start" );
bMetaRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor,
- rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("meta.xml")),
+ rtl::OUString("meta.xml"),
sTextMediaType,
- bOasis ? rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisMetaExporter"))
- : rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLMetaExporter")),
+ bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisMetaExporter")
+ : rtl::OUString("com.sun.star.comp.Calc.XMLMetaExporter"),
aMetaArgs, pSharedData);
RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export end" );
@@ -943,10 +943,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export start" );
bStylesRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor,
- rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("styles.xml")),
+ rtl::OUString("styles.xml"),
sTextMediaType,
- bOasis ? rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisStylesExporter"))
- : rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLStylesExporter")),
+ bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisStylesExporter")
+ : rtl::OUString("com.sun.star.comp.Calc.XMLStylesExporter"),
aStylesArgs, pSharedData);
RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export end" );
@@ -967,10 +967,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export start" );
bDocRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor,
- rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("content.xml")),
+ rtl::OUString("content.xml"),
sTextMediaType,
- bOasis ? rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisContentExporter"))
- : rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLContentExporter")),
+ bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisContentExporter")
+ : rtl::OUString("com.sun.star.comp.Calc.XMLContentExporter"),
aDocArgs, pSharedData);
RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export end" );
@@ -995,10 +995,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export start" );
bSettingsRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor,
- rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("settings.xml")),
+ rtl::OUString("settings.xml"),
sTextMediaType,
- bOasis ? rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisSettingsExporter"))
- : rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLSettingsExporter")),
+ bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisSettingsExporter")
+ : rtl::OUString("com.sun.star.comp.Calc.XMLSettingsExporter"),
aSettingsArgs, pSharedData);
RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export end" );
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 4dd5387721b6..eadf4b239b4a 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -268,7 +268,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL
::rtl::OUString SAL_CALL ScAccessibleCell::getImplementationName(void)
throw (uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleCell"));
+ return rtl::OUString("ScAccessibleCell");
}
uno::Sequence< ::rtl::OUString> SAL_CALL
@@ -280,7 +280,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL
aSequence.realloc(nOldSize + 1);
::rtl::OUString* pNames = aSequence.getArray();
- pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.AccessibleCell"));
+ pNames[nOldSize] = rtl::OUString("com.sun.star.sheet.AccessibleCell");
return aSequence;
}
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 0e7220ad3459..b9a0e082cd7d 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -290,7 +290,7 @@ uno::Any SAL_CALL
::rtl::OUString SAL_CALL ScAccessibleCellBase::getImplementationName(void)
throw (uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleCellBase"));
+ return rtl::OUString("ScAccessibleCellBase");
}
//===== XTypeProvider ===================================================
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index a6b6c9e6d790..f19eb7c4692a 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -467,7 +467,7 @@ void SAL_CALL ScAccessibleContextBase::notifyEvent(
ScAccessibleContextBase::getImplementationName(void)
throw (uno::RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleContextBase"));
+ return OUString("ScAccessibleContextBase");
}
sal_Bool SAL_CALL
@@ -494,8 +494,8 @@ uno::Sequence< ::rtl::OUString> SAL_CALL
OUString* pServiceNames = aServiceNames.getArray();
if (pServiceNames)
{
- pServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.accessibility.Accessible"));
- pServiceNames[1] = OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.accessibility.AccessibleContext"));
+ pServiceNames[0] = OUString("com.sun.star.accessibility.Accessible");
+ pServiceNames[1] = OUString("com.sun.star.accessibility.AccessibleContext");
}
return aServiceNames;
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index 035004ae60f4..0b3141f7f3a8 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
@@ -450,7 +450,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotControl::getAc
::rtl::OUString SAL_CALL ScAccessibleDataPilotControl::getImplementationName(void)
throw (uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleDataPilotControl"));
+ return rtl::OUString("ScAccessibleDataPilotControl");
}
///===== XTypeProvider ===================================================
@@ -661,7 +661,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotButton::getAcc
::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::getImplementationName(void)
throw (::com::sun::star::uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleDataPilotButton"));
+ return rtl::OUString("ScAccessibleDataPilotButton");
}
///===== XTypeProvider ===================================================
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index e0d17a63dfbc..76f84f0441ed 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1040,7 +1040,7 @@ void ScChildrenShapes::AddShape(const uno::Reference<drawing::XShape>& xShape, s
uno::Reference< beans::XPropertySet > xShapeProp(xShape, uno::UNO_QUERY);
if (xShapeProp.is())
{
- uno::Any aPropAny = xShapeProp->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LayerID" )));
+ uno::Any aPropAny = xShapeProp->getPropertyValue(rtl::OUString( "LayerID" ));
sal_Int16 nLayerID = 0;
if( aPropAny >>= nLayerID )
{
@@ -1787,7 +1787,7 @@ void SAL_CALL
ScAccessibleDocument::getImplementationName(void)
throw (uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleDocument"));
+ return ::rtl::OUString("ScAccessibleDocument");
}
uno::Sequence< ::rtl::OUString> SAL_CALL
@@ -1799,7 +1799,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL
aSequence.realloc(nOldSize + 1);
::rtl::OUString* pNames = aSequence.getArray();
- pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.AccessibleSpreadsheetDocumentView"));
+ pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheetDocumentView");
return aSequence;
}
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index be40bd82f2be..99927af07599 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -1594,7 +1594,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::ge
::rtl::OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName(void)
throw (uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessibleDocumentPagePreview"));
+ return ::rtl::OUString("ScAccessibleDocumentPagePreview");
}
uno::Sequence< ::rtl::OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames(void)
@@ -1605,7 +1605,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSup
aSequence.realloc(nOldSize + 1);
::rtl::OUString* pNames = aSequence.getArray();
- pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.AccessibleSpreadsheetPageView"));
+ pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheetPageView");
return aSequence;
}
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index 8a5ed0294479..8c8583ecf9cb 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -275,7 +275,7 @@ void SAL_CALL
::rtl::OUString SAL_CALL ScAccessibleEditObject::getImplementationName(void)
throw (uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleEditObject"));
+ return rtl::OUString("ScAccessibleEditObject");
}
//===== XTypeProvider =======================================================
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
index fbab89dfacc5..d2618789456a 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
@@ -160,7 +160,7 @@ Reference<XAccessibleStateSet> ScAccessibleFilterMenu::getAccessibleStateSet()
OUString ScAccessibleFilterMenu::getImplementationName()
throw (RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessibleFilterMenu"));
+ return OUString("ScAccessibleFilterMenu");
}
// XAccessibleEventBroadcaster
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
index feb88a715d27..dfaae342ba46 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
@@ -79,7 +79,7 @@ Reference<XAccessibleStateSet> ScAccessibleFilterMenuItem::getAccessibleStateSet
OUString ScAccessibleFilterMenuItem::getImplementationName()
throw (RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessibleFilterMenuItem"));
+ return OUString("ScAccessibleFilterMenuItem");
}
// XAccessibleAction
@@ -99,7 +99,7 @@ sal_Bool ScAccessibleFilterMenuItem::doAccessibleAction(sal_Int32 /*nIndex*/)
OUString ScAccessibleFilterMenuItem::getAccessibleActionDescription(sal_Int32 /*nIndex*/)
throw (IndexOutOfBoundsException, RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("click"));
+ return OUString("click");
}
Reference<XAccessibleKeyBinding> ScAccessibleFilterMenuItem::getAccessibleActionKeyBinding(
diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
index 58df96c3638a..c5511140c64b 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
@@ -84,7 +84,7 @@ Reference<XAccessible> ScAccessibleFilterTopWindow::getAccessibleChild(
OUString ScAccessibleFilterTopWindow::getImplementationName() throw (RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessibleFilterTopWindow"));
+ return OUString("ScAccessibleFilterTopWindow");
}
void ScAccessibleFilterTopWindow::setAccessibleChild(
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index 5af2ec182fbc..7291e3ffc7ef 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -318,7 +318,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePageHeader::getAccess
rtl::OUString SAL_CALL ScAccessiblePageHeader::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessiblePageHeader"));
+ return rtl::OUString("ScAccessiblePageHeader");
}
uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceNames()
@@ -329,7 +329,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServic
aSequence.realloc(nOldSize + 1);
::rtl::OUString* pNames = aSequence.getArray();
- pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.AccessibleHeaderFooterView"));
+ pNames[nOldSize] = rtl::OUString("com.sun.star.text.AccessibleHeaderFooterView");
return aSequence;
}
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 40bf5a636892..61efa0e810e1 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -185,7 +185,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
ScAccessiblePageHeaderArea::getImplementationName(void)
throw (uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessiblePageHeaderArea"));
+ return rtl::OUString("ScAccessiblePageHeaderArea");
}
uno::Sequence< ::rtl::OUString> SAL_CALL
@@ -197,7 +197,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL
aSequence.realloc(nOldSize + 1);
::rtl::OUString* pNames = aSequence.getArray();
- pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.AccessiblePageHeaderFooterAreasView"));
+ pNames[nOldSize] = rtl::OUString("com.sun.star.sheet.AccessiblePageHeaderFooterAreasView");
return aSequence;
}
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index f532a72492ff..ce6a79a52da1 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -182,7 +182,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewCell::getAccessi
rtl::OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessiblePreviewCell"));
+ return rtl::OUString("ScAccessiblePreviewCell");
}
uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNames()
@@ -193,7 +193,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServi
aSequence.realloc(nOldSize + 1);
::rtl::OUString* pNames = aSequence.getArray();
- pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.AccessibleCellView"));
+ pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleCellView");
return aSequence;
}
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index eb80f9d9f14e..3f747ee53947 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -268,7 +268,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewHeaderCell::getA
rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessiblePreviewHeaderCell"));
+ return rtl::OUString("ScAccessiblePreviewHeaderCell");
}
uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServiceNames()
@@ -279,7 +279,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupporte
aSequence.realloc(nOldSize + 1);
::rtl::OUString* pNames = aSequence.getArray();
- pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.AccessibleCellView"));
+ pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleCellView");
return aSequence;
}
@@ -376,7 +376,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() thr
{
//! name for corner cell?
-// sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Column/Row Header"));
+// sName = rtl::OUString("Column/Row Header");
}
else
{
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index d7833cd64674..557db8336f5f 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -568,7 +568,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePreviewTable::getAcce
rtl::OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessiblePreviewTable"));
+ return rtl::OUString("ScAccessiblePreviewTable");
}
uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNames()
@@ -579,7 +579,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServ
aSequence.realloc(nOldSize + 1);
::rtl::OUString* pNames = aSequence.getArray();
- pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.AccessibleTableView"));
+ pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleTableView");
return aSequence;
}
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index e4d00607fa6b..88037b59b4c5 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -798,7 +798,7 @@ void ScAccessibleSpreadsheet::AddMarkedRange(const ScRange& rRange)
::rtl::OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName(void)
throw (uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleSpreadsheet"));
+ return rtl::OUString("ScAccessibleSpreadsheet");
}
uno::Sequence< ::rtl::OUString> SAL_CALL
@@ -810,7 +810,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL
aSequence.realloc(nOldSize + 1);
::rtl::OUString* pNames = aSequence.getArray();
- pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.AccessibleSpreadsheet"));
+ pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheet");
return aSequence;
}
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index 3a950c49e3f6..b5de4ab84886 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -439,7 +439,7 @@ void SAL_CALL
::rtl::OUString SAL_CALL ScAccessibleTableBase::getImplementationName(void)
throw (uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleTableBase"));
+ return rtl::OUString("ScAccessibleTableBase");
}
//===== XTypeProvider ===================================================
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 75bb92b8ad8e..f34b346b2ff7 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2776,7 +2776,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode )
if (!aReplace.equalsAsciiL("'", 1))
aString = aString.replaceAll(
aReplace,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'")));
+ rtl::OUString("'"));
aReplace = rtl::OUString(pAuto->GetEndSingleQuote());
if (aReplace.isEmpty())
@@ -2784,7 +2784,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode )
if (!aReplace.equalsAsciiL("'", 1))
aString = aString.replaceAll(
aReplace,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'")));
+ rtl::OUString("'"));
}
}
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 6ada63d7fdff..27ff958d4176 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1088,7 +1088,7 @@ void ScInputBarGroup::TriggerToolboxLayout()
if ( xPropSet.is() )
{
- com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
+ com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" ));
aValue >>= xLayoutManager;
}
@@ -2096,7 +2096,7 @@ namespace {
rtl::OUString createLocalRangeName(const rtl::OUString& rName, const rtl::OUString& rTableName)
{
rtl::OUStringBuffer aString (rName);
- aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (")));
+ aString.append(rtl::OUString(" ("));
aString.append(rTableName);
aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
return aString.makeStringAndClear();
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 7b35091fd679..01602ecf8460 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -136,7 +136,7 @@ void ScDLL::Init()
ScModule* pMod = new ScModule( &ScDocShell::Factory() );
(*ppShlPtr) = pMod;
- ScDocShell::Factory().SetDocumentServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" )) );
+ ScDocShell::Factory().SetDocumentServiceName( rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ) );
ScGlobal::Init(); // erst wenn der ResManager initialisiert ist
// erst nach ScGlobal::Init duerfen die App-Optionen
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 29f9618107da..2951c569a161 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -550,7 +550,7 @@ void ScModule::Execute( SfxRequest& rReq )
{
try
{
- com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ui.XSLTFilterDialog"))), com::sun::star::uno::UNO_QUERY);
+ com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.ui.XSLTFilterDialog")), com::sun::star::uno::UNO_QUERY);
if( xDialog.is() )
{
xDialog->execute();
diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx
index 925ff9963cc8..910b6c50d9c4 100644
--- a/sc/source/ui/attrdlg/scabstdlg.cxx
+++ b/sc/source/ui/attrdlg/scabstdlg.cxx
@@ -49,7 +49,7 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create()
if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, aStrBuf.makeStringAndClear(),
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
fp = ( ScAbstractDialogFactory* (SAL_CALL*)() )
- aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) );
+ aDialogLibrary.getFunctionSymbol( ::rtl::OUString("CreateDialogFactory") );
if ( fp )
return fp();
return 0;
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 98f37d0a31f2..e13894aef1f1 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -93,7 +93,7 @@ ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sa
maLabelFont.SetHeight(nPopupFontHeight);
SetFont(maLabelFont);
- SetText( OUString(RTL_CONSTASCII_USTRINGPARAM("ScMenuFloatingWindow")) );
+ SetText( OUString("ScMenuFloatingWindow") );
}
ScMenuFloatingWindow::~ScMenuFloatingWindow()
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 9fcf586e362f..120a633b4812 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -311,7 +311,7 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt )
aZoomSliderItem.QueryValue( a );
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 );
- aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScalingFactor" ));
+ aArgs[0].Name = rtl::OUString( "ScalingFactor" );
aArgs[0].Value = a;
SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ScalingFactor"), aArgs );
@@ -351,7 +351,7 @@ void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt )
aZoomSliderItem.QueryValue( a );
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 );
- aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScalingFactor" ));
+ aArgs[0].Name = rtl::OUString( "ScalingFactor" );
aArgs[0].Value = a;
SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ScalingFactor"), aArgs );
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index f45c7f20e288..23fdc2329f0f 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -75,7 +75,7 @@ void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFram
uno::Reference<frame::XDispatchProvider> xDP(xFrame, uno::UNO_QUERY);
uno::Reference<frame::XFrame> xBeamerFrame = xFrame->findFrame(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_beamer")),
+ rtl::OUString("_beamer"),
frame::FrameSearchFlag::CHILDREN);
if (xBeamerFrame.is())
{
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 28c7af47d308..97cb21813ba3 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -2810,7 +2810,7 @@ uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, St
uno::Reference< uno::XInterface > xDocModuleApiObject;
if ( xSF.is() )
{
- xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY );
+ xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY );
xDocModuleApiObject.set( xVBACodeNamedObjectAccess->getByName( sCodeName ), uno::UNO_QUERY );
}
return xDocModuleApiObject;
@@ -2855,12 +2855,12 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const rtl::OUString& sModul
nNum = 1;
}
while( xLib->hasByName( genModuleName ) )
- genModuleName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Sheet")) + rtl::OUString::valueOf( ++nNum );
+ genModuleName = rtl::OUString( "Sheet") + rtl::OUString::valueOf( ++nNum );
uno::Any aSourceAny;
rtl::OUString sTmpSource = sSource;
if ( sTmpSource.isEmpty() )
- sTmpSource = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport 1\n" ));
+ sTmpSource = ::rtl::OUString( "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport 1\n" );
aSourceAny <<= sTmpSource;
uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY );
if ( xVBAModuleInfo.is() )
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 150c26993b5a..67ae652f7d49 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -685,7 +685,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
uno::UNO_QUERY_THROW );
uno::Reference< container::XContentEnumerationAccess > xEnumAccess( xServiceManager, uno::UNO_QUERY_THROW );
uno::Reference< container::XEnumeration> xEnum = xEnumAccess->createContentEnumeration(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocumentJob" ) ) );
+ ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocumentJob" ) );
if ( xEnum.is() )
{
while ( xEnum->hasMoreElements() )
@@ -703,7 +703,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
SfxFrame* pFrame = ( pViewFrame ? &pViewFrame->GetFrame() : NULL );
uno::Reference< frame::XController > xController = ( pFrame ? pFrame->GetController() : 0 );
uno::Reference< sheet::XSpreadsheetView > xSpreadsheetView( xController, uno::UNO_QUERY_THROW );
- aArgsForJob[0] = beans::NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SpreadsheetView" )),
+ aArgsForJob[0] = beans::NamedValue( ::rtl::OUString( "SpreadsheetView" ),
uno::makeAny( xSpreadsheetView ) );
xJob->execute( aArgsForJob );
}
@@ -831,7 +831,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
uno::Reference< frame::XStorable > xStor( GetModel(), uno::UNO_QUERY_THROW );
// TODO/LATER: More entries from the MediaDescriptor might be interesting for the merge
uno::Sequence< beans::PropertyValue > aValues(1);
- aValues[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName"));
+ aValues[0].Name = ::rtl::OUString( "FilterName");
aValues[0].Value <<= ::rtl::OUString( GetMedium()->GetFilter()->GetFilterName() );
SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false);
@@ -2921,7 +2921,7 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType )
// Grab the Calc configuration.
Reference<XUIConfigurationManager> xConfigMgr =
xModuleCfgSupplier->getUIConfigurationManager(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument")));
+ OUString("com.sun.star.sheet.SpreadsheetDocument"));
if (!xConfigMgr.is())
return;
@@ -2968,15 +2968,15 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType )
switch (eType)
{
case ScOptionsUtil::KEY_DEFAULT:
- xScAccel->setKeyEvent(aDelete, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:ClearContents")));
- xScAccel->setKeyEvent(aBackspace, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Delete")));
- xScAccel->setKeyEvent(aCtrlD, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FillDown")));
- xScAccel->setKeyEvent(aAltDown, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DataSelect")));
+ xScAccel->setKeyEvent(aDelete, OUString(".uno:ClearContents"));
+ xScAccel->setKeyEvent(aBackspace, OUString(".uno:Delete"));
+ xScAccel->setKeyEvent(aCtrlD, OUString(".uno:FillDown"));
+ xScAccel->setKeyEvent(aAltDown, OUString(".uno:DataSelect"));
break;
case ScOptionsUtil::KEY_OOO_LEGACY:
- xScAccel->setKeyEvent(aDelete, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Delete")));
- xScAccel->setKeyEvent(aBackspace, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:ClearContents")));
- xScAccel->setKeyEvent(aCtrlD, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DataSelect")));
+ xScAccel->setKeyEvent(aDelete, OUString(".uno:Delete"));
+ xScAccel->setKeyEvent(aBackspace, OUString(".uno:ClearContents"));
+ xScAccel->setKeyEvent(aCtrlD, OUString(".uno:DataSelect"));
break;
default:
;
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 5591d60b4cc8..93d1ca04f10e 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2339,7 +2339,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument()
SC_MOD()->SetInSharedDocLoading( true );
uno::Reference< frame::XDesktop2 > xLoader = frame::Desktop::create( ::comphelper::getProcessComponentContext() );
uno::Sequence < beans::PropertyValue > aArgs( 1 );
- aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Hidden" ));
+ aArgs[0].Name = ::rtl::OUString( "Hidden" );
aArgs[0].Value <<= sal_True;
if ( GetMedium() )
@@ -2354,7 +2354,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument()
}
xModel.set(
- xLoader->loadComponentFromURL( GetSharedFileURL(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_blank" ) ), 0, aArgs ),
+ xLoader->loadComponentFromURL( GetSharedFileURL(), ::rtl::OUString( "_blank" ), 0, aArgs ),
uno::UNO_QUERY_THROW );
SC_MOD()->SetInSharedDocLoading( false );
}
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 82687c8458c1..40c4a0fe5ca4 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -175,7 +175,7 @@ bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject&
uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
uno::Reference< ::com::sun::star::ucb::XCommandInfo > xInfo = aDestPath.getCommands();
- rtl::OUString aTransferName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "transfer" ));
+ rtl::OUString aTransferName = rtl::OUString( "transfer" );
if ( xInfo->hasCommandByName( aTransferName ) )
{
aDestPath.executeCommand( aTransferName, uno::makeAny(
@@ -208,7 +208,7 @@ bool ScDocShell::KillFile( const INetURLObject& rURL )
::ucbhelper::Content aCnt( rURL.GetMainURL(INetURLObject::NO_DECODE),
uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- aCnt.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "delete" )),
+ aCnt.executeCommand( rtl::OUString( "delete" ),
comphelper::makeBoolAny( sal_True ) );
}
catch( uno::Exception& )
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 83b8bff74a5f..0429fc820b60 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2155,7 +2155,7 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt
{
// Generate a relative file path.
INetURLObject aBaseURL(getOwnDocumentName());
- aBaseURL.insertName(OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml")));
+ aBaseURL.insertName(OUString("content.xml"));
OUString aStr = URIHelper::simpleNormalizedMakeRelative(
aBaseURL.GetMainURL(INetURLObject::NO_DECODE), aFile);
@@ -2279,7 +2279,7 @@ void ScExternalRefManager::SrcFileData::maybeCreateRealFileName(const String& rO
// Formulate the absolute file path from the relative path.
const OUString& rRelPath = maRelativeName;
INetURLObject aBaseURL(rOwnDocName);
- aBaseURL.insertName(OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml")));
+ aBaseURL.insertName(OUString("content.xml"));
bool bWasAbs = false;
maRealFileName = aBaseURL.smartRel2Abs(rRelPath, bWasAbs).GetMainURL(INetURLObject::NO_DECODE);
}
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 36d7d79086cc..4dca12ab764e 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -2262,7 +2262,7 @@ ScFormatFilterPlugin &ScFormatFilter::Get()
bLoaded = aModule.load(sFilterLib);
if (bLoaded)
{
- oslGenericFunction fn = aModule.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScFilterCreate" )) );
+ oslGenericFunction fn = aModule.getFunctionSymbol( ::rtl::OUString( "ScFilterCreate" ) );
if (fn != NULL)
plugin = reinterpret_cast<FilterFn>(fn)();
}
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 95e589db63c9..c9cd38ea34b0 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -176,16 +176,16 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie
uno::Sequence< beans::PropertyValue > aArgs( 4 );
aArgs[0] = beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1,
+ ::rtl::OUString("CellRangeRepresentation"), -1,
uno::makeAny( aRangeString ), beans::PropertyState_DIRECT_VALUE );
aArgs[1] = beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1,
+ ::rtl::OUString("HasCategories"), -1,
uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE );
aArgs[2] = beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1,
+ ::rtl::OUString("FirstCellAsLabel"), -1,
uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE );
aArgs[3] = beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1,
+ ::rtl::OUString("DataRowSource"), -1,
uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE );
xReceiver->setArguments( aArgs );
@@ -290,7 +290,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY );
if ( xSet.is() )
{
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")),
+ xSet->setPropertyValue( ::rtl::OUString("PluginURL"),
uno::makeAny( ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) );
}
}
@@ -667,7 +667,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
{
uno::Reference< ui::dialogs::XExecutableDialog > xDialog(
xMCF->createInstanceWithContext(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.WizardDialog"))
+ rtl::OUString("com.sun.star.comp.chart2.WizardDialog")
, xContext), uno::UNO_QUERY);
uno::Reference< lang::XInitialization > xInit( xDialog, uno::UNO_QUERY );
if( xChartModel.is() && xInit.is() )
@@ -677,10 +677,10 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
uno::Sequence<uno::Any> aSeq(2);
uno::Any* pArray = aSeq.getArray();
beans::PropertyValue aParam1;
- aParam1.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow"));
+ aParam1.Name = rtl::OUString("ParentWindow");
aParam1.Value <<= uno::makeAny(xDialogParentWindow);
beans::PropertyValue aParam2;
- aParam2.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ChartModel"));
+ aParam2.Name = rtl::OUString("ChartModel");
aParam2.Value <<= uno::makeAny(xChartModel);
pArray[0] <<= uno::makeAny(aParam1);
pArray[1] <<= uno::makeAny(aParam2);
@@ -694,7 +694,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
{
//get dialog size:
awt::Size aDialogAWTSize;
- if( xDialogProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) )
+ if( xDialogProps->getPropertyValue( ::rtl::OUString("Size") )
>>= aDialogAWTSize )
{
Size aDialogSize( aDialogAWTSize.Width, aDialogAWTSize.Height );
@@ -702,12 +702,12 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
{
//calculate and set new position
Point aDialogPos = pViewShell->GetChartDialogPos( aDialogSize, aRect );
- xDialogProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Position")),
+ xDialogProps->setPropertyValue( ::rtl::OUString("Position"),
uno::makeAny( awt::Point(aDialogPos.getX(),aDialogPos.getY()) ) );
}
}
//tell the dialog to unlock controller
- xDialogProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UnlockControllersOnExecute")),
+ xDialogProps->setPropertyValue( ::rtl::OUString("UnlockControllersOnExecute"),
uno::makeAny( sal_True ) );
}
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index a3568b0992fb..d07cefa60b47 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -211,7 +211,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
{
try
{
- aCaller = xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) );
+ aCaller = xProps->getPropertyValue( rtl::OUString("Name") );
}
catch( uno::Exception& ) {}
}
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index d74d32decda1..9799b70d55c6 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -643,7 +643,7 @@ namespace {
rtl::OUString createLocalRangeName(const rtl::OUString& rName, const rtl::OUString& rTableName)
{
rtl::OUStringBuffer aString (rName);
- aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (")));
+ aString.append(rtl::OUString(" ("));
aString.append(rTableName);
aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
return aString.makeStringAndClear();
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index fd8c3e0102d1..e3b3c6498a8b 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -186,7 +186,7 @@ void ScUndoDeleteContents::Undo()
{
ScRangeList aChangeRanges;
aChangeRanges.Append( aRange );
- pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges );
+ pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges );
}
}
@@ -202,7 +202,7 @@ void ScUndoDeleteContents::Redo()
{
ScRangeList aChangeRanges;
aChangeRanges.Append( aRange );
- pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges );
+ pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges );
}
}
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 3b935e7f521a..fd09d198dcc0 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -284,7 +284,7 @@ void ScUndoEnterData::Undo()
{
aChangeRanges.Append( ScRange( nCol, nRow, pTabs[i] ) );
}
- pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges );
+ pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges );
}
}
@@ -318,7 +318,7 @@ void ScUndoEnterData::Redo()
{
aChangeRanges.Append( ScRange( nCol, nRow, pTabs[i] ) );
}
- pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges );
+ pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges );
}
}
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index b2137e8e7c3f..33a788dfcbb2 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -195,7 +195,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScAutoFormatsObj_CreateInstance(
rtl::OUString ScAutoFormatsObj::getImplementationName_Static()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScAutoFormatsObj" ));
+ return rtl::OUString( "stardiv.StarCalc.ScAutoFormatsObj" );
}
uno::Sequence<rtl::OUString> ScAutoFormatsObj::getSupportedServiceNames_Static()
@@ -319,7 +319,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatsObj::createEnumera
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.TableAutoFormatEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableAutoFormatEnumeration"));
}
// container::XIndexAccess
@@ -477,7 +477,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatObj::createEnumerat
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.TableAutoFormatEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableAutoFormatEnumeration"));
}
// container::XIndexAccess
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 95a4c356a149..906a227a548d 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -367,7 +367,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance(
rtl::OUString ScSpreadsheetSettings::getImplementationName_Static()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScSpreadsheetSettings" ));
+ return rtl::OUString( "stardiv.StarCalc.ScSpreadsheetSettings" );
}
uno::Sequence<rtl::OUString> ScSpreadsheetSettings::getSupportedServiceNames_Static()
@@ -629,7 +629,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScRecentFunctionsObj_CreateInstance(
rtl::OUString ScRecentFunctionsObj::getImplementationName_Static()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScRecentFunctionsObj" ));
+ return rtl::OUString( "stardiv.StarCalc.ScRecentFunctionsObj" );
}
uno::Sequence<rtl::OUString> ScRecentFunctionsObj::getSupportedServiceNames_Static()
@@ -710,7 +710,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionListObj_CreateInstance(
rtl::OUString ScFunctionListObj::getImplementationName_Static()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScFunctionListObj" ));
+ return rtl::OUString( "stardiv.StarCalc.ScFunctionListObj" );
}
uno::Sequence<rtl::OUString> ScFunctionListObj::getSupportedServiceNames_Static()
@@ -882,7 +882,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScFunctionListObj::createEnumer
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.FunctionDescriptionEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.FunctionDescriptionEnumeration"));
}
// XElementAccess
diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx
index b2454d3639c9..0109379986c8 100644
--- a/sc/source/ui/unoobj/celllistsource.cxx
+++ b/sc/source/ui/unoobj/celllistsource.cxx
@@ -79,7 +79,7 @@ namespace calc
// register our property at the base class
CellRangeAddress aInitialPropValue;
registerPropertyNoMember(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CellRange" )),
+ ::rtl::OUString( "CellRange" ),
PROP_HANDLE_RANGE_ADDRESS,
PropertyAttribute::BOUND | PropertyAttribute::READONLY,
::getCppuType( &aInitialPropValue ),
@@ -176,7 +176,7 @@ namespace calc
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL OCellListSource::getImplementationName( ) throw (RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sheet.OCellListSource" ) );
+ return ::rtl::OUString( "com.sun.star.comp.sheet.OCellListSource" );
}
//--------------------------------------------------------------------
@@ -196,8 +196,8 @@ namespace calc
Sequence< ::rtl::OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) throw (RuntimeException)
{
Sequence< ::rtl::OUString > aServices( 2 );
- aServices[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellRangeListSource" ) );
- aServices[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.binding.ListEntrySource" ) );
+ aServices[ 0 ] = ::rtl::OUString( "com.sun.star.table.CellRangeListSource" );
+ aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.binding.ListEntrySource" );
return aServices;
}
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index bcab454b54ca..90511ae45d18 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3374,7 +3374,7 @@ void SAL_CALL ScCellRangesBase::addChartDataChangeEventListener( const uno::Refe
ScDocument* pDoc = pDocShell->GetDocument();
ScRangeListRef aRangesRef( new ScRangeList(aRanges) );
ScChartListenerCollection* pColl = pDoc->GetChartListenerCollection();
- rtl::OUString aName = pColl->getUniqueName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("__Uno")));
+ rtl::OUString aName = pColl->getUniqueName(rtl::OUString("__Uno"));
if (aName.isEmpty())
// failed to create unique name.
return;
@@ -4762,7 +4762,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellRangesObj::createEnumerat
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRangesEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SheetCellRangesEnumeration"));
}
// XIndexAccess
@@ -4803,7 +4803,7 @@ sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException)
rtl::OUString SAL_CALL ScCellRangesObj::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellRangesObj" ));
+ return rtl::OUString( "ScCellRangesObj" );
}
sal_Bool SAL_CALL ScCellRangesObj::supportsService( const rtl::OUString& rServiceName )
@@ -6090,7 +6090,7 @@ const SfxItemPropertyMap& ScCellRangeObj::GetItemPropertyMap()
rtl::OUString SAL_CALL ScCellRangeObj::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellRangeObj" ));
+ return rtl::OUString( "ScCellRangeObj" );
}
sal_Bool SAL_CALL ScCellRangeObj::supportsService( const rtl::OUString& rServiceName )
@@ -6807,7 +6807,7 @@ const SfxItemPropertyMap& ScCellObj::GetItemPropertyMap()
rtl::OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellObj" ));
+ return rtl::OUString( "ScCellObj" );
}
sal_Bool SAL_CALL ScCellObj::supportsService( const rtl::OUString& rServiceName )
@@ -8706,7 +8706,7 @@ const SfxItemPropertyMap& ScTableSheetObj::GetItemPropertyMap()
rtl::OUString SAL_CALL ScTableSheetObj::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScTableSheetObj" ));
+ return rtl::OUString( "ScTableSheetObj" );
}
sal_Bool SAL_CALL ScTableSheetObj::supportsService( const rtl::OUString& rServiceName )
diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx
index 7356423f2980..b438d3b23973 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.cxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.cxx
@@ -85,7 +85,7 @@ namespace calc
// register our property at the base class
CellAddress aInitialPropValue;
registerPropertyNoMember(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "BoundCell" )),
+ ::rtl::OUString( "BoundCell" ),
PROP_HANDLE_BOUND_CELL,
PropertyAttribute::BOUND | PropertyAttribute::READONLY,
::getCppuType( &aInitialPropValue ),
@@ -254,7 +254,7 @@ namespace calc
if ( xProp.is() )
{
CellContentType eResultType;
- if ( (xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FormulaResultType" )) ) >>= eResultType) && eResultType == CellContentType_VALUE )
+ if ( (xProp->getPropertyValue(::rtl::OUString( "FormulaResultType" ) ) >>= eResultType) && eResultType == CellContentType_VALUE )
bHasValue = sal_True;
}
}
@@ -417,10 +417,10 @@ namespace calc
if ( xOldFormat.is() )
{
// use the locale of the existing format
- xOldFormat->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Locale" )) ) >>= aLocale;
+ xOldFormat->getPropertyValue( ::rtl::OUString( "Locale" ) ) >>= aLocale;
sal_Int16 nOldType = ::comphelper::getINT16(
- xOldFormat->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Type" )) ) );
+ xOldFormat->getPropertyValue( ::rtl::OUString( "Type" ) ) );
if ( nOldType & NumberFormat::LOGICAL )
bWasBoolean = sal_True;
}
@@ -471,7 +471,7 @@ namespace calc
{
DBG_CHKTHIS( OCellValueBinding, checkConsistency_static );
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sheet.OCellValueBinding" ) );
+ return ::rtl::OUString( "com.sun.star.comp.sheet.OCellValueBinding" );
}
//--------------------------------------------------------------------
@@ -495,10 +495,10 @@ namespace calc
DBG_CHKTHIS( OCellValueBinding, checkConsistency_static );
Sequence< ::rtl::OUString > aServices( m_bListPos ? 3 : 2 );
- aServices[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellValueBinding" ) );
- aServices[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.binding.ValueBinding" ) );
+ aServices[ 0 ] = ::rtl::OUString( "com.sun.star.table.CellValueBinding" );
+ aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.binding.ValueBinding" );
if ( m_bListPos )
- aServices[ 2 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.ListPositionCellBinding" ) );
+ aServices[ 2 ] = ::rtl::OUString( "com.sun.star.table.ListPositionCellBinding" );
return aServices;
}
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index ccb152484ff5..9282a2737371 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1802,7 +1802,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
{
Reference< beans::XPropertySet > xSeqProp( xLS->getValues(), uno::UNO_QUERY );
::rtl::OUString aRole;
- if( xSeqProp.is() && (xSeqProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Role"))) >>= aRole) &&
+ if( xSeqProp.is() && (xSeqProp->getPropertyValue(::rtl::OUString("Role")) >>= aRole) &&
aRole.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("categories")) )
bThisIsCategories = bHasCategories = true;
}
@@ -1904,7 +1904,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
func = ::std::for_each(aAllTokens.begin(), aAllTokens.end(), func);
func.getList(aTableNumList);
aResult.push_back(
- beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableNumberList")), -1,
+ beans::PropertyValue( ::rtl::OUString("TableNumberList"), -1,
uno::makeAny( lcl_createTableNumberList( aTableNumList ) ),
beans::PropertyState_DIRECT_VALUE ));
}
@@ -1913,7 +1913,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
if( bRowSourceDetected )
{
aResult.push_back(
- beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1,
+ beans::PropertyValue( ::rtl::OUString("DataRowSource"), -1,
uno::makeAny( eRowSource ), beans::PropertyState_DIRECT_VALUE ));
}
@@ -1921,7 +1921,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
if( bRowSourceDetected )
{
aResult.push_back(
- beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1,
+ beans::PropertyValue( ::rtl::OUString("HasCategories"), -1,
uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE ));
}
@@ -1929,7 +1929,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
if( bRowSourceDetected )
{
aResult.push_back(
- beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1,
+ beans::PropertyValue( ::rtl::OUString("FirstCellAsLabel"), -1,
uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ));
}
@@ -1955,7 +1955,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
// add cell range property
aResult.push_back(
- beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1,
+ beans::PropertyValue( ::rtl::OUString("CellRangeRepresentation"), -1,
uno::makeAny( sRangeRep ), beans::PropertyState_DIRECT_VALUE ));
//Sequence Mapping
@@ -2025,7 +2025,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
if( bDifferentIndexes && !aSequenceMappingVector.empty() )
{
aResult.push_back(
- beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SequenceMapping")), -1,
+ beans::PropertyValue( ::rtl::OUString("SequenceMapping"), -1,
uno::makeAny( lcl_VectorToSequence(aSequenceMappingVector) )
, beans::PropertyState_DIRECT_VALUE ));
}
@@ -2486,7 +2486,7 @@ ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc,
// rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument );
// m_aIdentifier = ::rtl::OUString( aStr );
-// m_aIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ID_"));
+// m_aIdentifier = ::rtl::OUString( "ID_");
// static sal_Int32 nID = 0;
// m_aIdentifier += ::rtl::OUString::valueOf( ++nID);
}
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 8072f3b0d728..d0f688f424c7 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -259,16 +259,16 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName,
// set arguments
uno::Sequence< beans::PropertyValue > aArgs( 4 );
aArgs[0] = beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1,
+ ::rtl::OUString("CellRangeRepresentation"), -1,
uno::makeAny( ::rtl::OUString( sRangeStr )), beans::PropertyState_DIRECT_VALUE );
aArgs[1] = beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1,
+ ::rtl::OUString("HasCategories"), -1,
uno::makeAny( bRowHeaders ), beans::PropertyState_DIRECT_VALUE );
aArgs[2] = beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1,
+ ::rtl::OUString("FirstCellAsLabel"), -1,
uno::makeAny( bColumnHeaders ), beans::PropertyState_DIRECT_VALUE );
aArgs[3] = beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1,
+ ::rtl::OUString("DataRowSource"), -1,
uno::makeAny( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE );
xReceiver->setArguments( aArgs );
}
@@ -314,7 +314,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration(
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.TableChartsEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableChartsEnumeration"));
}
// XIndexAccess
@@ -447,7 +447,7 @@ ScChartObj::ScChartObj(ScDocShell* pDocSh, SCTAB nT, const String& rN)
pDocShell->GetDocument()->AddUnoObject(*this);
uno::Sequence< table::CellRangeAddress > aInitialPropValue;
- registerPropertyNoMember( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RelatedCellRanges" )),
+ registerPropertyNoMember( ::rtl::OUString( "RelatedCellRanges" ),
PROP_HANDLE_RELATED_CELLRANGES, beans::PropertyAttribute::MAYBEVOID,
::getCppuType( &aInitialPropValue ), &aInitialPropValue );
}
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 8ac0dfbf9d75..f26007d854f1 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -268,13 +268,13 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
uno::Sequence< beans::PropertyValue > aInfo;
if ( !( aValue >>= aInfo ) )
throw lang::IllegalArgumentException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value of type Sequence<PropertyValue> expected!" ) ),
+ ::rtl::OUString( "Value of type Sequence<PropertyValue> expected!" ),
uno::Reference< uno::XInterface >(),
2 );
if ( !pDocShell->SetModifyPasswordInfo( aInfo ) )
throw beans::PropertyVetoException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The hash is not allowed to be changed now!" ) ),
+ ::rtl::OUString( "The hash is not allowed to be changed now!" ),
uno::Reference< uno::XInterface >() );
}
else if ( aPropertyName.compareToAscii( SC_UNO_EMBED_FONTS ) == 0 )
@@ -461,7 +461,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocumentConfiguration )
rtl::OUString SAL_CALL ScDocumentConfiguration::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScDocumentConfiguration" ));
+ return rtl::OUString( "ScDocumentConfiguration" );
}
sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const rtl::OUString& rServiceName )
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index ec6047707ff5..a71a324bf5c8 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -458,7 +458,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName(
rtl::OUString SAL_CALL ScCellCursorObj::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellCursorObj" ));
+ return rtl::OUString( "ScCellCursorObj" );
}
sal_Bool SAL_CALL ScCellCursorObj::supportsService( const rtl::OUString& rServiceName )
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index ac9293f5f63f..bb7830dbd726 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -468,7 +468,7 @@ void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName )
Reference< XEnumeration > SAL_CALL ScDataPilotTablesObj::createEnumeration() throw(RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DataPilotTablesEnumeration")));
+ return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotTablesEnumeration"));
}
// XIndexAccess
@@ -1746,7 +1746,7 @@ Reference<XEnumeration> SAL_CALL ScDataPilotFieldsObj::createEnumeration()
throw(RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DataPilotFieldsEnumeration")));
+ return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotFieldsEnumeration"));
}
// XIndexAccess
@@ -2995,7 +2995,7 @@ Any SAL_CALL ScDataPilotFieldGroupsObj::getByIndex( sal_Int32 nIndex )
Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration() throw(RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration( this, OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.DataPilotFieldGroupsEnumeration" ) ) );
+ return new ScIndexEnumeration( this, OUString( "com.sun.star.sheet.DataPilotFieldGroupsEnumeration" ) );
}
// XElementAccess
@@ -3183,7 +3183,7 @@ Any SAL_CALL ScDataPilotFieldGroupObj::getByIndex( sal_Int32 nIndex )
Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration() throw(RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration( this, OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.DataPilotFieldGroupEnumeration" ) ) );
+ return new ScIndexEnumeration( this, OUString( "com.sun.star.sheet.DataPilotFieldGroupEnumeration" ) );
}
// XElementAccess
@@ -3330,7 +3330,7 @@ Reference<XEnumeration> SAL_CALL ScDataPilotItemsObj::createEnumeration()
throw(RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DataPilotItemsEnumeration")));
+ return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotItemsEnumeration"));
}
// XIndexAccess
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index c2b441dc3470..b45539503323 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -675,7 +675,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSubTotalDescriptorBase::creat
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SubTotalFieldsEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SubTotalFieldsEnumeration"));
}
// XIndexAccess
@@ -2218,7 +2218,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDatabaseRangeObj )
rtl::OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScDatabaseRangeObj" ));
+ return rtl::OUString( "ScDatabaseRangeObj" );
}
sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const rtl::OUString& rServiceName )
@@ -2335,7 +2335,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDatabaseRangesObj::createEnum
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DatabaseRangesEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.DatabaseRangesEnumeration"));
}
// XIndexAccess
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 18b9e5b6b7af..6fa397e52f8c 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -250,7 +250,7 @@ ScPrintUIOptions::ScPrintUIOptions()
! bSuppress);
// show Subgroup for print content
vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt;
- aPrintRangeOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) );
+ aPrintRangeOpt.maGroupHint = rtl::OUString( "PrintRange" );
m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", rtl::OUString(aStrings.GetString(2)),
rtl::OUString(),
aPrintRangeOpt);
@@ -258,13 +258,13 @@ ScPrintUIOptions::ScPrintUIOptions()
// create a choice for the content to create
uno::Sequence< rtl::OUString > aChoices( 3 ), aHelpIds( 3 ), aWidgetIds( 3 );
aChoices[0] = aStrings.GetString( 3 );
- aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ) );
+ aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" );
aWidgetIds[0] = "printallsheets";
aChoices[1] = aStrings.GetString( 4 );
- aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ) );
+ aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" );
aWidgetIds[1] = "printselectedsheets";
aChoices[2] = aStrings.GetString( 5 );
- aHelpIds[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ) );
+ aHelpIds[2] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" );
aWidgetIds[2] = "printselectedcells";
m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(),
aHelpIds, "PrintContent",
@@ -282,10 +282,10 @@ ScPrintUIOptions::ScPrintUIOptions()
aHelpIds.realloc( 2 );
aWidgetIds.realloc( 2 );
aChoices[0] = aStrings.GetString( 7 );
- aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0" ) );
+ aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0" );
aWidgetIds[0] = "printallpages";
aChoices[1] = aStrings.GetString( 8 );
- aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1" ) );
+ aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1" );
aWidgetIds[1] = "printpages";
m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(),
aHelpIds,
@@ -1840,7 +1840,7 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa
That constant will be equivelant to 'ThisComponent' but for
each application, so e.g. a 'ThisExcelDoc' and a 'ThisWordDoc'
constant can co-exist, as required by VBA. */
- aRet <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ThisExcelDoc" ) );
+ aRet <<= rtl::OUString( "ThisExcelDoc" );
}
else if ( aString.EqualsAscii( SC_UNO_RUNTIMEUID ) )
{
@@ -2013,7 +2013,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getAvailableServiceNames()
rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScModelObj" ));
+ return rtl::OUString( "ScModelObj" );
}
sal_Bool SAL_CALL ScModelObj::supportsService( const rtl::OUString& rServiceName )
@@ -2696,7 +2696,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableSheetsObj::createEnumera
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetsEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SpreadsheetsEnumeration"));
}
// XIndexAccess
@@ -2872,7 +2872,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableColumnsObj::createEnumer
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.TableColumnsEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableColumnsEnumeration"));
}
// XIndexAccess
@@ -3131,7 +3131,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableRowsObj::createEnumerati
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.TableRowsEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableRowsEnumeration"));
}
// XIndexAccess
@@ -3484,7 +3484,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumera
//! iterate directly (more efficiently)?
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.CellAnnotationsEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.CellAnnotationsEnumeration"));
}
// XIndexAccess
@@ -3644,7 +3644,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScScenariosObj::createEnumerati
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.ScenariosEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.ScenariosEnumeration"));
}
// XIndexAccess
diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx
index e515c223f7f0..8c2822ea6f77 100644
--- a/sc/source/ui/unoobj/eventuno.cxx
+++ b/sc/source/ui/unoobj/eventuno.cxx
@@ -141,10 +141,10 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName )
{
uno::Sequence<beans::PropertyValue> aPropSeq( 2 );
aPropSeq[0] = beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EventType")), -1,
- uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script")) ), beans::PropertyState_DIRECT_VALUE );
+ rtl::OUString("EventType"), -1,
+ uno::makeAny( rtl::OUString("Script") ), beans::PropertyState_DIRECT_VALUE );
aPropSeq[1] = beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script")), -1,
+ rtl::OUString("Script"), -1,
uno::makeAny( *pScript ), beans::PropertyState_DIRECT_VALUE );
aRet <<= aPropSeq;
}
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index dd97c91e62fb..b478f1bd146c 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -392,7 +392,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellFieldsObj::createEnumerat
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFieldEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.text.TextFieldEnumeration"));
}
void SAL_CALL ScCellFieldsObj::addContainerListener(
@@ -572,7 +572,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFieldsObj::createEnumer
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFieldEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.text.TextFieldEnumeration"));
}
void SAL_CALL ScHeaderFieldsObj::addContainerListener(
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index c51f53192f14..a0c9abf624ed 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -383,7 +383,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableConditionalFormat::creat
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.TableConditionalEntryEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableConditionalEntryEnumeration"));
}
// XIndexAccess
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index cd72688964b9..90d3b01dbdc1 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -246,7 +246,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionAccess_CreateInstance(
rtl::OUString ScFunctionAccess::getImplementationName_Static()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScFunctionAccess" ));
+ return rtl::OUString( "stardiv.StarCalc.ScFunctionAccess" );
}
uno::Sequence<rtl::OUString> ScFunctionAccess::getSupportedServiceNames_Static()
@@ -261,7 +261,7 @@ uno::Sequence<rtl::OUString> ScFunctionAccess::getSupportedServiceNames_Static()
rtl::OUString SAL_CALL ScFunctionAccess::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScFunctionAccess") );
+ return rtl::OUString( "ScFunctionAccess");
}
sal_Bool SAL_CALL ScFunctionAccess::supportsService( const rtl::OUString& rServiceName )
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index e7a023bb239d..38f1ce4bd610 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -458,7 +458,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumerat
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetLinksEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SheetLinksEnumeration"));
}
// XIndexAccess
@@ -993,7 +993,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumerati
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.CellAreaLinksEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.CellAreaLinksEnumeration"));
}
// XIndexAccess
@@ -1209,8 +1209,8 @@ uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults( )
if ( !bSuccess )
{
- throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "ScDDELinkObj::getResults: failed to get results!" ) ),
+ throw uno::RuntimeException( ::rtl::OUString(
+ "ScDDELinkObj::getResults: failed to get results!" ),
uno::Reference< uno::XInterface >() );
}
@@ -1241,8 +1241,8 @@ void ScDDELinkObj::setResults( const uno::Sequence< uno::Sequence< uno::Any > >&
if ( !bSuccess )
{
- throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "ScDDELinkObj::setResults: failed to set results!" ) ),
+ throw uno::RuntimeException( ::rtl::OUString(
+ "ScDDELinkObj::setResults: failed to set results!" ),
uno::Reference< uno::XInterface >() );
}
}
@@ -1319,7 +1319,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeratio
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DDELinksEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.DDELinksEnumeration"));
}
// XIndexAccess
@@ -1461,8 +1461,8 @@ uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink(
if ( !xLink.is() )
{
- throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "ScDDELinksObj::addDDELink: cannot add DDE link!" ) ),
+ throw uno::RuntimeException( ::rtl::OUString(
+ "ScDDELinksObj::addDDELink: cannot add DDE link!" ),
uno::Reference< uno::XInterface >() );
}
@@ -1680,8 +1680,8 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumer
{
SolarMutexGuard aGuard;
Reference< container::XEnumeration > aRef(
- new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.sheet.ExternalDocLink"))));
+ new ScIndexEnumeration(this, OUString(
+ "com.sun.star.sheet.ExternalDocLink")));
return aRef;
}
@@ -1796,8 +1796,8 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnume
{
SolarMutexGuard aGuard;
Reference< container::XEnumeration > aRef(
- new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.sheet.ExternalDocLinks"))));
+ new ScIndexEnumeration(this, OUString(
+ "com.sun.star.sheet.ExternalDocLinks")));
return aRef;
}
diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx
index f69429b4940b..f7b05a8f4bf0 100644
--- a/sc/source/ui/unoobj/miscuno.cxx
+++ b/sc/source/ui/unoobj/miscuno.cxx
@@ -225,7 +225,7 @@ uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchEleme
::rtl::OUString SAL_CALL ScIndexEnumeration::getImplementationName()
throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScIndexEnumeration"));
+ return ::rtl::OUString("ScIndexEnumeration");
}
sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const ::rtl::OUString& ServiceName )
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 7cc199c118a1..3539c7e30314 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -429,7 +429,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangeObj )
rtl::OUString SAL_CALL ScNamedRangeObj::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScNamedRangeObj" ) );
+ return rtl::OUString( "ScNamedRangeObj" );
}
sal_Bool SAL_CALL ScNamedRangeObj::supportsService( const rtl::OUString& rServiceName )
@@ -611,7 +611,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScNamedRangesObj::createEnumera
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.NamedRangesEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.NamedRangesEnumeration"));
}
// container::XIndexAccess
@@ -1186,7 +1186,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScLabelRangesObj::createEnumera
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.LabelRangesEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.LabelRangesEnumeration"));
}
// container::XIndexAccess
diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx
index 0e9ffbb131d4..dc4364a08bc2 100644
--- a/sc/source/ui/unoobj/pageuno.cxx
+++ b/sc/source/ui/unoobj/pageuno.cxx
@@ -45,7 +45,7 @@ uno::Reference<drawing::XShape > ScPageObj::_CreateShape( SdrObject *pObj ) cons
::rtl::OUString SAL_CALL ScPageObj::getImplementationName()
throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScPageObj"));
+ return rtl::OUString("ScPageObj");
}
sal_Bool SAL_CALL ScPageObj::supportsService( const rtl::OUString& rServiceName )
@@ -60,7 +60,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScPageObj::getSupportedServiceNames()
{
uno::Sequence<rtl::OUString> aRet(1);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDrawPage"));
+ pArray[0] = rtl::OUString("com.sun.star.sheet.SpreadsheetDrawPage");
return aRet;
}
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 52f4841e5214..a6662f8bac22 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -86,7 +86,7 @@ public:
{
ScDocument* pDoc = mpDocShell->GetDocument();
if ( !pDoc )
- throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString(""), uno::Reference< uno::XInterface >() );
uno::Sequence< uno::Any > aArgs(2);
// access the application object ( parent for workbook )
@@ -632,7 +632,7 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
{
uno::Sequence< uno::Any > aArgs(1);
aArgs[ 0 ] <<= pDocShell->GetModel();
- xRet = ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Globals" ) ), aArgs );
+ xRet = ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( "ooo.vba.excel.Globals" ), aArgs );
pDocShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", uno::Any( xRet ) );
BasicManager* pAppMgr = SFX_APP()->GetBasicManager();
if ( pAppMgr )
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 21aced61bcf4..55fcc99bdb8e 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -278,7 +278,7 @@ static sal_Bool lcl_GetCaptionPoint( uno::Reference< drawing::XShape >& xShape,
uno::Reference < beans::XPropertySet > xShapeProp (xShape, uno::UNO_QUERY);
if (xShapeProp.is())
{
- xShapeProp->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CaptionPoint" )) ) >>= rCaptionPoint;
+ xShapeProp->getPropertyValue( rtl::OUString( "CaptionPoint" ) ) >>= rCaptionPoint;
bReturn = sal_True;
}
}
@@ -446,7 +446,7 @@ void SAL_CALL ScShapeObj::setPropertyValue(
}
}
else
- throw lang::IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("only XCell or XSpreadsheet objects allowed")), static_cast<cppu::OWeakObject*>(this), 0);
+ throw lang::IllegalArgumentException(rtl::OUString("only XCell or XSpreadsheet objects allowed"), static_cast<cppu::OWeakObject*>(this), 0);
}
else if ( aNameString.EqualsAscii( SC_UNONAME_IMAGEMAP ) )
{
@@ -1403,9 +1403,9 @@ SdrObject* ScShapeObj::GetSdrObject() const throw()
return NULL;
}
-#define SC_EVENTACC_ONCLICK ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) )
-#define SC_EVENTACC_SCRIPT ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Script" ) )
-#define SC_EVENTACC_EVENTTYPE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EventType" ) )
+#define SC_EVENTACC_ONCLICK ::rtl::OUString( "OnClick" )
+#define SC_EVENTACC_SCRIPT ::rtl::OUString( "Script" )
+#define SC_EVENTACC_EVENTTYPE ::rtl::OUString( "EventType" )
typedef ::cppu::WeakImplHelper1< container::XNameReplace > ShapeUnoEventAcess_BASE;
class ShapeUnoEventAccessImpl : public ShapeUnoEventAcess_BASE
@@ -1517,7 +1517,7 @@ ScShapeObj::getEvents( ) throw(uno::RuntimeException)
::rtl::OUString SAL_CALL ScShapeObj::getImplementationName( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sc.ScShapeObj" ) );
+ return ::rtl::OUString( "com.sun.star.comp.sc.ScShapeObj" );
}
::sal_Bool SAL_CALL ScShapeObj::supportsService( const ::rtl::OUString& _ServiceName ) throw (uno::RuntimeException)
@@ -1543,12 +1543,12 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ScShapeObj::getSupportedServiceNames(
aSupported = xSI->getSupportedServiceNames();
aSupported.realloc( aSupported.getLength() + 1 );
- aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.Shape" ) );
+ aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( "com.sun.star.sheet.Shape" );
if( bIsNoteCaption )
{
aSupported.realloc( aSupported.getLength() + 1 );
- aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.CellAnnotationShape" ) );
+ aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( "com.sun.star.sheet.CellAnnotationShape" );
}
return aSupported;
diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx
index a0e24895120d..1ead24df1f09 100644
--- a/sc/source/ui/unoobj/srchuno.cxx
+++ b/sc/source/ui/unoobj/srchuno.cxx
@@ -193,7 +193,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScCellSearchObj )
rtl::OUString SAL_CALL ScCellSearchObj::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellSearchObj" ));
+ return rtl::OUString( "ScCellSearchObj" );
}
sal_Bool SAL_CALL ScCellSearchObj::supportsService( const rtl::OUString& rServiceName )
diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx
index 3eb94ed4c669..dacd7ec34313 100644
--- a/sc/source/ui/unoobj/unodoc.cxx
+++ b/sc/source/ui/unoobj/unodoc.cxx
@@ -32,13 +32,13 @@ using namespace ::com::sun::star;
::rtl::OUString SAL_CALL ScDocument_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.SpreadsheetDocument" ) );
+ return rtl::OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" );
}
uno::Sequence< rtl::OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw()
{
uno::Sequence< rtl::OUString > aSeq( 1 );
- aSeq[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ));
+ aSeq[0] = ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" );
return aSeq;
}
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 4c43504f0339..22c0d9d791a3 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -984,7 +984,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTabViewObj::createEnumeration
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetViewPanesEnumeration")));
+ return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SpreadsheetViewPanesEnumeration"));
}
// XIndexAccess
@@ -2149,7 +2149,7 @@ void ScTabViewObj::RangeSelChanged( const String& rText )
rtl::OUString SAL_CALL ScTabViewObj::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScTabViewObj" ));
+ return rtl::OUString( "ScTabViewObj" );
}
sal_Bool SAL_CALL ScTabViewObj::supportsService( const rtl::OUString& rServiceName )
diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx
index 676d05aadcee..b4bf3ff4670b 100644
--- a/sc/source/ui/vba/excelvbahelper.cxx
+++ b/sc/source/ui/vba/excelvbahelper.cxx
@@ -50,7 +50,7 @@ GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException )
if ( pShell )
xModel.set( pShell->GetModel(), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xModelProps( xModel, uno::UNO_QUERY_THROW );
- uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( xModelProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UnnamedDatabaseRanges") ) ), uno::UNO_QUERY_THROW );
+ uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( xModelProps->getPropertyValue( rtl::OUString("UnnamedDatabaseRanges") ), uno::UNO_QUERY_THROW );
return xUnnamedDBRanges;
}
@@ -66,7 +66,7 @@ GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( uno::RuntimeExc
uno::Reference< sheet::XDatabaseRange > xDBRange( xUnnamedDBRanges->getByTable( nSheet ) , uno::UNO_QUERY_THROW );
sal_Bool bHasAuto = false;
uno::Reference< beans::XPropertySet > xProps( xDBRange, uno::UNO_QUERY_THROW );
- xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoFilter") ) ) >>= bHasAuto;
+ xProps->getPropertyValue( rtl::OUString("AutoFilter") ) >>= bHasAuto;
if ( bHasAuto )
{
xDataBaseRange=xDBRange;
@@ -80,7 +80,7 @@ ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRang
ScCellRangesBase* pScCellRangesBase = ScCellRangesBase::getImplementation( xRange );
if ( !pScCellRangesBase )
{
- throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access underlying doc shell uno range object" ) ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( "Failed to access underlying doc shell uno range object" ), uno::Reference< uno::XInterface >() );
}
return pScCellRangesBase->GetDocShell();
}
@@ -113,7 +113,7 @@ private:
comphelper::getProcessComponentContext() );
static uno::Reference<lang::XMultiComponentFactory > xServiceManager(
xContext->getServiceManager() );
- static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" ) ) ,xContext ), uno::UNO_QUERY_THROW );
+ static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ,xContext ), uno::UNO_QUERY_THROW );
return xProps;
}
@@ -265,7 +265,7 @@ getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) thro
{
uno::Reference< beans::XPropertySet > xProps( xSheet, uno::UNO_QUERY_THROW );
rtl::OUString sCodeName;
- xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CodeName") ) ) >>= sCodeName;
+ xProps->getPropertyValue( rtl::OUString("CodeName") ) >>= sCodeName;
// #TODO #FIXME ideally we should 'throw' here if we don't get a valid parent, but... it is possible
// to create a module ( and use 'Option VBASupport 1' ) for a calc document, in this scenario there
// are *NO* special document module objects ( of course being able to switch between vba/non vba mode at
@@ -327,7 +327,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >&
{
uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW );
uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW);
- uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY_THROW );
+ uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW );
// set up the module info for the workbook and sheets in the nealy created
// spreadsheet
ScDocument* pDoc = pShell->GetDocument();
@@ -359,9 +359,9 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >&
sModuleInfo.ModuleType = script::ModuleType::DOCUMENT;
xVBAModuleInfo->insertModuleInfo( *it, sModuleInfo );
if( xLib->hasByName( *it ) )
- xLib->replaceByName( *it, uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n") ) ) );
+ xLib->replaceByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n") ) );
else
- xLib->insertByName( *it, uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n" ) ) ) );
+ xLib->insertByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n" ) ) );
}
}
}
diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx
index 9372b208756a..186c7ffd4afb 100644
--- a/sc/source/ui/vba/excelvbahelper.hxx
+++ b/sc/source/ui/vba/excelvbahelper.hxx
@@ -79,7 +79,7 @@ template < typename ImplObject >
if ( xTunnel.is() )
pObj = reinterpret_cast<ImplObject*>( xTunnel->getSomething(ImplObject::getUnoTunnelId()));
if ( bThrow && !pObj )
- throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Internal error, can't exctract implementation object" ) ), rxWrapperIf );
+ throw css::uno::RuntimeException( rtl::OUString( "Internal error, can't exctract implementation object" ), rxWrapperIf );
return pObj;
}
// ============================================================================
diff --git a/sc/source/ui/vba/testvba/testvba.cxx b/sc/source/ui/vba/testvba/testvba.cxx
index 433dea872408..f3d32063b472 100644
--- a/sc/source/ui/vba/testvba/testvba.cxx
+++ b/sc/source/ui/vba/testvba/testvba.cxx
@@ -78,7 +78,7 @@ OUString convertToURL( const OUString& rPath )
{
osl::FileBase::getFileURLFromSystemPath( rPath, aURL );
if ( aURL.equals( rPath ) )
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "could'nt convert " )).concat( rPath ).concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " to a URL, is it a fully qualified path name? " )) ), Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( "could'nt convert " ).concat( rPath ).concat( rtl::OUString( " to a URL, is it a fully qualified path name? " ) ), Reference< uno::XInterface >() );
}
return aURL;
}
@@ -123,9 +123,9 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) )
rtl::OUString getLogLocation() throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception )
{
rtl::OUString sLogLocation;
- Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.framework.PathSettings" )), mxContext), uno::UNO_QUERY_THROW );
- pathSettings->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Work" )) ) >>= sLogLocation;
- sLogLocation = sLogLocation.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) ).concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HelperAPI-test.log" )) );
+ Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW );
+ pathSettings->getPropertyValue( rtl::OUString( "Work" ) ) >>= sLogLocation;
+ sLogLocation = sLogLocation.concat( rtl::OUString( "/" ) ).concat( rtl::OUString( "HelperAPI-test.log" ) );
return sLogLocation;
}
rtl::OUString getLogLocationWithName( OUString fileName ) throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception )
@@ -133,9 +133,9 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) )
printf("%s\n", getenv("HOME") );
printf("file name %s\n", rtl::OUStringToOString( fileName, RTL_TEXTENCODING_UTF8 ).getStr() );
rtl::OUString sLogLocation;
- Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.framework.PathSettings" )), mxContext), uno::UNO_QUERY_THROW );
- pathSettings->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Work" )) ) >>= sLogLocation;
- sLogLocation = sLogLocation.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) ).concat( fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".log" )) );
+ Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW );
+ pathSettings->getPropertyValue( rtl::OUString( "Work" ) ) >>= sLogLocation;
+ sLogLocation = sLogLocation.concat( rtl::OUString( "/" ) ).concat( fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString( ".log" ) );
return sLogLocation;
}
@@ -150,13 +150,13 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) )
printf( "processing %s\n", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
// Loading the wanted document
Sequence< PropertyValue > propertyValues(1);
- propertyValues[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Hidden" ));
+ propertyValues[0].Name = rtl::OUString( "Hidden" );
propertyValues[0].Value <<= false;
rtl::OUString sfileUrl = convertToURL( sUrl );
printf( "try to get xDoc %s\n", rtl::OUStringToOString( sfileUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
Reference< uno::XInterface > xDoc =
- mxCompLoader->loadComponentFromURL( sfileUrl, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_blank" )), 0, propertyValues);
+ mxCompLoader->loadComponentFromURL( sfileUrl, rtl::OUString( "_blank" ), 0, propertyValues);
printf( "got xDoc\n" );
OUString logFileURL = convertToURL( getLogLocation() );
@@ -173,15 +173,15 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) )
Reference< script::provider::XScript > xScript;
try
{
- xScript = xProv->getScript( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document") ));
+ xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document"));
} catch ( uno::Exception& e )
{
try
{
- xScript = xProv->getScript( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" )));
+ xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" ));
} catch ( uno::Exception& e2 )
{
- xScript = xProv->getScript( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" )));
+ xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" ));
}
}
OSL_TRACE("Got script for doc %s", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -193,7 +193,7 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) )
xScript->invoke(aArgs, aOutArgsIndex, aOutArgs);
OUString fileName = sUrl.copy ( sUrl.lastIndexOf( '/' ) );
- OUString newLocation = msOutDirPath + fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".log" ));
+ OUString newLocation = msOutDirPath + fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString( ".log" );
try
{
printf("move log file\n");
@@ -253,7 +253,7 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) )
rtl::OUString sFileDirectoryURL = convertToURL( sFileDirectory );
if ( !mxSFA->isFolder( sFileDirectoryURL) )
{
- throw lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "not a directory: ")).concat( sFileDirectoryURL ), Reference<uno::XInterface>(), 1 );
+ throw lang::IllegalArgumentException( rtl::OUString( "not a directory: ").concat( sFileDirectoryURL ), Reference<uno::XInterface>(), 1 );
}
// Getting all files and directories in the current directory
Sequence<OUString> entries = mxSFA->getFolderContents( sFileDirectoryURL, false );
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 1a2e82b8d3b8..0825e457cad5 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -259,7 +259,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException)
if (!aSelection.is())
{
throw uno::RuntimeException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("failed to obtain current selection")),
+ rtl::OUString("failed to obtain current selection"),
uno::Reference< uno::XInterface >() );
}
@@ -277,15 +277,15 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException)
if ( ScVbaShape::getType( xShape ) == office::MsoShapeType::msoAutoShape )
{
uno::Reference< lang::XServiceInfo > xShapeServiceInfo( xShape, uno::UNO_QUERY_THROW );
- if ( xShapeServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.Text" ) ) ) )
+ if ( xShapeServiceInfo->supportsService( rtl::OUString( "com.sun.star.drawing.Text" ) ) )
{
return uno::makeAny( uno::Reference< msforms::XTextBoxShape >(new ScVbaTextBoxShape( mxContext, xShape, xShapes, xModel ) ) );
}
}
return uno::makeAny( uno::Reference< msforms::XShape >(new ScVbaShape( this, mxContext, xShape, xShapes, xModel, ScVbaShape::getType( xShape ) ) ) );
}
- else if( xServiceInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRange")) ) ||
- xServiceInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRanges")) ) )
+ else if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.sheet.SheetCellRange") ) ||
+ xServiceInfo->supportsService( rtl::OUString("com.sun.star.sheet.SheetCellRanges") ) )
{
uno::Reference< table::XCellRange > xRange( aSelection, ::uno::UNO_QUERY);
if ( !xRange.is() )
@@ -299,8 +299,8 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException)
}
else
{
- throw uno::RuntimeException( sImplementationName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- " not supported")), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( sImplementationName + rtl::OUString(
+ " not supported"), uno::Reference< uno::XInterface >() );
}
}
@@ -311,10 +311,10 @@ ScVbaApplication::getActiveCell() throw (uno::RuntimeException )
uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW);
ScTabViewShell* pViewShell = excel::getCurrentBestViewShell(mxContext);
if ( !pViewShell )
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No ViewShell available")), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString("No ViewShell available"), uno::Reference< uno::XInterface >() );
ScViewData* pTabView = pViewShell->GetViewData();
if ( !pTabView )
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No ViewData available")), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString("No ViewData available"), uno::Reference< uno::XInterface >() );
sal_Int32 nCursorX = pTabView->GetCurX();
sal_Int32 nCursorY = pTabView->GetCurY();
@@ -424,7 +424,7 @@ ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::Runtime
}
}
else
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid prarameter. It should be a string or False" )),
+ throw uno::RuntimeException( rtl::OUString( "Invalid prarameter. It should be a string or False" ),
uno::Reference< uno::XInterface >() );
}
@@ -472,7 +472,7 @@ ScVbaApplication::wait( double time ) throw (uno::RuntimeException)
SbxVariableRef aRef = new SbxVariable;
aRef->PutDouble( time );
aArgs->Put( aRef, 1 );
- SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WaitUntil") ), SbxCLASS_METHOD );
+ SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString("WaitUntil"), SbxCLASS_METHOD );
if ( pMeth )
{
@@ -496,7 +496,7 @@ ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeExcep
uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xPropertySet( xModel, uno::UNO_QUERY_THROW );
uno::Reference< sheet::XNamedRanges > xNamedRanges( xPropertySet->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "NamedRanges" )) ), uno::UNO_QUERY_THROW );
+ rtl::OUString( "NamedRanges" ) ), uno::UNO_QUERY_THROW );
css::uno::Reference< excel::XNames > xNames ( new ScVbaNames( this , mxContext , xNamedRanges , xModel ) );
if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID )
@@ -525,7 +525,7 @@ ScVbaApplication::getActiveSheet() throw (uno::RuntimeException)
if ( !result.is() )
{
// Fixme - check if this is reasonable/desired behavior
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No activeSheet available" )),
+ throw uno::RuntimeException( rtl::OUString( "No activeSheet available" ),
uno::Reference< uno::XInterface >() );
}
return result;
@@ -557,7 +557,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro
bScroll = aScroll;
}
else
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "second parameter should be boolean" )),
+ throw uno::RuntimeException( rtl::OUString( "second parameter should be boolean" ),
uno::Reference< uno::XInterface >() );
}
@@ -599,11 +599,11 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro
{
//maybe this should be a procedure name
//TODO for procedure name
- //browse::XBrowseNodeFactory is a singlton. OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory"))
+ //browse::XBrowseNodeFactory is a singlton. OUString( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory")
//and the createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) to get a root browse::XBrowseNode.
//for query XInvocation interface.
//but how to directly get the XInvocation?
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid reference for range name, it should be procedure name" )),
+ throw uno::RuntimeException( rtl::OUString( "invalid reference for range name, it should be procedure name" ),
uno::Reference< uno::XInterface >() );
}
return;
@@ -638,7 +638,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro
}
return;
}
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid reference or name" )),
+ throw uno::RuntimeException( rtl::OUString( "invalid reference or name" ),
uno::Reference< uno::XInterface >() );
}
@@ -691,8 +691,7 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException)
break;
}
default:
- throw uno::RuntimeException( rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Unknown value for Cursor pointer")), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() );
// TODO: isn't this a flaw in the API? It should be allowed to throw an
// IllegalArgumentException, or so
}
@@ -757,7 +756,7 @@ ScVbaApplication::setDisplayFullScreen( sal_Bool bSet ) throw (uno::RuntimeExce
// #FIXME calling ScViewUtil::SetFullScreen( *pShell, bSet );
// directly results in a strange crash, using dispatch instead
if ( bSet != getDisplayFullScreen() )
- dispatchRequests( getCurrentDocument(), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:FullScreen") ) );
+ dispatchRequests( getCurrentDocument(), rtl::OUString(".uno:FullScreen") );
}
sal_Bool SAL_CALL
@@ -777,8 +776,8 @@ ScVbaApplication::setDisplayScrollBars( sal_Bool bSet ) throw (uno::RuntimeExce
// use uno here as it does all he repainting etc. magic
uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xProps( xView, uno::UNO_QUERY );
- xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasVerticalScrollBar") ), uno::makeAny( bSet ) );
- xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasHorizontalScrollBar") ), uno::makeAny( bSet ) );
+ xProps->setPropertyValue( rtl::OUString("HasVerticalScrollBar"), uno::makeAny( bSet ) );
+ xProps->setPropertyValue( rtl::OUString("HasHorizontalScrollBar"), uno::makeAny( bSet ) );
}
sal_Bool SAL_CALL
@@ -831,7 +830,7 @@ static uno::Reference< beans::XPropertySet > lcl_getPathSettingsService( const u
if ( !xPathSettings.is() )
{
uno::Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager(), uno::UNO_QUERY_THROW );
- xPathSettings.set( xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSettings")), xContext ), uno::UNO_QUERY_THROW );
+ xPathSettings.set( xSMgr->createInstanceWithContext( rtl::OUString("com.sun.star.util.PathSettings"), xContext ), uno::UNO_QUERY_THROW );
}
return xPathSettings;
}
@@ -863,25 +862,25 @@ ScVbaApplication::setDefaultFilePath( const ::rtl::OUString& DefaultFilePath ) t
uno::Reference< beans::XPropertySet > xProps = lcl_getPathSettingsService( mxContext );
rtl::OUString aURL;
osl::FileBase::getFileURLFromSystemPath( DefaultFilePath, aURL );
- xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Work")), uno::Any( aURL ) );
+ xProps->setPropertyValue( rtl::OUString("Work"), uno::Any( aURL ) );
}
::rtl::OUString SAL_CALL
ScVbaApplication::getDefaultFilePath() throw (uno::RuntimeException)
{
- return getOfficePath( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Work")));
+ return getOfficePath( rtl::OUString("Work"));
}
::rtl::OUString SAL_CALL
ScVbaApplication::getLibraryPath() throw (uno::RuntimeException)
{
- return getOfficePath( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Basic")));
+ return getOfficePath( rtl::OUString("Basic"));
}
::rtl::OUString SAL_CALL
ScVbaApplication::getTemplatesPath() throw (uno::RuntimeException)
{
- return getOfficePath( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Template")));
+ return getOfficePath( rtl::OUString("Template"));
}
::rtl::OUString SAL_CALL
@@ -1230,7 +1229,7 @@ uno::Any SAL_CALL
ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeException )
{
StarBASIC* pBasic = SFX_APP()->GetBasic();
- SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FuncCaller") ), SbxCLASS_METHOD );
+ SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString("FuncCaller"), SbxCLASS_METHOD );
uno::Any aRet;
if ( pMeth )
{
@@ -1256,7 +1255,7 @@ uno::Any SAL_CALL ScVbaApplication::GetOpenFilename(
aArgs[ 5 ] = rMultiSelect;
uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW );
uno::Reference< XExecutableDialog > xFilePicker( xFactory->createInstanceWithArgumentsAndContext(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.OpenFilePicker" ) ), aArgs, mxContext ), uno::UNO_QUERY_THROW );
+ ::rtl::OUString( "ooo.vba.OpenFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW );
return xFilePicker->execute();
}
@@ -1273,7 +1272,7 @@ uno::Any SAL_CALL ScVbaApplication::GetSaveAsFilename(
aArgs[ 5 ] = rButtonText;
uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW );
uno::Reference< XExecutableDialog > xFilePicker( xFactory->createInstanceWithArgumentsAndContext(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.SaveAsFilePicker" ) ), aArgs, mxContext ), uno::UNO_QUERY_THROW );
+ ::rtl::OUString( "ooo.vba.SaveAsFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW );
return xFilePicker->execute();
}
@@ -1299,7 +1298,7 @@ ScVbaApplication::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeExceptio
rtl::OUString
ScVbaApplication::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaApplication"));
+ return rtl::OUString("ScVbaApplication");
}
uno::Sequence< rtl::OUString >
@@ -1309,7 +1308,7 @@ ScVbaApplication::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Application" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Application" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx
index 9944ea166f5b..0d3ed7eb84bf 100644
--- a/sc/source/ui/vba/vbaassistant.cxx
+++ b/sc/source/ui/vba/vbaassistant.cxx
@@ -107,7 +107,7 @@ ScVbaAssistant::Name( ) throw (css::script::BasicErrorException, css::uno::Runt
rtl::OUString
ScVbaAssistant::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAssistant"));
+ return rtl::OUString("ScVbaAssistant");
}
uno::Sequence< rtl::OUString >
@@ -117,7 +117,7 @@ ScVbaAssistant::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.Assistant" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.Assistant" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx
index 6fa603aa7bd6..3174bd2ed093 100644
--- a/sc/source/ui/vba/vbaaxes.cxx
+++ b/sc/source/ui/vba/vbaaxes.cxx
@@ -64,7 +64,7 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno:
{
ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() );
if ( !pChart )
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Object failure, can't access chart implementation" )), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( "Object failure, can't access chart implementation" ), uno::Reference< uno::XInterface >() );
uno::Reference< beans::XPropertySet > xAxisPropertySet;
if (((nType == xlCategory) || (nType == xlSeriesAxis) || (nType == xlValue)))
@@ -96,18 +96,18 @@ public:
// primary
sal_Bool bBool = false;
uno::Reference< beans::XPropertySet > xDiagramPropertySet( pChart->xDiagramPropertySet() );
- if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" ) ) ) >>= bBool ) && bBool )
+ if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasXAxis" ) ) >>= bBool ) && bBool )
mCoordinates.push_back( AxesCoordinate( xlPrimary, xlCategory ) );
- if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasYAxis" ) ) ) >>= bBool ) && bBool )
+ if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasYAxis" ) ) >>= bBool ) && bBool )
mCoordinates.push_back( AxesCoordinate( xlPrimary, xlSeriesAxis ) );
if ( pChart->is3D() )
mCoordinates.push_back( AxesCoordinate( xlPrimary, xlValue ) );
// secondary
- if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxis" ) ) ) >>= bBool ) && bBool )
+ if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasSecondaryXAxis" ) ) >>= bBool ) && bBool )
mCoordinates.push_back( AxesCoordinate( xlSecondary, xlCategory ) );
- if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxis" ) ) ) >>= bBool ) && bBool )
+ if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasSecondaryYAxis" ) ) >>= bBool ) && bBool )
mCoordinates.push_back( AxesCoordinate( xlSecondary, xlSeriesAxis ) );
}
@@ -160,7 +160,7 @@ ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup)
sal_Int32 nAxisGroup = xlPrimary;
sal_Int32 nType = -1;
if ( !_nType.hasValue() || ( ( _nType >>= nType ) == false ) )
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Axes::Item Failed to extract type" )), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( "Axes::Item Failed to extract type" ), uno::Reference< uno::XInterface >() );
if ( _oAxisGroup.hasValue() )
_oAxisGroup >>= nAxisGroup ;
@@ -177,7 +177,7 @@ ScVbaAxes::createCollectionObject(const css::uno::Any& aSource)
rtl::OUString
ScVbaAxes::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxes"));
+ return rtl::OUString("ScVbaAxes");
}
uno::Sequence< rtl::OUString >
@@ -187,7 +187,7 @@ ScVbaAxes::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Axes" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Axes" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx
index c1f92f22cc9e..035383a118c4 100644
--- a/sc/source/ui/vba/vbaaxis.cxx
+++ b/sc/source/ui/vba/vbaaxis.cxx
@@ -38,7 +38,7 @@ ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
{
ScVbaChart* pChart = static_cast< ScVbaChart* >( moChartParent.get() );
if ( !pChart )
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't access parent chart impl")), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString("Can't access parent chart impl"), uno::Reference< uno::XInterface >() );
return pChart;
}
@@ -232,13 +232,13 @@ ScVbaAxis::setHasTitle( ::sal_Bool _bHasTitle ) throw (script::BasicErrorExcepti
switch(nType)
{
case xlCategory:
- pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasXAxisTitle")), uno::makeAny(_bHasTitle));
+ pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasXAxisTitle"), uno::makeAny(_bHasTitle));
break;
case xlSeriesAxis:
- pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasZAxisTitle")), uno::makeAny(_bHasTitle));
+ pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasZAxisTitle"), uno::makeAny(_bHasTitle));
break;
default: // xlValue:
- pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasYAxisTitle")), uno::makeAny(_bHasTitle));
+ pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasYAxisTitle"), uno::makeAny(_bHasTitle));
}
}
@@ -259,13 +259,13 @@ ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExcep
switch(nType)
{
case xlCategory:
- pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasXAxisTitle")) ) >>= bHasTitle;
+ pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasXAxisTitle") ) >>= bHasTitle;
break;
case xlSeriesAxis:
- pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasZAxisTitle")) ) >>= bHasTitle;
+ pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasZAxisTitle") ) >>= bHasTitle;
break;
default: // xlValue:
- pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasYAxisTitle")) ) >>= bHasTitle;
+ pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasYAxisTitle") ) >>= bHasTitle;
}
}
catch (const uno::Exception& e)
@@ -281,7 +281,7 @@ ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException
try
{
if (isValueAxis())
- mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepHelp") ), uno::makeAny(_fMinorUnit));
+ mxPropertySet->setPropertyValue( rtl::OUString("StepHelp"), uno::makeAny(_fMinorUnit));
}
catch (uno::Exception& )
{
@@ -296,7 +296,7 @@ ScVbaAxis::getMinorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce
try
{
if (isValueAxis())
- mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepHelp"))) >>= fMinor;
+ mxPropertySet->getPropertyValue( rtl::OUString("StepHelp")) >>= fMinor;
}
catch (uno::Exception& )
{
@@ -311,7 +311,7 @@ ScVbaAxis::setMinorUnitIsAuto( ::sal_Bool _bMinorUnitIsAuto ) throw (script::Bas
try
{
if (isValueAxis())
- mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoStepHelp" ) ), uno::makeAny(_bMinorUnitIsAuto));
+ mxPropertySet->setPropertyValue( rtl::OUString( "AutoStepHelp" ), uno::makeAny(_bMinorUnitIsAuto));
}
catch (uno::Exception& )
{
@@ -327,7 +327,7 @@ ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti
{
if (isValueAxis())
{
- mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoStepHelp")) ) >>= bIsAuto;
+ mxPropertySet->getPropertyValue( rtl::OUString( "AutoStepHelp") ) >>= bIsAuto;
}
}
catch (uno::Exception& )
@@ -357,7 +357,7 @@ ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException
{
if (isValueAxis())
{
- mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepMain")), uno::makeAny(_fMajorUnit));
+ mxPropertySet->setPropertyValue( rtl::OUString("StepMain"), uno::makeAny(_fMajorUnit));
}
}
catch (uno::Exception& )
@@ -373,7 +373,7 @@ ScVbaAxis::getMajorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce
try
{
if (isValueAxis())
- mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepMain"))) >>= fMax;
+ mxPropertySet->getPropertyValue( rtl::OUString("StepMain")) >>= fMax;
}
catch (uno::Exception& )
{
@@ -389,7 +389,7 @@ ScVbaAxis::setMajorUnitIsAuto( ::sal_Bool _bMajorUnitIsAuto ) throw (script::Bas
{
if (isValueAxis())
{
- mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoStepMain" ) ), uno::makeAny( _bMajorUnitIsAuto ));
+ mxPropertySet->setPropertyValue( rtl::OUString( "AutoStepMain" ), uno::makeAny( _bMajorUnitIsAuto ));
}
}
catch (uno::Exception& )
@@ -406,7 +406,7 @@ ScVbaAxis::getMajorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti
{
if (isValueAxis())
{
- mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoStepMain"))) >>= bIsAuto;
+ mxPropertySet->getPropertyValue( rtl::OUString( "AutoStepMain")) >>= bIsAuto;
}
}
catch (uno::Exception& )
@@ -423,7 +423,7 @@ ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorExc
{
if ( isValueAxis() )
{
- mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" ) ), uno::makeAny(_fMaximumScale));
+ mxPropertySet->setPropertyValue( rtl::OUString( "Max" ), uno::makeAny(_fMaximumScale));
}
}
catch ( uno::Exception& )
@@ -440,7 +440,7 @@ ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeE
{
if (isValueAxis())
{
- mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" ))) >>= fMax;
+ mxPropertySet->getPropertyValue( rtl::OUString( "Max" )) >>= fMax;
}
}
catch (uno::Exception& )
@@ -457,7 +457,7 @@ ScVbaAxis::setMaximumScaleIsAuto( ::sal_Bool _bMaximumScaleIsAuto ) throw (scrip
try
{
if ( isValueAxis() )
- mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoMax" ) ), uno::makeAny( _bMaximumScaleIsAuto ));
+ mxPropertySet->setPropertyValue( rtl::OUString( "AutoMax" ), uno::makeAny( _bMaximumScaleIsAuto ));
}
catch ( uno::Exception& )
@@ -474,7 +474,7 @@ ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru
try
{
if (isValueAxis())
- mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoMax" )) ) >>= bIsAuto;
+ mxPropertySet->getPropertyValue( rtl::OUString( "AutoMax" ) ) >>= bIsAuto;
}
catch ( uno::Exception& )
{
@@ -489,7 +489,7 @@ ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorExc
try
{
if (isValueAxis())
- mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Min") ), uno::makeAny( _fMinimumScale ) );
+ mxPropertySet->setPropertyValue( rtl::OUString("Min"), uno::makeAny( _fMinimumScale ) );
}
catch ( uno::Exception& )
{
@@ -504,7 +504,7 @@ ScVbaAxis::getMinimumScale( ) throw (script::BasicErrorException, uno::RuntimeE
try
{
if (isValueAxis())
- mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Min") )) >>= fMin;
+ mxPropertySet->getPropertyValue( rtl::OUString( "Min")) >>= fMin;
}
catch (const uno::Exception& e)
{
@@ -520,7 +520,7 @@ ScVbaAxis::setMinimumScaleIsAuto( ::sal_Bool _bMinimumScaleIsAuto ) throw (scrip
{
if (isValueAxis())
{
- mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoMin") ), uno::makeAny(_bMinimumScaleIsAuto));
+ mxPropertySet->setPropertyValue( rtl::OUString("AutoMin"), uno::makeAny(_bMinimumScaleIsAuto));
}
}
catch (uno::Exception& )
@@ -537,7 +537,7 @@ ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru
{
if (isValueAxis())
{
- mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoMin")) ) >>= bIsAuto;
+ mxPropertySet->getPropertyValue( rtl::OUString("AutoMin") ) >>= bIsAuto;
}
}
catch (uno::Exception& )
@@ -563,10 +563,10 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce
switch (_nScaleType)
{
case xlScaleLinear:
- mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Logarithmic" ) ), uno::makeAny( sal_False ) );
+ mxPropertySet->setPropertyValue( rtl::OUString( "Logarithmic" ), uno::makeAny( sal_False ) );
break;
case xlScaleLogarithmic:
- mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Logarithmic" ) ), uno::makeAny( sal_True ) );
+ mxPropertySet->setPropertyValue( rtl::OUString( "Logarithmic" ), uno::makeAny( sal_True ) );
break;
default:
// According to MS the paramenter is ignored and no Error is thrown
@@ -589,7 +589,7 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce
if (isValueAxis())
{
sal_Bool bisLogarithmic = false;
- mxPropertySet->getPropertyValue( rtl::OUString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Logarithmic"))) ) >>= bisLogarithmic;
+ mxPropertySet->getPropertyValue( rtl::OUString( rtl::OUString("Logarithmic")) ) >>= bisLogarithmic;
if (bisLogarithmic)
nScaleType = xlScaleLogarithmic;
else
@@ -641,7 +641,7 @@ void SAL_CALL ScVbaAxis::setLeft( double left ) throw (css::script::BasicErrorEx
rtl::OUString
ScVbaAxis::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxis"));
+ return rtl::OUString("ScVbaAxis");
}
uno::Sequence< rtl::OUString >
@@ -651,7 +651,7 @@ ScVbaAxis::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Axis" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Axis" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbaaxistitle.cxx b/sc/source/ui/vba/vbaaxistitle.cxx
index 2d715c46597e..986d1a3766e7 100644
--- a/sc/source/ui/vba/vbaaxistitle.cxx
+++ b/sc/source/ui/vba/vbaaxistitle.cxx
@@ -28,7 +28,7 @@ ScVbaAxisTitle::ScVbaAxisTitle( const uno::Reference< XHelperInterface >& xParen
rtl::OUString
ScVbaAxisTitle::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxisTitle"));
+ return rtl::OUString("ScVbaAxisTitle");
}
uno::Sequence< rtl::OUString >
@@ -39,7 +39,7 @@ ScVbaAxisTitle::getServiceNames()
{
uno::Sequence< rtl::OUString > BaseServiceNames = AxisTitleBase::getServiceNames();
aServiceNames.realloc( BaseServiceNames.getLength() + 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.AxisTitle" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.AxisTitle" );
for ( sal_Int32 index = 1; index < (BaseServiceNames.getLength() + 1); ++index )
aServiceNames[ index ] = BaseServiceNames[ index ];
}
diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx
index cb23dd87eed4..e792c6ea5418 100644
--- a/sc/source/ui/vba/vbaborders.cxx
+++ b/sc/source/ui/vba/vbaborders.cxx
@@ -146,7 +146,7 @@ private:
protected:
virtual rtl::OUString getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaBorder"));
+ return rtl::OUString("ScVbaBorder");
}
virtual css::uno::Sequence<rtl::OUString> getServiceNames()
{
@@ -154,7 +154,7 @@ protected:
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Border" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Border" );
}
return aServiceNames;
}
@@ -167,7 +167,7 @@ public:
table::BorderLine aBorderLine;
if ( getBorderLine( aBorderLine ) )
return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) );
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No Implementation available" ) ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() );
}
void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException)
{
@@ -180,7 +180,7 @@ public:
setBorderLine( aBorderLine );
}
else
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No Implementation available" ) ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() );
}
uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException)
@@ -231,7 +231,7 @@ public:
break;
}
}
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Method failed" ) ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() );
}
void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException)
{
@@ -255,12 +255,12 @@ public:
aBorderLine.OuterLineWidth = OOLineHairline;
break;
default:
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bad param" ) ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( "Bad param" ), uno::Reference< uno::XInterface >() );
}
setBorderLine( aBorderLine );
}
else
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Method failed" ) ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() );
}
uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException)
@@ -289,12 +289,12 @@ public:
case XlLineStyle::xlSlantDashDot:
break;
default:
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bad param" ) ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( "Bad param" ), uno::Reference< uno::XInterface >() );
}
setBorderLine( aBorderLine );
}
else
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Method failed" ) ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() );
}
};
@@ -549,7 +549,7 @@ void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::Run
rtl::OUString
ScVbaBorders::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaBorders"));
+ return rtl::OUString("ScVbaBorders");
}
uno::Sequence< rtl::OUString >
@@ -559,7 +559,7 @@ ScVbaBorders::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Borders" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Borders" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx
index 2cfa4759b3ec..ae4f367c3a31 100644
--- a/sc/source/ui/vba/vbacharacters.cxx
+++ b/sc/source/ui/vba/vbacharacters.cxx
@@ -87,7 +87,7 @@ void SAL_CALL
ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) throw (css::uno::RuntimeException)
{
// #TODO #FIXME needs implementation, or can't be done?
- throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Not Implemented") ), uno::Reference< XInterface >() );
+ throw uno::RuntimeException( ::rtl::OUString( "Not Implemented"), uno::Reference< XInterface >() );
}
@@ -110,7 +110,7 @@ ScVbaCharacters::Delete( ) throw (css::uno::RuntimeException)
rtl::OUString
ScVbaCharacters::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaCharacters"));
+ return rtl::OUString("ScVbaCharacters");
}
uno::Sequence< rtl::OUString >
@@ -120,7 +120,7 @@ ScVbaCharacters::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Characters" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Characters" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx
index 7483da72f56b..a050d4f93553 100644
--- a/sc/source/ui/vba/vbachart.cxx
+++ b/sc/source/ui/vba/vbachart.cxx
@@ -262,7 +262,7 @@ try
case xlSurfaceWireframe:
case xlSurfaceTopView:
case xlSurfaceTopViewWireframe:
- setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.BarDiagram")));
+ setDiagram( rtl::OUString("com.sun.star.chart.BarDiagram"));
break;
case xlLine:
case xl3DLine:
@@ -271,7 +271,7 @@ try
case xlLineMarkers:
case xlLineMarkersStacked:
case xlLineMarkersStacked100:
- setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.LineDiagram")));
+ setDiagram( rtl::OUString("com.sun.star.chart.LineDiagram"));
break;
case xl3DArea:
case xlArea:
@@ -279,17 +279,17 @@ try
case xlAreaStacked100:
case xl3DAreaStacked:
case xl3DAreaStacked100:
- setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.AreaDiagram")) );
+ setDiagram( rtl::OUString("com.sun.star.chart.AreaDiagram") );
break;
case xlDoughnut:
case xlDoughnutExploded:
- setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.DonutDiagram") ) );
+ setDiagram( rtl::OUString("com.sun.star.chart.DonutDiagram") );
break;
case xlStockHLC:
case xlStockOHLC:
case xlStockVHLC:
case xlStockVOHLC:
- setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.StockDiagram")));
+ setDiagram( rtl::OUString("com.sun.star.chart.StockDiagram"));
mxDiagramPropertySet->setPropertyValue( UPDOWN, uno::makeAny(sal_Bool((_nChartType == xlStockOHLC) || (_nChartType == xlStockVOHLC))));
mxDiagramPropertySet->setPropertyValue(VOLUME, uno::makeAny(sal_Bool((_nChartType == xlStockVHLC) || (_nChartType == xlStockVOHLC))));
break;
@@ -300,13 +300,13 @@ try
case xl3DPie:
case xlPie:
case xlBarOfPie: // not possible (Zoom pie)
- setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.PieDiagram")));
+ setDiagram( rtl::OUString("com.sun.star.chart.PieDiagram"));
break;
case xlRadar:
case xlRadarMarkers:
case xlRadarFilled:
- setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.NetDiagram")));
+ setDiagram( rtl::OUString("com.sun.star.chart.NetDiagram"));
break;
case xlXYScatter:
case xlBubble: // not possible
@@ -315,7 +315,7 @@ try
case xlXYScatterLinesNoMarkers:
case xlXYScatterSmooth:
case xlXYScatterSmoothNoMarkers:
- setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.XYDiagram")));
+ setDiagram( rtl::OUString("com.sun.star.chart.XYDiagram"));
switch(_nChartType)
{
case xlXYScatter:
@@ -555,7 +555,7 @@ ScVbaChart::Activate() throw (script::BasicErrorException, uno::RuntimeException
if ( pChartObj )
pChartObj->Activate();
else
- throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no ChartObject as parent" ) ) );
+ throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "no ChartObject as parent" ) );
}
void SAL_CALL
@@ -1055,7 +1055,7 @@ ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) thro
rtl::OUString
ScVbaChart::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChart"));
+ return rtl::OUString("ScVbaChart");
}
uno::Sequence< rtl::OUString >
@@ -1065,7 +1065,7 @@ ScVbaChart::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Chart" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Chart" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx
index 17860737d13e..07183cc036da 100644
--- a/sc/source/ui/vba/vbachartobject.cxx
+++ b/sc/source/ui/vba/vbachartobject.cxx
@@ -100,7 +100,7 @@ ScVbaChartObject::Delete() throw ( css::script::BasicErrorException )
if (pChartObjectsImpl)
pChartObjectsImpl->removeByName( getPersistName() );
else
- throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Parent is not ChartObjects" ) ) );
+ throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "Parent is not ChartObjects" ) );
}
void
@@ -117,7 +117,7 @@ ScVbaChartObject::Activate() throw ( script::BasicErrorException )
}
catch (uno::Exception& )
{
- throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ChartObject Activate internal error" ) ) );
+ throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "ChartObject Activate internal error" ) );
}
}
@@ -130,7 +130,7 @@ ScVbaChartObject::getChart() throw (css::uno::RuntimeException)
rtl::OUString
ScVbaChartObject::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObject"));
+ return rtl::OUString("ScVbaChartObject");
}
uno::Sequence< rtl::OUString >
@@ -140,7 +140,7 @@ ScVbaChartObject::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.ChartObject" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.ChartObject" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx
index d3df6585f12a..cdfd42545885 100644
--- a/sc/source/ui/vba/vbachartobjects.cxx
+++ b/sc/source/ui/vba/vbachartobjects.cxx
@@ -74,10 +74,10 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException
ScCellRangesBase* pUno= dynamic_cast< ScCellRangesBase* >( xIf.get() );
ScDocShell* pDocShell = NULL;
if ( !pUno )
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Failed to obtain the impl class from the drawpage")), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString("Failed to obtain the impl class from the drawpage"), uno::Reference< uno::XInterface >() );
pDocShell = pUno->GetDocShell();
if ( !pDocShell )
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Failed to obtain the docshell implclass")), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString("Failed to obtain the docshell implclass"), uno::Reference< uno::XInterface >() );
uno::Reference< sheet::XSpreadsheetDocument > xSpreadsheetDocument( pDocShell->GetModel(), uno::UNO_QUERY_THROW );
uno::Reference< sheet::XSpreadsheets > xSpreadsheets = xSpreadsheetDocument->getSheets();
@@ -119,7 +119,7 @@ ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight
aRectangle.Width = Millimeter::getInHundredthsOfOneMillimeter(_nWidth);
aRectangle.Height = Millimeter::getInHundredthsOfOneMillimeter(_nHeight);
// Note the space at the end of the stem ("Chart "). In ChartSheets only "Chart" is the stem
- rtl::OUString sPersistChartName = ContainerUtilities::getUniqueName( getChartObjectNames(), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Chart " ) ) , rtl::OUString(), 1);
+ rtl::OUString sPersistChartName = ContainerUtilities::getUniqueName( getChartObjectNames(), rtl::OUString( "Chart " ) , rtl::OUString(), 1);
xTableCharts->addNewByName(sPersistChartName, aRectangle, aCellRangeAddress, true, false );
uno::Reference< excel::XChartObject > xChartObject( getItemByStringIndex( sPersistChartName ), uno::UNO_QUERY_THROW );
xChartObject->getChart()->setChartType(excel::XlChartType::xlColumnClustered);
@@ -168,7 +168,7 @@ ScVbaChartObjects::createCollectionObject( const css::uno::Any& aSource )
rtl::OUString
ScVbaChartObjects::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObjects"));
+ return rtl::OUString("ScVbaChartObjects");
}
css::uno::Sequence<rtl::OUString>
@@ -178,7 +178,7 @@ ScVbaChartObjects::getServiceNames()
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.ChartObjects") );
+ sNames[0] = rtl::OUString("ooo.vba.excel.ChartObjects");
}
return sNames;
}
diff --git a/sc/source/ui/vba/vbacharttitle.cxx b/sc/source/ui/vba/vbacharttitle.cxx
index 865bf3dc746e..3fbe661f98fa 100644
--- a/sc/source/ui/vba/vbacharttitle.cxx
+++ b/sc/source/ui/vba/vbacharttitle.cxx
@@ -28,7 +28,7 @@ ScVbaChartTitle::ScVbaChartTitle( const uno::Reference< XHelperInterface >& xPar
rtl::OUString
ScVbaChartTitle::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartTitle"));
+ return rtl::OUString("ScVbaChartTitle");
}
uno::Sequence< rtl::OUString >
@@ -39,7 +39,7 @@ ScVbaChartTitle::getServiceNames()
{
uno::Sequence< rtl::OUString > BaseServiceNames = ChartTitleBase::getServiceNames();
aServiceNames.realloc( BaseServiceNames.getLength() + 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Chart" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Chart" );
for ( sal_Int32 index = 1; index < (BaseServiceNames.getLength() + 1); ++index )
aServiceNames[ index ] = BaseServiceNames[ index ];
}
diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx
index cc4a683a3141..1393237312bf 100644
--- a/sc/source/ui/vba/vbacomment.cxx
+++ b/sc/source/ui/vba/vbacomment.cxx
@@ -47,7 +47,7 @@ ScVbaComment::ScVbaComment(
mxRange( xRange )
{
if ( !xRange.is() )
- throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "range is not set " ) ), uno::Reference< uno::XInterface >() , 1 );
+ throw lang::IllegalArgumentException( rtl::OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 );
uno::Reference< text::XSimpleText > xAnnoText( getAnnotation(), uno::UNO_QUERY );
}
@@ -200,7 +200,7 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An
xAnnoText->insertString( xRange, sText, bOverwrite );
return xAnnoText->getString();
}
- throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScVbaComment::Text - bad Start value " ) ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( "ScVbaComment::Text - bad Start value " ), uno::Reference< uno::XInterface >() );
}
else if ( aText.hasValue() )
{
@@ -215,7 +215,7 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An
rtl::OUString
ScVbaComment::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaComment"));
+ return rtl::OUString("ScVbaComment");
}
uno::Sequence< rtl::OUString >
@@ -225,7 +225,7 @@ ScVbaComment::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.ScVbaComment" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.ScVbaComment" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx
index 24423a7a3dfb..9e09ee631cda 100644
--- a/sc/source/ui/vba/vbacomments.cxx
+++ b/sc/source/ui/vba/vbacomments.cxx
@@ -91,7 +91,7 @@ ScVbaComments::getElementType() throw (uno::RuntimeException)
rtl::OUString
ScVbaComments::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaComments"));
+ return rtl::OUString("ScVbaComments");
}
css::uno::Sequence<rtl::OUString>
@@ -101,7 +101,7 @@ ScVbaComments::getServiceNames()
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Comments") );
+ sNames[0] = rtl::OUString("ooo.vba.excel.Comments");
}
return sNames;
}
diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx
index bc222676da8c..3ebd89adf753 100644
--- a/sc/source/ui/vba/vbacondition.cxx
+++ b/sc/source/ui/vba/vbacondition.cxx
@@ -157,7 +157,7 @@ ScVbaCondition< Ifc1 >::Operator(sal_Bool _bIncludeFormulaValue) throw ( script:
}
case sheet::ConditionOperator_NONE:
default:
- DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Operator not supported")));
+ DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString("Operator not supported"));
break;
}
return retvalue;
diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx
index 78fccd684510..1f1c3736bce9 100644
--- a/sc/source/ui/vba/vbadialog.cxx
+++ b/sc/source/ui/vba/vbadialog.cxx
@@ -65,7 +65,7 @@ ScVbaDialog::mapIndexToName( sal_Int32 nIndex )
rtl::OUString
ScVbaDialog::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaDialog"));
+ return rtl::OUString("ScVbaDialog");
}
uno::Sequence< rtl::OUString >
@@ -75,7 +75,7 @@ ScVbaDialog::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Dialog" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Dialog" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx
index 8375a06fb636..367dbcf6cea1 100644
--- a/sc/source/ui/vba/vbadialogs.cxx
+++ b/sc/source/ui/vba/vbadialogs.cxx
@@ -40,7 +40,7 @@ ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException)
rtl::OUString
ScVbaDialogs::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaDialogs"));
+ return rtl::OUString("ScVbaDialogs");
}
uno::Sequence< rtl::OUString >
@@ -50,7 +50,7 @@ ScVbaDialogs::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Dialogs" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Dialogs" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx
index 17939060c89e..b89f3cd46416 100644
--- a/sc/source/ui/vba/vbafont.cxx
+++ b/sc/source/ui/vba/vbafont.cxx
@@ -105,8 +105,8 @@ ScVbaFont::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeExceptio
nValue = SUPERSCRIPT;
nValue2 = SUPERSCRIPTHEIGHT;
}
- xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ), ( uno::Any )nValue );
- xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapementHeight" ) ), ( uno::Any )nValue2 );
+ xProps->setPropertyValue( rtl::OUString( "CharEscapement" ), ( uno::Any )nValue );
+ xProps->setPropertyValue( rtl::OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 );
}
uno::Any SAL_CALL
@@ -138,7 +138,7 @@ ScVbaFont::getSuperscript() throw ( uno::RuntimeException )
xCell.set( xCellRange->getCellByPosition( 0,0 ) );
uno::Reference< beans::XPropertySet > xProps = lcl_TextProperties( xCell );
short nValue = 0;
- xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ) ) >>= nValue;
+ xProps->getPropertyValue( rtl::OUString( "CharEscapement" ) ) >>= nValue;
return uno::makeAny( ( nValue == SUPERSCRIPT ) );
}
@@ -178,8 +178,8 @@ ScVbaFont::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException
nValue2 = SUBSCRIPTHEIGHT;
}
- xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapementHeight" ) ), ( uno::Any )nValue2 );
- xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ), ( uno::Any )nValue );
+ xProps->setPropertyValue( rtl::OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 );
+ xProps->setPropertyValue( rtl::OUString( "CharEscapement" ), ( uno::Any )nValue );
}
@@ -213,7 +213,7 @@ ScVbaFont::getSubscript() throw ( uno::RuntimeException )
uno::Reference< beans::XPropertySet > xProps = lcl_TextProperties( xCell );
short nValue = NORMAL;
- xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ) ) >>= nValue;
+ xProps->getPropertyValue( rtl::OUString( "CharEscapement" ) ) >>= nValue;
return uno::makeAny( ( nValue == SUBSCRIPT ) );
}
@@ -258,9 +258,9 @@ void SAL_CALL
ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException )
{
//XXX #TODO# #FIXME#
- //mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharSize" ) ), ( uno::Any )fValue );
+ //mxFont->setPropertyValue( rtl::OUString( "CharSize" ), ( uno::Any )fValue );
throw uno::RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setStandardFontSize not supported") ), uno::Reference< uno::XInterface >() );
+ rtl::OUString("setStandardFontSize not supported"), uno::Reference< uno::XInterface >() );
}
@@ -269,7 +269,7 @@ ScVbaFont::getStandardFontSize() throw ( uno::RuntimeException )
{
//XXX #TODO# #FIXME#
throw uno::RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getStandardFontSize not supported") ), uno::Reference< uno::XInterface >() );
+ rtl::OUString("getStandardFontSize not supported"), uno::Reference< uno::XInterface >() );
// return uno::Any();
}
@@ -279,7 +279,7 @@ ScVbaFont::setStandardFont( const uno::Any& /*aValue*/ ) throw( uno::RuntimeExce
{
//XXX #TODO# #FIXME#
throw uno::RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setStandardFont not supported") ), uno::Reference< uno::XInterface >() );
+ rtl::OUString("setStandardFont not supported"), uno::Reference< uno::XInterface >() );
}
@@ -288,7 +288,7 @@ ScVbaFont::getStandardFont() throw ( uno::RuntimeException )
{
//XXX #TODO# #FIXME#
throw uno::RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getStandardFont not supported") ), uno::Reference< uno::XInterface >() );
+ rtl::OUString("getStandardFont not supported"), uno::Reference< uno::XInterface >() );
// return uno::Any();
}
@@ -379,10 +379,10 @@ ScVbaFont::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException
nValue = awt::FontUnderline::DOUBLE;
break;
default:
- throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Unknown value for Underline")), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString("Unknown value for Underline"), uno::Reference< uno::XInterface >() );
}
- mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharUnderline" ) ), ( uno::Any )nValue );
+ mxFont->setPropertyValue( rtl::OUString( "CharUnderline" ), ( uno::Any )nValue );
}
@@ -394,7 +394,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException )
return aNULL();
sal_Int32 nValue = awt::FontUnderline::NONE;
- mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharUnderline" ) ) ) >>= nValue;
+ mxFont->getPropertyValue( rtl::OUString( "CharUnderline" ) ) >>= nValue;
switch ( nValue )
{
case awt::FontUnderline::DOUBLE:
@@ -407,7 +407,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException )
nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone;
break;
default:
- throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Unknown value retrieved for Underline") ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString("Unknown value retrieved for Underline"), uno::Reference< uno::XInterface >() );
}
return uno::makeAny( nValue );
@@ -454,14 +454,14 @@ ScVbaFont::getColor() throw (uno::RuntimeException)
{
// #TODO #FIXME - behave like getXXX above ( wrt. GetDataSet )
uno::Any aAny;
- aAny = OORGBToXLRGB( mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) ) ) );
+ aAny = OORGBToXLRGB( mxFont->getPropertyValue( rtl::OUString( "CharColor" ) ) );
return aAny;
}
void SAL_CALL
ScVbaFont::setOutlineFont( const uno::Any& aValue ) throw ( uno::RuntimeException )
{
- mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharContoured" ) ), aValue );
+ mxFont->setPropertyValue( rtl::OUString( "CharContoured" ), aValue );
}
uno::Any SAL_CALL
@@ -470,13 +470,13 @@ ScVbaFont::getOutlineFont() throw (uno::RuntimeException)
if ( GetDataSet() )
if ( GetDataSet()->GetItemState( ATTR_FONT_CONTOUR, sal_True, NULL) == SFX_ITEM_DONTCARE )
return aNULL();
- return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharContoured" ) ) );
+ return mxFont->getPropertyValue( rtl::OUString( "CharContoured" ) );
}
rtl::OUString
ScVbaFont::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFont"));
+ return rtl::OUString("ScVbaFont");
}
uno::Sequence< rtl::OUString >
@@ -486,7 +486,7 @@ ScVbaFont::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Font" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Font" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index c33dcf448222..e05e3ce53bd4 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -50,12 +50,12 @@ using namespace ::com::sun::star;
#define LOCALE "Locale"
template< typename Ifc1 >
-ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("en") ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "US") ), rtl::OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( sal_False )
+ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( rtl::OUString("en"), rtl::OUString( "US"), rtl::OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( sal_False )
{
try
{
if ( !mxModel.is() )
- DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XModel Interface could not be retrieved") ) );
+ DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( "XModel Interface could not be retrieved") );
// mxServiceInfo is unused,
// mxNumberFormatsSupplier is initialized when needed in initializeNumberFormats.
}
@@ -774,7 +774,7 @@ template< typename Ifc1 >
rtl::OUString
ScVbaFormat<Ifc1>::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormat"));
+ return rtl::OUString("ScVbaFormat");
}
template< typename Ifc1 >
@@ -785,7 +785,7 @@ ScVbaFormat<Ifc1>::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Format" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Format" );
}
return aServiceNames;
}
@@ -803,7 +803,7 @@ ScVbaFormat<Ifc1>::getCurrentDataSet( ) throw ( uno::RuntimeException )
{
SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() );
if ( !pDataSet )
- throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't access Itemset for XPropertySet" ) ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( "Can't access Itemset for XPropertySet" ), uno::Reference< uno::XInterface >() );
return pDataSet;
}
diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx
index acdb253c60eb..09a1455a3d73 100644
--- a/sc/source/ui/vba/vbaformatcondition.cxx
+++ b/sc/source/ui/vba/vbaformatcondition.cxx
@@ -140,7 +140,7 @@ ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException )
{
try
{
- mxParentRangePropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ConditionalFormat") ), uno::makeAny( mxSheetConditionalEntries) );
+ mxParentRangePropertySet->setPropertyValue( rtl::OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries) );
}
catch (uno::Exception& )
{
@@ -151,7 +151,7 @@ ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException )
rtl::OUString
ScVbaFormatCondition::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatCondition"));
+ return rtl::OUString("ScVbaFormatCondition");
}
uno::Sequence< rtl::OUString >
@@ -161,7 +161,7 @@ ScVbaFormatCondition::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.FormatCondition" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.FormatCondition" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx
index 7cfb8a549f21..f0922d52f384 100644
--- a/sc/source/ui/vba/vbaformatconditions.cxx
+++ b/sc/source/ui/vba/vbaformatconditions.cxx
@@ -203,7 +203,7 @@ ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException )
{
try
{
- mxParentRangePropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ConditionalFormat")), uno::makeAny( mxSheetConditionalEntries ));
+ mxParentRangePropertySet->setPropertyValue( rtl::OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries ));
}
catch (uno::Exception& )
{
@@ -228,7 +228,7 @@ ScVbaFormatConditions::getStyleName()
if ( !pStyles )
DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() );
uno::Sequence< rtl::OUString > sCellStyleNames = pStyles->getStyleNames();
- return ContainerUtilities::getUniqueName(sCellStyleNames, sStyleNamePrefix, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_") ));
+ return ContainerUtilities::getUniqueName(sCellStyleNames, sStyleNamePrefix, rtl::OUString("_"));
}
void
@@ -263,7 +263,7 @@ ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName,
rtl::OUString
ScVbaFormatConditions::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatConditions"));
+ return rtl::OUString("ScVbaFormatConditions");
}
uno::Sequence< rtl::OUString >
@@ -273,7 +273,7 @@ ScVbaFormatConditions::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.FormatConditions" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.FormatConditions" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx
index d213535c7f4a..707a5578b605 100644
--- a/sc/source/ui/vba/vbaglobals.cxx
+++ b/sc/source/ui/vba/vbaglobals.cxx
@@ -230,7 +230,7 @@ ScVbaGlobals::getDebug() throw (uno::RuntimeException)
{
uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW );
uno::Reference< uno::XInterface > xVBADebug = xServiceManager->createInstanceWithContext(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.Debug" ) ), mxContext );
+ ::rtl::OUString( "ooo.vba.Debug" ), mxContext );
return uno::Any( xVBADebug );
}
catch( uno::Exception& )
diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx
index e8df70391fa8..0c1ce0e618da 100644
--- a/sc/source/ui/vba/vbahyperlink.cxx
+++ b/sc/source/ui/vba/vbahyperlink.cxx
@@ -55,7 +55,7 @@ ScVbaHyperlink::ScVbaHyperlink( const uno::Reference< XHelperInterface >& rxAnch
UrlComponents aUrlComp;
OUString aTextToDisplay;
if( !(rAddress >>= aUrlComp.first) || aUrlComp.first.isEmpty() )
- throw uno::RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot get address" ) ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString( "Cannot get address" ), uno::Reference< uno::XInterface >() );
rSubAddress >>= aUrlComp.second;
rScreenTip >>= maScreenTip;
rTextToDisplay >>= aTextToDisplay;
@@ -84,7 +84,7 @@ ScVbaHyperlink::ScVbaHyperlink( const uno::Reference< XHelperInterface >& rxAnch
}
// create and initialize a new URL text field
uno::Reference< lang::XMultiServiceFactory > xFactory( ScVbaRange::getUnoModel( xAnchorRange ), uno::UNO_QUERY_THROW );
- uno::Reference< text::XTextContent > xUrlField( xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextField.URL" ) ) ), uno::UNO_QUERY_THROW );
+ uno::Reference< text::XTextContent > xUrlField( xFactory->createInstance( OUString( "com.sun.star.text.TextField.URL" ) ), uno::UNO_QUERY_THROW );
mxTextField.set( xUrlField, uno::UNO_QUERY_THROW );
setUrlComponents( aUrlComp );
setTextToDisplay( aTextToDisplay );
@@ -155,14 +155,14 @@ OUString ScVbaHyperlink::getTextToDisplay() throw (uno::RuntimeException)
{
ensureTextField();
OUString aTextToDisplay;
- mxTextField->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Representation" ) ) ) >>= aTextToDisplay;
+ mxTextField->getPropertyValue( OUString( "Representation" ) ) >>= aTextToDisplay;
return aTextToDisplay;
}
void ScVbaHyperlink::setTextToDisplay( const OUString& rTextToDisplay ) throw (uno::RuntimeException)
{
ensureTextField();
- mxTextField->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Representation" ) ), uno::Any( rTextToDisplay ) );
+ mxTextField->setPropertyValue( OUString( "Representation" ), uno::Any( rTextToDisplay ) );
}
sal_Int32 SAL_CALL ScVbaHyperlink::getType() throw (uno::RuntimeException)
@@ -209,7 +209,7 @@ ScVbaHyperlink::UrlComponents ScVbaHyperlink::getUrlComponents() throw (uno::Run
{
ensureTextField();
OUString aUrl;
- mxTextField->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) ) >>= aUrl;
+ mxTextField->getPropertyValue( OUString( "URL" ) ) >>= aUrl;
sal_Int32 nHashPos = aUrl.indexOf( '#' );
if( nHashPos < 0 )
return UrlComponents( aUrl, OUString() );
@@ -222,7 +222,7 @@ void ScVbaHyperlink::setUrlComponents( const UrlComponents& rUrlComp ) throw (un
OUStringBuffer aUrl( rUrlComp.first );
if( !rUrlComp.second.isEmpty() )
aUrl.append( sal_Unicode( '#' ) ).append( rUrlComp.second );
- mxTextField->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ), uno::Any( aUrl.makeStringAndClear() ) );
+ mxTextField->setPropertyValue( OUString( "URL" ), uno::Any( aUrl.makeStringAndClear() ) );
}
namespace hyperlink
diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx
index c1d056f5e6d8..8711ba0a1168 100644
--- a/sc/source/ui/vba/vbahyperlinks.cxx
+++ b/sc/source/ui/vba/vbahyperlinks.cxx
@@ -38,7 +38,7 @@ bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRan
{
const ScRangeList& rScInner = ScVbaRange::getScRangeList( rxInner );
if( rScInner.empty() || rScOuter.empty() )
- throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Empty range objects" ) ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( ::rtl::OUString( "Empty range objects" ), uno::Reference< uno::XInterface >() );
for( size_t nIndex = 0, nCount = rScInner.size(); nIndex < nCount; ++nIndex )
if( !rScOuter.In( *rScInner[ nIndex ] ) )
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index 6cda078aefef..7b4d65d8496b 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -86,7 +86,7 @@ ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent,
m_aPattColor.SetColor( (sal_uInt32)0x0 );
m_nPattern = 0L;
if ( !m_xProps.is() )
- throw lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "properties") ), uno::Reference< uno::XInterface >(), 2 );
+ throw lang::IllegalArgumentException( rtl::OUString( "properties"), uno::Reference< uno::XInterface >(), 2 );
}
uno::Any
@@ -250,7 +250,7 @@ ScVbaInterior::GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 n
uno::Reference< container::XNameContainer >
ScVbaInterior::GetAttributeContainer()
{
- return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserDefinedAttributes" )) ), uno::UNO_QUERY_THROW );
+ return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( rtl::OUString( "UserDefinedAttributes" ) ), uno::UNO_QUERY_THROW );
}
sal_Int32
ScVbaInterior::GetAttributeData( uno::Any aValue )
@@ -266,7 +266,7 @@ uno::Any
ScVbaInterior::SetAttributeData( sal_Int32 nValue )
{
xml::AttributeData aAttributeData;
- aAttributeData.Type = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "sal_Int32" ));
+ aAttributeData.Type = rtl::OUString( "sal_Int32" );
aAttributeData.Value = rtl::OUString::valueOf( nValue );
return uno::makeAny( aAttributeData );
}
@@ -289,7 +289,7 @@ ScVbaInterior::SetUserDefinedAttributes( const rtl::OUString& sName, const uno::
if( xNameContainer->hasByName( sName ) )
xNameContainer->removeByName( sName );
xNameContainer->insertByName( sName, aValue );
- m_xProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserDefinedAttributes" )), uno::makeAny( xNameContainer ) );
+ m_xProps->setPropertyValue( rtl::OUString( "UserDefinedAttributes" ), uno::makeAny( xNameContainer ) );
}
}
// OOo do not support below API
@@ -311,7 +311,7 @@ ScVbaInterior::setPattern( const uno::Any& _pattern ) throw (uno::RuntimeExcepti
SetMixedColor();
}
else
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern index" )), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( "Invalid Pattern index" ), uno::Reference< uno::XInterface >() );
}
Color
ScVbaInterior::GetBackColor()
@@ -359,7 +359,7 @@ ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::Runt
SetMixedColor();
}
else
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern Color" )), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() );
}
uno::Any SAL_CALL
ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException)
@@ -382,13 +382,13 @@ ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw
setPatternColor( uno::makeAny( OORGBToXLRGB( nPattColor ) ) );
}
else
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern Color" )), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() );
}
rtl::OUString
ScVbaInterior::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaInterior"));
+ return rtl::OUString("ScVbaInterior");
}
uno::Sequence< rtl::OUString >
@@ -398,7 +398,7 @@ ScVbaInterior::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Interior" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Interior" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbamenu.cxx b/sc/source/ui/vba/vbamenu.cxx
index 19c1392eeb0c..dedb0398d6bb 100644
--- a/sc/source/ui/vba/vbamenu.cxx
+++ b/sc/source/ui/vba/vbamenu.cxx
@@ -69,7 +69,7 @@ ScVbaMenu::MenuItems( const uno::Any& aIndex ) throw (script::BasicErrorExceptio
rtl::OUString
ScVbaMenu::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenu"));
+ return rtl::OUString("ScVbaMenu");
}
uno::Sequence<rtl::OUString>
@@ -79,7 +79,7 @@ ScVbaMenu::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Menu" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Menu" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbamenubar.cxx b/sc/source/ui/vba/vbamenubar.cxx
index 6d9b625326d5..91997c0b1b20 100644
--- a/sc/source/ui/vba/vbamenubar.cxx
+++ b/sc/source/ui/vba/vbamenubar.cxx
@@ -51,7 +51,7 @@ ScVbaMenuBar::Menus( const uno::Any& aIndex ) throw (script::BasicErrorException
rtl::OUString
ScVbaMenuBar::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBar"));
+ return rtl::OUString("ScVbaMenuBar");
}
uno::Sequence<rtl::OUString>
@@ -61,7 +61,7 @@ ScVbaMenuBar::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuBar" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuBar" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx
index 33d43897657f..eb7aead78349 100644
--- a/sc/source/ui/vba/vbamenubars.cxx
+++ b/sc/source/ui/vba/vbamenubars.cxx
@@ -106,20 +106,20 @@ ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw
if( nIndex == excel::XlSheetType::xlWorksheet )
{
uno::Any aSource;
- aSource <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Worksheet Menu Bar" ));
+ aSource <<= rtl::OUString( "Worksheet Menu Bar" );
uno::Reference< XCommandBar > xCommandBar( m_xCommandBars->Item( aSource, uno::Any() ), uno::UNO_QUERY_THROW );
uno::Reference< excel::XMenuBar > xMenuBar( new ScVbaMenuBar( this, mxContext, xCommandBar ) );
return uno::makeAny( xMenuBar );
}
- throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
// XHelperInterface
rtl::OUString
ScVbaMenuBars::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBars"));
+ return rtl::OUString("ScVbaMenuBars");
}
uno::Sequence<rtl::OUString>
@@ -129,7 +129,7 @@ ScVbaMenuBars::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuBars" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuBars" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbamenuitem.cxx b/sc/source/ui/vba/vbamenuitem.cxx
index 37a701e8e726..881ef72fa9cc 100644
--- a/sc/source/ui/vba/vbamenuitem.cxx
+++ b/sc/source/ui/vba/vbamenuitem.cxx
@@ -67,7 +67,7 @@ ScVbaMenuItem::Delete( ) throw (script::BasicErrorException, uno::RuntimeExcepti
rtl::OUString
ScVbaMenuItem::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItem"));
+ return rtl::OUString("ScVbaMenuItem");
}
uno::Sequence<rtl::OUString>
@@ -77,7 +77,7 @@ ScVbaMenuItem::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuItem" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuItem" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx
index 8df35adac119..90e70b127c18 100644
--- a/sc/source/ui/vba/vbamenuitems.cxx
+++ b/sc/source/ui/vba/vbamenuitems.cxx
@@ -135,7 +135,7 @@ uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const rtl::OUSt
rtl::OUString
ScVbaMenuItems::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItems"));
+ return rtl::OUString("ScVbaMenuItems");
}
uno::Sequence<rtl::OUString>
@@ -145,7 +145,7 @@ ScVbaMenuItems::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuItems" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuItems" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx
index b7d50e590a92..f1ab8e120485 100644
--- a/sc/source/ui/vba/vbamenus.cxx
+++ b/sc/source/ui/vba/vbamenus.cxx
@@ -121,7 +121,7 @@ uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const rtl::OUString& Ca
rtl::OUString
ScVbaMenus::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenus"));
+ return rtl::OUString("ScVbaMenus");
}
uno::Sequence<rtl::OUString>
@@ -131,7 +131,7 @@ ScVbaMenus::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Menus" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Menus" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx
index e02d7e0e99cb..6bd3cb59bc79 100644
--- a/sc/source/ui/vba/vbaoleobject.cxx
+++ b/sc/source/ui/vba/vbaoleobject.cxx
@@ -40,7 +40,7 @@ ScVbaOLEObject::ScVbaOLEObject( const uno::Reference< XHelperInterface >& xParen
xChild.set( xChild->getParent(), uno::UNO_QUERY_THROW );
css::uno::Reference< css::frame::XModel > xModel( xChild->getParent(), uno::UNO_QUERY_THROW );
uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
- uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW );
+ uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW );
m_xControl.set( xControlProvider->createControl( xControlShape, xModel ) );
}
@@ -128,7 +128,7 @@ ScVbaOLEObject::setWidth( double _width ) throw (uno::RuntimeException)
rtl::OUString
ScVbaOLEObject::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObject"));
+ return rtl::OUString("ScVbaOLEObject");
}
uno::Sequence< rtl::OUString >
@@ -138,7 +138,7 @@ ScVbaOLEObject::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.OLEObject" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.OLEObject" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx
index 88b1ac4d6a16..7b1c44fd94ad 100644
--- a/sc/source/ui/vba/vbaoleobjects.cxx
+++ b/sc/source/ui/vba/vbaoleobjects.cxx
@@ -161,7 +161,7 @@ ScVbaOLEObjects::getElementType() throw (uno::RuntimeException)
rtl::OUString
ScVbaOLEObjects::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObjects"));
+ return rtl::OUString("ScVbaOLEObjects");
}
uno::Sequence< rtl::OUString >
@@ -171,7 +171,7 @@ ScVbaOLEObjects::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.OLEObjects" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.OLEObjects" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbaoutline.cxx b/sc/source/ui/vba/vbaoutline.cxx
index 00ea233f7c48..29cbd0e09434 100644
--- a/sc/source/ui/vba/vbaoutline.cxx
+++ b/sc/source/ui/vba/vbaoutline.cxx
@@ -40,7 +40,7 @@ ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevel
rtl::OUString
ScVbaOutline::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaOutline"));
+ return rtl::OUString("ScVbaOutline");
}
uno::Sequence< rtl::OUString >
@@ -50,7 +50,7 @@ ScVbaOutline::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Outline" ) );
+ aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Outline" );
}
return aServiceNames;
}
diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx
index e8e3b8d0f48b..611c568243e6 100644
--- a/sc/source/ui/vba/vbapagebreak.cxx
+++ b/sc/source/ui/vba/vbapagebreak.cxx