[Libreoffice-commits] core.git: bridges/source bridges/test cli_ure/source connectivity/source cppuhelper/source cppuhelper/test cppu/qa cppu/source cpputools/source crashrep/source cui/source dbaccess/qa dbaccess/source drawinglayer/source editeng/source embeddedobj/source embedserv/source extensions/qa extensions/source extensions/test filter/source forms/source fpicker/source framework/source i18npool/qa idlc/source jvmfwk/plugins jvmfwk/source mysqlc/source odk/examples pyuno/source registry/source reportdesign/source sal/osl sal/qa sal/rtl sal/test sax/source sc/qa scripting/source sc/source sdext/source sd/source sfx2/source shell/source stoc/source stoc/test svgio/source svtools/source svx/source sw/source test/source testtools/source toolkit/source ucb/workben vcl/aqua vcl/ios vcl/unx vcl/win xmlsecurity/source
Thomas Arnhold
thomas at arnhold.org
Tue Mar 19 03:48:53 PDT 2013
bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx | 2
bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx | 2
bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx | 2
bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx | 2
bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx | 2
bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx | 2
bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx | 2
bridges/test/java_uno/acquire/testacquire.cxx | 2
bridges/test/java_uno/equals/testequals.cxx | 2
bridges/test/performance/testperformance.cxx | 2
bridges/test/testcomp.cxx | 2
cli_ure/source/uno_bridge/cli_data.cxx | 10 -
connectivity/source/commontools/AutoRetrievingBase.cxx | 4
connectivity/source/commontools/ConnectionWrapper.cxx | 2
connectivity/source/commontools/DateConversion.cxx | 6
connectivity/source/commontools/DriversConfig.cxx | 4
connectivity/source/commontools/FValue.cxx | 4
connectivity/source/commontools/TColumnsHelper.cxx | 4
connectivity/source/commontools/TIndexColumns.cxx | 2
connectivity/source/commontools/TIndexes.cxx | 4
connectivity/source/commontools/TTableHelper.cxx | 10 -
connectivity/source/commontools/conncleanup.cxx | 2
connectivity/source/commontools/dbconversion.cxx | 2
connectivity/source/commontools/dbtools.cxx | 36 ++--
connectivity/source/commontools/dbtools2.cxx | 30 +--
connectivity/source/commontools/parameters.cxx | 2
connectivity/source/commontools/predicateinput.cxx | 8
connectivity/source/commontools/sqlerror.cxx | 2
connectivity/source/commontools/statementcomposer.cxx | 2
connectivity/source/cpool/ZConnectionPool.cxx | 2
connectivity/source/drivers/ado/AConnection.cxx | 2
connectivity/source/drivers/ado/APreparedStatement.cxx | 4
connectivity/source/drivers/ado/Awrapado.cxx | 2
connectivity/source/drivers/hsqldb/HCatalog.cxx | 4
connectivity/source/drivers/jdbc/JConnection.cxx | 2
connectivity/source/drivers/mozab/MConfigAccess.cxx | 2
connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx | 3
connectivity/source/drivers/mysql/YCatalog.cxx | 6
connectivity/source/drivers/postgresql/pq_connection.cxx | 2
connectivity/source/drivers/postgresql/pq_driver.cxx | 5
cppu/qa/test_any.cxx | 40 ++--
cppu/source/threadpool/current.cxx | 14 -
cppu/source/typelib/static_types.cxx | 36 ++--
cppu/source/uno/cascade_mapping.cxx | 8
cppuhelper/source/tdmgr.cxx | 30 +--
cppuhelper/test/cfg_test.cxx | 4
cppuhelper/test/testcmp/TestComponent.cxx | 2
cpputools/source/unoexe/unoexe.cxx | 6
crashrep/source/win32/soreport.cxx | 2
cui/source/dialogs/colorpicker.cxx | 2
cui/source/dialogs/cuigaldlg.cxx | 4
cui/source/dialogs/hlmarkwn.cxx | 6
dbaccess/qa/extras/macros-test.cxx | 6
dbaccess/source/ui/control/FieldDescControl.cxx | 2
dbaccess/source/ui/dlg/CollectionView.cxx | 6
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 4
dbaccess/source/ui/dlg/dbfindex.cxx | 4
dbaccess/source/ui/dlg/odbcconfig.cxx | 2
dbaccess/source/ui/dlg/queryfilter.cxx | 6
dbaccess/source/ui/dlg/queryorder.cxx | 6
dbaccess/source/ui/dlg/tablespage.cxx | 4
dbaccess/source/ui/misc/DExport.cxx | 6
dbaccess/source/ui/misc/UITools.cxx | 6
dbaccess/source/ui/misc/WCPage.cxx | 2
dbaccess/source/ui/misc/WCopyTable.cxx | 6
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx | 2
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 16 -
dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 4
dbaccess/source/ui/tabledesign/TableController.cxx | 2
dbaccess/source/ui/uno/ColumnPeer.cxx | 2
drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx | 2
drawinglayer/source/geometry/viewinformation2d.cxx | 12 -
drawinglayer/source/geometry/viewinformation3d.cxx | 18 +-
editeng/source/items/flditem.cxx | 2
editeng/source/misc/unolingu.cxx | 2
editeng/source/uno/unotext.cxx | 4
editeng/source/xml/xmltxtexp.cxx | 2
editeng/source/xml/xmltxtimp.cxx | 2
embeddedobj/source/commonembedding/persistence.cxx | 2
embeddedobj/source/general/docholder.cxx | 4
embeddedobj/source/msole/olepersist.cxx | 8
embedserv/source/embed/docholder.cxx | 6
embedserv/source/embed/ed_ipersiststr.cxx | 4
extensions/qa/update/test_update.cxx | 2
extensions/source/abpilot/datasourcehandling.cxx | 2
extensions/source/abpilot/fieldmappingimpl.cxx | 8
extensions/source/config/ldap/ldapuserprofilebe.cxx | 20 +-
extensions/source/plugin/unx/sysplug.cxx | 3
extensions/source/propctrlr/objectinspectormodel.cxx | 2
extensions/test/ole/unloading/unloadTest.cxx | 16 -
filter/source/msfilter/escherex.cxx | 2
filter/source/msfilter/mstoolbar.cxx | 8
filter/source/msfilter/svdfppt.cxx | 18 +-
filter/source/placeware/exporter.cxx | 10 -
filter/source/svg/svgexport.cxx | 3
filter/source/svg/svgimport.cxx | 2
filter/source/svg/svgwriter.cxx | 12 -
filter/source/xsltdialog/typedetectionexport.cxx | 42 ++---
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 2
filter/source/xsltdialog/xmlfilterjar.cxx | 8
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 4
filter/source/xsltfilter/OleHandler.cxx | 2
forms/source/component/Columns.cxx | 4
forms/source/component/DatabaseForm.cxx | 2
forms/source/component/Filter.cxx | 2
forms/source/component/FormattedField.cxx | 4
forms/source/component/ListBox.cxx | 2
forms/source/misc/InterfaceContainer.cxx | 2
forms/source/misc/limitedformats.cxx | 2
forms/source/richtext/richtextcontrol.cxx | 2
forms/source/xforms/binding.cxx | 4
forms/source/xforms/submission/submission_post.cxx | 2
forms/source/xforms/xpathlib/xpathlib.cxx | 2
fpicker/source/aqua/FilterHelper.mm | 4
fpicker/source/win32/filepicker/VistaFilePicker.cxx | 6
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx | 4
fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx | 40 ++--
fpicker/source/win32/filepicker/shared.hxx | 6
fpicker/source/win32/filepicker/workbench/Test_fps.cxx | 2
fpicker/source/win32/folderpicker/WinFOPImpl.cxx | 2
fpicker/source/win32/misc/WinImplHelper.cxx | 4
framework/source/fwi/jobs/jobconst.cxx | 6
i18npool/qa/cppunit/test_breakiterator.cxx | 4
idlc/source/idlccompile.cxx | 4
jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 18 --
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 9 -
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 12 -
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 12 -
jvmfwk/source/framework.cxx | 6
mysqlc/source/mysqlc_databasemetadata.cxx | 4
mysqlc/source/mysqlc_preparedstatement.cxx | 2
mysqlc/source/mysqlc_resultset.cxx | 2
odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx | 2
pyuno/source/loader/pyuno_loader.cxx | 8
pyuno/source/module/pyuno_module.cxx | 2
registry/source/regkey.cxx | 18 +-
reportdesign/source/core/api/ReportDefinition.cxx | 18 +-
reportdesign/source/core/api/ReportEngineJFree.cxx | 8
reportdesign/source/core/misc/conditionalexpression.cxx | 6
reportdesign/source/core/misc/reportformula.cxx | 4
reportdesign/source/core/sdr/formatnormalizer.cxx | 2
reportdesign/source/filter/xml/xmlCell.cxx | 4
reportdesign/source/filter/xml/xmlExport.cxx | 4
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 12 -
reportdesign/source/filter/xml/xmlFixedContent.cxx | 4
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 2
reportdesign/source/filter/xml/xmlfilter.cxx | 8
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 4
reportdesign/source/ui/inspection/GeometryHandler.cxx | 4
reportdesign/source/ui/inspection/ReportComponentHandler.cxx | 4
reportdesign/source/ui/report/ReportController.cxx | 10 -
reportdesign/source/ui/report/propbrw.cxx | 6
sal/osl/unx/file_url.cxx | 2
sal/osl/unx/process.cxx | 2
sal/osl/unx/process_impl.cxx | 2
sal/qa/rtl/ostring/rtl_string.cxx | 2
sal/rtl/logfile.cxx | 2
sal/test/testbootstrap.cxx | 4
sal/test/unloading/unloadTest.cxx | 16 -
sax/source/tools/converter.cxx | 4
sc/qa/extras/macros-test.cxx | 2
sc/qa/extras/regression-test.cxx | 2
sc/qa/extras/sccellrangeobj.cxx | 4
sc/qa/extras/scnamedrangeobj.cxx | 2
sc/qa/extras/scnamedrangesobj.cxx | 2
sc/qa/unit/filters-test.cxx | 2
sc/qa/unit/helper/qahelper.hxx | 2
sc/qa/unit/subsequent_filters-test.cxx | 18 +-
sc/source/filter/excel/xestream.cxx | 2
sc/source/filter/excel/xltoolbar.cxx | 2
sc/source/filter/html/htmlpars.cxx | 4
sc/source/filter/lotus/lotread.cxx | 2
sc/source/filter/xml/XMLCodeNameProvider.cxx | 4
sc/source/filter/xml/XMLStylesExportHelper.cxx | 2
sc/source/filter/xml/XMLTableShapeResizer.cxx | 2
sc/source/filter/xml/xmlcvali.cxx | 2
sc/source/filter/xml/xmlexprt.cxx | 6
sc/source/filter/xml/xmlimprt.cxx | 8
sc/source/filter/xml/xmlstyle.cxx | 4
sc/source/filter/xml/xmlwrap.cxx | 20 +-
sc/source/ui/app/drwtrans.cxx | 8
sc/source/ui/app/seltrans.cxx | 2
sc/source/ui/cctrl/tbinsert.cxx | 8
sc/source/ui/dbgui/scuiasciiopt.cxx | 2
sc/source/ui/docshell/impex.cxx | 2
sc/source/ui/drawfunc/drawsh5.cxx | 16 -
sc/source/ui/miscdlgs/optsolver.cxx | 2
sc/source/ui/unoobj/cellvaluebinding.cxx | 4
sc/source/ui/unoobj/docuno.cxx | 2
sc/source/ui/unoobj/fmtuno.cxx | 2
sc/source/ui/vba/excelvbahelper.cxx | 2
sc/source/ui/vba/testvba/testvba.cxx | 2
sc/source/ui/vba/vbaapplication.cxx | 2
sc/source/ui/vba/vbaaxis.cxx | 8
sc/source/ui/vba/vbaborders.cxx | 2
sc/source/ui/vba/vbachart.cxx | 32 +--
sc/source/ui/vba/vbachartobject.cxx | 2
sc/source/ui/vba/vbaformatconditions.cxx | 10 -
sc/source/ui/vba/vbainterior.cxx | 6
sc/source/ui/vba/vbastyle.cxx | 2
sc/source/ui/vba/vbastyles.cxx | 4
sc/source/ui/vba/vbawindow.cxx | 4
sc/source/ui/vba/vbaworkbooks.cxx | 2
scripting/source/stringresource/stringresource.cxx | 6
sd/source/ui/remotecontrol/ImagePreparer.cxx | 4
sdext/source/minimizer/configurationaccess.cxx | 5
sdext/source/minimizer/unodialog.cxx | 4
sdext/source/pdfimport/filterdet.cxx | 2
sdext/source/pdfimport/pdfiadaptor.cxx | 2
sdext/source/pdfimport/sax/saxattrlist.cxx | 2
sfx2/source/appl/shutdowniconaqua.mm | 2
sfx2/source/dialog/dockwin.cxx | 2
sfx2/source/dialog/partwnd.cxx | 4
sfx2/source/dialog/recfloat.cxx | 2
sfx2/source/doc/docmacromode.cxx | 2
sfx2/source/doc/doctemplateslocal.cxx | 12 -
sfx2/source/doc/guisaveas.cxx | 4
sfx2/source/menu/virtmenu.cxx | 8
sfx2/source/view/frame2.cxx | 4
shell/source/backends/desktopbe/desktopbackend.cxx | 3
shell/source/backends/gconfbe/gconfbackend.cxx | 3
shell/source/backends/kde4be/kde4backend.cxx | 3
shell/source/backends/kdebe/kdebackend.cxx | 3
stoc/source/inspect/introspection.cxx | 2
stoc/source/javaloader/javaloader.cxx | 2
stoc/source/javavm/javavm.cxx | 23 +-
stoc/test/javavm/jvm_interaction/interactionhandler.cxx | 2
stoc/test/javavm/testjavavm.cxx | 8
svgio/source/svguno/xsvgparser.cxx | 2
svtools/source/config/extcolorcfg.cxx | 30 +--
svtools/source/config/helpopt.cxx | 18 +-
svtools/source/contnr/fileview.cxx | 16 -
svtools/source/control/calendar.cxx | 2
svtools/source/dialogs/addresstemplate.cxx | 6
svtools/source/dialogs/colrdlg.cxx | 2
svtools/source/dialogs/insdlg.cxx | 6
svtools/source/filter/exportdialog.cxx | 2
svtools/source/graphic/grfmgr.cxx | 2
svtools/source/hatchwindow/documentcloser.cxx | 2
svtools/source/misc/bindablecontrolhelper.cxx | 2
svtools/source/misc/embedtransfer.cxx | 2
svtools/source/misc/transfer.cxx | 22 +-
svtools/source/uno/contextmenuhelper.cxx | 2
svtools/source/uno/popupmenucontrollerbase.cxx | 2
svtools/source/uno/unoimap.cxx | 2
svx/source/fmcomp/fmgridcl.cxx | 2
svx/source/fmcomp/gridcols.cxx | 4
svx/source/form/fmPropBrw.cxx | 6
svx/source/form/fmobj.cxx | 2
svx/source/form/fmpgeimp.cxx | 2
svx/source/form/fmscriptingenv.cxx | 2
svx/source/form/fmundo.cxx | 2
svx/source/form/formcontrolfactory.cxx | 4
svx/source/form/formtoolbars.cxx | 2
svx/source/form/tbxform.cxx | 2
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 2
svx/source/sdr/primitive2d/primitivefactory2d.cxx | 2
svx/source/svdraw/svdoashp.cxx | 84 +++++-----
svx/source/table/accessiblecell.cxx | 2
svx/source/table/cellcursor.cxx | 4
svx/source/table/svdotable.cxx | 8
svx/source/table/tablecontroller.cxx | 4
svx/source/table/tabledesign.cxx | 4
svx/source/table/tablelayouter.cxx | 4
svx/source/table/tablemodel.cxx | 4
svx/source/table/tablertfimporter.cxx | 2
svx/source/tbxctrls/extrusioncontrols.cxx | 2
svx/source/tbxctrls/fontworkgallery.cxx | 2
svx/source/tbxctrls/grafctrl.cxx | 3
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 6
svx/source/toolbars/extrusionbar.cxx | 82 ++++-----
svx/source/toolbars/fontworkbar.cxx | 22 +-
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 4
svx/source/unodraw/UnoGraphicExporter.cxx | 2
svx/source/unodraw/XPropertyTable.cxx | 12 -
svx/source/unodraw/unomod.cxx | 4
svx/source/unodraw/unoshape.cxx | 4
svx/source/xoutdev/xtable.cxx | 2
sw/source/core/unocore/unodraw.cxx | 12 -
sw/source/core/unocore/unofield.cxx | 8
sw/source/core/view/printdata.cxx | 4
sw/source/filter/html/htmlforw.cxx | 12 -
sw/source/filter/xml/swxml.cxx | 35 +---
sw/source/filter/xml/wrtxml.cxx | 30 +--
sw/source/filter/xml/xmlexp.cxx | 9 -
sw/source/filter/xml/xmlfmt.cxx | 4
sw/source/filter/xml/xmlimp.cxx | 33 +--
sw/source/filter/xml/xmltble.cxx | 4
sw/source/filter/xml/xmltbli.cxx | 5
sw/source/filter/xml/xmltexti.cxx | 10 -
sw/source/ui/app/docsh2.cxx | 6
sw/source/ui/dbui/swdbtoolsclient.cxx | 2
sw/source/ui/docvw/edtwin.cxx | 2
sw/source/ui/envelp/mailmrge.cxx | 2
sw/source/ui/ribbar/workctrl.cxx | 8
sw/source/ui/uno/unoatxt.cxx | 2
sw/source/ui/vba/vbaapplication.cxx | 2
sw/source/ui/vba/vbaborders.cxx | 2
sw/source/ui/vba/vbafont.cxx | 2
sw/source/ui/vba/vbaglobals.cxx | 2
sw/source/ui/vba/vbatemplate.cxx | 2
sw/source/ui/wrtsh/navmgr.cxx | 2
test/source/container/xnamed.cxx | 2
test/source/sheet/cellproperties.cxx | 4
test/source/sheet/datapilotfield.cxx | 18 +-
test/source/sheet/tableautoformatfield.cxx | 4
test/source/sheet/xdatabaserange.cxx | 2
test/source/sheet/xdatapilotdescriptor.cxx | 4
test/source/sheet/xnamedrange.cxx | 14 -
test/source/sheet/xnamedranges.cxx | 22 +-
test/source/sheet/xspreadsheets2.cxx | 26 +--
testtools/source/performance/pseudo.cxx | 4
testtools/source/performance/ubtest.cxx | 6
toolkit/source/controls/tabpagemodel.cxx | 4
toolkit/source/controls/tree/treedatamodel.cxx | 6
toolkit/source/controls/unocontrolcontainer.cxx | 6
toolkit/source/controls/unocontrolmodel.cxx | 2
toolkit/source/helper/formpdfexport.cxx | 44 ++---
ucb/workben/cachemap/cachemaptest.cxx | 2
vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm | 24 +-
vcl/aqua/source/app/salinst.cxx | 2
vcl/aqua/source/gdi/atsui/salgdi.cxx | 2
vcl/ios/source/app/salinst.cxx | 2
vcl/unx/generic/desktopdetect/desktopdetector.cxx | 4
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 4
vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 2
vcl/unx/gtk/gdi/salprn-gtk.cxx | 4
vcl/unx/kde/UnxFilePicker.cxx | 16 -
vcl/win/source/app/salinst.cxx | 2
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 10 -
xmlsecurity/source/dialogs/resourcemanager.cxx | 2
348 files changed, 1091 insertions(+), 1135 deletions(-)
New commits:
commit 39d45390f4fab1e9e85f211d74ed2c08fda5b652
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 19 11:39:07 2013 +0100
removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations
s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms
Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b
Reviewed-on: https://gerrit.libreoffice.org/2835
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
Tested-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
index 5c0db33..aa7a279 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
@@ -397,7 +397,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
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 7d85b1a..892dc8c 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
@@ -582,7 +582,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
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 366c18e..45e51a9 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
@@ -394,7 +394,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
index fa9eccb..522f4c5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
@@ -434,7 +434,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 66d43bb..c2c7d28 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -641,7 +641,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
index 4efc234..8475b27 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
@@ -418,7 +418,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
index a021228..b7b0020 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
@@ -592,7 +592,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
index 4e3f7db..55a1250 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
@@ -292,7 +292,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx
index 3127440..ba66b6e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx
@@ -393,7 +393,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
index e14e86f..19f4294 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
@@ -502,7 +502,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
index 5d1c47c..e3c2dd3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
@@ -585,7 +585,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
index 03dbd00..bc8a1a4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
@@ -502,7 +502,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
index 7b5c99e..3582aae 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
@@ -536,7 +536,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
index ac7607a..b8fa8ad 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
@@ -439,7 +439,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
index fc92e39..37b00d2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
@@ -503,7 +503,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
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 7be37bb..d5711a5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -355,7 +355,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx
index 0bef4f8..9b14f17 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx
@@ -397,7 +397,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx
index 8e63487..0f5e0bc 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx
@@ -547,7 +547,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
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 7be37bb..d5711a5 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
@@ -355,7 +355,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
index be63fdb..1be1215 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
@@ -331,7 +331,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
index d91d490..4129785 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
@@ -502,7 +502,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
index dd26e38..60a57a4 100644
--- a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
@@ -291,7 +291,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
index 47e96d0..301e617 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
@@ -369,7 +369,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
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 6062332..67f2a0d 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
@@ -336,7 +336,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = sal_False;
typelib_TypeDescriptionReference * pReturnTypeRef = NULL;
- OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aVoidName("void");
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx
index 47a2a0b..a0f5ef6 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -517,7 +517,7 @@ namespace {
bool writeInfo(void * registryKey, rtl::OUString const & implementationName,
css::uno::Sequence< rtl::OUString > const & serviceNames) {
- rtl::OUString keyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
+ rtl::OUString keyName( "/" );
keyName += implementationName;
keyName += rtl::OUString( "/UNO/SERVICES" );
css::uno::Reference< css::registry::XRegistryKey > key;
diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx
index dc3936f..5c27493 100644
--- a/bridges/test/java_uno/equals/testequals.cxx
+++ b/bridges/test/java_uno/equals/testequals.cxx
@@ -177,7 +177,7 @@ namespace {
bool writeInfo(void * pRegistryKey, sal_Char const * pImplementationName,
css::uno::Sequence< rtl::OUString > const & rServiceNames)
{
- rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
+ rtl::OUString aKeyName( "/" );
aKeyName += rtl::OUString::createFromAscii(pImplementationName);
aKeyName += rtl::OUString( "/UNO/SERVICES" );
css::uno::Reference< css::registry::XRegistryKey > xKey;
diff --git a/bridges/test/performance/testperformance.cxx b/bridges/test/performance/testperformance.cxx
index 36102ac..75d12ad 100644
--- a/bridges/test/performance/testperformance.cxx
+++ b/bridges/test/performance/testperformance.cxx
@@ -171,7 +171,7 @@ void main()
MyTimer timer( "performance - 1000*1000 unicode string construction/destruction" );
for( int i = 0 ; i < 1000*1000 ; i ++ )
{
- OUString textEnc( RTL_CONSTASCII_USTRINGPARAM( "this is a test string" ) );
+ OUString textEnc( "this is a test string" );
}
}
diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx
index 21eadd9..08248b0 100644
--- a/bridges/test/testcomp.cxx
+++ b/bridges/test/testcomp.cxx
@@ -672,7 +672,7 @@ void testRemote( const Reference< XInterface > &rRemote )
//--------------------
// Test attributes
//----------------------
- OUString ow( RTL_CONSTASCII_USTRINGPARAM( "dum didel dum dideldei" ));
+ OUString ow( "dum didel dum dideldei" );
rLCallMe->setsAttribute( ow );
OSL_ASSERT( rLCallMe->getsAttribute() == ow );
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index d5d17ba..828e7f4 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -237,7 +237,7 @@ System::Type^ mapUnoType(typelib_TypeDescriptionReference const * pTD)
case typelib_TypeClass_INTERFACE:
{
//special handling for XInterface, since it does not exist in cli.
- rtl::OUString usXInterface(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface"));
+ rtl::OUString usXInterface("com.sun.star.uno.XInterface");
if (usXInterface.equals(pTD->pTypeName))
retVal= System::Object::typeid;
else
@@ -1072,7 +1072,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
{
typelib_TypeDescriptionReference * member_type= NULL;
- rtl::OUString usUnoException(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception"));
+ rtl::OUString usUnoException("com.sun.star.uno.Exception");
for (; nPos < nMembers; ++nPos)
{
member_type= comp_td->ppTypeRefs[nPos];
@@ -1092,7 +1092,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
// System.Exception property. Type.GetField("Message") returns null
if ( ! aField && usUnoException.equals(td.get()->pTypeName))
{// get Exception.Message property
- rtl::OUString usMessageMember(RTL_CONSTASCII_USTRINGPARAM("Message"));
+ rtl::OUString usMessageMember("Message");
if (usMessageMember.equals(comp_td->ppMemberNames[nPos]))
{
sr::PropertyInfo^ pi= cliType->GetProperty(
@@ -1625,7 +1625,7 @@ void Bridge::map_to_cli(
pCTD = pCTD->pBaseTypeDescription;
int nPos = -1;
- rtl::OUString usMessageMember(RTL_CONSTASCII_USTRINGPARAM("Message"));
+ rtl::OUString usMessageMember("Message");
for (int i = 0; i < pCTD->nMembers; i ++)
{
#if OSL_DEBUG_LEVEL >= 2
@@ -1685,7 +1685,7 @@ void Bridge::map_to_cli(
((typelib_TypeDescription *)comp_td->pBaseTypeDescription)->pWeakRef, nullptr,
true);
}
- rtl::OUString usUnoException(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception"));
+ rtl::OUString usUnoException("com.sun.star.uno.Exception");
for (sal_Int32 nPos = comp_td->nMembers; nPos--; )
{
typelib_TypeDescriptionReference * member_type = comp_td->ppTypeRefs[ nPos ];
diff --git a/connectivity/source/commontools/AutoRetrievingBase.cxx b/connectivity/source/commontools/AutoRetrievingBase.cxx
index c3a1366..ffbb348 100644
--- a/connectivity/source/commontools/AutoRetrievingBase.cxx
+++ b/connectivity/source/commontools/AutoRetrievingBase.cxx
@@ -29,8 +29,8 @@ namespace connectivity
if ( sStmt.startsWith("INSERT") )
{
sStatement = m_sGeneratedValueStatement;
- static const ::rtl::OUString sColumn(RTL_CONSTASCII_USTRINGPARAM("$column"));
- static const ::rtl::OUString sTable(RTL_CONSTASCII_USTRINGPARAM("$table"));
+ static const ::rtl::OUString sColumn("$column");
+ static const ::rtl::OUString sTable("$table");
sal_Int32 nIndex = 0;
nIndex = sStatement.indexOf(sColumn,nIndex);
if ( -1 != nIndex )
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index 7d19e70..a8408fe 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -118,7 +118,7 @@ OConnectionWrapper::~OConnectionWrapper()
aSupported = m_xServiceInfo->getSupportedServiceNames();
// append our own service, if necessary
- ::rtl::OUString sConnectionService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.Connection" ) );
+ ::rtl::OUString sConnectionService( "com.sun.star.sdbc.Connection" );
if ( 0 == ::comphelper::findValue( aSupported, sConnectionService, sal_True ).getLength() )
{
sal_Int32 nLen = aSupported.getLength();
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index f102744..b9c0b3d 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -83,8 +83,8 @@ using namespace ::com::sun::star::uno;
::rtl::OUString aTemp;
_rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= aTemp;
sal_Int32 nIndex = (sal_Int32)-1;
- const ::rtl::OUString sQuot(RTL_CONSTASCII_USTRINGPARAM("\'"));
- const ::rtl::OUString sQuotToReplace(RTL_CONSTASCII_USTRINGPARAM("\'\'"));
+ const ::rtl::OUString sQuot("\'");
+ const ::rtl::OUString sQuotToReplace("\'\'");
do
{
nIndex += 2;
@@ -258,7 +258,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
if ((NumberFormat::NUMBER == nRealUsedTypeClass) && (NumberFormat::PERCENT == nTypeClass))
{ // formatting should be "percent", but the String provides just a simple number -> adjust
::rtl::OUString sExpanded(rString);
- static ::rtl::OUString s_sPercentSymbol( RTL_CONSTASCII_USTRINGPARAM( "%" ));
+ static ::rtl::OUString s_sPercentSymbol( "%" );
// need a method to add a sal_Unicode to a string, 'til then we use a static string
sExpanded += s_sPercentSymbol;
fValue = xFormatter->convertStringToNumber(nKeyToUse, sExpanded);
diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx
index 8b94f69..1bdf05e 100644
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
@@ -43,7 +43,7 @@ namespace
if ( aPropertiesNode.isValid() )
{
uno::Sequence< ::rtl::OUString > aStringSeq;
- static const ::rtl::OUString s_sValue(RTL_CONSTASCII_USTRINGPARAM("/Value"));
+ static const ::rtl::OUString s_sValue("/Value");
const uno::Sequence< ::rtl::OUString > aProperties = aPropertiesNode.getNodeNames();
const ::rtl::OUString* pPropertiesIter = aProperties.getConstArray();
const ::rtl::OUString* pPropertiesEnd = pPropertiesIter + aProperties.getLength();
@@ -96,7 +96,7 @@ void DriversConfigImpl::Load(const uno::Reference< uno::XComponentContext >& _rx
{
if ( !m_aInstalled.isValid() )
{
- static const ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess.Drivers/Installed")); ///Installed
+ static const ::rtl::OUString s_sNodeName("org.openoffice.Office.DataAccess.Drivers/Installed"); ///Installed
m_aInstalled = ::utl::OConfigurationTreeRoot::createWithComponentContext(_rxORB, s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
}
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 309ec2f..65ef483 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -1060,8 +1060,8 @@ bool ORowSetValue::getBool() const
case DataType::LONGVARCHAR:
{
const ::rtl::OUString sValue(m_aValue.m_pString);
- const static ::rtl::OUString s_sTrue(RTL_CONSTASCII_USTRINGPARAM("true"));
- const static ::rtl::OUString s_sFalse(RTL_CONSTASCII_USTRINGPARAM("false"));
+ const static ::rtl::OUString s_sTrue("true");
+ const static ::rtl::OUString s_sFalse("false");
if ( sValue.equalsIgnoreAsciiCase(s_sTrue) )
{
bRet = sal_True;
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index 0f7830f..8f68406 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -177,7 +177,7 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName
return cloneDescriptor( descriptor );
Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData();
- ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " ));
+ ::rtl::OUString aSql( "ALTER TABLE " );
aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true );
aSql += ::rtl::OUString(" ADD ");
@@ -198,7 +198,7 @@ void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem
OSL_ENSURE(m_pTable,"OColumnsHelper::dropByName: Table is null!");
if ( m_pTable && !m_pTable->isNew() )
{
- ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " ));
+ ::rtl::OUString aSql( "ALTER TABLE " );
Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData();
::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString( );
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index c64e94b..eb04b27 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -60,7 +60,7 @@ sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName)
if ( xResult.is() )
{
Reference< XRow > xRow(xResult,UNO_QUERY);
- ::rtl::OUString aD(RTL_CONSTASCII_USTRINGPARAM("D"));
+ ::rtl::OUString aD("D");
while( xResult->next() )
{
if(xRow->getString(9) == _rName)
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index ea28c41c..d1db215 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -138,7 +138,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName
::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
::rtl::OUStringBuffer aSql( ::rtl::OUString("CREATE "));
::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( );
- ::rtl::OUString aDot( RTL_CONSTASCII_USTRINGPARAM( "." ));
+ ::rtl::OUString aDot( "." );
if(comphelper::getBOOL(descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISUNIQUE))))
aSql.appendAscii("UNIQUE ");
@@ -226,7 +226,7 @@ void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem
aSchema = _sElementName.copy(0,nLen);
aName = _sElementName.copy(nLen+1);
- ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP INDEX " ));
+ ::rtl::OUString aSql( "DROP INDEX " );
::rtl::OUString aComposedName = dbtools::composeTableName( m_pTable->getMetaData(), m_pTable, ::dbtools::eInIndexDefinitions, false, false, true );
::rtl::OUString sIndexName,sTemp;
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 3822b9a..e17eaa5 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -122,13 +122,13 @@ namespace connectivity
Reference<XMultiServiceFactory> xFac(_xConnection,UNO_QUERY);
if ( xFac.is() )
{
- static const ::rtl::OUString s_sTableRename(RTL_CONSTASCII_USTRINGPARAM("TableRenameServiceName"));
+ static const ::rtl::OUString s_sTableRename("TableRenameServiceName");
m_xRename.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sTableRename)),UNO_QUERY);
- static const ::rtl::OUString s_sTableAlteration(RTL_CONSTASCII_USTRINGPARAM("TableAlterationServiceName"));
+ static const ::rtl::OUString s_sTableAlteration("TableAlterationServiceName");
m_xAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sTableAlteration)),UNO_QUERY);
- static const ::rtl::OUString s_sKeyAlteration(RTL_CONSTASCII_USTRINGPARAM("KeyAlterationServiceName"));
+ static const ::rtl::OUString s_sKeyAlteration("KeyAlterationServiceName");
m_xKeyAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sKeyAlteration)),UNO_QUERY);
- static const ::rtl::OUString s_sIndexAlteration(RTL_CONSTASCII_USTRINGPARAM("IndexAlterationServiceName"));
+ static const ::rtl::OUString s_sIndexAlteration("IndexAlterationServiceName");
m_xIndexAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sIndexAlteration)),UNO_QUERY);
}
}
@@ -475,7 +475,7 @@ void OTableHelper::refreshIndexes()
// -----------------------------------------------------------------------------
::rtl::OUString OTableHelper::getRenameStart() const
{
- ::rtl::OUString sSql(RTL_CONSTASCII_USTRINGPARAM("RENAME "));
+ ::rtl::OUString sSql("RENAME ");
if ( m_Type == ::rtl::OUString("VIEW") )
sSql += ::rtl::OUString(" VIEW ");
else
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index 94ab932..2da06c8 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -35,7 +35,7 @@ namespace dbtools
//=====================================================================
static const ::rtl::OUString& getActiveConnectionPropertyName()
{
- static const ::rtl::OUString s_sActiveConnectionPropertyName( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ));
+ static const ::rtl::OUString s_sActiveConnectionPropertyName( "ActiveConnection" );
return s_sActiveConnectionPropertyName;
}
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index 087495d..698ce2e 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -441,7 +441,7 @@ namespace dbtools
{
// our time struct only supports hundredth seconds
sNano = sNano.copy(0,::std::min<sal_Int32>(sNano.getLength(),2));
- const static ::rtl::OUString s_Zeros(RTL_CONSTASCII_USTRINGPARAM("00"));
+ const static ::rtl::OUString s_Zeros("00");
sNano += s_Zeros.copy(0,s_Zeros.getLength() - sNano.getLength());
nHundredthSeconds = static_cast<sal_uInt16>(sNano.toInt32());
}
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index d06ca5e..499e6b2 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -393,7 +393,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
// build a connection with it's current settings (4. data source name, or 5. URL)
- const ::rtl::OUString sUserProp( RTL_CONSTASCII_USTRINGPARAM( "User" ));
+ const ::rtl::OUString sUserProp( "User" );
::rtl::OUString sDataSourceName;
xRowSetProps->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sDataSourceName;
::rtl::OUString sURL;
@@ -952,7 +952,7 @@ Reference< XNumberFormatsSupplier> getNumberFormats(
// ask the parent of the connection (should be an DatabaseAccess)
Reference< XNumberFormatsSupplier> xReturn;
Reference< XChild> xConnAsChild(_rxConn, UNO_QUERY);
- ::rtl::OUString sPropFormatsSupplier( RTL_CONSTASCII_USTRINGPARAM( "NumberFormatsSupplier" ));
+ ::rtl::OUString sPropFormatsSupplier( "NumberFormatsSupplier" );
if (xConnAsChild.is())
{
Reference< XPropertySet> xConnParentProps(xConnAsChild->getParent(), UNO_QUERY);
@@ -990,22 +990,22 @@ try
Property* pOldProps = aOldProperties.getArray();
Property* pNewProps = aNewProperties.getArray();
- ::rtl::OUString sPropDefaultControl(RTL_CONSTASCII_USTRINGPARAM("DefaultControl"));
- ::rtl::OUString sPropLabelControl(RTL_CONSTASCII_USTRINGPARAM("LabelControl"));
- ::rtl::OUString sPropFormatsSupplier(RTL_CONSTASCII_USTRINGPARAM("FormatsSupplier"));
- ::rtl::OUString sPropCurrencySymbol(RTL_CONSTASCII_USTRINGPARAM("CurrencySymbol"));
- ::rtl::OUString sPropDecimals(RTL_CONSTASCII_USTRINGPARAM("Decimals"));
- ::rtl::OUString sPropEffectiveMin(RTL_CONSTASCII_USTRINGPARAM("EffectiveMin"));
- ::rtl::OUString sPropEffectiveMax(RTL_CONSTASCII_USTRINGPARAM("EffectiveMax"));
- ::rtl::OUString sPropEffectiveDefault(RTL_CONSTASCII_USTRINGPARAM("EffectiveDefault"));
- ::rtl::OUString sPropDefaultText(RTL_CONSTASCII_USTRINGPARAM("DefaultText"));
- ::rtl::OUString sPropDefaultDate(RTL_CONSTASCII_USTRINGPARAM("DefaultDate"));
- ::rtl::OUString sPropDefaultTime(RTL_CONSTASCII_USTRINGPARAM("DefaultTime"));
- ::rtl::OUString sPropValueMin(RTL_CONSTASCII_USTRINGPARAM("ValueMin"));
- ::rtl::OUString sPropValueMax(RTL_CONSTASCII_USTRINGPARAM("ValueMax"));
- ::rtl::OUString sPropDecimalAccuracy(RTL_CONSTASCII_USTRINGPARAM("DecimalAccuracy"));
- ::rtl::OUString sPropClassId(RTL_CONSTASCII_USTRINGPARAM("ClassId"));
- ::rtl::OUString sFormattedServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FormattedField" ) );
+ ::rtl::OUString sPropDefaultControl("DefaultControl");
+ ::rtl::OUString sPropLabelControl("LabelControl");
+ ::rtl::OUString sPropFormatsSupplier("FormatsSupplier");
+ ::rtl::OUString sPropCurrencySymbol("CurrencySymbol");
+ ::rtl::OUString sPropDecimals("Decimals");
+ ::rtl::OUString sPropEffectiveMin("EffectiveMin");
+ ::rtl::OUString sPropEffectiveMax("EffectiveMax");
+ ::rtl::OUString sPropEffectiveDefault("EffectiveDefault");
+ ::rtl::OUString sPropDefaultText("DefaultText");
+ ::rtl::OUString sPropDefaultDate("DefaultDate");
+ ::rtl::OUString sPropDefaultTime("DefaultTime");
+ ::rtl::OUString sPropValueMin("ValueMin");
+ ::rtl::OUString sPropValueMax("ValueMax");
+ ::rtl::OUString sPropDecimalAccuracy("DecimalAccuracy");
+ ::rtl::OUString sPropClassId("ClassId");
+ ::rtl::OUString sFormattedServiceName( "com.sun.star.form.component.FormattedField" );
for (sal_Int16 i=0; i<aOldProperties.getLength(); ++i)
{
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index a348e87..4d6d802 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -229,7 +229,7 @@ namespace
static const ::rtl::OUString sComma(::rtl::OUString(","));
const ::rtl::OUString sQuote(_xMetaData->getIdentifierQuoteString());
- ::rtl::OUString sSql( RTL_CONSTASCII_USTRINGPARAM( " (" ));
+ ::rtl::OUString sSql( " (" );
Reference< XPropertySet > xColProp;
sal_Int32 nColCount = _xColumns->getCount();
@@ -673,15 +673,15 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
Reference< XRow > xCurrentRow(xPrivileges, UNO_QUERY);
const ::rtl::OUString sUserWorkingFor = _xMetaData->getUserName();
- static const ::rtl::OUString sSELECT( RTL_CONSTASCII_USTRINGPARAM( "SELECT" ));
- static const ::rtl::OUString sINSERT( RTL_CONSTASCII_USTRINGPARAM( "INSERT" ));
- static const ::rtl::OUString sUPDATE( RTL_CONSTASCII_USTRINGPARAM( "UPDATE" ));
- static const ::rtl::OUString sDELETE( RTL_CONSTASCII_USTRINGPARAM( "DELETE" ));
- static const ::rtl::OUString sREAD( RTL_CONSTASCII_USTRINGPARAM( "READ" ));
- static const ::rtl::OUString sCREATE( RTL_CONSTASCII_USTRINGPARAM( "CREATE" ));
- static const ::rtl::OUString sALTER( RTL_CONSTASCII_USTRINGPARAM( "ALTER" ));
- static const ::rtl::OUString sREFERENCE( RTL_CONSTASCII_USTRINGPARAM( "REFERENCE" ));
- static const ::rtl::OUString sDROP( RTL_CONSTASCII_USTRINGPARAM( "DROP" ));
+ static const ::rtl::OUString sSELECT( "SELECT" );
+ static const ::rtl::OUString sINSERT( "INSERT" );
+ static const ::rtl::OUString sUPDATE( "UPDATE" );
+ static const ::rtl::OUString sDELETE( "DELETE" );
+ static const ::rtl::OUString sREAD( "READ" );
+ static const ::rtl::OUString sCREATE( "CREATE" );
+ static const ::rtl::OUString sALTER( "ALTER" );
+ static const ::rtl::OUString sREFERENCE( "REFERENCE" );
+ static const ::rtl::OUString sDROP( "DROP" );
if ( xCurrentRow.is() )
{
@@ -795,7 +795,7 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
}
catch(const SQLException& e)
{
- static ::rtl::OUString sNotSupportedState( RTL_CONSTASCII_USTRINGPARAM( "IM001" ));
+ static ::rtl::OUString sNotSupportedState( "IM001" );
// some drivers don't support any privileges so we assume that we are allowed to do all we want :-)
if(e.SQLState == sNotSupportedState)
nPrivileges |= Privilege::DROP |
@@ -966,19 +966,19 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString&
}
::rtl::OUString lcl_getReportEngines()
{
- static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess/ReportEngines"));
+ static ::rtl::OUString s_sNodeName("org.openoffice.Office.DataAccess/ReportEngines");
return s_sNodeName;
}
// -----------------------------------------------------------------------------
::rtl::OUString lcl_getDefaultReportEngine()
{
- static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("DefaultReportEngine"));
+ static ::rtl::OUString s_sNodeName("DefaultReportEngine");
return s_sNodeName;
}
// -----------------------------------------------------------------------------
::rtl::OUString lcl_getReportEngineNames()
{
- static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("ReportEngineNames"));
+ static ::rtl::OUString s_sNodeName("ReportEngineNames");
return s_sNodeName;
}
// -----------------------------------------------------------------------------
@@ -1000,7 +1000,7 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString&
if ( aReportEngine.isValid() )
{
::rtl::OUString sRet;
- const static ::rtl::OUString s_sService(RTL_CONSTASCII_USTRINGPARAM("ServiceName"));
+ const static ::rtl::OUString s_sService("ServiceName");
aReportEngine.getNodeValue(s_sService) >>= sRet;
return sRet;
}
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 46be148..972e683 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -380,7 +380,7 @@ namespace dbtools
// did we find links where the detail field refers to a detail column (instead of a parameter name)?
if ( !aAdditionalFilterComponents.empty() )
{
- const static ::rtl::OUString s_sAnd( RTL_CONSTASCII_USTRINGPARAM( " AND " ) );
+ const static ::rtl::OUString s_sAnd( " AND " );
// build a conjunction of all the filter components
::rtl::OUStringBuffer sAdditionalFilter;
for ( ::std::vector< ::rtl::OUString >::const_iterator aComponent = aAdditionalFilterComponents.begin();
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 43ac90c..42d60a0 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -156,8 +156,8 @@ namespace dbtools
)
)
{
- static const ::rtl::OUString sSingleQuote( RTL_CONSTASCII_USTRINGPARAM( "'" ) );
- static const ::rtl::OUString sDoubleQuote( RTL_CONSTASCII_USTRINGPARAM( "''" ) );
+ static const ::rtl::OUString sSingleQuote( "'" );
+ static const ::rtl::OUString sDoubleQuote( "''" );
sal_Int32 nIndex = -1;
sal_Int32 nTemp = 0;
@@ -306,8 +306,8 @@ namespace dbtools
if ( bValidQuotedText )
{
sValue = sValue.copy( 1, sValue.getLength() - 2 );
- static const ::rtl::OUString sSingleQuote( RTL_CONSTASCII_USTRINGPARAM( "'" ) );
- static const ::rtl::OUString sDoubleQuote( RTL_CONSTASCII_USTRINGPARAM( "''" ) );
+ static const ::rtl::OUString sSingleQuote( "'" );
+ static const ::rtl::OUString sDoubleQuote( "''" );
sal_Int32 nIndex = -1;
sal_Int32 nTemp = 0;
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index 7a10ad2..075978f 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -115,7 +115,7 @@ namespace connectivity
//--------------------------------------------------------------------
const ::rtl::OUString& SQLError_Impl::getMessagePrefix()
{
- static ::rtl::OUString s_sMessagePrefix( RTL_CONSTASCII_USTRINGPARAM( "[OOoBase]" ) );
+ static ::rtl::OUString s_sMessagePrefix( "[OOoBase]" );
return s_sMessagePrefix;
}
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index f0bf69a..40cee31 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -180,7 +180,7 @@ namespace dbtools
// the filter
sal_Bool bApplyFilter = sal_True;
- const ::rtl::OUString sPropApply( RTL_CONSTASCII_USTRINGPARAM( "ApplyFilter" ));
+ const ::rtl::OUString sPropApply( "ApplyFilter" );
if ( ::comphelper::hasProperty( sPropApply, xQuery ) )
{
OSL_VERIFY( xQuery->getPropertyValue( sPropApply ) >>= bApplyFilter );
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index cdd8897..8387918 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -53,7 +53,7 @@ namespace
//--------------------------------------------------------------------
static const ::rtl::OUString& getTimeoutNodeName()
{
- static ::rtl::OUString s_sNodeName( RTL_CONSTASCII_USTRINGPARAM( "Timeout" ));
+ static ::rtl::OUString s_sNodeName( "Timeout" );
return s_sNodeName;
}
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 775f0a2..019935d 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -435,7 +435,7 @@ void OConnection::buildTypeInfo() throw( SQLException)
if ( bOk )
{
// HACK for access
- static const ::rtl::OUString s_sVarChar(RTL_CONSTASCII_USTRINGPARAM("VarChar"));
+ static const ::rtl::OUString s_sVarChar("VarChar");
do
{
sal_Int32 nPos = 1;
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index de0ba5f..cca5f6a 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -68,7 +68,7 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInf
{ // special handling for parameters
/* we recusive replace all occurrences of ? in the statement and replace them with name like "æ¬å" */
sal_Int32 nParameterCount = 0;
- ::rtl::OUString sDefaultName( RTL_CONSTASCII_USTRINGPARAM( "parame" ));
+ ::rtl::OUString sDefaultName( "parame" );
replaceParameterNodeName(pNode,sDefaultName,nParameterCount);
pNode->parseNodeToStr( sNewSql, _pConnection );
delete pNode;
@@ -215,7 +215,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn
m_pParameters->get_Count(&nCount);
if(nCount < (parameterIndex-1))
{
- ::rtl::OUString sDefaultName( RTL_CONSTASCII_USTRINGPARAM( "parame" ));
+ ::rtl::OUString sDefaultName( "parame" );
sDefaultName += ::rtl::OUString::valueOf(parameterIndex);
ADOParameter* pParam = m_Command.CreateParameter(sDefaultName,_eType,adParamInput,_nSize,_Val);
if(pParam)
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index 7d75406..5d38e0a 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -1986,7 +1986,7 @@ ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& cata
++nPos;
::rtl::OUStringBuffer aTypes;
- ::rtl::OUString aComma( RTL_CONSTASCII_USTRINGPARAM( "," ));
+ ::rtl::OUString aComma( "," );
const ::rtl::OUString* pIter = types.getConstArray();
const ::rtl::OUString* pEnd = pIter + types.getLength();
for( ; pIter != pEnd ; ++pIter)
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx
index ea447b7..22f5a00 100644
--- a/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx
@@ -53,8 +53,8 @@ void OHCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfObject
void OHCatalog::refreshTables()
{
TStringVector aVector;
- static const ::rtl::OUString s_sTableTypeView(RTL_CONSTASCII_USTRINGPARAM("VIEW"));
- static const ::rtl::OUString s_sTableTypeTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
+ static const ::rtl::OUString s_sTableTypeView("VIEW");
+ static const ::rtl::OUString s_sTableTypeTable("TABLE");
Sequence< ::rtl::OUString > sTableTypes(2);
sTableTypes[0] = s_sTableTypeView;
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index 5667b75..9207cdb 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -757,7 +757,7 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri
// -----------------------------------------------------------------------------
::rtl::OUString java_sql_Connection::impl_getJavaDriverClassPath_nothrow(const ::rtl::OUString& _sDriverClass)
{
- static const ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess/JDBC/DriverClassPaths"));
+ static const ::rtl::OUString s_sNodeName("org.openoffice.Office.DataAccess/JDBC/DriverClassPaths");
::utl::OConfigurationTreeRoot aNamesRoot = ::utl::OConfigurationTreeRoot::createWithComponentContext(
m_pDriver->getContext().getUNOContext(), s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
::rtl::OUString sURL;
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx
index ee1e1b3..d71c6ec 100644
--- a/connectivity/source/drivers/mozab/MConfigAccess.cxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx
@@ -46,7 +46,7 @@ namespace connectivity
com::sun::star::configuration::theDefaultProvider::get(
comphelper::getComponentContext( _rxORB ) ) );
- ::rtl::OUString sCompleteNodePath(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/DriverSettings/" ));
+ ::rtl::OUString sCompleteNodePath( "/org.openoffice.Office.DataAccess/DriverSettings/" );
sCompleteNodePath += OConnection::getDriverImplementationName();
//=========================================================
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index 090a7ca..09d665b 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -114,8 +114,7 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists)
{
nsCOMPtr<nsILocalFile> binDir;
// Note: if path3 construction fails, mozilla will default to using MOZILLA_FIVE_HOME in the NS_InitXPCOM2()
- rtl::OUString path1(
- RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program"));
+ rtl::OUString path1("$BRAND_BASE_DIR/program");
rtl::Bootstrap::expandMacros(path1);
rtl::OString path2;
if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) ==
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx
index a756e2c..cb0bd5a 100644
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -54,9 +54,9 @@ void OMySQLCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfOb
void OMySQLCatalog::refreshTables()
{
TStringVector aVector;
- static const ::rtl::OUString s_sTableTypeView(RTL_CONSTASCII_USTRINGPARAM("VIEW"));
- static const ::rtl::OUString s_sTableTypeTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
- static const ::rtl::OUString s_sAll(RTL_CONSTASCII_USTRINGPARAM("%"));
+ static const ::rtl::OUString s_sTableTypeView("VIEW");
+ static const ::rtl::OUString s_sTableTypeTable("TABLE");
+ static const ::rtl::OUString s_sAll("%");
Sequence< ::rtl::OUString > sTableTypes(3);
sTableTypes[0] = s_sTableTypeView;
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 7a14c3b..e0060e9 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -164,7 +164,7 @@ OUString ConnectionGetImplementationName()
}
com::sun::star::uno::Sequence<rtl::OUString> ConnectionGetSupportedServiceNames(void)
{
- OUString serv( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.Connection" ) );
+ OUString serv( "com.sun.star.sdbc.Connection" );
return Sequence< OUString> (&serv,1);
}
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index 96e719f..2d2d03da 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -102,8 +102,7 @@ OUString DriverGetImplementationName()
if (! p )
{
MutexGuard guard( osl::Mutex::getGlobalMutex() );
- static OUString instance(
- RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.connectivity.pq.Driver.noext" ) );
+ static OUString instance( "org.openoffice.comp.connectivity.pq.Driver.noext" );
p = &instance;
}
return *p;
@@ -115,7 +114,7 @@ Sequence< OUString > DriverGetSupportedServiceNames()
if( ! p )
{
MutexGuard guard( osl::Mutex::getGlobalMutex() );
- OUString tmp( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.Driver" ) );
+ OUString tmp( "com.sun.star.sdbc.Driver" );
static Sequence< OUString > instance( &tmp,1 );
p = &instance;
}
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index aadc1b3..31c26fa 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -291,7 +291,7 @@ void Test::testVoid() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -389,7 +389,7 @@ void Test::testBoolean() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -488,7 +488,7 @@ void Test::testByte() {
}
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -587,7 +587,7 @@ void Test::testShort() {
}
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -688,7 +688,7 @@ void Test::testUnsignedShort() {
}
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -783,7 +783,7 @@ void Test::testLong() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -878,7 +878,7 @@ void Test::testUnsignedLong() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -973,7 +973,7 @@ void Test::testHyper() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -1068,7 +1068,7 @@ void Test::testUnsignedHyper() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -1163,7 +1163,7 @@ void Test::testFloat() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -1258,7 +1258,7 @@ void Test::testDouble() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -1358,7 +1358,7 @@ void Test::testChar() {
}
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -1453,7 +1453,7 @@ void Test::testString() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", (a >>= b) && b == "1" );
}
{
@@ -1548,7 +1548,7 @@ void Test::testType() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -1644,7 +1644,7 @@ void Test::testSequence() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -1745,7 +1745,7 @@ void Test::testEnum() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -1844,7 +1844,7 @@ void Test::testStruct() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -1964,7 +1964,7 @@ void Test::testException() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -2080,7 +2080,7 @@ void Test::testInterface() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
@@ -2194,7 +2194,7 @@ void Test::testNull() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
+ rtl::OUString b("2");
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
}
{
diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx
index 2aa66b6..d8b6727 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -46,11 +46,10 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext()
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if (0 == s_type_XCurrentContext)
{
- OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XCurrentContext") );
+ OUString sTypeName("com.sun.star.uno.XCurrentContext");
typelib_InterfaceTypeDescription * pTD = 0;
typelib_TypeDescriptionReference * pMembers[1] = { 0 };
- OUString sMethodName0(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XCurrentContext::getValueByName") );
+ OUString sMethodName0("com.sun.star.uno.XCurrentContext::getValueByName");
typelib_typedescriptionreference_new(
&pMembers[0],
typelib_TypeClass_INTERFACE_METHOD,
@@ -67,18 +66,17 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext()
typelib_InterfaceMethodTypeDescription * pMethod = 0;
typelib_Parameter_Init aParameters[1];
- OUString sParamName0( RTL_CONSTASCII_USTRINGPARAM("Name") );
- OUString sParamType0( RTL_CONSTASCII_USTRINGPARAM("string") );
+ OUString sParamName0("Name");
+ OUString sParamType0("string");
aParameters[0].pParamName = sParamName0.pData;
aParameters[0].eTypeClass = typelib_TypeClass_STRING;
aParameters[0].pTypeName = sParamType0.pData;
aParameters[0].bIn = sal_True;
aParameters[0].bOut = sal_False;
rtl_uString * pExceptions[1];
- OUString sExceptionName0(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException") );
+ OUString sExceptionName0("com.sun.star.uno.RuntimeException");
pExceptions[0] = sExceptionName0.pData;
- OUString sReturnType0( RTL_CONSTASCII_USTRINGPARAM("any") );
+ OUString sReturnType0("any");
typelib_typedescription_newInterfaceMethod(
&pMethod,
3, sal_False,
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index a010401..f12cf1f 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -161,7 +161,7 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
// type
if (! s_aTypes[typelib_TypeClass_TYPE])
{
- OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("type") );
+ OUString sTypeName("type");
::typelib_typedescriptionreference_new(
&s_aTypes[typelib_TypeClass_TYPE], typelib_TypeClass_TYPE, sTypeName.pData );
// another static ref:
@@ -170,7 +170,7 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
// any
if (! s_aTypes[typelib_TypeClass_ANY])
{
- OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("any") );
+ OUString sTypeName("any");
::typelib_typedescriptionreference_new(
&s_aTypes[typelib_TypeClass_ANY], typelib_TypeClass_ANY, sTypeName.pData );
// another static ref:
@@ -179,7 +179,7 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
// string
if (! s_aTypes[typelib_TypeClass_STRING])
{
- OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("string") );
+ OUString sTypeName("string");
::typelib_typedescriptionreference_new(
&s_aTypes[typelib_TypeClass_STRING], typelib_TypeClass_STRING, sTypeName.pData );
// another static ref:
@@ -188,18 +188,18 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
// XInterface
if (! s_aTypes[typelib_TypeClass_INTERFACE])
{
- OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface") );
+ OUString sTypeName("com.sun.star.uno.XInterface");
typelib_InterfaceTypeDescription * pTD = 0;
typelib_TypeDescriptionReference * pMembers[3] = { 0,0,0 };
- OUString sMethodName0( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface::queryInterface") );
+ OUString sMethodName0("com.sun.star.uno.XInterface::queryInterface");
::typelib_typedescriptionreference_new(
&pMembers[0], typelib_TypeClass_INTERFACE_METHOD, sMethodName0.pData );
- OUString sMethodName1( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface::acquire") );
+ OUString sMethodName1("com.sun.star.uno.XInterface::acquire");
::typelib_typedescriptionreference_new(
&pMembers[1], typelib_TypeClass_INTERFACE_METHOD, sMethodName1.pData );
- OUString sMethodName2( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface::release") );
+ OUString sMethodName2("com.sun.star.uno.XInterface::release");
::typelib_typedescriptionreference_new(
&pMembers[2], typelib_TypeClass_INTERFACE_METHOD, sMethodName2.pData );
@@ -221,16 +221,16 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
assert( ! s_aTypes[typelib_TypeClass_EXCEPTION] );
{
typelib_TypeDescription * pTD1 = 0;
- OUString sTypeName1( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception") );
+ OUString sTypeName1("com.sun.star.uno.Exception");
typelib_CompoundMember_Init aMembers[2];
- OUString sMemberType0( RTL_CONSTASCII_USTRINGPARAM("string") );
- OUString sMemberName0( RTL_CONSTASCII_USTRINGPARAM("Message") );
+ OUString sMemberType0("string");
+ OUString sMemberName0("Message");
aMembers[0].eTypeClass = typelib_TypeClass_STRING;
aMembers[0].pTypeName = sMemberType0.pData;
aMembers[0].pMemberName = sMemberName0.pData;
- OUString sMemberType1( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface") );
- OUString sMemberName1( RTL_CONSTASCII_USTRINGPARAM("Context") );
+ OUString sMemberType1("com.sun.star.uno.XInterface");
+ OUString sMemberName1("Context");
aMembers[1].eTypeClass = typelib_TypeClass_INTERFACE;
aMembers[1].pTypeName = sMemberType1.pData;
aMembers[1].pMemberName = sMemberName1.pData;
@@ -243,7 +243,7 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
// another static ref:
++s_aTypes[typelib_TypeClass_EXCEPTION]->nStaticRefCount;
// RuntimeException
- OUString sTypeName2( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException") );
+ OUString sTypeName2("com.sun.star.uno.RuntimeException");
::typelib_typedescription_new(
&pTD1, typelib_TypeClass_EXCEPTION, sTypeName2.pData, s_aTypes[typelib_TypeClass_EXCEPTION], 0, 0 );
::typelib_typedescription_register( &pTD1 );
@@ -252,24 +252,24 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
// XInterface members
typelib_InterfaceMethodTypeDescription * pMethod = 0;
typelib_Parameter_Init aParameters[1];
- OUString sParamName0( RTL_CONSTASCII_USTRINGPARAM("aType") );
- OUString sParamType0( RTL_CONSTASCII_USTRINGPARAM("type") );
+ OUString sParamName0("aType");
+ OUString sParamType0("type");
aParameters[0].pParamName = sParamName0.pData;
aParameters[0].eTypeClass = typelib_TypeClass_TYPE;
aParameters[0].pTypeName = sParamType0.pData;
aParameters[0].bIn = sal_True;
aParameters[0].bOut = sal_False;
rtl_uString * pExceptions[1];
- OUString sExceptionName0( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException") );
+ OUString sExceptionName0("com.sun.star.uno.RuntimeException");
pExceptions[0] = sExceptionName0.pData;
- OUString sReturnType0( RTL_CONSTASCII_USTRINGPARAM("any") );
+ OUString sReturnType0("any");
typelib_typedescription_newInterfaceMethod(
&pMethod, 0, sal_False, sMethodName0.pData,
typelib_TypeClass_ANY, sReturnType0.pData,
1, aParameters, 1, pExceptions );
::typelib_typedescription_register( (typelib_TypeDescription**)&pMethod );
- OUString sReturnType1( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString sReturnType1("void");
::typelib_typedescription_newInterfaceMethod(
&pMethod, 1, sal_True, sMethodName1.pData,
typelib_TypeClass_VOID, sReturnType1.pData, 0, 0, 0, 0 );
diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx
index 08d65ea..5e53ea8 100644
--- a/cppu/source/uno/cascade_mapping.cxx
+++ b/cppu/source/uno/cascade_mapping.cxx
@@ -199,10 +199,10 @@ static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const &
return result;
}
-// rtl::OUString str1(RTL_CONSTASCII_USTRINGPARAM("abc:def:ghi"));
-// rtl::OUString str2(RTL_CONSTASCII_USTRINGPARAM("abc:def"));
-// rtl::OUString str3(RTL_CONSTASCII_USTRINGPARAM("abc"));
-// rtl::OUString str4(RTL_CONSTASCII_USTRINGPARAM(""));
+// rtl::OUString str1("abc:def:ghi");
+// rtl::OUString str2("abc:def");
+// rtl::OUString str3("abc");
+// rtl::OUString str4("");
// rtl::OUString pref;
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index ef922dc..e230c15 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -532,91 +532,91 @@ static typelib_TypeDescription * createCTD(
// built in types
case TypeClass_VOID:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aTypeName("void");
typelib_typedescription_new( &pRet, typelib_TypeClass_VOID, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_CHAR:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("char") );
+ OUString aTypeName("char");
typelib_typedescription_new( &pRet, typelib_TypeClass_CHAR, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_BOOLEAN:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("boolean") );
+ OUString aTypeName("boolean");
typelib_typedescription_new( &pRet, typelib_TypeClass_BOOLEAN, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_BYTE:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("byte") );
+ OUString aTypeName("byte");
typelib_typedescription_new( &pRet, typelib_TypeClass_BYTE, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_SHORT:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("short") );
+ OUString aTypeName("short");
typelib_typedescription_new( &pRet, typelib_TypeClass_SHORT, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_UNSIGNED_SHORT:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("unsigned short") );
+ OUString aTypeName("unsigned short");
typelib_typedescription_new( &pRet, typelib_TypeClass_UNSIGNED_SHORT, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_LONG:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("long") );
+ OUString aTypeName("long");
typelib_typedescription_new( &pRet, typelib_TypeClass_LONG, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_UNSIGNED_LONG:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("unsigned long") );
+ OUString aTypeName("unsigned long");
typelib_typedescription_new( &pRet, typelib_TypeClass_UNSIGNED_LONG, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_HYPER:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("hyper") );
+ OUString aTypeName("hyper");
typelib_typedescription_new( &pRet, typelib_TypeClass_HYPER, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_UNSIGNED_HYPER:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("unsigned hyper") );
+ OUString aTypeName("unsigned hyper");
typelib_typedescription_new( &pRet, typelib_TypeClass_UNSIGNED_HYPER, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_FLOAT:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("float") );
+ OUString aTypeName("float");
typelib_typedescription_new( &pRet, typelib_TypeClass_FLOAT, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_DOUBLE:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("double") );
+ OUString aTypeName("double");
typelib_typedescription_new( &pRet, typelib_TypeClass_DOUBLE, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_STRING:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("string") );
+ OUString aTypeName("string");
typelib_typedescription_new( &pRet, typelib_TypeClass_STRING, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_TYPE:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("type") );
+ OUString aTypeName("type");
typelib_typedescription_new( &pRet, typelib_TypeClass_TYPE, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_ANY:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("any") );
+ OUString aTypeName("any");
typelib_typedescription_new( &pRet, typelib_TypeClass_ANY, aTypeName.pData, 0, 0, 0 );
break;
}
diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx
index 4acc23c..dbbc3e0 100644
--- a/cppuhelper/test/cfg_test.cxx
+++ b/cppuhelper/test/cfg_test.cxx
@@ -53,7 +53,7 @@ namespace cfg_test
//--------------------------------------------------------------------------------------------------
static Sequence< OUString > impl0_getSupportedServiceNames()
{
- OUString str( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bootstrap.TestComponent0") );
+ OUString str("com.sun.star.bootstrap.TestComponent0");
return Sequence< OUString >( &str, 1 );
}
//--------------------------------------------------------------------------------------------------
@@ -64,7 +64,7 @@ static OUString impl0_getImplementationName()
//--------------------------------------------------------------------------------------------------
static Sequence< OUString > impl1_getSupportedServiceNames()
{
- OUString str( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bootstrap.TestComponent1") );
+ OUString str("com.sun.star.bootstrap.TestComponent1");
return Sequence< OUString >( &str, 1 );
}
//--------------------------------------------------------------------------------------------------
diff --git a/cppuhelper/test/testcmp/TestComponent.cxx b/cppuhelper/test/testcmp/TestComponent.cxx
index a5cd71d..999417a 100644
--- a/cppuhelper/test/testcmp/TestComponent.cxx
+++ b/cppuhelper/test/testcmp/TestComponent.cxx
@@ -179,7 +179,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
rtl::OUString uTmp(pImplName, rtl_str_getLength(pImplName), RTL_TEXTENCODING_ASCII_US);
rtl::OUString uImplName(cppu::EnvDcp::getTypeName(uTmp));
- rtl::OUString cmpName(RTL_CONSTASCII_USTRINGPARAM("impl.test.TestComponent"));
+ rtl::OUString cmpName("impl.test.TestComponent");
if (uImplName.equals(cmpName))
{
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 0aed44a..8c06245 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -99,7 +99,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
sal_uInt32 * pnIndex, const OUString & aArg)
throw (RuntimeException)
{
- const OUString dash(RTL_CONSTASCII_USTRINGPARAM("-"));
+ const OUString dash("-");
if(aArg.indexOf(dash) != 0)
return sal_False;
@@ -155,7 +155,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
static sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
sal_uInt32 * pnIndex, const OUString & aArg)
{
- const OUString dashdash(RTL_CONSTASCII_USTRINGPARAM("--"));
+ const OUString dashdash("--");
OUString aOpt = OUString::createFromAscii(pOpt);
if(aArg.indexOf(dashdash) == 0 && aOpt.equals(aArg.copy(2)))
@@ -511,7 +511,7 @@ SAL_IMPLEMENT_MAIN()
rtl_getAppCommandArg(nPos, &arg.pData);
- const OUString dashdash(RTL_CONSTASCII_USTRINGPARAM("--"));
+ const OUString dashdash("--");
if (dashdash == arg)
{
++nPos;
diff --git a/crashrep/source/win32/soreport.cxx b/crashrep/source/win32/soreport.cxx
index c827c1c..a67e434 100644
--- a/crashrep/source/win32/soreport.cxx
+++ b/crashrep/source/win32/soreport.cxx
@@ -159,7 +159,7 @@ static FILE *_tmpfile(void)
static BOOL GetCrashDataPath( LPTSTR szBuffer )
{
- ::rtl::OUString ustrValue(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"));
+ ::rtl::OUString ustrValue("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}");
::rtl::Bootstrap::expandMacros( ustrValue );
if ( !ustrValue.isEmpty() )
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index bbe06d6..c9a2c09 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -173,7 +173,7 @@ sal_Int32 HexColorControl::GetColor()
{
sal_Int32 nColor = -1;
- OUString aStr( RTL_CONSTASCII_USTRINGPARAM( "#" ) );
+ OUString aStr( "#" );
aStr += GetText();
sal_Int32 nLen = aStr.getLength();
if( nLen < 7 )
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index d5c0fed..eec7c36 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -825,7 +825,7 @@ SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet&
::rtl::OUString TPGalleryThemeProperties::addExtension( const ::rtl::OUString& _rDisplayText, const ::rtl::OUString& _rExtension )
{
::rtl::OUString sAllFilter( RTL_CONSTASCII_USTRINGPARAM( "(*.*)" ) );
- ::rtl::OUString sOpenBracket( RTL_CONSTASCII_USTRINGPARAM( " (" ) );
+ ::rtl::OUString sOpenBracket( " (" );
::rtl::OUString sCloseBracket( RTL_CONSTASCII_USTRINGPARAM( ")" ) );
::rtl::OUString sRet = _rDisplayText;
@@ -901,7 +901,7 @@ void TPGalleryThemeProperties::FillFilterList()
}
// media filters
- static const ::rtl::OUString aWildcard( RTL_CONSTASCII_USTRINGPARAM( "*." ) );
+ static const ::rtl::OUString aWildcard( "*." );
::avmedia::FilterNameVector aFilters;
::avmedia::MediaWindow::getMediaFilters( aFilters );
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 1506680..782743d 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -311,9 +311,9 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink
const OUString* pNames = aNames.getConstArray();
Color aMaskColor( COL_LIGHTMAGENTA );
- const OUString aProp_LinkDisplayName( RTL_CONSTASCII_USTRINGPARAM( "LinkDisplayName" ) );
- const OUString aProp_LinkTarget( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.LinkTarget" ) );
- const OUString aProp_LinkDisplayBitmap( RTL_CONSTASCII_USTRINGPARAM( "LinkDisplayBitmap" ) );
+ const OUString aProp_LinkDisplayName( "LinkDisplayName" );
+ const OUString aProp_LinkTarget( "com.sun.star.document.LinkTarget" );
+ const OUString aProp_LinkDisplayBitmap( "LinkDisplayBitmap" );
for( sal_uLong i = 0; i < nLinks; i++ )
{
uno::Any aAny;
diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx
index b3f30b9..2d0151c 100644
--- a/dbaccess/qa/extras/macros-test.cxx
+++ b/dbaccess/qa/extras/macros-test.cxx
@@ -72,7 +72,7 @@ private:
void DBAccessTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath)
{
- rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM("/"));
+ rtl::OUString aSep("/");
rtl::OUStringBuffer aBuffer( getSrcRootURL() );
aBuffer.append(m_aBaseString);
aBuffer.append(aSep).append(aFileBase).append(aFileExtension);
@@ -86,8 +86,8 @@ DBAccessTest::DBAccessTest()
void DBAccessTest::test()
{
- const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("testdb."));
- const rtl::OUString aFileExtension(RTL_CONSTASCII_USTRINGPARAM("odb"));
+ const rtl::OUString aFileNameBase("testdb.");
+ const rtl::OUString aFileExtension("odb");
rtl::OUString aFileName;
createFileURL(aFileNameBase, aFileExtension, aFileName);
uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName);
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index dc51d3c..ed88d8d 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -1291,7 +1291,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
ActivateAggregate( tpScale );
pScale->SetMax(::std::max<sal_Int32>(pFieldType->nMaximumScale,pFieldDescr->GetScale()));
pScale->SetMin(pFieldType->nMinimumScale);
- static const ::rtl::OUString s_sPRECISION(RTL_CONSTASCII_USTRINGPARAM("PRECISION"));
+ static const ::rtl::OUString s_sPRECISION("PRECISION");
pScale->SetSpecialReadOnly(pFieldType->aCreateParams.isEmpty() || pFieldType->aCreateParams == s_sPRECISION);
}
else
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 3660aa5..40516da 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -285,10 +285,10 @@ void OCollectionView::initCurrentPath()
if ( m_xContent.is() )
{
const ::rtl::OUString sCID = m_xContent->getIdentifier()->getContentIdentifier();
- const static ::rtl::OUString s_sFormsCID(RTL_CONSTASCII_USTRINGPARAM("private:forms"));
- const static ::rtl::OUString s_sReportsCID(RTL_CONSTASCII_USTRINGPARAM("private:reports"));
+ const static ::rtl::OUString s_sFormsCID("private:forms");
+ const static ::rtl::OUString s_sReportsCID("private:reports");
m_bCreateForm = s_sFormsCID.compareTo(sCID) == 0;
- ::rtl::OUString sPath(RTL_CONSTASCII_USTRINGPARAM("/"));
+ ::rtl::OUString sPath("/");
if ( m_bCreateForm && sCID.getLength() != s_sFormsCID.getLength())
sPath = sCID.copy(s_sFormsCID.getLength());
else if ( !m_bCreateForm && sCID.getLength() != s_sReportsCID.getLength() )
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 9c4cc2e..5b1cebc 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -228,7 +228,7 @@ DBG_NAME(OConnectionHelper)
break;
case ::dbaccess::DST_MSACCESS:
{
- const ::rtl::OUString sExt(RTL_CONSTASCII_USTRINGPARAM("*.mdb"));
+ const ::rtl::OUString sExt("*.mdb");
String sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME));
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
@@ -240,7 +240,7 @@ DBG_NAME(OConnectionHelper)
break;
case ::dbaccess::DST_MSACCESS_2007:
{
- const ::rtl::OUString sAccdb(RTL_CONSTASCII_USTRINGPARAM("*.accdb"));
+ const ::rtl::OUString sAccdb("*.accdb");
String sFilterName2(ModuleRes (STR_MSACCESS_2007_FILTERNAME));
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 559f04a..f600a38 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -311,8 +311,8 @@ void ODbaseIndexDialog::Init()
Sequence< ::rtl::OUString> aFolderContent( ::utl::LocalFileHelper::GetFolderContents(m_aDSN,bFolder));
- ::rtl::OUString aIndexExt(RTL_CONSTASCII_USTRINGPARAM("ndx"));
- ::rtl::OUString aTableExt(RTL_CONSTASCII_USTRINGPARAM("dbf"));
+ ::rtl::OUString aIndexExt("ndx");
+ ::rtl::OUString aTableExt("dbf");
::std::vector< String > aUsedIndexes;
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index c6047a1..12c6d9c 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -349,7 +349,7 @@ bool OOdbcManagement::manageDataSources_async()
// this is done in an external process, due to #i78733#
// (and note this whole functionality is supported on Windows only, ATM)
- ::rtl::OUString sExecutableName( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR/program/odbcconfig.exe" ) );
+ ::rtl::OUString sExecutableName( "$BRAND_BASE_DIR/program/odbcconfig.exe" );
::rtl::Bootstrap::expandMacros( sExecutableName ); //TODO: detect failure
oslProcess hProcessHandle(0);
oslProcessError eError = osl_executeProcess( sExecutableName.pData, NULL, 0, 0, NULL, NULL, NULL, 0, &hProcessHandle );
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index 26c0fb6..130ee03 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -328,10 +328,10 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom
}
}
xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name;
- static ::rtl::OUString sAgg(RTL_CONSTASCII_USTRINGPARAM("AggregateFunction"));
+ static ::rtl::OUString sAgg("AggregateFunction");
if ( xInfo->hasPropertyByName(sAgg) )
xColumn->getPropertyValue(sAgg) >>= bHaving;
- static ::rtl::OUString sFunction(RTL_CONSTASCII_USTRINGPARAM("Function"));
+ static ::rtl::OUString sFunction("Function");
if ( xInfo->hasPropertyByName(sFunction) )
xColumn->getPropertyValue(sFunction) >>= bFunction;
}
@@ -341,7 +341,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom
_rFilter.Name = ::dbtools::quoteName(aQuote,_rFilter.Name);
if ( !sTableName.isEmpty() )
{
- static ::rtl::OUString sSep(RTL_CONSTASCII_USTRINGPARAM("."));
+ static ::rtl::OUString sSep(".");
sTableName += sSep;
sTableName += _rFilter.Name;
_rFilter.Name = sTableName;
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 1f1b2e5..33d1bef 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -220,8 +220,8 @@ void DlgOrderCrit::EnableLines()
DBG_CHKTHIS(DlgOrderCrit,NULL);
Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData();
::rtl::OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : ::rtl::OUString();
- static const ::rtl::OUString sDESC(RTL_CONSTASCII_USTRINGPARAM(" DESC "));
- static const ::rtl::OUString sASC(RTL_CONSTASCII_USTRINGPARAM(" ASC "));
+ static const ::rtl::OUString sDESC(" DESC ");
+ static const ::rtl::OUString sASC(" ASC ");
Reference< XNameAccess> xColumns = Reference< XColumnsSupplier >(m_xQueryComposer,UNO_QUERY)->getColumns();
@@ -245,7 +245,7 @@ void DlgOrderCrit::EnableLines()
::rtl::OUString sRealName;
xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName;
sName = sRealName;
- static ::rtl::OUString sFunction(RTL_CONSTASCII_USTRINGPARAM("Function"));
+ static ::rtl::OUString sFunction("Function");
if ( xColumn->getPropertySetInfo()->hasPropertyByName(sFunction) )
xColumn->getPropertyValue(sFunction) >>= bFunction;
}
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index f31c32a..7817ddf 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -467,8 +467,8 @@ DBG_NAME(OTableSubscriptionPage)
Sequence< ::rtl::OUString > OTableSubscriptionPage::collectDetailedSelection() const
{
Sequence< ::rtl::OUString > aTableFilter;
- static const ::rtl::OUString sDot(RTL_CONSTASCII_USTRINGPARAM("."));
- static const ::rtl::OUString sWildcard(RTL_CONSTASCII_USTRINGPARAM("%"));
+ static const ::rtl::OUString sDot(".");
+ static const ::rtl::OUString sWildcard("%");
::rtl::OUString sComposedName;
const SvTreeListEntry* pAllObjectsEntry = m_aTablesList.getAllObjectsEntry();
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 5d19916..9ba2dd7 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -838,9 +838,9 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R
aSql += sComposedTableName;
aSql += ::rtl::OUString(" ( ");
// set values and column names
- ::rtl::OUString aValues(RTL_CONSTASCII_USTRINGPARAM(" VALUES ( "));
- static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM("?,"));
- static ::rtl::OUString aComma(RTL_CONSTASCII_USTRINGPARAM(","));
+ ::rtl::OUString aValues(" VALUES ( ");
+ static ::rtl::OUString aPara("?,");
+ static ::rtl::OUString aComma(",");
::rtl::OUString aQuote;
if ( _xMetaData.is() )
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 3f409cf..98be0f4 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -448,8 +448,8 @@ void fillTypeInfo( const Reference< ::com::sun::star::sdbc::XConnection>& _rxCo
// Information for a single SQL type
if(xRs.is())
{
- static const ::rtl::OUString aB1(RTL_CONSTASCII_USTRINGPARAM(" [ "));
- static const ::rtl::OUString aB2(RTL_CONSTASCII_USTRINGPARAM(" ]"));
+ static const ::rtl::OUString aB1(" [ ");
+ static const ::rtl::OUString aB2(" ]");
Reference<XResultSetMetaData> xResultSetMetaData = Reference<XResultSetMetaDataSupplier>(xRs,UNO_QUERY)->getMetaData();
::connectivity::ORowSetValue aValue;
::std::vector<sal_Int32> aTypes;
@@ -1376,7 +1376,7 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType
}
if ( !pTypeInfo )
{
- ::rtl::OUString sCreate(RTL_CONSTASCII_USTRINGPARAM("x")),sTypeName;
+ ::rtl::OUString sCreate("x"),sTypeName;
sal_Bool bForce = sal_True;
pTypeInfo = ::dbaui::getTypeInfoFromType(_rTypeInfo,DataType::VARCHAR,sTypeName,sCreate,50,0,sal_False,bForce);
}
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index cb69741..db68666 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -97,7 +97,7 @@ OCopyTable::OCopyTable( Window * pParent )
m_aFT_KeyName.Enable(sal_False);
m_edKeyName.Enable(sal_False);
- ::rtl::OUString sKeyName(RTL_CONSTASCII_USTRINGPARAM("ID"));
+ ::rtl::OUString sKeyName("ID");
sKeyName = m_pParent->createUniqueName(sKeyName);
m_edKeyName.SetText(sKeyName);
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 8255bfc..fa220bf 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -180,7 +180,7 @@ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _
const ::rtl::OUString sTargetName = ::dbtools::composeTableNameForSelect(_xConnection,_rxObject);
const String sTargetNameTemp = (sTargetName + ::rtl::OUString("."));
- ::rtl::OUString sStatement(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM "));
+ ::rtl::OUString sStatement("SELECT * FROM ");
sStatement += sTargetName;
sStatement += ::rtl::OUString(" WHERE 0=1");
@@ -1113,7 +1113,7 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject,
_rColumns.clear();
OFieldDescription* pActFieldDescr = NULL;
- ::rtl::OUString sCreateParam(RTL_CONSTASCII_USTRINGPARAM("x"));
+ ::rtl::OUString sCreateParam("x");
//////////////////////////////////////////////////////////////////////
// ReadOnly-Flag
// On drop no line must be editable.
@@ -1612,7 +1612,7 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool&
if ( !pType.get() )
{
_bNotConvert = sal_False;
- ::rtl::OUString sCreate(RTL_CONSTASCII_USTRINGPARAM("x"));
+ ::rtl::OUString sCreate("x");
pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,DataType::VARCHAR,_pType->aTypeName,sCreate,50,0,sal_False,bForce);
if ( !pType.get() )
pType = m_pTypeInfo;
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index 5cab1e4..765a240d 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@ -108,7 +108,7 @@ namespace dbaui
// -----------------------------------------------------------------------------
::rtl::OUString SAL_CALL OConnectionLineAccess::getAccessibleDescription( ) throw (RuntimeException)
{
- static ::rtl::OUString sDescription(RTL_CONSTASCII_USTRINGPARAM("Relation"));
+ static ::rtl::OUString sDescription("Relation");
return sDescription;
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 4bb97c5..b1b91f6 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -69,8 +69,8 @@ using namespace ::com::sun::star::container;
// please look at the book LargeScale C++ to know why
namespace
{
- static const OUString C_AND(RTL_CONSTASCII_USTRINGPARAM(" AND "));
- static const OUString C_OR(RTL_CONSTASCII_USTRINGPARAM(" OR "));
+ static const OUString C_AND(" AND ");
+ static const OUString C_OR(" OR ");
// forward declarations
sal_Bool InsertJoin( const OQueryDesignView* _pView,
@@ -302,7 +302,7 @@ namespace
{
const Reference< XDatabaseMetaData > xMetaData = _xConnection->getMetaData();
const OUString aQuote = xMetaData->getIdentifierQuoteString();
- const OUString sEqual(RTL_CONSTASCII_USTRINGPARAM(" = "));
+ const OUString sEqual(" = ");
for(;aIter != aEnd;++aIter)
{
@@ -657,8 +657,8 @@ namespace
OJoinTableView::OTableWindowMap* pTabList = _pView->getTableView()->GetTabWinMap();
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list