summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-10-23 12:06:00 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-24 14:43:34 +0200
commit6f50961e69406a17d6ec998956a6b33208b1001b (patch)
tree413c83df969e73c5cba1e11ef3740afc748ee1f5
parent4e729de73f2947155248f8df5897380611b87917 (diff)
remove more rtl::OUString and OString prefixes
which seem to have snuck back in since the great rounds of removals. Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1 Reviewed-on: https://gerrit.libreoffice.org/62229 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--accessibility/inc/standard/vclxaccessiblelist.hxx2
-rw-r--r--accessibility/inc/standard/vclxaccessiblemenu.hxx2
-rw-r--r--accessibility/inc/standard/vclxaccessiblescrollbar.hxx2
-rw-r--r--accessibility/source/standard/vclxaccessiblelist.cxx2
-rw-r--r--avmedia/source/macavf/framegrabber.hxx6
-rw-r--r--avmedia/source/macavf/framegrabber.mm8
-rw-r--r--avmedia/source/macavf/macavfuno.mm4
-rw-r--r--avmedia/source/macavf/manager.hxx8
-rw-r--r--avmedia/source/macavf/manager.mm10
-rw-r--r--avmedia/source/macavf/player.hxx8
-rw-r--r--avmedia/source/macavf/player.mm10
-rw-r--r--avmedia/source/macavf/window.hxx6
-rw-r--r--avmedia/source/macavf/window.mm8
-rw-r--r--avmedia/source/vlc/vlcframegrabber.cxx16
-rw-r--r--avmedia/source/vlc/vlcframegrabber.hxx8
-rw-r--r--avmedia/source/vlc/vlcmanager.cxx12
-rw-r--r--avmedia/source/vlc/vlcmanager.hxx10
-rw-r--r--avmedia/source/vlc/vlcplayer.cxx12
-rw-r--r--avmedia/source/vlc/vlcplayer.hxx10
-rw-r--r--avmedia/source/vlc/vlcwindow.cxx10
-rw-r--r--avmedia/source/vlc/vlcwindow.hxx6
-rw-r--r--avmedia/source/vlc/wrapper/Media.cxx6
-rw-r--r--avmedia/source/vlc/wrapper/Player.cxx4
-rw-r--r--basegfx/source/tools/numbertools.cxx2
-rw-r--r--basic/source/runtime/methods.cxx2
-rw-r--r--canvas/source/opengl/ogl_spritecanvas.cxx4
-rw-r--r--canvas/source/opengl/ogl_spritecanvas.hxx2
-rw-r--r--chart2/source/controller/sidebar/Chart2PanelFactory.cxx3
-rw-r--r--chart2/source/controller/sidebar/Chart2PanelFactory.hxx2
-rw-r--r--chart2/source/view/main/PropertyMapper.cxx4
-rw-r--r--codemaker/source/codemaker/exceptiontree.cxx10
-rw-r--r--codemaker/source/codemaker/global.cxx10
-rw-r--r--codemaker/source/codemaker/options.cxx2
-rw-r--r--codemaker/source/cppumaker/cppuoptions.cxx2
-rw-r--r--codemaker/source/cppumaker/cpputype.hxx2
-rw-r--r--codemaker/source/cppumaker/dependencies.hxx6
-rw-r--r--codemaker/source/cppumaker/dumputils.cxx8
-rw-r--r--codemaker/source/javamaker/javatype.cxx2
-rw-r--r--codemaker/source/javamaker/javatype.hxx2
-rw-r--r--comphelper/source/container/embeddedobjectcontainer.cxx2
-rw-r--r--comphelper/source/misc/backupfilehelper.cxx4
-rw-r--r--comphelper/source/misc/docpasswordhelper.cxx16
-rw-r--r--comphelper/source/property/opropertybag.hxx12
-rw-r--r--configmgr/source/writemodfile.cxx2
-rw-r--r--connectivity/source/drivers/firebird/Clob.hxx4
-rw-r--r--connectivity/source/drivers/firebird/Connection.cxx2
-rw-r--r--connectivity/source/drivers/firebird/Connection.hxx18
-rw-r--r--connectivity/source/drivers/firebird/DatabaseMetaData.hxx64
-rw-r--r--connectivity/source/drivers/firebird/Driver.cxx4
-rw-r--r--connectivity/source/drivers/firebird/Driver.hxx16
-rw-r--r--connectivity/source/drivers/firebird/Indexes.hxx4
-rw-r--r--connectivity/source/drivers/firebird/Keys.hxx2
-rw-r--r--connectivity/source/drivers/firebird/PreparedStatement.cxx2
-rw-r--r--connectivity/source/drivers/firebird/PreparedStatement.hxx8
-rw-r--r--connectivity/source/drivers/firebird/ResultSet.hxx6
-rw-r--r--connectivity/source/drivers/firebird/ResultSetMetaData.hxx14
-rw-r--r--connectivity/source/drivers/firebird/Services.cxx1
-rw-r--r--connectivity/source/drivers/firebird/Statement.hxx8
-rw-r--r--connectivity/source/drivers/firebird/Table.hxx12
-rw-r--r--connectivity/source/drivers/firebird/Tables.hxx4
-rw-r--r--connectivity/source/drivers/firebird/User.hxx2
-rw-r--r--connectivity/source/drivers/firebird/Users.hxx4
-rw-r--r--connectivity/source/drivers/firebird/Util.hxx4
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_connection.cxx66
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_connection.hxx29
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx337
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx112
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_driver.hxx1
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_general.cxx22
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_general.hxx6
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx24
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx12
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx24
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx10
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx38
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx12
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx36
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx14
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_services.cxx10
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_statement.cxx34
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_statement.hxx15
-rw-r--r--connectivity/source/parse/sqlflex.l50
-rw-r--r--cppu/qa/cppumaker/test_cppumaker.cxx2
-rw-r--r--cppu/qa/test_any.cxx218
-rw-r--r--cppu/source/AffineBridge/AffineBridge.cxx4
-rw-r--r--cppu/source/LogBridge/LogBridge.cxx10
-rw-r--r--cppu/source/UnsafeBridge/UnsafeBridge.cxx4
-rw-r--r--cppu/source/helper/purpenv/Proxy.hxx4
-rw-r--r--cppu/source/helper/purpenv/helper_purpenv_Environment.cxx28
-rw-r--r--cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx2
-rw-r--r--cppu/source/threadpool/current.cxx4
-rw-r--r--cppu/source/typelib/static_types.cxx3
-rw-r--r--cppu/source/typelib/typelib.cxx20
-rw-r--r--cppu/source/uno/EnvStack.cxx32
-rw-r--r--cppu/source/uno/IdentityMapping.cxx2
-rw-r--r--cppu/source/uno/cascade_mapping.cxx48
-rw-r--r--cppu/source/uno/eq.hxx2
-rw-r--r--cppu/source/uno/lbenv.cxx14
-rw-r--r--cppu/source/uno/lbmap.cxx2
-rw-r--r--cppu/source/uno/loadmodule.cxx4
-rw-r--r--cppu/source/uno/loadmodule.hxx2
-rw-r--r--cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx2
-rw-r--r--cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx28
-rw-r--r--cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx152
-rw-r--r--cppuhelper/qa/unourl/cppu_unourl.cxx34
-rw-r--r--cppuhelper/source/access_control.cxx2
-rw-r--r--cppuhelper/source/bootstrap.cxx9
-rw-r--r--cppuhelper/source/compat.cxx24
-rw-r--r--cppuhelper/source/component.cxx3
-rw-r--r--cppuhelper/source/component_context.cxx3
-rw-r--r--cppuhelper/source/defaultbootstrap.cxx14
-rw-r--r--cppuhelper/source/factory.cxx2
-rw-r--r--cppuhelper/source/gcc3.map4
-rw-r--r--cppuhelper/source/implbase_ex.cxx2
-rw-r--r--cppuhelper/source/implementationentry.cxx2
-rw-r--r--cppuhelper/source/loadsharedlibcomponentfactory.hxx8
-rw-r--r--cppuhelper/source/macro_expander.cxx5
-rw-r--r--cppuhelper/source/macro_expander.hxx2
-rw-r--r--cppuhelper/source/paths.cxx18
-rw-r--r--cppuhelper/source/paths.hxx6
-rw-r--r--cppuhelper/source/propertysetmixin.cxx88
-rw-r--r--cppuhelper/source/propshlp.cxx2
-rw-r--r--cppuhelper/source/servicemanager.cxx172
-rw-r--r--cppuhelper/source/servicemanager.hxx108
-rw-r--r--cppuhelper/source/shlib.cxx42
-rw-r--r--cppuhelper/source/supportsservice.cxx4
-rw-r--r--cppuhelper/source/tdmgr.cxx2
-rw-r--r--cppuhelper/source/typemanager.cxx260
-rw-r--r--cppuhelper/source/typemanager.hxx38
-rw-r--r--cppuhelper/source/unourl.cxx44
-rw-r--r--dbaccess/source/filter/hsqldb/rowinputbinary.cxx2
-rw-r--r--desktop/source/app/cmdlineargs.cxx2
-rw-r--r--desktop/source/app/crashreport.cxx4
-rw-r--r--desktop/source/app/dispatchwatcher.cxx12
-rw-r--r--desktop/test/deployment/active/active_native.cxx40
-rw-r--r--desktop/test/deployment/passive/passive_native.cxx40
-rw-r--r--embedserv/source/embed/docholder.cxx6
-rw-r--r--extensions/source/bibliography/bibprop.hxx20
-rw-r--r--extensions/source/logging/loggerconfig.cxx10
-rw-r--r--filter/qa/cppunit/priority-test.cxx4
-rw-r--r--filter/source/config/cache/contenthandlerfactory.hxx8
-rw-r--r--filter/source/config/cache/frameloaderfactory.hxx8
-rw-r--r--filter/source/msfilter/escherex.cxx2
-rw-r--r--filter/source/svg/svgexport.cxx2
-rw-r--r--forms/source/component/FormsCollection.hxx14
-rw-r--r--forms/source/inc/property.hxx36
-rw-r--r--fpicker/source/aqua/CFStringUtilities.mm16
-rw-r--r--fpicker/source/aqua/ControlHelper.mm2
-rw-r--r--fpicker/source/aqua/FilterHelper.mm56
-rw-r--r--fpicker/source/aqua/NSString_OOoAdditions.mm6
-rw-r--r--fpicker/source/aqua/NSURL_OOoAdditions.mm4
-rw-r--r--fpicker/source/aqua/SalAquaFilePicker.mm44
-rw-r--r--fpicker/source/aqua/SalAquaFolderPicker.mm22
-rw-r--r--fpicker/source/aqua/SalAquaPicker.mm6
-rw-r--r--fpicker/source/aqua/resourceprovider.mm1
-rw-r--r--framework/inc/uielement/statusbaritem.hxx22
-rw-r--r--framework/inc/uielement/statusbarmerger.hxx20
-rw-r--r--framework/source/fwe/classes/addonmenu.cxx6
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx58
-rw-r--r--framework/source/services/ContextChangeEventMultiplexer.cxx12
-rw-r--r--framework/source/uielement/genericstatusbarcontroller.cxx4
-rw-r--r--framework/source/uielement/menubarmanager.cxx2
-rw-r--r--framework/source/uielement/newmenucontroller.cxx2
-rw-r--r--framework/source/uielement/statusbaritem.cxx4
-rw-r--r--framework/source/uielement/statusbarmerger.cxx13
-rw-r--r--framework/source/uifactory/uicontrollerfactory.cxx4
-rw-r--r--idlc/source/parser.y37
-rw-r--r--idlc/source/scanner.l36
-rw-r--r--include/comphelper/DisableInteractionHelper.hxx2
-rw-r--r--include/comphelper/backupfilehelper.hxx2
-rw-r--r--include/comphelper/docpasswordhelper.hxx18
-rw-r--r--include/drawinglayer/primitive2d/textlayoutdevice.hxx10
-rw-r--r--include/framework/addonmenu.hxx2
-rw-r--r--include/framework/addonsoptions.hxx8
-rw-r--r--include/o3tl/string_view.hxx12
-rw-r--r--include/oox/drawingml/clrscheme.hxx2
-rw-r--r--include/oox/ole/axcontrol.hxx4
-rw-r--r--include/oox/ole/vbaproject.hxx2
-rw-r--r--include/oox/vml/vmlshape.hxx4
-rw-r--r--include/registry/reader.hxx64
-rw-r--r--include/registry/registry.hxx108
-rw-r--r--include/registry/writer.hxx30
-rw-r--r--include/sfx2/linksrc.hxx6
-rw-r--r--include/sfx2/progress.hxx4
-rw-r--r--include/sfx2/sfxdlg.hxx10
-rw-r--r--include/sfx2/shell.hxx2
-rw-r--r--include/sfx2/sidebar/Context.hxx8
-rw-r--r--include/sfx2/sidebar/ContextList.hxx4
-rw-r--r--include/sfx2/sidebar/ControllerFactory.hxx4
-rw-r--r--include/sfx2/sidebar/ResourceManager.hxx2
-rw-r--r--include/sfx2/sidebar/Theme.hxx20
-rw-r--r--include/sfx2/sidebar/Tools.hxx10
-rw-r--r--include/store/store.hxx12
-rw-r--r--include/svl/IndexedStyleSheets.hxx6
-rw-r--r--include/svtools/accessibleruler.hxx14
-rw-r--r--include/svtools/imagemgr.hxx8
-rw-r--r--include/svtools/rtfout.hxx2
-rw-r--r--include/svtools/rtftoken.h2
-rw-r--r--include/svx/galleryitem.hxx6
-rw-r--r--include/svx/nbdtmg.hxx10
-rw-r--r--include/svx/sidebar/ContextChangeEventMultiplexer.hxx2
-rw-r--r--include/svx/sidebar/SelectionChangeHandler.hxx4
-rw-r--r--include/svx/textchain.hxx2
-rw-r--r--include/toolkit/controls/dialogcontrol.hxx6
-rw-r--r--include/unoidl/unoidl.hxx220
-rw-r--r--include/unotools/datetime.hxx8
-rw-r--r--include/vcl/EnumContext.hxx16
-rw-r--r--include/vcl/opengl/OpenGLContext.hxx4
-rw-r--r--include/vcl/vclstatuslistener.hxx4
-rw-r--r--include/xmloff/prstylei.hxx2
-rw-r--r--include/xmloff/unointerfacetouniqueidentifiermapper.hxx2
-rw-r--r--io/qa/textinputstream.cxx4
-rw-r--r--lingucomponent/source/spellcheck/macosxspell/macspellimp.mm3
-rw-r--r--officecfg/registry/cppheader.xsl10
-rw-r--r--oox/source/drawingml/colorchoicecontext.cxx2
-rw-r--r--oox/source/export/chartexport.cxx2
-rw-r--r--opencl/source/openclwrapper.cxx8
-rw-r--r--registry/source/reflread.cxx24
-rw-r--r--registry/source/reflread.hxx12
-rw-r--r--registry/source/reflwrit.cxx12
-rw-r--r--registry/source/reflwrit.hxx12
-rw-r--r--sal/cppunittester/cppunittester.cxx18
-rw-r--r--sal/osl/all/debugbase.cxx10
-rw-r--r--sal/osl/all/loadmodulerelative.cxx4
-rw-r--r--sal/osl/unx/file_misc.cxx8
-rw-r--r--sal/osl/unx/file_path_helper.cxx40
-rw-r--r--sal/osl/unx/file_path_helper.hxx20
-rw-r--r--sal/osl/unx/file_stat.cxx20
-rw-r--r--sal/osl/unx/file_url.cxx36
-rw-r--r--sal/osl/unx/nlsupport.cxx4
-rw-r--r--sal/osl/unx/nlsupport.hxx2
-rw-r--r--sal/osl/unx/osxlocale.cxx6
-rw-r--r--sal/osl/unx/process.cxx14
-rw-r--r--sal/osl/unx/process_impl.cxx2
-rw-r--r--sal/osl/unx/uunxapi.cxx22
-rw-r--r--sal/osl/unx/uunxapi.hxx10
-rw-r--r--sal/osl/w32/file_dirvol.cxx38
-rw-r--r--sal/osl/w32/file_url.cxx8
-rw-r--r--sal/osl/w32/path_helper.cxx10
-rw-r--r--sal/osl/w32/path_helper.hxx6
-rw-r--r--sal/osl/w32/procimpl.cxx58
-rw-r--r--sal/qa/OStringBuffer/rtl_OStringBuffer.cxx1648
-rw-r--r--sal/qa/inc/stringhelper.hxx4
-rw-r--r--sal/qa/osl/condition/osl_Condition_Const.h2
-rw-r--r--sal/qa/osl/file/osl_File_Const.h2
-rw-r--r--sal/qa/osl/file/osl_old_test_file.cxx2
-rw-r--r--sal/qa/osl/file/test_cpy_wrt_file.cxx6
-rw-r--r--sal/qa/osl/module/osl_Module.cxx24
-rw-r--r--sal/qa/osl/pipe/osl_Pipe.cxx21
-rw-r--r--sal/qa/osl/process/osl_Thread.cxx8
-rw-r--r--sal/qa/osl/process/osl_process.cxx12
-rw-r--r--sal/qa/osl/profile/osl_old_testprofile.cxx6
-rw-r--r--sal/qa/osl/security/osl_Security.cxx50
-rw-r--r--sal/qa/osl/security/osl_Security_Const.h6
-rw-r--r--sal/qa/rtl/bootstrap/expand.cxx8
-rw-r--r--sal/qa/rtl/cipher/rtl_cipher.cxx4
-rw-r--r--sal/qa/rtl/digest/rtl_digest.cxx2
-rw-r--r--sal/qa/rtl/doublelock/rtl_doublelocking.cxx12
-rw-r--r--sal/qa/rtl/locale/rtl_locale.cxx24
-rw-r--r--sal/qa/rtl/math/test-rtl-math.cxx28
-rw-r--r--sal/qa/rtl/ostring/rtl_OString2.cxx102
-rw-r--r--sal/qa/rtl/ostring/rtl_str.cxx132
-rw-r--r--sal/qa/rtl/ostring/rtl_string.cxx36
-rw-r--r--sal/qa/rtl/oustring/rtl_OUString2.cxx272
-rw-r--r--sal/qa/rtl/oustring/rtl_ustr.cxx286
-rw-r--r--sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx2
-rw-r--r--sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx10
-rw-r--r--sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx42
-rw-r--r--sal/qa/rtl/process/child_process.cxx4
-rw-r--r--sal/qa/rtl/process/rtl_Process.cxx32
-rw-r--r--sal/qa/rtl/process/rtl_Process_Const.h8
-rw-r--r--sal/qa/rtl/strings/test_oustring_compare.cxx20
-rw-r--r--sal/qa/rtl/strings/test_oustring_convert.cxx18
-rw-r--r--sal/qa/rtl/strings/test_oustring_endswith.cxx10
-rw-r--r--sal/qa/rtl/strings/test_oustring_startswith.cxx6
-rw-r--r--sal/qa/rtl/strings/test_strings_replace.cxx170
-rw-r--r--sal/qa/rtl/strings/test_strings_toint.cxx4
-rw-r--r--sal/qa/rtl/strings/test_strings_valuex.cxx12
-rw-r--r--sal/qa/rtl/uri/rtl_Uri.cxx20
-rw-r--r--sal/qa/rtl/uri/rtl_testuri.cxx46
-rw-r--r--sal/rtl/bootstrap.cxx104
-rw-r--r--sal/rtl/uri.cxx10
-rw-r--r--salhelper/source/dynload.cxx8
-rw-r--r--salhelper/test/Symbols/loader.cxx6
-rw-r--r--salhelper/test/dynamicloader/loader.cxx6
-rw-r--r--sax/qa/cppunit/test_converter.cxx2
-rw-r--r--sax/source/tools/converter.cxx2
-rw-r--r--sc/qa/unit/ucalc.cxx4
-rw-r--r--sc/source/core/data/bcaslot.cxx6
-rw-r--r--sc/source/core/data/stlpool.cxx6
-rw-r--r--sc/source/core/opencl/formulagroupcl.cxx2
-rw-r--r--sc/source/core/tool/formulalogger.cxx2
-rw-r--r--sc/source/core/tool/interpr7.cxx2
-rw-r--r--sc/source/filter/excel/xecontent.cxx2
-rw-r--r--sc/source/filter/excel/xeescher.cxx2
-rw-r--r--sc/source/filter/excel/xestream.cxx2
-rw-r--r--sc/source/filter/excel/xestyle.cxx2
-rw-r--r--sc/source/filter/excel/xiescher.cxx4
-rw-r--r--sc/source/filter/inc/ooxformulaparser.hxx12
-rw-r--r--sc/source/filter/oox/ooxformulaparser.cxx2
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx6
-rw-r--r--sc/source/ui/inc/AccessibleEditObject.hxx2
-rw-r--r--sc/source/ui/sidebar/ScPanelFactory.cxx3
-rw-r--r--sc/source/ui/sidebar/ScPanelFactory.hxx2
-rw-r--r--sc/source/ui/vba/vbaname.cxx4
-rw-r--r--sc/source/ui/vba/vbapagesetup.hxx8
-rw-r--r--sc/source/ui/vba/vbarange.cxx2
-rw-r--r--sc/source/ui/view/tabview.cxx2
-rw-r--r--sd/source/core/drawdoc.cxx8
-rw-r--r--sd/source/core/sdpage.cxx22
-rw-r--r--sd/source/core/stlpool.cxx2
-rw-r--r--sd/source/ui/accessibility/AccessibleOutlineView.cxx2
-rw-r--r--sd/source/ui/dlg/present.cxx2
-rw-r--r--sd/source/ui/inc/present.hxx2
-rw-r--r--sd/source/ui/sidebar/PanelFactory.cxx3
-rw-r--r--sd/source/ui/sidebar/PanelFactory.hxx2
-rw-r--r--sfx2/inc/sidebar/ContextChangeBroadcaster.hxx10
-rw-r--r--sfx2/source/appl/shutdowniconaqua.mm42
-rw-r--r--sfx2/source/control/emojiview.cxx6
-rw-r--r--sfx2/source/control/shell.cxx2
-rw-r--r--sfx2/source/sidebar/Context.cxx4
-rw-r--r--sfx2/source/sidebar/ContextChangeBroadcaster.cxx7
-rw-r--r--sfx2/source/sidebar/ContextList.cxx2
-rw-r--r--sfx2/source/sidebar/ControllerFactory.cxx1
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx14
-rw-r--r--sfx2/source/sidebar/SidebarPanelBase.cxx6
-rw-r--r--sfx2/source/sidebar/Theme.cxx20
-rw-r--r--sfx2/source/sidebar/Tools.cxx16
-rw-r--r--shell/source/backends/macbe/macbackend.mm40
-rw-r--r--shell/source/cmdmail/cmdmailsuppl.cxx2
-rw-r--r--shell/source/win32/simplemail/smplmailmsg.cxx4
-rw-r--r--shell/source/win32/simplemail/smplmailmsg.hxx4
-rw-r--r--solenv/gdb/libreoffice/sal.py8
-rw-r--r--solenv/gdb/libreoffice/util/uno.py2
-rw-r--r--solenv/lldb/libreoffice/LO.py4
-rw-r--r--solenv/vs/LibreOffice.natvis6
-rw-r--r--starmath/source/view.cxx2
-rw-r--r--stoc/source/inspect/introspection.cxx2
-rw-r--r--svl/qa/unit/items/test_IndexedStyleSheets.cxx12
-rw-r--r--svl/qa/unit/svl.cxx8
-rw-r--r--svl/source/items/IndexedStyleSheets.cxx10
-rw-r--r--svtools/inc/vclxaccessibleheaderbar.hxx4
-rw-r--r--svtools/source/control/vclxaccessibleheaderbar.cxx4
-rw-r--r--svx/inc/AccessibleSvxFindReplaceDialog.hxx4
-rw-r--r--svx/source/accessibility/AccessibleOLEShape.cxx2
-rw-r--r--svx/source/gallery2/gallery1.cxx2
-rw-r--r--svx/source/gengal/gengal.cxx4
-rw-r--r--svx/source/inc/DefaultShapesPanel.hxx2
-rw-r--r--svx/source/inc/ShapesUtil.hxx2
-rw-r--r--svx/source/inc/charmapacc.hxx2
-rw-r--r--svx/source/inc/svxrectctaccessiblecontext.hxx2
-rw-r--r--svx/source/items/galleryitem.cxx2
-rw-r--r--svx/source/sidebar/ContextChangeEventMultiplexer.cxx2
-rw-r--r--svx/source/sidebar/PanelFactory.cxx4
-rw-r--r--svx/source/sidebar/SelectionChangeHandler.cxx2
-rw-r--r--svx/source/sidebar/media/MediaPlaybackPanel.cxx1
-rw-r--r--svx/source/sidebar/nbdtmg.cxx4
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/shapes/DefaultShapesPanel.cxx4
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingControl.cxx2
-rw-r--r--svx/source/smarttags/SmartTagMgr.cxx2
-rw-r--r--svx/source/tbxctrls/tbxcolor.cxx2
-rw-r--r--svx/source/unodraw/unoprov.cxx2
-rw-r--r--svx/source/xoutdev/xtabgrdt.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport10.cxx2
-rw-r--r--sw/qa/extras/rtfimport/rtfimport.cxx3
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx4
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx2
-rw-r--r--test/source/drawing/captionshape.cxx2
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx6
-rw-r--r--tools/source/generic/gen.cxx2
-rw-r--r--ucb/source/inc/regexpmap.hxx12
-rw-r--r--ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx2
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontent.cxx12
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx2
-rw-r--r--ucb/source/ucp/webdav/DAVProperties.cxx8
-rw-r--r--ucb/source/ucp/webdav/DAVProperties.hxx4
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.cxx2
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.hxx4
-rw-r--r--ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx4
-rw-r--r--ucb/source/ucp/webdav/SerfSession.cxx4
-rw-r--r--ucb/source/ucp/webdav/webdavcontent.cxx22
-rw-r--r--ucb/source/ucp/webdav/webdavcontent.hxx2
-rw-r--r--ucb/source/ucp/webdav/webdavcontentcaps.cxx2
-rw-r--r--unodevtools/source/skeletonmaker/cppcompskeleton.cxx134
-rw-r--r--unodevtools/source/skeletonmaker/cpptypemaker.cxx8
-rw-r--r--unodevtools/source/skeletonmaker/skeletoncommon.cxx6
-rw-r--r--unoidl/source/sourcefileprovider.cxx6
-rw-r--r--unoidl/source/sourceprovider-scanner.hxx14
-rw-r--r--unoidl/source/unoidl.cxx4
-rw-r--r--unotools/source/misc/ServiceDocumenter.hxx8
-rw-r--r--unotools/source/misc/datetime.cxx2
-rw-r--r--unotools/source/ucbhelper/tempfile.cxx2
-rw-r--r--ure/source/uretest/cppmain.cc30
-rw-r--r--ure/source/uretest/cppserver.cc10
-rw-r--r--ure/source/uretest/cpptest.cc12
-rw-r--r--vcl/inc/opengl/program.hxx2
-rw-r--r--vcl/inc/unx/screensaverinhibitor.hxx2
-rw-r--r--vcl/opengl/program.cxx4
-rw-r--r--vcl/opengl/x11/X11DeviceInfo.cxx4
-rw-r--r--vcl/osx/printaccessoryview.mm76
-rw-r--r--vcl/osx/vclnsapp.mm2
-rw-r--r--vcl/qt5/Qt5Menu.cxx2
-rw-r--r--vcl/source/app/settings.cxx2
-rw-r--r--vcl/source/control/notebookbar.cxx2
-rw-r--r--vcl/source/opengl/OpenGLContext.cxx6
-rw-r--r--vcl/source/opengl/OpenGLHelper.cxx18
-rw-r--r--vcl/source/window/EnumContext.cxx24
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx2
-rw-r--r--vcl/unx/gtk3_kde5/filepicker_ipc_commands.hxx6
-rw-r--r--vcl/workben/commonfuzzer.hxx4
-rw-r--r--vcl/workben/vcldemo.cxx6
-rw-r--r--winaccessibility/inc/AccObject.hxx2
-rw-r--r--winaccessibility/source/UAccCOM/AccActionBase.cxx2
-rw-r--r--winaccessibility/source/UAccCOM/AccEditableText.cxx24
-rw-r--r--winaccessibility/source/UAccCOM/AccEditableText.h2
-rw-r--r--winaccessibility/source/UAccCOM/AccImage.cxx2
-rw-r--r--winaccessibility/source/UAccCOM/AccTable.cxx4
-rw-r--r--winaccessibility/source/UAccCOM/AccTextBase.cxx10
-rw-r--r--winaccessibility/source/UAccCOM/MAccessible.cxx16
-rw-r--r--winaccessibility/source/service/AccObject.cxx22
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx6
-rw-r--r--writerfilter/source/dmapper/NumberingManager.hxx2
-rw-r--r--writerperfect/inc/DocumentHandlerFor.hxx2
-rw-r--r--writerperfect/inc/DocumentHandlerForOdg.hxx5
-rw-r--r--writerperfect/inc/DocumentHandlerForOdp.hxx5
-rw-r--r--writerperfect/inc/DocumentHandlerForOds.hxx5
-rw-r--r--writerperfect/inc/DocumentHandlerForOdt.hxx5
-rw-r--r--writerperfect/qa/unit/DrawingImportTest.cxx22
-rw-r--r--writerperfect/qa/unit/ImportTest.cxx15
-rw-r--r--writerperfect/qa/unit/PresentationImportTest.cxx23
-rw-r--r--writerperfect/qa/unit/SpreadsheetImportTest.cxx19
-rw-r--r--writerperfect/qa/unit/TextImportTest.cxx23
-rw-r--r--writerperfect/qa/unit/WPXSvStreamTest.cxx2
-rw-r--r--writerperfect/qa/unit/WpftFilterTestBase.cxx6
-rw-r--r--writerperfect/qa/unit/WpftFilterTestBase.hxx10
-rw-r--r--writerperfect/qa/unit/WpftLoader.cxx12
-rw-r--r--writerperfect/qa/unit/WpftLoader.hxx13
-rw-r--r--writerperfect/source/calc/MSWorksCalcImportFilter.cxx16
-rw-r--r--writerperfect/source/common/DirectoryStream.cxx7
-rw-r--r--writerperfect/source/common/WPXSvInputStream.cxx80
-rw-r--r--writerperfect/source/writer/EBookImportFilter.cxx2
-rw-r--r--xmloff/source/core/RDFaExportHelper.cxx2
-rw-r--r--xmloff/source/draw/animationexport.cxx12
-rw-r--r--xmloff/source/draw/animationimport.cxx4
-rw-r--r--xmloff/source/style/PageMasterExportPropMapper.cxx2
-rw-r--r--xmloff/source/style/PageMasterImportContext.cxx10
-rw-r--r--xmloff/source/style/prstylei.cxx2
-rw-r--r--xmloff/source/text/txtstyli.cxx4
-rw-r--r--xmlscript/source/xmldlg_imexp/imp_share.hxx2
450 files changed, 4445 insertions, 4575 deletions
diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx
index 71c4b0ff4892..d869f865fbc0 100644
--- a/accessibility/inc/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelist.hxx
@@ -123,7 +123,7 @@ public:
bool IsInDropDown();
void HandleDropOpen();
void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent, bool b_IsDropDownList);
- void UpdateSelection_Acc (const ::rtl::OUString& sTextOfSelectedItem, bool b_IsDropDownList);
+ void UpdateSelection_Acc (const OUString& sTextOfSelectedItem, bool b_IsDropDownList);
void UpdateSelection_Impl_Acc (bool b_IsDropDownList);
static void NotifyListItem(css::uno::Any const & val);
diff --git a/accessibility/inc/standard/vclxaccessiblemenu.hxx b/accessibility/inc/standard/vclxaccessiblemenu.hxx
index 7a7bb6f74b8f..958e73470611 100644
--- a/accessibility/inc/standard/vclxaccessiblemenu.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenu.hxx
@@ -71,7 +71,7 @@ public:
virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override;
// XAccessibleAction
- virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
+ virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
};
#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENU_HXX
diff --git a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
index a8826487d664..228924042108 100644
--- a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
+++ b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
@@ -70,7 +70,7 @@ public:
virtual css::uno::Any SAL_CALL getMinimumValue( ) override;
// XAccessibleContext
- ::rtl::OUString SAL_CALL getAccessibleName( ) override;
+ OUString SAL_CALL getAccessibleName( ) override;
};
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index 1fd7ccc5cb6e..bcc805ddb0fc 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -173,7 +173,7 @@ void VCLXAccessibleList::notifyVisibleStates(bool _bSetNew )
}
}
-void VCLXAccessibleList::UpdateSelection_Acc (const ::rtl::OUString& /*sTextOfSelectedItem*/, bool b_IsDropDownList)
+void VCLXAccessibleList::UpdateSelection_Acc (const OUString& /*sTextOfSelectedItem*/, bool b_IsDropDownList)
{
if ( m_aBoxType == COMBOBOX )
{
diff --git a/avmedia/source/macavf/framegrabber.hxx b/avmedia/source/macavf/framegrabber.hxx
index 9d9d436b042a..2bcd5011497c 100644
--- a/avmedia/source/macavf/framegrabber.hxx
+++ b/avmedia/source/macavf/framegrabber.hxx
@@ -41,9 +41,9 @@ public:
virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) override;
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
private:
diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm
index fc9ef1e1cdaf..f6872e30c317 100644
--- a/avmedia/source/macavf/framegrabber.mm
+++ b/avmedia/source/macavf/framegrabber.mm
@@ -86,17 +86,17 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
}
-::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( )
+OUString SAL_CALL FrameGrabber::getImplementationName( )
{
- return ::rtl::OUString( AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME );
+ return OUString( AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME );
}
-sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName )
{
return ServiceName == AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME;
}
-uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
+uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
{
return { AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME };
}
diff --git a/avmedia/source/macavf/macavfuno.mm b/avmedia/source/macavf/macavfuno.mm
index c10ad73d22dd..60435b8337a3 100644
--- a/avmedia/source/macavf/macavfuno.mm
+++ b/avmedia/source/macavf/macavfuno.mm
@@ -35,12 +35,12 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* avmediaMacAVF_component_getFactory( const
if( rtl_str_compare( pImplName, AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME ) == 0 )
{
- const ::rtl::OUString aServiceName( AVMEDIA_MACAVF_MANAGER_SERVICENAME );
+ const OUString aServiceName( AVMEDIA_MACAVF_MANAGER_SERVICENAME );
xFactory.set( ::cppu::createSingleFactory(
static_cast< lang::XMultiServiceFactory* >( pServiceManager ),
AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME,
- create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
+ create_MediaPlayer, uno::Sequence< OUString >( &aServiceName, 1 ) ) );
}
if( xFactory.is() )
diff --git a/avmedia/source/macavf/manager.hxx b/avmedia/source/macavf/manager.hxx
index e20385725988..9f8f6da2f59d 100644
--- a/avmedia/source/macavf/manager.hxx
+++ b/avmedia/source/macavf/manager.hxx
@@ -37,12 +37,12 @@ public:
virtual ~Manager() override;
// XManager
- virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) override;
+ virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) override;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) override;
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
private:
css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm
index 69d2a3c0196f..a932549ea618 100644
--- a/avmedia/source/macavf/manager.mm
+++ b/avmedia/source/macavf/manager.mm
@@ -36,7 +36,7 @@ Manager::~Manager()
{}
-uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
+uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL )
{
Player* pPlayer( new Player( mxMgr ) );
uno::Reference< media::XPlayer > xRet( pPlayer );
@@ -49,19 +49,19 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
}
-::rtl::OUString SAL_CALL Manager::getImplementationName( )
+OUString SAL_CALL Manager::getImplementationName( )
{
- return ::rtl::OUString( AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME );
+ return OUString( AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME );
}
-sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
{
return ServiceName == AVMEDIA_MACAVF_MANAGER_SERVICENAME;
}
-uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
+uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( )
{
return { AVMEDIA_MACAVF_MANAGER_SERVICENAME };
}
diff --git a/avmedia/source/macavf/player.hxx b/avmedia/source/macavf/player.hxx
index 47a62aa56971..99b79b843459 100644
--- a/avmedia/source/macavf/player.hxx
+++ b/avmedia/source/macavf/player.hxx
@@ -37,7 +37,7 @@ public:
explicit Player( const css::uno::Reference< css::lang::XMultiServiceFactory >& );
virtual ~Player() override;
- bool create( const ::rtl::OUString& rURL );
+ bool create( const OUString& rURL );
bool create( AVAsset* );
// XPlayer
@@ -61,9 +61,9 @@ public:
virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) override;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
AVPlayer* getAVPlayer() const { return mpPlayer; }
virtual bool handleObservation( NSString* pKeyPath ) override;
diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index 1d51ca276474..ea7e48711861 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -108,7 +108,7 @@ bool Player::handleObservation( NSString* pKeyPath )
}
-bool Player::create( const ::rtl::OUString& rURL )
+bool Player::create( const OUString& rURL )
{
// get the media asset
NSString* aNSStr = [NSString stringWithCharacters:reinterpret_cast<unichar const *>(rURL.getStr()) length:rURL.getLength()];
@@ -342,19 +342,19 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
}
-::rtl::OUString SAL_CALL Player::getImplementationName( )
+OUString SAL_CALL Player::getImplementationName( )
{
- return ::rtl::OUString( AVMEDIA_MACAVF_PLAYER_IMPLEMENTATIONNAME );
+ return OUString( AVMEDIA_MACAVF_PLAYER_IMPLEMENTATIONNAME );
}
-sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
{
return ServiceName == AVMEDIA_MACAVF_PLAYER_SERVICENAME;
}
-uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
+uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames( )
{
return { AVMEDIA_MACAVF_PLAYER_SERVICENAME };
}
diff --git a/avmedia/source/macavf/window.hxx b/avmedia/source/macavf/window.hxx
index 709f35371772..d8d1f71b3772 100644
--- a/avmedia/source/macavf/window.hxx
+++ b/avmedia/source/macavf/window.hxx
@@ -85,9 +85,9 @@ public:
virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) override;
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
virtual bool handleObservation( NSString* pKeyPath ) override;
diff --git a/avmedia/source/macavf/window.mm b/avmedia/source/macavf/window.mm
index 46f9c4c50669..ebd6065df450 100644
--- a/avmedia/source/macavf/window.mm
+++ b/avmedia/source/macavf/window.mm
@@ -239,19 +239,19 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
// XServiceInfo
-::rtl::OUString SAL_CALL Window::getImplementationName( )
+OUString SAL_CALL Window::getImplementationName( )
{
- return ::rtl::OUString( AVMEDIA_MACAVF_WINDOW_IMPLEMENTATIONNAME );
+ return OUString( AVMEDIA_MACAVF_WINDOW_IMPLEMENTATIONNAME );
}
-sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName )
{
return ServiceName == AVMEDIA_MACAVF_WINDOW_SERVICENAME;
}
-uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
+uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( )
{
return { AVMEDIA_MACAVF_WINDOW_SERVICENAME };
}
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index 99b08060b3c4..23cbe6c4730a 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -43,8 +43,8 @@ namespace vlc {
namespace
{
- const ::rtl::OUString AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.VLCFrameGrabber_VLC";
- const ::rtl::OUString AVMEDIA_VLC_GRABBER_SERVICENAME = "com.sun.star.media.VLCFrameGrabber_VLC";
+ const OUString AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.VLCFrameGrabber_VLC";
+ const OUString AVMEDIA_VLC_GRABBER_SERVICENAME = "com.sun.star.media.VLCFrameGrabber_VLC";
const int MSEC_IN_SEC = 1000;
const char * const VLC_ARGS[] = {
@@ -58,7 +58,7 @@ namespace
};
}
-VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString& url )
+VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const OUString& url )
: FrameGrabber_BASE()
, mInstance( SAL_N_ELEMENTS(VLC_ARGS), VLC_ARGS )
, mMedia( url, mInstance )
@@ -71,7 +71,7 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString
{
osl::Condition condition;
- const rtl::OUString& fileName = utl::TempFile::CreateTempName();
+ const OUString& fileName = utl::TempFile::CreateTempName();
{
wrapper::EventManager manager( mPlayer, mEventHandler );
manager.onPaused([&condition](){ condition.set(); });
@@ -100,7 +100,7 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString
manager.onPaused();
}
- rtl::OUString url;
+ OUString url;
osl::FileBase::getFileURLFromSystemPath( fileName, url );
std::shared_ptr<SvStream> stream( utl::UcbStreamHelper::CreateStream( url,
StreamMode::STD_READ ) );
@@ -112,17 +112,17 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString
return Graphic( bitmap ).GetXGraphic();
}
-::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName()
+OUString SAL_CALL VLCFrameGrabber::getImplementationName()
{
return AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME;
}
-sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const ::rtl::OUString& serviceName )
+sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const OUString& serviceName )
{
return cppu::supportsService(this, serviceName);
}
-::uno::Sequence< ::rtl::OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames()
+::uno::Sequence< OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames()
{
return { AVMEDIA_VLC_GRABBER_SERVICENAME };
}
diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx
index 02853c8fda5d..5599f3689f6d 100644
--- a/avmedia/source/vlc/vlcframegrabber.hxx
+++ b/avmedia/source/vlc/vlcframegrabber.hxx
@@ -38,13 +38,13 @@ class VLCFrameGrabber : public FrameGrabber_BASE
wrapper::Player mPlayer;
wrapper::EventHandler& mEventHandler;
public:
- VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString& url );
+ VLCFrameGrabber( wrapper::EventHandler& eh, const OUString& url );
css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override;
- ::rtl::OUString SAL_CALL getImplementationName() override;
- sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override;
- css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
+ OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService( const OUString& serviceName ) override;
+ css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
};
}
diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx
index 0b61eeb7d3f7..e82e88b604aa 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -27,8 +27,8 @@ namespace vlc {
namespace
{
- const rtl::OUString VLC_IMPLEMENTATION_NAME = "com.sun.star.comp.avmedia.Manager_VLC";
- const ::rtl::OUString VLC_SERVICENAME = "com.sun.star.media.Manager_VLC";
+ const OUString VLC_IMPLEMENTATION_NAME = "com.sun.star.comp.avmedia.Manager_VLC";
+ const OUString VLC_SERVICENAME = "com.sun.star.media.Manager_VLC";
const char * const VLC_ARGS[] = {
"--demux",
@@ -82,7 +82,7 @@ Manager::~Manager()
mEventHandler.stop();
}
-uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUString& rURL )
+uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL )
{
if ( !m_is_vlc_found )
throw uno::RuntimeException("VLC not found", nullptr);
@@ -105,17 +105,17 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUSt
return mPlayer;
}
-rtl::OUString SAL_CALL Manager::getImplementationName()
+OUString SAL_CALL Manager::getImplementationName()
{
return VLC_IMPLEMENTATION_NAME;
}
-sal_Bool SAL_CALL Manager::supportsService( const rtl::OUString& serviceName )
+sal_Bool SAL_CALL Manager::supportsService( const OUString& serviceName )
{
return cppu::supportsService(this, serviceName);
}
-uno::Sequence< rtl::OUString > SAL_CALL Manager::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames()
{
return { VLC_SERVICENAME };
}
diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx
index 5b83cea984e0..478a2e9d664d 100644
--- a/avmedia/source/vlc/vlcmanager.hxx
+++ b/avmedia/source/vlc/vlcmanager.hxx
@@ -37,15 +37,15 @@ public:
explicit Manager();
virtual ~Manager() override;
- css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) override;
+ css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) override;
- rtl::OUString SAL_CALL getImplementationName() override;
- sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) override;
- css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() override;
+ OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService( const OUString& serviceName ) override;
+ css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
css::uno::Reference< css::media::XPlayer > mPlayer;
- rtl::OUString mURL;
+ OUString mURL;
bool m_is_vlc_found;
};
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index a36064030921..0382b3e1c57c 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -33,13 +33,13 @@ namespace vlc {
namespace
{
- const ::rtl::OUString AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Player_VLC";
- const ::rtl::OUString AVMEDIA_VLC_PLAYER_SERVICENAME = "com.sun.star.media.Player_VLC";
+ const OUString AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Player_VLC";
+ const OUString AVMEDIA_VLC_PLAYER_SERVICENAME = "com.sun.star.media.Player_VLC";
const int MS_IN_SEC = 1000; // Millisec in sec
}
-VLCPlayer::VLCPlayer( const rtl::OUString& url,
+VLCPlayer::VLCPlayer( const OUString& url,
wrapper::Instance& instance,
wrapper::EventHandler& eh )
: VLC_Base( m_aMutex )
@@ -232,17 +232,17 @@ uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabb
return mrFrameGrabber;
}
-::rtl::OUString SAL_CALL VLCPlayer::getImplementationName()
+OUString SAL_CALL VLCPlayer::getImplementationName()
{
return AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME;
}
-sal_Bool SAL_CALL VLCPlayer::supportsService( const ::rtl::OUString& serviceName )
+sal_Bool SAL_CALL VLCPlayer::supportsService( const OUString& serviceName )
{
return cppu::supportsService(this, serviceName);
}
-::uno::Sequence< ::rtl::OUString > SAL_CALL VLCPlayer::getSupportedServiceNames()
+::uno::Sequence< OUString > SAL_CALL VLCPlayer::getSupportedServiceNames()
{
return { AVMEDIA_VLC_PLAYER_SERVICENAME };
}
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index 8e5298175bc8..c5248707d044 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -44,12 +44,12 @@ class VLCPlayer : public ::cppu::BaseMutex,
wrapper::Media mMedia;
wrapper::Player mPlayer;
wrapper::EventManager mEventManager;
- const rtl::OUString mUrl;
+ const OUString mUrl;
bool mPlaybackLoop;
css::uno::Reference< css::media::XFrameGrabber > mrFrameGrabber;
intptr_t mPrevWinID;
public:
- VLCPlayer( const rtl::OUString& url,
+ VLCPlayer( const OUString& url,
wrapper::Instance& instance,
wrapper::EventHandler& eh );
@@ -73,9 +73,9 @@ public:
css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() override;
- ::rtl::OUString SAL_CALL getImplementationName() override;
- sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override;
- css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
+ OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService( const OUString& serviceName ) override;
+ css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
void replay();
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index 1887f3ee1424..36894d1f74e8 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -29,8 +29,8 @@ namespace vlc {
namespace
{
- const ::rtl::OUString AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Window_VLC";
- const ::rtl::OUString AVMEDIA_VLC_WINDOW_SERVICENAME = "com.sun.star.media.Window_VLC";
+ const OUString AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Window_VLC";
+ const OUString AVMEDIA_VLC_WINDOW_SERVICENAME = "com.sun.star.media.Window_VLC";
}
VLCWindow::VLCWindow( VLCPlayer& player, const intptr_t prevWinID )
@@ -93,17 +93,17 @@ void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 )
{
}
-::rtl::OUString SAL_CALL VLCWindow::getImplementationName()
+OUString SAL_CALL VLCWindow::getImplementationName()
{
return AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME;
}
-sal_Bool SAL_CALL VLCWindow::supportsService( const ::rtl::OUString& serviceName )
+sal_Bool SAL_CALL VLCWindow::supportsService( const OUString& serviceName )
{
return cppu::supportsService(this, serviceName);
}
-uno::Sequence< ::rtl::OUString > SAL_CALL VLCWindow::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL VLCWindow::getSupportedServiceNames()
{
return { AVMEDIA_VLC_WINDOW_SERVICENAME };
}
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
index eaab56d718d2..df0530035412 100644
--- a/avmedia/source/vlc/vlcwindow.hxx
+++ b/avmedia/source/vlc/vlcwindow.hxx
@@ -42,9 +42,9 @@ public:
css::media::ZoomLevel SAL_CALL getZoomLevel() override;
void SAL_CALL setPointerType( ::sal_Int32 SystemPointerType ) override;
- ::rtl::OUString SAL_CALL getImplementationName() override;
- sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override;
- css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
+ OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService( const OUString& serviceName ) override;
+ css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
void SAL_CALL dispose() override;
void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
diff --git a/avmedia/source/vlc/wrapper/Media.cxx b/avmedia/source/vlc/wrapper/Media.cxx
index d884180bbd9d..c6c74420ab53 100644
--- a/avmedia/source/vlc/wrapper/Media.cxx
+++ b/avmedia/source/vlc/wrapper/Media.cxx
@@ -35,9 +35,9 @@ namespace
char* ( *libvlc_media_get_mrl )(libvlc_media_t *p_md);
- libvlc_media_t* InitMedia( const rtl::OUString& url, Instance& instance )
+ libvlc_media_t* InitMedia( const OUString& url, Instance& instance )
{
- rtl::OString dest;
+ OString dest;
url.convertToString(&dest, RTL_TEXTENCODING_UTF8, 0);
return libvlc_media_new_location(instance, dest.getStr());
@@ -61,7 +61,7 @@ bool Media::LoadSymbols()
return InitApiMap( VLC_MEDIA_API );
}
-Media::Media( const rtl::OUString& url, Instance& instance )
+Media::Media( const OUString& url, Instance& instance )
: mMedia( InitMedia( url, instance ) )
{
if (mMedia == nullptr)
diff --git a/avmedia/source/vlc/wrapper/Player.cxx b/avmedia/source/vlc/wrapper/Player.cxx
index 108ec02d2100..2f8e0d8903a0 100644
--- a/avmedia/source/vlc/wrapper/Player.cxx
+++ b/avmedia/source/vlc/wrapper/Player.cxx
@@ -229,9 +229,9 @@ namespace wrapper
#endif
}
- void Player::takeSnapshot( const rtl::OUString& file )
+ void Player::takeSnapshot( const OUString& file )
{
- rtl::OString dest;
+ OString dest;
file.convertToString( &dest, RTL_TEXTENCODING_UTF8, 0 );
libvlc_video_take_snapshot( mPlayer, 0, dest.getStr(), 480, 360 );
}
diff --git a/basegfx/source/tools/numbertools.cxx b/basegfx/source/tools/numbertools.cxx
index c4bf5792cfb5..73faf5c60e75 100644
--- a/basegfx/source/tools/numbertools.cxx
+++ b/basegfx/source/tools/numbertools.cxx
@@ -27,7 +27,7 @@ namespace basegfx { namespace utils
// }
// config here
- rtl::OStringBuffer aNum;
+ OStringBuffer aNum;
rtl::math::doubleToStringBuffer(aNum,
fValue,
rtl_math_StringFormat_F,
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 05ce540be4b1..fc7d149191ac 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -593,7 +593,7 @@ void SbRtl_MkDir(StarBASIC * pBasic, SbxArray & rPar, bool bWrite)
pPar->Insert( pParam.get(), pPar->Count() );
SbRtl_CurDir( pBasic, *pPar, bWrite );
- rtl::OUString sCurPathURL;
+ OUString sCurPathURL;
File::getFileURLFromSystemPath( pPar->Get(0)->GetOUString(), sCurPathURL );
aURLObj.SetURL( sCurPathURL );
diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx
index f415f792809d..ed2de8179748 100644
--- a/canvas/source/opengl/ogl_spritecanvas.cxx
+++ b/canvas/source/opengl/ogl_spritecanvas.cxx
@@ -138,9 +138,9 @@ namespace oglcanvas
return maDeviceHelper.showBuffer(mbIsVisible, bUpdateAll);
}
- ::rtl::OUString SAL_CALL SpriteCanvas::getServiceName( )
+ OUString SAL_CALL SpriteCanvas::getServiceName( )
{
- return ::rtl::OUString( SPRITECANVAS_SERVICE_NAME );
+ return OUString( SPRITECANVAS_SERVICE_NAME );
}
void SpriteCanvas::show( const ::rtl::Reference< CanvasCustomSprite >& xSprite )
diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx
index 2ab985143dc8..ae6697cc85e2 100644
--- a/canvas/source/opengl/ogl_spritecanvas.hxx
+++ b/canvas/source/opengl/ogl_spritecanvas.hxx
@@ -96,7 +96,7 @@ namespace oglcanvas
virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) override;
// XServiceName
- virtual ::rtl::OUString SAL_CALL getServiceName( ) override;
+ virtual OUString SAL_CALL getServiceName( ) override;
void show( const ::rtl::Reference< CanvasCustomSprite >& );
void hide( const ::rtl::Reference< CanvasCustomSprite >& );
diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
index 19ce79f8fad7..014ce5d0a924 100644
--- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
+++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
@@ -39,7 +39,6 @@
#include "ChartLinePanel.hxx"
using namespace css::uno;
-using ::rtl::OUString;
namespace chart { namespace sidebar {
@@ -53,7 +52,7 @@ ChartPanelFactory::~ChartPanelFactory()
}
Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement (
- const ::rtl::OUString& rsResourceURL,
+ const OUString& rsResourceURL,
const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments)
{
Reference<css::ui::XUIElement> xElement;
diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx
index 4a1b043c1130..a3292525e6ff 100644
--- a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx
+++ b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx
@@ -44,7 +44,7 @@ public:
// XUIElementFactory
virtual css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement(
- const ::rtl::OUString& rsResourceURL,
+ const OUString& rsResourceURL,
const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index 7427b280edd5..9221c750f645 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -79,8 +79,8 @@ void PropertyMapper::getValueMap(
uno::Reference< beans::XMultiPropertySet > xMultiPropSet(xSourceProp, uno::UNO_QUERY);
if((false) && xMultiPropSet.is())
{
- uno::Sequence< rtl::OUString > aPropSourceNames(rNameMap.size());
- uno::Sequence< rtl::OUString > aPropTargetNames(rNameMap.size());
+ uno::Sequence< OUString > aPropSourceNames(rNameMap.size());
+ uno::Sequence< OUString > aPropTargetNames(rNameMap.size());
sal_Int32 i = 0;
for (auto const& elem : rNameMap)
{
diff --git a/codemaker/source/codemaker/exceptiontree.cxx b/codemaker/source/codemaker/exceptiontree.cxx
index 8fa60ab6776f..b6c2aeee6f87 100644
--- a/codemaker/source/codemaker/exceptiontree.cxx
+++ b/codemaker/source/codemaker/exceptiontree.cxx
@@ -33,7 +33,7 @@
using codemaker::ExceptionTree;
using codemaker::ExceptionTreeNode;
-ExceptionTreeNode * ExceptionTreeNode::add(rtl::OString const & theName) {
+ExceptionTreeNode * ExceptionTreeNode::add(OString const & theName) {
std::unique_ptr< ExceptionTreeNode > node(new ExceptionTreeNode(theName));
children.push_back(std::move(node));
return children.back().get();
@@ -44,11 +44,11 @@ void ExceptionTreeNode::clearChildren() {
}
void ExceptionTree::add(
- rtl::OString const & name, rtl::Reference< TypeManager > const & manager)
+ OString const & name, rtl::Reference< TypeManager > const & manager)
{
- std::vector< rtl::OString > list;
+ std::vector< OString > list;
bool bRuntimeException = false;
- for (rtl::OString n(name); n != "com.sun.star.uno.Exception";) {
+ for (OString n(name); n != "com.sun.star.uno.Exception";) {
if (n == "com.sun.star.uno.RuntimeException") {
bRuntimeException = true;
break;
@@ -65,7 +65,7 @@ void ExceptionTree::add(
}
if (!bRuntimeException) {
ExceptionTreeNode * node = &m_root;
- for (std::vector< rtl::OString >::reverse_iterator i(list.rbegin());
+ for (std::vector< OString >::reverse_iterator i(list.rbegin());
!node->present; ++i)
{
if (i == list.rend()) {
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index 5b95332c1007..5005882bd765 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -333,30 +333,30 @@ FileStream &operator<<(FileStream& o, char const * s) {
osl_writeFile(o.m_file, s, strlen(s), &writtenBytes);
return o;
}
-FileStream &operator<<(FileStream& o, ::rtl::OString const * s) {
+FileStream &operator<<(FileStream& o, OString const * s) {
sal_uInt64 writtenBytes;
osl_writeFile(o.m_file, s->getStr(), s->getLength() * sizeof(sal_Char), &writtenBytes);
return o;
}
-FileStream &operator<<(FileStream& o, const ::rtl::OString& s) {
+FileStream &operator<<(FileStream& o, const OString& s) {
sal_uInt64 writtenBytes;
osl_writeFile(o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes);
return o;
}
-FileStream &operator<<(FileStream& o, ::rtl::OStringBuffer const * s) {
+FileStream &operator<<(FileStream& o, OStringBuffer const * s) {
sal_uInt64 writtenBytes;
osl_writeFile(o.m_file, s->getStr(), s->getLength() * sizeof(sal_Char), &writtenBytes);
return o;
}
-FileStream &operator<<(FileStream& o, const ::rtl::OStringBuffer& s) {
+FileStream &operator<<(FileStream& o, const OStringBuffer& s) {
sal_uInt64 writtenBytes;
osl_writeFile(
o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes);
return o;
}
-FileStream & operator <<(FileStream & out, rtl::OUString const & s) {
+FileStream & operator <<(FileStream & out, OUString const & s) {
return out << OUStringToOString(s, RTL_TEXTENCODING_UTF8);
}
diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx
index 7a94b0956b75..9b8dbf61f6bf 100644
--- a/codemaker/source/codemaker/options.cxx
+++ b/codemaker/source/codemaker/options.cxx
@@ -20,8 +20,6 @@
#include <codemaker/options.hxx>
-using ::rtl::OString;
-
Options::Options()
{
}
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx
index 54bfec3393f9..d9077dc43d7e 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -24,8 +24,6 @@
#include <osl/thread.h>
#include <osl/process.h>
-using ::rtl::OString;
-
#ifdef SAL_UNX
#define SEPARATOR '/'
#else
diff --git a/codemaker/source/cppumaker/cpputype.hxx b/codemaker/source/cppumaker/cpputype.hxx
index cde5c68d2f93..91226c0165e2 100644
--- a/codemaker/source/cppumaker/cpputype.hxx
+++ b/codemaker/source/cppumaker/cpputype.hxx
@@ -30,7 +30,7 @@ class CppuOptions;
class TypeManager;
void produce(
- rtl::OUString const & name, rtl::Reference< TypeManager > const & manager,
+ OUString const & name, rtl::Reference< TypeManager > const & manager,
codemaker::GeneratedTypeSet & generated, CppuOptions const & options);
#endif
diff --git a/codemaker/source/cppumaker/dependencies.hxx b/codemaker/source/cppumaker/dependencies.hxx
index 5e7adb442024..3143b4e40483 100644
--- a/codemaker/source/cppumaker/dependencies.hxx
+++ b/codemaker/source/cppumaker/dependencies.hxx
@@ -47,7 +47,7 @@ public:
*/
enum Kind { KIND_NORMAL, KIND_BASE, KIND_EXCEPTION };
- typedef std::map< rtl::OUString, Kind > Map;
+ typedef std::map< OUString, Kind > Map;
/**
Constructs the dependencies for a given entity.
@@ -62,7 +62,7 @@ public:
*/
Dependencies(
rtl::Reference< TypeManager > const & manager,
- rtl::OUString const & name);
+ OUString const & name);
~Dependencies();
@@ -101,7 +101,7 @@ public:
bool hasSequenceDependency() const { return m_sequenceDependency; }
private:
- void insert(rtl::OUString const & name, Kind kind);
+ void insert(OUString const & name, Kind kind);
rtl::Reference< TypeManager > m_manager;
Map m_map;
diff --git a/codemaker/source/cppumaker/dumputils.cxx b/codemaker/source/cppumaker/dumputils.cxx
index a540e782bbd7..ec4a586c4a17 100644
--- a/codemaker/source/cppumaker/dumputils.cxx
+++ b/codemaker/source/cppumaker/dumputils.cxx
@@ -29,12 +29,12 @@
namespace codemaker { namespace cppumaker {
bool dumpNamespaceOpen(
- FileStream & out, rtl::OUString const & entityName, bool fullModuleType)
+ FileStream & out, OUString const & entityName, bool fullModuleType)
{
bool bOutput = false;
bool bFirst = true;
for (sal_Int32 i = 0; i >= 0;) {
- rtl::OUString id(entityName.getToken(0, '.', i));
+ OUString id(entityName.getToken(0, '.', i));
if (fullModuleType || i >= 0) {
if (!bFirst) {
out << " ";
@@ -48,7 +48,7 @@ bool dumpNamespaceOpen(
}
bool dumpNamespaceClose(
- FileStream & out, rtl::OUString const & entityName, bool fullModuleType)
+ FileStream & out, OUString const & entityName, bool fullModuleType)
{
bool bOutput = false;
bool bFirst = true;
@@ -69,7 +69,7 @@ bool dumpNamespaceClose(
return bOutput;
}
-void dumpTypeIdentifier(FileStream & out, rtl::OUString const & entityName) {
+void dumpTypeIdentifier(FileStream & out, OUString const & entityName) {
out << entityName.copy(entityName.lastIndexOf('.') + 1);
}
diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index b5ece143572e..9d683a53ce08 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -861,7 +861,7 @@ sal_uInt16 addFieldInit(
OString name(codemaker::convertString(fieldName));
OUString nucleus;
sal_Int32 rank;
- std::vector< rtl::OUString > args;
+ std::vector< OUString > args;
rtl::Reference< unoidl::Entity > ent;
codemaker::UnoType::Sort sort = manager->decompose(
fieldType, true, &nucleus, &rank, &args, &ent);
diff --git a/codemaker/source/javamaker/javatype.hxx b/codemaker/source/javamaker/javatype.hxx
index 4aee28e9887c..9263ecee9676 100644
--- a/codemaker/source/javamaker/javatype.hxx
+++ b/codemaker/source/javamaker/javatype.hxx
@@ -30,7 +30,7 @@ class JavaOptions;
class TypeManager;
void produce(
- rtl::OUString const & name, rtl::Reference< TypeManager > const & manager,
+ OUString const & name, rtl::Reference< TypeManager > const & manager,
codemaker::GeneratedTypeSet & generated, JavaOptions const & options);
#endif
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index cd927faa2bb8..81e5064f34e2 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -311,7 +311,7 @@ EmbeddedObjectContainer::GetEmbeddedObject(
uno::Reference<embed::XEmbeddedObject> EmbeddedObjectContainer::Get_Impl(
const OUString& rName,
const uno::Reference<embed::XEmbeddedObject>& xCopy,
- rtl::OUString const*const pBaseURL)
+ OUString const*const pBaseURL)
{
uno::Reference < embed::XEmbeddedObject > xObj;
try
diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx
index ee3f336f7d15..8a107e891577 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -2210,9 +2210,9 @@ namespace comphelper
/////////////////// helpers ///////////////////////
- const rtl::OUString BackupFileHelper::getPackURL()
+ const OUString BackupFileHelper::getPackURL()
{
- return rtl::OUString(maUserConfigWorkURL + "/pack");
+ return OUString(maUserConfigWorkURL + "/pack");
}
/////////////////// file push helpers ///////////////////////
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index 1458d0c0a4f6..6cf07d4795fb 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -262,11 +262,11 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
std::vector<unsigned char> DocPasswordHelper::GetOoxHashAsVector(
- const rtl::OUString& rPassword,
+ const OUString& rPassword,
const std::vector<unsigned char>& rSaltValue,
sal_uInt32 nSpinCount,
comphelper::Hash::IterCount eIterCount,
- const rtl::OUString& rAlgorithmName)
+ const OUString& rAlgorithmName)
{
comphelper::HashType eType;
if (rAlgorithmName == "SHA-512" || rAlgorithmName == "SHA512")
@@ -285,11 +285,11 @@ std::vector<unsigned char> DocPasswordHelper::GetOoxHashAsVector(
css::uno::Sequence<sal_Int8> DocPasswordHelper::GetOoxHashAsSequence(
- const rtl::OUString& rPassword,
- const rtl::OUString& rSaltValue,
+ const OUString& rPassword,
+ const OUString& rSaltValue,
sal_uInt32 nSpinCount,
comphelper::Hash::IterCount eIterCount,
- const rtl::OUString& rAlgorithmName)
+ const OUString& rAlgorithmName)
{
std::vector<unsigned char> aSaltVec;
if (!rSaltValue.isEmpty())
@@ -305,11 +305,11 @@ css::uno::Sequence<sal_Int8> DocPasswordHelper::GetOoxHashAsSequence(
}
OUString DocPasswordHelper::GetOoxHashAsBase64(
- const rtl::OUString& rPassword,
- const rtl::OUString& rSaltValue,
+ const OUString& rPassword,
+ const OUString& rSaltValue,
sal_uInt32 nSpinCount,
comphelper::Hash::IterCount eIterCount,
- const rtl::OUString& rAlgorithmName)
+ const OUString& rAlgorithmName)
{
css::uno::Sequence<sal_Int8> aSeq( GetOoxHashAsSequence( rPassword, rSaltValue, nSpinCount,
eIterCount, rAlgorithmName));
diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx
index 4c797105ce4f..1a7ebd8bde0d 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.hxx
@@ -129,17 +129,17 @@ namespace comphelper
// XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
- virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const css::uno::Any& p2) override
+ virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) override
{ OPropertyBag_PBase::setPropertyValue(p1, p2); }
- virtual css::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) override
+ virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) override
{ return OPropertyBag_PBase::getPropertyValue(p1); }
- virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
+ virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
{ OPropertyBag_PBase::addPropertyChangeListener(p1, p2); }
- virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
+ virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
{ OPropertyBag_PBase::removePropertyChangeListener(p1, p2); }
- virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
+ virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
{ OPropertyBag_PBase::addVetoableChangeListener(p1, p2); }
- virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
+ virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
{ OPropertyBag_PBase::removeVetoableChangeListener(p1, p2); }
// XSet
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index ffb1287b82da..b3592bb1a8af 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -392,7 +392,7 @@ void writeNode(
}
// helpers to allow sorting of configmgr::Modifications::Node
-typedef std::pair< const rtl::OUString, configmgr::Modifications::Node > ModNodePairEntry;
+typedef std::pair< const OUString, configmgr::Modifications::Node > ModNodePairEntry;
struct PairEntrySorter
{
bool operator() (const ModNodePairEntry* pValue1, const ModNodePairEntry* pValue2) const
diff --git a/connectivity/source/drivers/firebird/Clob.hxx b/connectivity/source/drivers/firebird/Clob.hxx
index 738b0ce86c64..626b284d3785 100644
--- a/connectivity/source/drivers/firebird/Clob.hxx
+++ b/connectivity/source/drivers/firebird/Clob.hxx
@@ -48,12 +48,12 @@ namespace connectivity
// ---- XClob ----------------------------------------------------
virtual sal_Int64 SAL_CALL
length() override;
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getSubString(sal_Int64 aPosition, sal_Int32 aLength) override;
virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
getCharacterStream() override;
virtual sal_Int64 SAL_CALL
- position(const ::rtl::OUString& rPattern,
+ position(const OUString& rPattern,
sal_Int32 aStart) override;
virtual sal_Int64 SAL_CALL
positionOfClob(const ::css::uno::Reference< ::css::sdbc::XClob >& rPattern,
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 04c4cb821daa..b7f1276a8d4f 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -123,7 +123,7 @@ struct ConnectionGuard
}
};
-void Connection::construct(const ::rtl::OUString& url, const Sequence< PropertyValue >& info)
+void Connection::construct(const OUString& url, const Sequence< PropertyValue >& info)
{
ConnectionGuard aGuard(m_refCount);
diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx
index 6992a5dedd1f..f1d4f7dd8003 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -75,13 +75,13 @@ namespace connectivity
// DatabaseMetaData.getTypeInfo.
/** The URL passed to us when opening, i.e. of the form sdbc:* */
- ::rtl::OUString m_sConnectionURL;
+ OUString m_sConnectionURL;
/**
* The URL passed to firebird, i.e. either a local file (for a
* temporary .fdb extracted from a .odb or a normal local file) or
* a remote url.
*/
- ::rtl::OUString m_sFirebirdURL;
+ OUString m_sFirebirdURL;
/* EMBEDDED MODE DATA */
/** Denotes that we have a database stored within a .odb file. */
@@ -117,7 +117,7 @@ namespace connectivity
*
* (The temporary .fdb is our m_sFirebirdURL.)
*/
- ::rtl::OUString m_sFBKPath;
+ OUString m_sFBKPath;
void loadDatabaseFile(const OUString& pSrcLocation, const OUString& pTmpLocation);
@@ -169,7 +169,7 @@ namespace connectivity
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- void construct( const ::rtl::OUString& url,
+ void construct( const OUString& url,
const css::uno::Sequence< css::beans::PropertyValue >& info);
const OUString& getConnectionURL() const {return m_sConnectionURL;}
@@ -217,9 +217,9 @@ namespace connectivity
DECLARE_SERVICE_INFO();
// XConnection
virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override;
- virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) override;
- virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) override;
- virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) override;
+ virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override;
+ virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override;
+ virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override;
virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override;
virtual sal_Bool SAL_CALL getAutoCommit( ) override;
virtual void SAL_CALL commit( ) override;
@@ -228,8 +228,8 @@ namespace connectivity
virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override;
virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override;
virtual sal_Bool SAL_CALL isReadOnly( ) override;
- virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) override;
- virtual ::rtl::OUString SAL_CALL getCatalog( ) override;
+ virtual void SAL_CALL setCatalog( const OUString& catalog ) override;
+ virtual OUString SAL_CALL getCatalog( ) override;
virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override;
virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override;
virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override;
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
index aeb7acab00d9..dc55940fcfe5 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
@@ -47,17 +47,17 @@ namespace connectivity
// XDatabaseMetaData
virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override;
virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override;
- virtual ::rtl::OUString SAL_CALL getURL( ) override;
- virtual ::rtl::OUString SAL_CALL getUserName( ) override;
+ virtual OUString SAL_CALL getURL( ) override;
+ virtual OUString SAL_CALL getUserName( ) override;
virtual sal_Bool SAL_CALL isReadOnly( ) override;
virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override;
virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override;
virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override;
virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override;
- virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) override;
- virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) override;
- virtual ::rtl::OUString SAL_CALL getDriverName( ) override;
- virtual ::rtl::OUString SAL_CALL getDriverVersion( ) override;
+ virtual OUString SAL_CALL getDatabaseProductName( ) override;
+ virtual OUString SAL_CALL getDatabaseProductVersion( ) override;
+ virtual OUString SAL_CALL getDriverName( ) override;
+ virtual OUString SAL_CALL getDriverVersion( ) override;
virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override;
virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override;
virtual sal_Bool SAL_CALL usesLocalFiles( ) override;
@@ -70,14 +70,14 @@ namespace connectivity
virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override;
virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override;
virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) override;
- virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString( ) override;
- virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) override;
- virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) override;
- virtual ::rtl::OUString SAL_CALL getStringFunctions( ) override;
- virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) override;
- virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) override;
- virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) override;
- virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) override;
+ virtual OUString SAL_CALL getIdentifierQuoteString( ) override;
+ virtual OUString SAL_CALL getSQLKeywords( ) override;
+ virtual OUString SAL_CALL getNumericFunctions( ) override;
+ virtual OUString SAL_CALL getStringFunctions( ) override;
+ virtual OUString SAL_CALL getSystemFunctions( ) override;
+ virtual OUString SAL_CALL getTimeDateFunctions( ) override;
+ virtual OUString SAL_CALL getSearchStringEscape( ) override;
+ virtual OUString SAL_CALL getExtraNameCharacters( ) override;
virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) override;
virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) override;
virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override;
@@ -105,11 +105,11 @@ namespace connectivity
virtual sal_Bool SAL_CALL supportsOuterJoins( ) override;
virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override;
virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override;
- virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) override;
- virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) override;
- virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) override;
+ virtual OUString SAL_CALL getSchemaTerm( ) override;
+ virtual OUString SAL_CALL getProcedureTerm( ) override;
+ virtual OUString SAL_CALL getCatalogTerm( ) override;
virtual sal_Bool SAL_CALL isCatalogAtStart( ) override;
- virtual ::rtl::OUString SAL_CALL getCatalogSeparator( ) override;
+ virtual OUString SAL_CALL getCatalogSeparator( ) override;
virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) override;
virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override;
virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) override;
@@ -163,23 +163,23 @@ namespace connectivity
virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override;
virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override;
virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override;
- virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) override;
- virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) override;
- virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const css::uno::Sequence< ::rtl::OUString >& types ) override;
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) override;
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) override;
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override;
virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) override;
virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) override;
virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override;
- virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) override;
- virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) override;
- virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) override;
- virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) override;
- virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override;
- virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override;
- virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override;
- virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override;
- virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const css::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) override;
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override;
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) override;
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override;
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) override;
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) override;
virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) override;
- virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) override;
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override;
virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override;
virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override;
virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override;
@@ -192,7 +192,7 @@ namespace connectivity
virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override;
virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override;
virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override;
- virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override;
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override;
virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override;
};
}
diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index 87dd693efc88..199529016995 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -136,9 +136,9 @@ void FirebirdDriver::disposing()
}
//----- static ServiceInfo ---------------------------------------------------
-rtl::OUString FirebirdDriver::getImplementationName_Static()
+OUString FirebirdDriver::getImplementationName_Static()
{
- return rtl::OUString("com.sun.star.comp.sdbc.firebird.Driver");
+ return OUString("com.sun.star.comp.sdbc.firebird.Driver");
}
Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static()
diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx
index 7394f6ad238f..8fcf17fa2665 100644
--- a/connectivity/source/drivers/firebird/Driver.hxx
+++ b/connectivity/source/drivers/firebird/Driver.hxx
@@ -68,19 +68,19 @@ namespace connectivity
virtual void SAL_CALL disposing() override;
// XInterface
/// @throws css::uno::RuntimeException
- static ::rtl::OUString getImplementationName_Static( );
+ static OUString getImplementationName_Static( );
/// @throws css::uno::RuntimeException
- static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( );
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static( );
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) override;
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
// XDriver
- virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
- virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) override;
- virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+ virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+ virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override;
+ virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
virtual sal_Int32 SAL_CALL getMajorVersion( ) override;
virtual sal_Int32 SAL_CALL getMinorVersion( ) override;
diff --git a/connectivity/source/drivers/firebird/Indexes.hxx b/connectivity/source/drivers/firebird/Indexes.hxx
index 236a0ff064ae..364b36b04278 100644
--- a/connectivity/source/drivers/firebird/Indexes.hxx
+++ b/connectivity/source/drivers/firebird/Indexes.hxx
@@ -30,11 +30,11 @@ namespace connectivity
protected:
// XDrop
virtual void dropObject(sal_Int32 nPosition,
- const ::rtl::OUString& sIndexName) override;
+ const OUString& sIndexName) override;
public:
Indexes(Table* pTable,
::osl::Mutex& rMutex,
- const std::vector< ::rtl::OUString>& rVector);
+ const std::vector< OUString>& rVector);
};
} // namespace firebird
diff --git a/connectivity/source/drivers/firebird/Keys.hxx b/connectivity/source/drivers/firebird/Keys.hxx
index b712ab4122f7..143dbbf5486b 100644
--- a/connectivity/source/drivers/firebird/Keys.hxx
+++ b/connectivity/source/drivers/firebird/Keys.hxx
@@ -31,7 +31,7 @@ namespace connectivity
const ::std::vector< OUString>& rNames);
// OKeysHelper / XDrop
- void dropObject(sal_Int32 nPosition, const ::rtl::OUString& sName) override;
+ void dropObject(sal_Int32 nPosition, const OUString& sName) override;
};
}
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index acb99c8abb99..bec7fdfe02a8 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -766,7 +766,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c
}
-void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 nIndex, sal_Int32, const ::rtl::OUString& )
+void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 nIndex, sal_Int32, const OUString& )
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx b/connectivity/source/drivers/firebird/PreparedStatement.hxx
index 19f19d423c7b..63800ac09e01 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.hxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx
@@ -48,7 +48,7 @@ namespace connectivity
public OPreparedStatement_Base
{
protected:
- ::rtl::OUString m_sSqlStatement;
+ OUString m_sSqlStatement;
css::uno::Reference< css::sdbc::XResultSetMetaData > m_xMetaData;
XSQLDA* m_pOutSqlda;
@@ -88,7 +88,7 @@ namespace connectivity
DECLARE_SERVICE_INFO();
// a constructor, which is required for returning objects:
OPreparedStatement( Connection* _pConnection,
- const ::rtl::OUString& sql);
+ const OUString& sql);
//XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
@@ -109,7 +109,7 @@ namespace connectivity
// XParameters
virtual void SAL_CALL setNull(sal_Int32 nIndex, sal_Int32 nValue) override;
- virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) override;
+ virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override;
virtual void SAL_CALL setBoolean( sal_Int32 nIndex, sal_Bool nValue) override;
virtual void SAL_CALL setByte(sal_Int32 nIndex, sal_Int8 nValue) override;
virtual void SAL_CALL setShort(sal_Int32 nIndex, sal_Int16 nValue) override;
@@ -117,7 +117,7 @@ namespace connectivity
virtual void SAL_CALL setLong(sal_Int32 nIndex, sal_Int64 nValue) override;
virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override;
virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override;
- virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) override;
+ virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override;
virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override;
virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override;
diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx
index f6aac2e1dc1f..008bc5b55263 100644
--- a/connectivity/source/drivers/firebird/ResultSet.hxx
+++ b/connectivity/source/drivers/firebird/ResultSet.hxx
@@ -155,7 +155,7 @@ namespace connectivity
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) override;
// XRow
virtual sal_Bool SAL_CALL wasNull( ) override;
- virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+ virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
@@ -183,7 +183,7 @@ namespace connectivity
// XWarningsSupplier
// XColumnLocate
- virtual sal_Int32 SAL_CALL findColumn(const ::rtl::OUString& columnName) override;
+ virtual sal_Int32 SAL_CALL findColumn(const OUString& columnName) override;
};
@@ -208,7 +208,7 @@ namespace connectivity
OResultSet::retrieveValue(
const sal_Int32 nColumnIndex,
const ISC_SHORT nType);
- template <> ::rtl::OUString
+ template <> OUString
OResultSet::retrieveValue(
const sal_Int32 nColumnIndex,
const ISC_SHORT nType);
diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx
index 1b134a0628fd..1c6d1ca22fc1 100644
--- a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx
+++ b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx
@@ -62,19 +62,19 @@ namespace connectivity
virtual sal_Int32 SAL_CALL isNullable(sal_Int32 column) override;
virtual sal_Bool SAL_CALL isSigned(sal_Int32 column) override;
virtual sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column) override;
- virtual ::rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) override;
- virtual ::rtl::OUString SAL_CALL getColumnName(sal_Int32 column) override;
- virtual ::rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) override;
+ virtual OUString SAL_CALL getColumnLabel(sal_Int32 column) override;
+ virtual OUString SAL_CALL getColumnName(sal_Int32 column) override;
+ virtual OUString SAL_CALL getSchemaName(sal_Int32 column) override;
virtual sal_Int32 SAL_CALL getPrecision(sal_Int32 column) override;
virtual sal_Int32 SAL_CALL getScale(sal_Int32 column) override;
- virtual ::rtl::OUString SAL_CALL getTableName(sal_Int32 column) override;
- virtual ::rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) override;
+ virtual OUString SAL_CALL getTableName(sal_Int32 column) override;
+ virtual OUString SAL_CALL getCatalogName(sal_Int32 column) override;
virtual sal_Int32 SAL_CALL getColumnType(sal_Int32 column) override;
- virtual ::rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) override;
+ virtual OUString SAL_CALL getColumnTypeName(sal_Int32 column) override;
virtual sal_Bool SAL_CALL isReadOnly(sal_Int32 column) override;
virtual sal_Bool SAL_CALL isWritable(sal_Int32 column) override;
virtual sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column) override;
- virtual ::rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column) override;
+ virtual OUString SAL_CALL getColumnServiceName(sal_Int32 column) override;
};
}
}
diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx
index 023a41dff18b..69b05e471263 100644
--- a/connectivity/source/drivers/firebird/Services.cxx
+++ b/connectivity/source/drivers/firebird/Services.cxx
@@ -24,7 +24,6 @@
#include <sal/types.h>
using namespace connectivity::firebird;
-using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::lang::XSingleServiceFactory;
diff --git a/connectivity/source/drivers/firebird/Statement.hxx b/connectivity/source/drivers/firebird/Statement.hxx
index 248a2a65fb1a..56b1ae7edde5 100644
--- a/connectivity/source/drivers/firebird/Statement.hxx
+++ b/connectivity/source/drivers/firebird/Statement.hxx
@@ -58,15 +58,15 @@ namespace connectivity
// XStatement
virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
- executeQuery(const ::rtl::OUString& sql) override;
- virtual sal_Int32 SAL_CALL executeUpdate(const ::rtl::OUString& sqlIn) override;
+ executeQuery(const OUString& sql) override;
+ virtual sal_Int32 SAL_CALL executeUpdate(const OUString& sqlIn) override;
virtual sal_Bool SAL_CALL
- execute(const ::rtl::OUString& sql) override;
+ execute(const OUString& sql) override;
virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL
getConnection() override;
// XBatchExecution - UNSUPPORTED
- virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) override;
+ virtual void SAL_CALL addBatch( const OUString& sql ) override;
virtual void SAL_CALL clearBatch( ) override;
virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) override;
diff --git a/connectivity/source/drivers/firebird/Table.hxx b/connectivity/source/drivers/firebird/Table.hxx
index e0000f6f6e53..586152ecce10 100644
--- a/connectivity/source/drivers/firebird/Table.hxx
+++ b/connectivity/source/drivers/firebird/Table.hxx
@@ -33,7 +33,7 @@ namespace connectivity
* Get the ALTER TABLE [TABLE] ALTER [COLUMN] String.
* Includes a trailing space.
*/
- ::rtl::OUString getAlterTableColumn(const ::rtl::OUString& rColumn);
+ OUString getAlterTableColumn(const OUString& rColumn);
protected:
void construct() override;
@@ -45,9 +45,9 @@ namespace connectivity
Table(Tables* pTables,
::osl::Mutex& rMutex,
const css::uno::Reference< css::sdbc::XConnection >& _xConnection,
- const ::rtl::OUString& rName,
- const ::rtl::OUString& rType,
- const ::rtl::OUString& rDescription);
+ const OUString& rName,
+ const OUString& rType,
+ const OUString& rDescription);
// OTableHelper
virtual ::connectivity::sdbcx::OCollection* createColumns(
@@ -63,11 +63,11 @@ namespace connectivity
* rDescriptor.
*/
virtual void SAL_CALL alterColumnByName(
- const ::rtl::OUString& rColName,
+ const OUString& rColName,
const css::uno::Reference< css::beans::XPropertySet >& rDescriptor) override;
// XRename -- UNSUPPORTED
- virtual void SAL_CALL rename(const ::rtl::OUString& sName) override;
+ virtual void SAL_CALL rename(const OUString& sName) override;
//XInterface
virtual css::uno::Any
diff --git a/connectivity/source/drivers/firebird/Tables.hxx b/connectivity/source/drivers/firebird/Tables.hxx
index 5c2742659ce5..58b31a373468 100644
--- a/connectivity/source/drivers/firebird/Tables.hxx
+++ b/connectivity/source/drivers/firebird/Tables.hxx
@@ -34,7 +34,7 @@ namespace connectivity
// OCollection
virtual void impl_refresh() override;
virtual ::connectivity::sdbcx::ObjectType createObject(
- const ::rtl::OUString& rName) override;
+ const OUString& rName) override;
virtual css::uno::Reference< css::beans::XPropertySet >
createDescriptor() override;
virtual ::connectivity::sdbcx::ObjectType appendObject(
@@ -51,7 +51,7 @@ namespace connectivity
// XAppend, etc., but all are optional.
// XDrop
- virtual void dropObject(sal_Int32 nPosition, const ::rtl::OUString& rName) override;
+ virtual void dropObject(sal_Int32 nPosition, const OUString& rName) override;
};
diff --git a/connectivity/source/drivers/firebird/User.hxx b/connectivity/source/drivers/firebird/User.hxx
index 8ff9155a14af..d2cc091000b9 100644
--- a/connectivity/source/drivers/firebird/User.hxx
+++ b/connectivity/source/drivers/firebird/User.hxx
@@ -31,7 +31,7 @@ namespace connectivity
/**
* For a user that already exists in the db.
*/
- User(const ::rtl::OUString& rName);
+ User(const OUString& rName);
// IRefreshableGroups::
virtual void refreshGroups() override;
diff --git a/connectivity/source/drivers/firebird/Users.hxx b/connectivity/source/drivers/firebird/Users.hxx
index 8b307b5d1578..69cf571154cb 100644
--- a/connectivity/source/drivers/firebird/Users.hxx
+++ b/connectivity/source/drivers/firebird/Users.hxx
@@ -31,7 +31,7 @@ namespace connectivity
// OCollection
virtual void impl_refresh() override;
virtual ::connectivity::sdbcx::ObjectType createObject(
- const ::rtl::OUString& rName) override;
+ const OUString& rName) override;
virtual css::uno::Reference< css::beans::XPropertySet >
createDescriptor() override;
virtual ::connectivity::sdbcx::ObjectType appendObject(
@@ -48,7 +48,7 @@ namespace connectivity
// XAppend, etc., but all are optional.
// XDrop
- virtual void dropObject(sal_Int32 nPosition, const ::rtl::OUString& rName) override;
+ virtual void dropObject(sal_Int32 nPosition, const OUString& rName) override;
};
diff --git a/connectivity/source/drivers/firebird/Util.hxx b/connectivity/source/drivers/firebird/Util.hxx
index dbff25356205..26929a9de162 100644
--- a/connectivity/source/drivers/firebird/Util.hxx
+++ b/connectivity/source/drivers/firebird/Util.hxx
@@ -66,7 +66,7 @@ public:
OUString const & getCharacterSet() const { return m_sCharsetName; }
sal_Int32 getSdbcType() const;
- ::rtl::OUString getColumnTypeName() const;
+ OUString getColumnTypeName() const;
};
@@ -96,7 +96,7 @@ public:
* @throws css::sdbc::SQLException
*/
void evaluateStatusVector(const ISC_STATUS_ARRAY& rStatusVector,
- const ::rtl::OUString& aCause,
+ const OUString& aCause,
const css::uno::Reference< css::uno::XInterface >& _rxContext);
/**
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
index e6149975be9c..cb1b06261042 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
@@ -55,7 +55,7 @@ using ::osl::MutexGuard;
namespace
{
-void lcl_executeUpdate(MYSQL* pMySql, const rtl::OString& sql)
+void lcl_executeUpdate(MYSQL* pMySql, const OString& sql)
{
mysql_real_query(pMySql, sql.getStr(), sql.getLength());
// TODO handle error
@@ -78,7 +78,7 @@ OConnection::~OConnection()
}
}
-void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyValue>& info)
+void OConnection::construct(const OUString& url, const Sequence<PropertyValue>& info)
{
MutexGuard aGuard(m_aMutex);
@@ -90,10 +90,10 @@ void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyVal
mysql_options(&m_mysql, MYSQL_OPT_PROTOCOL, &protocol);
sal_Int32 nIndex;
- rtl::OUString token;
- rtl::OUString aHostName("localhost");
+ OUString token;
+ OUString aHostName("localhost");
sal_Int32 nPort = 3306;
- rtl::OUString aDbName;
+ OUString aDbName;
m_settings.encoding = MysqlCDriver::getDefaultEncoding();
@@ -114,7 +114,7 @@ void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyVal
if (!token.isEmpty())
{
sal_Int32 nIndex1 = 0;
- rtl::OUString hostandport = token.getToken(0, ':', nIndex1);
+ OUString hostandport = token.getToken(0, ':', nIndex1);
if (!hostandport.isEmpty())
{
aHostName = hostandport;
@@ -134,7 +134,7 @@ void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyVal
// get user and password for mysql connection
const PropertyValue* pIter = info.getConstArray();
const PropertyValue* pEnd = pIter + info.getLength();
- rtl::OUString aUser, aPass, sUnixSocket, sNamedPipe;
+ OUString aUser, aPass, sUnixSocket, sNamedPipe;
bool unixSocketPassed = false;
bool namedPipePassed = false;
@@ -169,18 +169,18 @@ void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyVal
}
}
- rtl::OString host_str = rtl::OUStringToOString(aHostName, m_settings.encoding);
- rtl::OString user_str = rtl::OUStringToOString(aUser, m_settings.encoding);
- rtl::OString pass_str = rtl::OUStringToOString(aPass, m_settings.encoding);
- rtl::OString schema_str = rtl::OUStringToOString(aDbName, m_settings.encoding);
- rtl::OString socket_str;
+ OString host_str = OUStringToOString(aHostName, m_settings.encoding);
+ OString user_str = OUStringToOString(aUser, m_settings.encoding);
+ OString pass_str = OUStringToOString(aPass, m_settings.encoding);
+ OString schema_str = OUStringToOString(aDbName, m_settings.encoding);
+ OString socket_str;
if (unixSocketPassed)
{
- socket_str = rtl::OUStringToOString(sUnixSocket, m_settings.encoding);
+ socket_str = OUStringToOString(sUnixSocket, m_settings.encoding);
}
else if (namedPipePassed)
{
- socket_str = rtl::OUStringToOString(sNamedPipe, m_settings.encoding);
+ socket_str = OUStringToOString(sNamedPipe, m_settings.encoding);
}
// flags can also be passed as last parameter
@@ -195,26 +195,26 @@ void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyVal
if (getMysqlVersion() < 40100)
{
throw SQLException("MariaDB LibreOffice Connector requires MySQL Server 4.1 or above",
- *this, rtl::OUString(), 0, Any());
+ *this, OUString(), 0, Any());
}
- lcl_executeUpdate(&m_mysql, rtl::OString{ "SET session sql_mode='ANSI_QUOTES'" });
- lcl_executeUpdate(&m_mysql, rtl::OString{ "SET NAMES utf8" });
+ lcl_executeUpdate(&m_mysql, OString{ "SET session sql_mode='ANSI_QUOTES'" });
+ lcl_executeUpdate(&m_mysql, OString{ "SET NAMES utf8" });
}
-rtl::OUString OConnection::getImplementationName()
+OUString OConnection::getImplementationName()
{
- return rtl::OUString("com.sun.star.sdbc.drivers.mysqlc.OConnection");
+ return OUString("com.sun.star.sdbc.drivers.mysqlc.OConnection");
}
-css::uno::Sequence<rtl::OUString> OConnection::getSupportedServiceNames()
+css::uno::Sequence<OUString> OConnection::getSupportedServiceNames()
{
- css::uno::Sequence<rtl::OUString> s(1);
+ css::uno::Sequence<OUString> s(1);
s[0] = "com.sun.star.sdbc.Connection";
return s;
}
-sal_Bool OConnection::supportsService(rtl::OUString const& ServiceName)
+sal_Bool OConnection::supportsService(OUString const& ServiceName)
{
return cppu::supportsService(this, ServiceName);
}
@@ -233,12 +233,12 @@ Reference<XStatement> SAL_CALL OConnection::createStatement()
return xReturn;
}
-Reference<XPreparedStatement> SAL_CALL OConnection::prepareStatement(const rtl::OUString& _sSql)
+Reference<XPreparedStatement> SAL_CALL OConnection::prepareStatement(const OUString& _sSql)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
- const rtl::OString sSqlStatement
- = rtl::OUStringToOString(_sSql, getConnectionEncoding()); // FIXME transform statement ?
+ const OString sSqlStatement
+ = OUStringToOString(_sSql, getConnectionEncoding()); // FIXME transform statement ?
MYSQL_STMT* pStmt = mysql_stmt_init(&m_mysql);
mysql_stmt_prepare(pStmt, sSqlStatement.getStr(), sSqlStatement.getLength());
@@ -254,7 +254,7 @@ Reference<XPreparedStatement> SAL_CALL OConnection::prepareStatement(const rtl::
return xStatement;
}
-Reference<XPreparedStatement> SAL_CALL OConnection::prepareCall(const rtl::OUString& /*_sSql*/)
+Reference<XPreparedStatement> SAL_CALL OConnection::prepareCall(const OUString& /*_sSql*/)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -263,12 +263,12 @@ Reference<XPreparedStatement> SAL_CALL OConnection::prepareCall(const rtl::OUStr
return Reference<XPreparedStatement>();
}
-rtl::OUString SAL_CALL OConnection::nativeSQL(const rtl::OUString& /*_sSql*/)
+OUString SAL_CALL OConnection::nativeSQL(const OUString& /*_sSql*/)
{
MutexGuard aGuard(m_aMutex);
- // const rtl::OUString sSqlStatement = transFormPreparedStatement( _sSql );
- rtl::OUString sNativeSQL;
+ // const OUString sSqlStatement = transFormPreparedStatement( _sSql );
+ OUString sNativeSQL;
// TODO
return sNativeSQL;
}
@@ -355,7 +355,7 @@ sal_Bool SAL_CALL OConnection::isReadOnly()
return m_settings.readOnly;
}
-void SAL_CALL OConnection::setCatalog(const rtl::OUString& /*catalog*/)
+void SAL_CALL OConnection::setCatalog(const OUString& /*catalog*/)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -363,7 +363,7 @@ void SAL_CALL OConnection::setCatalog(const rtl::OUString& /*catalog*/)
// TODO How?
}
-rtl::OUString SAL_CALL OConnection::getCatalog()
+OUString SAL_CALL OConnection::getCatalog()
{
MutexGuard aGuard(m_aMutex);
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -464,9 +464,9 @@ sal_Int32 OConnection::getMysqlVersion()
return static_cast<sal_Int32>(version);
}
-rtl::OUString OConnection::transFormPreparedStatement(const rtl::OUString& _sSQL)
+OUString OConnection::transFormPreparedStatement(const OUString& _sSQL)
{
- rtl::OUString sSqlStatement = _sSQL;
+ OUString sSqlStatement = _sSQL;
if (!m_xParameterSubstitution.is())
{
try
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
index ed96d5e42290..b1c8d5bda8ed 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
@@ -69,8 +69,8 @@ typedef ::cppu::WeakComponentImplHelper3<css::sdbc::XConnection, css::sdbc::XWar
struct ConnectionSettings
{
rtl_TextEncoding encoding;
- rtl::OUString schema;
- rtl::OUString connectionURL;
+ OUString schema;
+ OUString connectionURL;
bool readOnly;
ConnectionSettings()
: encoding(RTL_TEXTENCODING_DONTKNOW)
@@ -110,8 +110,7 @@ public:
sal_Int32 getMysqlVersion();
/// @throws SQLException
- void construct(const rtl::OUString& url,
- const css::uno::Sequence<css::beans::PropertyValue>& info);
+ void construct(const OUString& url, const css::uno::Sequence<css::beans::PropertyValue>& info);
OConnection(MysqlCDriver& _rDriver);
virtual ~OConnection() override;
@@ -122,22 +121,22 @@ public:
virtual void SAL_CALL disposing() override;
// XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName() override;
+ virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override;
- virtual css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
// XConnection
css::uno::Reference<css::sdbc::XStatement> SAL_CALL createStatement() override;
css::uno::Reference<css::sdbc::XPreparedStatement>
- SAL_CALL prepareStatement(const rtl::OUString& sql) override;
+ SAL_CALL prepareStatement(const OUString& sql) override;
css::uno::Reference<css::sdbc::XPreparedStatement>
- SAL_CALL prepareCall(const rtl::OUString& sql) override;
+ SAL_CALL prepareCall(const OUString& sql) override;
- rtl::OUString SAL_CALL nativeSQL(const rtl::OUString& sql) override;
+ OUString SAL_CALL nativeSQL(const OUString& sql) override;
void SAL_CALL setAutoCommit(sal_Bool autoCommit) override;
@@ -155,9 +154,9 @@ public:
sal_Bool SAL_CALL isReadOnly() override;
- void SAL_CALL setCatalog(const rtl::OUString& catalog) override;
+ void SAL_CALL setCatalog(const OUString& catalog) override;
- rtl::OUString SAL_CALL getCatalog() override;
+ OUString SAL_CALL getCatalog() override;
void SAL_CALL setTransactionIsolation(sal_Int32 level) override;
@@ -173,15 +172,15 @@ public:
void SAL_CALL clearWarnings() override;
// TODO: Not used
- //sal_Int32 sdbcColumnType(rtl::OUString typeName);
+ //sal_Int32 sdbcColumnType(OUString typeName);
const ConnectionSettings& getConnectionSettings() const { return m_settings; }
- rtl::OUString transFormPreparedStatement(const rtl::OUString& _sSQL);
+ OUString transFormPreparedStatement(const OUString& _sSQL);
const MysqlCDriver& getDriver() const { return *m_xDriver.get(); }
}; /* OConnection */
// TODO: Not used.
-//inline rtl::OUString getPattern(rtl::OUString p) { return (p.getLength()) ? p : ASC2OU("%"); }
+//inline OUString getPattern(OUString p) { return (p.getLength()) ? p : ASC2OU("%"); }
} /* mysqlc */
} /* connectivity */
#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_CONNECTION_HXX
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
index a1575c728298..507ce0b91e45 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
@@ -79,7 +79,7 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection& _rCon, MYSQL* pMySql)
ODatabaseMetaData::~ODatabaseMetaData() {}
-rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator() { return rtl::OUString(); }
+OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator() { return OUString(); }
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength() { return 16777208L; }
@@ -172,11 +172,11 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength() { return 256; }
sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns() { return true; }
-rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() { return rtl::OUString("n/a"); }
+OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() { return OUString("n/a"); }
-rtl::OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString() { return rtl::OUString("\""); }
+OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString() { return OUString("\""); }
-rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters() { return rtl::OUString("#@"); }
+OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters() { return OUString("#@"); }
sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames() { return true; }
@@ -355,39 +355,33 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds()
sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL() { return false; }
-rtl::OUString SAL_CALL ODatabaseMetaData::getURL()
+OUString SAL_CALL ODatabaseMetaData::getURL()
{
return m_rConnection.getConnectionSettings().connectionURL;
}
-rtl::OUString SAL_CALL ODatabaseMetaData::getUserName()
+OUString SAL_CALL ODatabaseMetaData::getUserName()
{
// TODO execute "SELECT USER()"
SAL_WARN("connectivity.mysqlc", "method not implemented");
- return rtl::OUString();
+ return OUString();
}
-rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName()
-{
- return rtl::OUString("MySQL Connector/OO.org");
-}
+OUString SAL_CALL ODatabaseMetaData::getDriverName() { return OUString("MySQL Connector/OO.org"); }
-rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion() { return rtl::OUString("0.9.2"); }
+OUString SAL_CALL ODatabaseMetaData::getDriverVersion() { return OUString("0.9.2"); }
-rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion()
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion()
{
- return rtl::OStringToOUString(mysql_get_server_info(m_pMySql),
- m_rConnection.getConnectionEncoding());
+ return OStringToOUString(mysql_get_server_info(m_pMySql),
+ m_rConnection.getConnectionEncoding());
}
-rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName()
-{
- return rtl::OUString("MySQL");
-}
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName() { return OUString("MySQL"); }
-rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm() { return rtl::OUString("procedure"); }
+OUString SAL_CALL ODatabaseMetaData::getProcedureTerm() { return OUString("procedure"); }
-rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() { return rtl::OUString("database"); }
+OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() { return OUString("database"); }
sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion()
{
@@ -409,87 +403,87 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion()
return MARIADBC_VERSION_MINOR;
}
-rtl::OUString SAL_CALL ODatabaseMetaData::getSQLKeywords()
+OUString SAL_CALL ODatabaseMetaData::getSQLKeywords()
{
- return rtl::OUString("ACCESSIBLE, ADD, ALL,"
- "ALTER, ANALYZE, AND, AS, ASC, ASENSITIVE, BEFORE,"
- "BETWEEN, BIGINT, BINARY, BLOB, BOTH, BY, CALL,"
- "CASCADE, CASE, CHANGE, CHAR, CHARACTER, CHECK,"
- "COLLATE, COLUMN, CONDITION, CONNECTION, CONSTRAINT,"
- "CONTINUE, CONVERT, CREATE, CROSS, CURRENT_DATE,"
- "CURRENT_TIME, CURRENT_TIMESTAMP, CURRENT_USER, CURSOR,"
- "DATABASE, DATABASES, DAY_HOUR, DAY_MICROSECOND,"
- "DAY_MINUTE, DAY_SECOND, DEC, DECIMAL, DECLARE,"
- "DEFAULT, DELAYED, DELETE, DESC, DESCRIBE,"
- "DETERMINISTIC, DISTINCT, DISTINCTROW, DIV, DOUBLE,"
- "DROP, DUAL, EACH, ELSE, ELSEIF, ENCLOSED,"
- "ESCAPED, EXISTS, EXIT, EXPLAIN, FALSE, FETCH,"
- "FLOAT, FLOAT4, FLOAT8, FOR, FORCE, FOREIGN, FROM,"
- "FULLTEXT, GRANT, GROUP, HAVING, HIGH_PRIORITY,"
- "HOUR_MICROSECOND, HOUR_MINUTE, HOUR_SECOND, IF,"
- "IGNORE, IN, INDEX, INFILE, INNER, INOUT,"
- "INSENSITIVE, INSERT, INT, INT1, INT2, INT3, INT4,"
- "INT8, INTEGER, INTERVAL, INTO, IS, ITERATE, JOIN,"
- "KEY, KEYS, KILL, LEADING, LEAVE, LEFT, LIKE,"
- "LOCALTIMESTAMP, LOCK, LONG, LONGBLOB, LONGTEXT,"
- "LOOP, LOW_PRIORITY, MATCH, MEDIUMBLOB, MEDIUMINT,"
- "MEDIUMTEXT, MIDDLEINT, MINUTE_MICROSECOND,"
- "MINUTE_SECOND, MOD, MODIFIES, NATURAL, NOT,"
- "NO_WRITE_TO_BINLOG, NULL, NUMERIC, ON, OPTIMIZE,"
- "OPTION, OPTIONALLY, OR, ORDER, OUT, OUTER,"
- "OUTFILE, PRECISION, PRIMARY, PROCEDURE, PURGE,"
- "RANGE, READ, READS, READ_ONLY, READ_WRITE, REAL,"
- "REFERENCES, REGEXP, RELEASE, RENAME, REPEAT,"
- "REPLACE, REQUIRE, RESTRICT, RETURN, REVOKE, RIGHT,"
- "RLIKE, SCHEMA, SCHEMAS, SECOND_MICROSECOND, SELECT,"
- "SENSITIVE, SEPARATOR, SET, SHOW, SMALLINT, SPATIAL,"
- "SPECIFIC, SQL, SQLEXCEPTION, SQLSTATE, SQLWARNING,"
- "SQL_BIG_RESULT, SQL_CALC_FOUND_ROWS, SQL_SMALL_RESULT,"
- "SSL, STARTING, STRAIGHT_JOIN, TABLE, TERMINATED,"
- "THEN, TINYBLOB, TINYINT, TINYTEXT, TO, TRAILING,"
- "TRIGGER, TRUE, UNDO, UNION, UNIQUE, UNLOCK,"
- "UNSIGNED, UPDATE, USAGE, USE, USING, UTC_DATE,"
- "UTC_TIME, UTC_TIMESTAMP, VALUES, VARBINARY, VARCHAR,"
- "VARCHARACTER, VARYING, WHEN, WHERE, WHILE, WITH,"
- "WRITE, X509, XOR, YEAR_MONTH, ZEROFILL"
- "GENERAL, IGNORE_SERVER_IDS, MASTER_HEARTBEAT_PERIOD,"
- "MAXVALUE, RESIGNAL, SIGNAL, SLOW");
+ return OUString("ACCESSIBLE, ADD, ALL,"
+ "ALTER, ANALYZE, AND, AS, ASC, ASENSITIVE, BEFORE,"
+ "BETWEEN, BIGINT, BINARY, BLOB, BOTH, BY, CALL,"
+ "CASCADE, CASE, CHANGE, CHAR, CHARACTER, CHECK,"
+ "COLLATE, COLUMN, CONDITION, CONNECTION, CONSTRAINT,"
+ "CONTINUE, CONVERT, CREATE, CROSS, CURRENT_DATE,"
+ "CURRENT_TIME, CURRENT_TIMESTAMP, CURRENT_USER, CURSOR,"
+ "DATABASE, DATABASES, DAY_HOUR, DAY_MICROSECOND,"
+ "DAY_MINUTE, DAY_SECOND, DEC, DECIMAL, DECLARE,"
+ "DEFAULT, DELAYED, DELETE, DESC, DESCRIBE,"
+ "DETERMINISTIC, DISTINCT, DISTINCTROW, DIV, DOUBLE,"
+ "DROP, DUAL, EACH, ELSE, ELSEIF, ENCLOSED,"
+ "ESCAPED, EXISTS, EXIT, EXPLAIN, FALSE, FETCH,"
+ "FLOAT, FLOAT4, FLOAT8, FOR, FORCE, FOREIGN, FROM,"
+ "FULLTEXT, GRANT, GROUP, HAVING, HIGH_PRIORITY,"
+ "HOUR_MICROSECOND, HOUR_MINUTE, HOUR_SECOND, IF,"
+ "IGNORE, IN, INDEX, INFILE, INNER, INOUT,"
+ "INSENSITIVE, INSERT, INT, INT1, INT2, INT3, INT4,"
+ "INT8, INTEGER, INTERVAL, INTO, IS, ITERATE, JOIN,"
+ "KEY, KEYS, KILL, LEADING, LEAVE, LEFT, LIKE,"
+ "LOCALTIMESTAMP, LOCK, LONG, LONGBLOB, LONGTEXT,"
+ "LOOP, LOW_PRIORITY, MATCH, MEDIUMBLOB, MEDIUMINT,"
+ "MEDIUMTEXT, MIDDLEINT, MINUTE_MICROSECOND,"
+ "MINUTE_SECOND, MOD, MODIFIES, NATURAL, NOT,"
+ "NO_WRITE_TO_BINLOG, NULL, NUMERIC, ON, OPTIMIZE,"
+ "OPTION, OPTIONALLY, OR, ORDER, OUT, OUTER,"
+ "OUTFILE, PRECISION, PRIMARY, PROCEDURE, PURGE,"
+ "RANGE, READ, READS, READ_ONLY, READ_WRITE, REAL,"
+ "REFERENCES, REGEXP, RELEASE, RENAME, REPEAT,"
+ "REPLACE, REQUIRE, RESTRICT, RETURN, REVOKE, RIGHT,"
+ "RLIKE, SCHEMA, SCHEMAS, SECOND_MICROSECOND, SELECT,"
+ "SENSITIVE, SEPARATOR, SET, SHOW, SMALLINT, SPATIAL,"
+ "SPECIFIC, SQL, SQLEXCEPTION, SQLSTATE, SQLWARNING,"
+ "SQL_BIG_RESULT, SQL_CALC_FOUND_ROWS, SQL_SMALL_RESULT,"
+ "SSL, STARTING, STRAIGHT_JOIN, TABLE, TERMINATED,"
+ "THEN, TINYBLOB, TINYINT, TINYTEXT, TO, TRAILING,"
+ "TRIGGER, TRUE, UNDO, UNION, UNIQUE, UNLOCK,"
+ "UNSIGNED, UPDATE, USAGE, USE, USING, UTC_DATE,"
+ "UTC_TIME, UTC_TIMESTAMP, VALUES, VARBINARY, VARCHAR,"
+ "VARCHARACTER, VARYING, WHEN, WHERE, WHILE, WITH,"
+ "WRITE, X509, XOR, YEAR_MONTH, ZEROFILL"
+ "GENERAL, IGNORE_SERVER_IDS, MASTER_HEARTBEAT_PERIOD,"
+ "MAXVALUE, RESIGNAL, SIGNAL, SLOW");
}
-rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape() { return rtl::OUString("\\"); }
+OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape() { return OUString("\\"); }
-rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions()
+OUString SAL_CALL ODatabaseMetaData::getStringFunctions()
{
- return rtl::OUString("ASCII,BIN,BIT_LENGTH,CHAR,CHARACTER_LENGTH,CHAR_LENGTH,CONCAT,"
- "CONCAT_WS,CONV,ELT,EXPORT_SET,FIELD,FIND_IN_SET,HEX,INSERT,"
- "INSTR,LCASE,LEFT,LENGTH,LOAD_FILE,LOCATE,LOCATE,LOWER,LPAD,"
- "LTRIM,MAKE_SET,MATCH,MID,OCT,OCTET_LENGTH,ORD,POSITION,"
- "QUOTE,REPEAT,REPLACE,REVERSE,RIGHT,RPAD,RTRIM,SOUNDEX,"
- "SPACE,STRCMP,SUBSTRING,SUBSTRING,SUBSTRING,SUBSTRING,"
- "SUBSTRING_INDEX,TRIM,UCASE,UPPER");
+ return OUString("ASCII,BIN,BIT_LENGTH,CHAR,CHARACTER_LENGTH,CHAR_LENGTH,CONCAT,"
+ "CONCAT_WS,CONV,ELT,EXPORT_SET,FIELD,FIND_IN_SET,HEX,INSERT,"
+ "INSTR,LCASE,LEFT,LENGTH,LOAD_FILE,LOCATE,LOCATE,LOWER,LPAD,"
+ "LTRIM,MAKE_SET,MATCH,MID,OCT,OCTET_LENGTH,ORD,POSITION,"
+ "QUOTE,REPEAT,REPLACE,REVERSE,RIGHT,RPAD,RTRIM,SOUNDEX,"
+ "SPACE,STRCMP,SUBSTRING,SUBSTRING,SUBSTRING,SUBSTRING,"
+ "SUBSTRING_INDEX,TRIM,UCASE,UPPER");
}
-rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions()
+OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions()
{
- return rtl::OUString("DAYOFWEEK,WEEKDAY,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,"
- "MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,PERIOD_ADD,"
- "PERIOD_DIFF,TO_DAYS,FROM_DAYS,DATE_FORMAT,TIME_FORMAT,"
- "CURDATE,CURRENT_DATE,CURTIME,CURRENT_TIME,NOW,SYSDATE,"
- "CURRENT_TIMESTAMP,UNIX_TIMESTAMP,FROM_UNIXTIME,"
- "SEC_TO_TIME,TIME_TO_SEC");
+ return OUString("DAYOFWEEK,WEEKDAY,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,"
+ "MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,PERIOD_ADD,"
+ "PERIOD_DIFF,TO_DAYS,FROM_DAYS,DATE_FORMAT,TIME_FORMAT,"
+ "CURDATE,CURRENT_DATE,CURTIME,CURRENT_TIME,NOW,SYSDATE,"
+ "CURRENT_TIMESTAMP,UNIX_TIMESTAMP,FROM_UNIXTIME,"
+ "SEC_TO_TIME,TIME_TO_SEC");
}
-rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions()
+OUString SAL_CALL ODatabaseMetaData::getSystemFunctions()
{
- return rtl::OUString("DATABASE,USER,SYSTEM_USER,"
- "SESSION_USER,PASSWORD,ENCRYPT,LAST_INSERT_ID,VERSION");
+ return OUString("DATABASE,USER,SYSTEM_USER,"
+ "SESSION_USER,PASSWORD,ENCRYPT,LAST_INSERT_ID,VERSION");
}
-rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions()
+OUString SAL_CALL ODatabaseMetaData::getNumericFunctions()
{
- return rtl::OUString("ABS,ACOS,ASIN,ATAN,ATAN2,BIT_COUNT,CEILING,COS,"
- "COT,DEGREES,EXP,FLOOR,LOG,LOG10,MAX,MIN,MOD,PI,POW,"
- "POWER,RADIANS,RAND,ROUND,SIN,SQRT,TAN,TRUNCATE");
+ return OUString("ABS,ACOS,ASIN,ATAN,ATAN2,BIT_COUNT,CEILING,COS,"
+ "COT,DEGREES,EXP,FLOOR,LOG,LOG10,MAX,MIN,MOD,PI,POW,"
+ "POWER,RADIANS,RAND,ROUND,SIN,SQRT,TAN,TRUNCATE");
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar() { return false; }
@@ -643,11 +637,11 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getSchemas()
UNO_QUERY);
std::vector<std::vector<Any>> rRows;
- rtl::OUString sSql
+ OUString sSql
= m_rConnection.getMysqlVersion() > 49999
- ? rtl::OUString{ "SELECT SCHEMA_NAME AS TABLE_SCHEM, CATALOG_NAME AS TABLE_CATALOG "
- "FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME" }
- : rtl::OUString{ "SHOW DATABASES" };
+ ? OUString{ "SELECT SCHEMA_NAME AS TABLE_SCHEM, CATALOG_NAME AS TABLE_CATALOG "
+ "FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME" }
+ : OUString{ "SHOW DATABASES" };
Reference<XStatement> statement = m_rConnection.createStatement();
Reference<XInterface> executed = statement->executeQuery(sSql);
@@ -663,7 +657,7 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getSchemas()
bool informationSchema = false;
for (sal_uInt32 i = 1; i <= columns; i++)
{
- rtl::OUString columnStringValue = xRow->getString(i);
+ OUString columnStringValue = xRow->getString(i);
if (i == 1)
{ // TABLE_SCHEM
informationSchema = !columnStringValue.equalsIgnoreAsciiCase("information_schema");
@@ -680,16 +674,17 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getSchemas()
return xResultSet;
}
-Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumnPrivileges(
- const Any& /*catalog*/, const rtl::OUString& schema, const rtl::OUString& table,
- const rtl::OUString& columnNamePattern)
+Reference<XResultSet>
+ SAL_CALL ODatabaseMetaData::getColumnPrivileges(const Any& /*catalog*/, const OUString& schema,
+ const OUString& table,
+ const OUString& columnNamePattern)
{
- rtl::OUString query("SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA AS "
- "TABLE_SCHEM, TABLE_NAME, COLUMN_NAME, NULL AS GRANTOR, "
- "GRANTEE, PRIVILEGE_TYPE AS PRIVILEGE, IS_GRANTABLE FROM "
- "INFORMATION_SCHEMA.COLUMN_PRIVILEGES WHERE TABLE_SCHEMA LIKE "
- "'?' AND TABLE_NAME='?' AND COLUMN_NAME LIKE '?' ORDER BY "
- "COLUMN_NAME, PRIVILEGE_TYPE");
+ OUString query("SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA AS "
+ "TABLE_SCHEM, TABLE_NAME, COLUMN_NAME, NULL AS GRANTOR, "
+ "GRANTEE, PRIVILEGE_TYPE AS PRIVILEGE, IS_GRANTABLE FROM "
+ "INFORMATION_SCHEMA.COLUMN_PRIVILEGES WHERE TABLE_SCHEMA LIKE "
+ "'?' AND TABLE_NAME='?' AND COLUMN_NAME LIKE '?' ORDER BY "
+ "COLUMN_NAME, PRIVILEGE_TYPE");
query = query.replaceFirst("?", schema);
query = query.replaceFirst("?", table);
@@ -701,34 +696,34 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumnPrivileges(
}
Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalog*/,
- const rtl::OUString& /*schemaPattern*/,
- const rtl::OUString& tableNamePattern,
- const rtl::OUString& columnNamePattern)
+ const OUString& /*schemaPattern*/,
+ const OUString& tableNamePattern,
+ const OUString& columnNamePattern)
{
- rtl::OUStringBuffer queryBuf("SELECT TABLE_CATALOG AS TABLE_CAT, " // 1
- "TABLE_SCHEMA AS TABLE_SCHEM, " // 2
- "TABLE_NAME, " // 3
- "COLUMN_NAME, " // 4
- "DATA_TYPE, " // 5
- // TYPE_NAME missing
- "CHARACTER_MAXIMUM_LENGTH, " // 6
- "NUMERIC_PRECISION, " // 7
- // buffer length missing
- "NUMERIC_SCALE AS DECIMAL_DIGITS, " // 8
- // NUM_PREC_RADIX missing
- // NULLABLE missing
- "COLUMN_COMMENT AS REMARKS, " // 9
- "COLUMN_DEFAULT AS COLUMN_DEF," // 10
- "CHARACTER_OCTET_LENGTH, " // 11
- "ORDINAL_POSITION, " // 12
- "IS_NULLABLE, " // 13
- "COLUMN_TYPE " // 14
- "FROM INFORMATION_SCHEMA.COLUMNS "
- "WHERE (1 = 1) ");
+ OUStringBuffer queryBuf("SELECT TABLE_CATALOG AS TABLE_CAT, " // 1
+ "TABLE_SCHEMA AS TABLE_SCHEM, " // 2
+ "TABLE_NAME, " // 3
+ "COLUMN_NAME, " // 4
+ "DATA_TYPE, " // 5
+ // TYPE_NAME missing
+ "CHARACTER_MAXIMUM_LENGTH, " // 6
+ "NUMERIC_PRECISION, " // 7
+ // buffer length missing
+ "NUMERIC_SCALE AS DECIMAL_DIGITS, " // 8
+ // NUM_PREC_RADIX missing
+ // NULLABLE missing
+ "COLUMN_COMMENT AS REMARKS, " // 9
+ "COLUMN_DEFAULT AS COLUMN_DEF," // 10
+ "CHARACTER_OCTET_LENGTH, " // 11
+ "ORDINAL_POSITION, " // 12
+ "IS_NULLABLE, " // 13
+ "COLUMN_TYPE " // 14
+ "FROM INFORMATION_SCHEMA.COLUMNS "
+ "WHERE (1 = 1) ");
if (!tableNamePattern.isEmpty())
{
- rtl::OUString sAppend;
+ OUString sAppend;
if (tableNamePattern.match("%"))
sAppend = "AND TABLE_NAME LIKE '%' ";
else
@@ -737,7 +732,7 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo
}
if (!columnNamePattern.isEmpty())
{
- rtl::OUString sAppend;
+ OUString sAppend;
if (columnNamePattern.match("%"))
sAppend = "AND COLUMN_NAME LIKE '%' ";
else
@@ -745,7 +740,7 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo
queryBuf.append(sAppend.replaceAll("%", columnNamePattern));
}
- rtl::OUString query = queryBuf.makeStringAndClear();
+ OUString query = queryBuf.makeStringAndClear();
Reference<XStatement> statement = m_rConnection.createStatement();
Reference<XResultSet> rs = statement->executeQuery(query.getStr());
Reference<XRow> xRow(rs, UNO_QUERY_THROW);
@@ -767,13 +762,13 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo
// column name
aRow.push_back(makeAny(xRow->getString(4)));
// data type
- rtl::OUString sDataType = xRow->getString(5);
+ OUString sDataType = xRow->getString(5);
aRow.push_back(makeAny(mysqlc_sdbc_driver::mysqlStrToOOOType(sDataType)));
// type name
aRow.push_back(makeAny(sDataType)); // TODO
// column size
sal_Int32 nColumnSize = 0;
- rtl::OUString sColumnType = xRow->getString(14);
+ OUString sColumnType = xRow->getString(14);
sal_Int32 nCharMaxLen = xRow->getShort(6);
bool bIsCharMax = !xRow->wasNull();
if (sDataType.equalsIgnoreAsciiCase("year"))
@@ -796,7 +791,7 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo
// num_prec_radix
aRow.push_back(makeAny(sal_Int32(10)));
// nullable
- rtl::OUString sIsNullable = xRow->getString(13);
+ OUString sIsNullable = xRow->getString(13);
if (xRow->wasNull())
aRow.push_back(makeAny(ColumnValue::NULLABLE_UNKNOWN));
else if (sIsNullable.equalsIgnoreAsciiCase("YES"))
@@ -823,11 +818,12 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo
return xResultSet;
}
-Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTables(
- const Any& /*catalog*/, const rtl::OUString& schemaPattern,
- const rtl::OUString& tableNamePattern, const Sequence<rtl::OUString>& /*types */)
+Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTables(const Any& /*catalog*/,
+ const OUString& schemaPattern,
+ const OUString& tableNamePattern,
+ const Sequence<OUString>& /*types */)
{
- rtl::OUString query(
+ OUString query(
"SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA AS TABLE_SCHEM, TABLE_NAME,"
"IF(STRCMP(TABLE_TYPE,'BASE TABLE'), TABLE_TYPE, 'TABLE') AS TABLE_TYPE, TABLE_COMMENT AS "
"REMARKS "
@@ -845,8 +841,8 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTables(
}
Reference<XResultSet> SAL_CALL ODatabaseMetaData::getProcedureColumns(
- const Any& /* catalog */, const rtl::OUString& /* schemaPattern */,
- const rtl::OUString& /* procedureNamePattern */, const rtl::OUString& /* columnNamePattern */)
+ const Any& /* catalog */, const OUString& /* schemaPattern */,
+ const OUString& /* procedureNamePattern */, const OUString& /* columnNamePattern */)
{
// Currently there is no information available
return nullptr;
@@ -854,8 +850,8 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getProcedureColumns(
Reference<XResultSet>
SAL_CALL ODatabaseMetaData::getProcedures(const Any& /*catalog*/,
- const rtl::OUString& /*schemaPattern*/,
- const rtl::OUString& /*procedureNamePattern*/)
+ const OUString& /*schemaPattern*/,
+ const OUString& /*procedureNamePattern*/)
{
Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(
"org.openoffice.comp.helper.DatabaseMetaDataResultSet"),
@@ -867,8 +863,9 @@ Reference<XResultSet>
return xResultSet;
}
-Reference<XResultSet> SAL_CALL ODatabaseMetaData::getVersionColumns(
- const Any& /* catalog */, const rtl::OUString& /* schema */, const rtl::OUString& /* table */)
+Reference<XResultSet> SAL_CALL ODatabaseMetaData::getVersionColumns(const Any& /* catalog */,
+ const OUString& /* schema */,
+ const OUString& /* table */)
{
Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(
"org.openoffice.comp.helper.DatabaseMetaDataResultSet"),
@@ -879,8 +876,8 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getVersionColumns(
}
Reference<XResultSet> SAL_CALL ODatabaseMetaData::getExportedKeys(const Any& /*catalog */,
- const rtl::OUString& /*schema */,
- const rtl::OUString& /*table */)
+ const OUString& /*schema */,
+ const OUString& /*table */)
{
Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(
"org.openoffice.comp.helper.DatabaseMetaDataResultSet"),
@@ -893,14 +890,14 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getExportedKeys(const Any& /*c
}
Reference<XResultSet> SAL_CALL ODatabaseMetaData::getImportedKeys(const Any& /*catalog*/,
- const rtl::OUString& schema,
- const rtl::OUString& table)
+ const OUString& schema,
+ const OUString& table)
{
Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(
"org.openoffice.comp.helper.DatabaseMetaDataResultSet"),
UNO_QUERY);
- rtl::OUString query(
+ OUString query(
"SELECT refi.CONSTRAINT_CATALOG, k.COLUMN_NAME, "
" refi.UNIQUE_CONSTRAINT_CATALOG, "
" refi.UNIQUE_CONSTRAINT_SCHEMA, refi.REFERENCED_TABLE_NAME, k.REFERENCED_COLUMN_NAME, "
@@ -959,16 +956,15 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getImportedKeys(const Any& /*c
}
Reference<XResultSet> SAL_CALL ODatabaseMetaData::getPrimaryKeys(const Any& /*catalog*/,
- const rtl::OUString& schema,
- const rtl::OUString& table)
+ const OUString& schema,
+ const OUString& table)
{
- rtl::OUString query(
- "SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA "
- "AS TABLE_SCHEM, TABLE_NAME, "
- "COLUMN_NAME, SEQ_IN_INDEX AS KEY_SEQ,"
- "INDEX_NAME AS PK_NAME FROM INFORMATION_SCHEMA.STATISTICS "
- "WHERE TABLE_SCHEMA LIKE '?' AND TABLE_NAME LIKE '?' AND INDEX_NAME='PRIMARY' "
- "ORDER BY TABLE_SCHEMA, TABLE_NAME, INDEX_NAME, SEQ_IN_INDEX");
+ OUString query("SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA "
+ "AS TABLE_SCHEM, TABLE_NAME, "
+ "COLUMN_NAME, SEQ_IN_INDEX AS KEY_SEQ,"
+ "INDEX_NAME AS PK_NAME FROM INFORMATION_SCHEMA.STATISTICS "
+ "WHERE TABLE_SCHEMA LIKE '?' AND TABLE_NAME LIKE '?' AND INDEX_NAME='PRIMARY' "
+ "ORDER BY TABLE_SCHEMA, TABLE_NAME, INDEX_NAME, SEQ_IN_INDEX");
// TODO use prepared stmt instead
// TODO escape schema, table name ?
@@ -981,8 +977,8 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getPrimaryKeys(const Any& /*ca
}
Reference<XResultSet> SAL_CALL ODatabaseMetaData::getIndexInfo(const Any& /*catalog*/,
- const rtl::OUString& /*schema*/,
- const rtl::OUString& /*table*/,
+ const OUString& /*schema*/,
+ const OUString& /*table*/,
sal_Bool /*unique*/,
sal_Bool /*approximate*/)
{
@@ -996,9 +992,11 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getIndexInfo(const Any& /*cata
return xResultSet;
}
-Reference<XResultSet> SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
- const Any& /*catalog*/, const rtl::OUString& /*schema*/, const rtl::OUString& /*table*/,
- sal_Int32 /*scope*/, sal_Bool /*nullable*/)
+Reference<XResultSet> SAL_CALL ODatabaseMetaData::getBestRowIdentifier(const Any& /*catalog*/,
+ const OUString& /*schema*/,
+ const OUString& /*table*/,
+ sal_Int32 /*scope*/,
+ sal_Bool /*nullable*/)
{
Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(
"org.openoffice.comp.helper.DatabaseMetaDataResultSet"),
@@ -1010,10 +1008,8 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
return xResultSet;
}
-Reference<XResultSet>
- SAL_CALL ODatabaseMetaData::getTablePrivileges(const Any& /*catalog*/,
- const rtl::OUString& /*schemaPattern*/,
- const rtl::OUString& /*tableNamePattern*/)
+Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTablePrivileges(
+ const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/)
{
Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(
"org.openoffice.comp.helper.DatabaseMetaDataResultSet"),
@@ -1026,9 +1022,9 @@ Reference<XResultSet>
}
Reference<XResultSet> SAL_CALL ODatabaseMetaData::getCrossReference(
- const Any& /*primaryCatalog*/, const rtl::OUString& /*primarySchema_*/,
- const rtl::OUString& /*primaryTable_*/, const Any& /*foreignCatalog*/,
- const rtl::OUString& /*foreignSchema*/, const rtl::OUString& /*foreignTable*/)
+ const Any& /*primaryCatalog*/, const OUString& /*primarySchema_*/,
+ const OUString& /*primaryTable_*/, const Any& /*foreignCatalog*/,
+ const OUString& /*foreignSchema*/, const OUString& /*foreignTable*/)
{
Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(
"org.openoffice.comp.helper.DatabaseMetaDataResultSet"),
@@ -1040,9 +1036,10 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getCrossReference(
return xResultSet;
}
-Reference<XResultSet> SAL_CALL ODatabaseMetaData::getUDTs(
- const Any& /* catalog */, const rtl::OUString& /* schemaPattern */,
- const rtl::OUString& /* typeNamePattern */, const Sequence<sal_Int32>& /* types */)
+Reference<XResultSet> SAL_CALL ODatabaseMetaData::getUDTs(const Any& /* catalog */,
+ const OUString& /* schemaPattern */,
+ const OUString& /* typeNamePattern */,
+ const Sequence<sal_Int32>& /* types */)
{
mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getUDTs", *this);
return nullptr;
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx
index 68865ae0bf1a..6814a574c87d 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx
@@ -50,17 +50,17 @@ public:
// XDatabaseMetaData
sal_Bool SAL_CALL allProceduresAreCallable() override;
sal_Bool SAL_CALL allTablesAreSelectable() override;
- rtl::OUString SAL_CALL getURL() override;
- rtl::OUString SAL_CALL getUserName() override;
+ OUString SAL_CALL getURL() override;
+ OUString SAL_CALL getUserName() override;
sal_Bool SAL_CALL isReadOnly() override;
sal_Bool SAL_CALL nullsAreSortedHigh() override;
sal_Bool SAL_CALL nullsAreSortedLow() override;
sal_Bool SAL_CALL nullsAreSortedAtStart() override;
sal_Bool SAL_CALL nullsAreSortedAtEnd() override;
- rtl::OUString SAL_CALL getDatabaseProductName() override;
- rtl::OUString SAL_CALL getDatabaseProductVersion() override;
- rtl::OUString SAL_CALL getDriverName() override;
- rtl::OUString SAL_CALL getDriverVersion() override;
+ OUString SAL_CALL getDatabaseProductName() override;
+ OUString SAL_CALL getDatabaseProductVersion() override;
+ OUString SAL_CALL getDriverName() override;
+ OUString SAL_CALL getDriverVersion() override;
sal_Int32 SAL_CALL getDriverMajorVersion() override;
sal_Int32 SAL_CALL getDriverMinorVersion() override;
sal_Bool SAL_CALL usesLocalFiles() override;
@@ -73,14 +73,14 @@ public:
sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers() override;
sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers() override;
sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers() override;
- rtl::OUString SAL_CALL getIdentifierQuoteString() override;
- rtl::OUString SAL_CALL getSQLKeywords() override;
- rtl::OUString SAL_CALL getNumericFunctions() override;
- rtl::OUString SAL_CALL getStringFunctions() override;
- rtl::OUString SAL_CALL getSystemFunctions() override;
- rtl::OUString SAL_CALL getTimeDateFunctions() override;
- rtl::OUString SAL_CALL getSearchStringEscape() override;
- rtl::OUString SAL_CALL getExtraNameCharacters() override;
+ OUString SAL_CALL getIdentifierQuoteString() override;
+ OUString SAL_CALL getSQLKeywords() override;
+ OUString SAL_CALL getNumericFunctions() override;
+ OUString SAL_CALL getStringFunctions() override;
+ OUString SAL_CALL getSystemFunctions() override;
+ OUString SAL_CALL getTimeDateFunctions() override;
+ OUString SAL_CALL getSearchStringEscape() override;
+ OUString SAL_CALL getExtraNameCharacters() override;
sal_Bool SAL_CALL supportsAlterTableWithAddColumn() override;
sal_Bool SAL_CALL supportsAlterTableWithDropColumn() override;
sal_Bool SAL_CALL supportsColumnAliasing() override;
@@ -108,11 +108,11 @@ public:
sal_Bool SAL_CALL supportsOuterJoins() override;
sal_Bool SAL_CALL supportsFullOuterJoins() override;
sal_Bool SAL_CALL supportsLimitedOuterJoins() override;
- rtl::OUString SAL_CALL getSchemaTerm() override;
- rtl::OUString SAL_CALL getProcedureTerm() override;
- rtl::OUString SAL_CALL getCatalogTerm() override;
+ OUString SAL_CALL getSchemaTerm() override;
+ OUString SAL_CALL getProcedureTerm() override;
+ OUString SAL_CALL getCatalogTerm() override;
sal_Bool SAL_CALL isCatalogAtStart() override;
- rtl::OUString SAL_CALL getCatalogSeparator() override;
+ OUString SAL_CALL getCatalogSeparator() override;
sal_Bool SAL_CALL supportsSchemasInDataManipulation() override;
sal_Bool SAL_CALL supportsSchemasInProcedureCalls() override;
sal_Bool SAL_CALL supportsSchemasInTableDefinitions() override;
@@ -167,57 +167,51 @@ public:
sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit() override;
sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions() override;
css::uno::Reference<css::sdbc::XResultSet>
- SAL_CALL getProcedures(const Any& catalog, const rtl::OUString& schemaPattern,
- const rtl::OUString& procedureNamePattern) override;
+ SAL_CALL getProcedures(const Any& catalog, const OUString& schemaPattern,
+ const OUString& procedureNamePattern) override;
css::uno::Reference<css::sdbc::XResultSet>
- SAL_CALL getProcedureColumns(const Any& catalog, const rtl::OUString& schemaPattern,
- const rtl::OUString& procedureNamePattern,
- const rtl::OUString& columnNamePattern) override;
+ SAL_CALL getProcedureColumns(const Any& catalog, const OUString& schemaPattern,
+ const OUString& procedureNamePattern,
+ const OUString& columnNamePattern) override;
css::uno::Reference<css::sdbc::XResultSet>
- SAL_CALL getTables(const Any& catalog, const rtl::OUString& schemaPattern,
- const rtl::OUString& tableNamePattern,
- const css::uno::Sequence<rtl::OUString>& types) override;
+ SAL_CALL getTables(const Any& catalog, const OUString& schemaPattern,
+ const OUString& tableNamePattern,
+ const css::uno::Sequence<OUString>& types) override;
css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getSchemas() override;
css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getCatalogs() override;
css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getTableTypes() override;
css::uno::Reference<css::sdbc::XResultSet>
- SAL_CALL getColumns(const Any& catalog, const rtl::OUString& schemaPattern,
- const rtl::OUString& tableNamePattern,
- const rtl::OUString& columnNamePattern) override;
+ SAL_CALL getColumns(const Any& catalog, const OUString& schemaPattern,
+ const OUString& tableNamePattern,
+ const OUString& columnNamePattern) override;
css::uno::Reference<css::sdbc::XResultSet>
- SAL_CALL getColumnPrivileges(const Any& catalog, const rtl::OUString& schema,
- const rtl::OUString& table,
- const rtl::OUString& columnNamePattern) override;
+ SAL_CALL getColumnPrivileges(const Any& catalog, const OUString& schema,
+ const OUString& table,
+ const OUString& columnNamePattern) override;
css::uno::Reference<css::sdbc::XResultSet>
- SAL_CALL getTablePrivileges(const Any& catalog, const rtl::OUString& schemaPattern,
- const rtl::OUString& tableNamePattern) override;
+ SAL_CALL getTablePrivileges(const Any& catalog, const OUString& schemaPattern,
+ const OUString& tableNamePattern) override;
css::uno::Reference<css::sdbc::XResultSet>
- SAL_CALL getBestRowIdentifier(const Any& catalog, const rtl::OUString& schema,
- const rtl::OUString& table, sal_Int32 scope,
+ SAL_CALL getBestRowIdentifier(const Any& catalog, const OUString& schema,
+ const OUString& table, sal_Int32 scope,
sal_Bool nullable) override;
+ css::uno::Reference<css::sdbc::XResultSet> SAL_CALL
+ getVersionColumns(const Any& catalog, const OUString& schema, const OUString& table) override;
+ css::uno::Reference<css::sdbc::XResultSet> SAL_CALL
+ getPrimaryKeys(const Any& catalog, const OUString& schema, const OUString& table) override;
+ css::uno::Reference<css::sdbc::XResultSet> SAL_CALL
+ getImportedKeys(const Any& catalog, const OUString& schema, const OUString& table) override;
+ css::uno::Reference<css::sdbc::XResultSet> SAL_CALL
+ getExportedKeys(const Any& catalog, const OUString& schema, const OUString& table) override;
css::uno::Reference<css::sdbc::XResultSet>
- SAL_CALL getVersionColumns(const Any& catalog, const rtl::OUString& schema,
- const rtl::OUString& table) override;
- css::uno::Reference<css::sdbc::XResultSet>
- SAL_CALL getPrimaryKeys(const Any& catalog, const rtl::OUString& schema,
- const rtl::OUString& table) override;
- css::uno::Reference<css::sdbc::XResultSet>
- SAL_CALL getImportedKeys(const Any& catalog, const rtl::OUString& schema,
- const rtl::OUString& table) override;
- css::uno::Reference<css::sdbc::XResultSet>
- SAL_CALL getExportedKeys(const Any& catalog, const rtl::OUString& schema,
- const rtl::OUString& table) override;
- css::uno::Reference<css::sdbc::XResultSet>
- SAL_CALL getCrossReference(const Any& primaryCatalog, const rtl::OUString& primarySchema,
- const rtl::OUString& primaryTable, const Any& foreignCatalog,
- const rtl::OUString& foreignSchema,
- const rtl::OUString& foreignTable) override;
+ SAL_CALL getCrossReference(const Any& primaryCatalog, const OUString& primarySchema,
+ const OUString& primaryTable, const Any& foreignCatalog,
+ const OUString& foreignSchema,
+ const OUString& foreignTable) override;
css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getTypeInfo() override;
- css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getIndexInfo(const Any& catalog,
- const rtl::OUString& schema,
- const rtl::OUString& table,
- sal_Bool unique,
- sal_Bool approximate) override;
+ css::uno::Reference<css::sdbc::XResultSet>
+ SAL_CALL getIndexInfo(const Any& catalog, const OUString& schema, const OUString& table,
+ sal_Bool unique, sal_Bool approximate) override;
sal_Bool SAL_CALL supportsResultSetType(sal_Int32 setType) override;
sal_Bool SAL_CALL supportsResultSetConcurrency(sal_Int32 setType,
sal_Int32 concurrency) override;
@@ -232,8 +226,8 @@ public:
sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType) override;
sal_Bool SAL_CALL supportsBatchUpdates() override;
css::uno::Reference<css::sdbc::XResultSet>
- SAL_CALL getUDTs(const Any& catalog, const rtl::OUString& schemaPattern,
- const rtl::OUString& typeNamePattern,
+ SAL_CALL getUDTs(const Any& catalog, const OUString& schemaPattern,
+ const OUString& typeNamePattern,
const css::uno::Sequence<sal_Int32>& types) override;
css::uno::Reference<css::sdbc::XConnection> SAL_CALL getConnection() override;
};
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
index 6a8a492f68b6..b55d9cfeeeaf 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
@@ -37,7 +37,6 @@ using css::uno::Exception;
using css::uno::Reference;
using css::uno::RuntimeException;
using css::uno::Sequence;
-using rtl::OUString;
Reference<css::uno::XInterface>
MysqlCDriver_CreateInstance(const Reference<css::lang::XMultiServiceFactory>& _rxFactory);
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
index d56be8b88500..179241193332 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
@@ -90,16 +90,16 @@ void allocateSqlVar(void** mem, enum_field_types eType, unsigned nSize)
void throwFeatureNotImplementedException(const sal_Char* _pAsciiFeatureName,
const css::uno::Reference<XInterface>& _rxContext)
{
- const rtl::OUString sMessage
- = rtl::OUString::createFromAscii(_pAsciiFeatureName) + ": feature not implemented.";
+ const OUString sMessage
+ = OUString::createFromAscii(_pAsciiFeatureName) + ": feature not implemented.";
throw SQLException(sMessage, _rxContext, "HYC00", 0, Any());
}
void throwInvalidArgumentException(const sal_Char* _pAsciiFeatureName,
const css::uno::Reference<XInterface>& _rxContext)
{
- const rtl::OUString sMessage
- = rtl::OUString::createFromAscii(_pAsciiFeatureName) + ": invalid arguments.";
+ const OUString sMessage
+ = OUString::createFromAscii(_pAsciiFeatureName) + ": invalid arguments.";
throw SQLException(sMessage, _rxContext, "HYC00", 0, Any());
}
@@ -107,10 +107,10 @@ void throwSQLExceptionWithMsg(const char* msg, unsigned int errorNum,
const css::uno::Reference<css::uno::XInterface>& _context,
const rtl_TextEncoding encoding)
{
- rtl::OString errorMsg{ msg };
+ OString errorMsg{ msg };
// TODO error code?
- throw SQLException(rtl::OStringToOUString(errorMsg, encoding), _context, rtl::OUString(),
- errorNum, Any());
+ throw SQLException(OStringToOUString(errorMsg, encoding), _context, OUString(), errorNum,
+ Any());
}
sal_Int32 mysqlToOOOType(int eType, int charsetnr) noexcept
@@ -182,7 +182,7 @@ sal_Int32 mysqlToOOOType(int eType, int charsetnr) noexcept
return css::sdbc::DataType::VARCHAR;
}
-sal_Int32 mysqlStrToOOOType(const rtl::OUString& sType)
+sal_Int32 mysqlStrToOOOType(const OUString& sType)
{
// TODO other types.
if (sType.equalsIgnoreAsciiCase("tiny") || sType.equalsIgnoreAsciiCase("tinyint"))
@@ -225,7 +225,7 @@ sal_Int32 mysqlStrToOOOType(const rtl::OUString& sType)
return css::sdbc::DataType::VARCHAR;
}
-rtl::OUString mysqlTypeToStr(MYSQL_FIELD* field)
+OUString mysqlTypeToStr(MYSQL_FIELD* field)
{
bool isUnsigned = (field->flags & UNSIGNED_FLAG) != 0;
bool isZerofill = (field->flags & ZEROFILL_FLAG) != 0;
@@ -322,9 +322,9 @@ rtl::OUString mysqlTypeToStr(MYSQL_FIELD* field)
}
}
-rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding)
+OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding)
{
- return rtl::OUString(_string.c_str(), _string.size(), encoding);
+ return OUString(_string.c_str(), _string.size(), encoding);
}
} /* namespace */
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.hxx b/connectivity/source/drivers/mysqlc/mysqlc_general.hxx
index 2d468bb367da..a7886c3015d2 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_general.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_general.hxx
@@ -107,11 +107,11 @@ void throwSQLExceptionWithMsg(const char* msg, unsigned int errorNum,
sal_Int32 mysqlToOOOType(int eType, int charsetnr) noexcept;
-rtl::OUString mysqlTypeToStr(MYSQL_FIELD* pField);
+OUString mysqlTypeToStr(MYSQL_FIELD* pField);
-sal_Int32 mysqlStrToOOOType(const rtl::OUString& sType);
+sal_Int32 mysqlStrToOOOType(const OUString& sType);
-rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding);
+OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding);
}
#endif
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index 1f55c2466cb6..a3e45937b610 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -52,20 +52,20 @@ using ::osl::MutexGuard;
#include <stdio.h>
-rtl::OUString SAL_CALL OPreparedResultSet::getImplementationName()
+OUString SAL_CALL OPreparedResultSet::getImplementationName()
{
- return rtl::OUString("com.sun.star.sdbcx.mysqlc.ResultSet");
+ return OUString("com.sun.star.sdbcx.mysqlc.ResultSet");
}
-uno::Sequence<rtl::OUString> SAL_CALL OPreparedResultSet::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL OPreparedResultSet::getSupportedServiceNames()
{
- uno::Sequence<rtl::OUString> aSupported(2);
+ uno::Sequence<OUString> aSupported(2);
aSupported[0] = "com.sun.star.sdbc.ResultSet";
aSupported[1] = "com.sun.star.sdbcx.ResultSet";
return aSupported;
}
-sal_Bool SAL_CALL OPreparedResultSet::supportsService(const rtl::OUString& _rServiceName)
+sal_Bool SAL_CALL OPreparedResultSet::supportsService(const OUString& _rServiceName)
{
return cppu::supportsService(this, _rServiceName);
}
@@ -112,7 +112,7 @@ uno::Sequence<Type> SAL_CALL OPreparedResultSet::getTypes()
return concatSequences(aTypes.getTypes(), OPreparedResultSet_BASE::getTypes());
}
-sal_Int32 SAL_CALL OPreparedResultSet::findColumn(const rtl::OUString& columnName)
+sal_Int32 SAL_CALL OPreparedResultSet::findColumn(const OUString& columnName)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(OPreparedResultSet_BASE::rBHelper.bDisposed);
@@ -370,7 +370,7 @@ sal_Int16 SAL_CALL OPreparedResultSet::getShort(sal_Int32 column)
return *static_cast<sal_Int16*>(m_aData[column - 1].buffer);
}
-rtl::OUString SAL_CALL OPreparedResultSet::getString(sal_Int32 column)
+OUString SAL_CALL OPreparedResultSet::getString(sal_Int32 column)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(OPreparedResultSet_BASE::rBHelper.bDisposed);
@@ -391,7 +391,7 @@ rtl::OUString SAL_CALL OPreparedResultSet::getString(sal_Int32 column)
const char* sStr = static_cast<const char*>(m_aData[column - 1].buffer);
- OUString sReturn = rtl::OUString(sStr, *m_aData[column - 1].length, m_encoding);
+ OUString sReturn = OUString(sStr, *m_aData[column - 1].length, m_encoding);
return sReturn;
}
@@ -827,7 +827,7 @@ void SAL_CALL OPreparedResultSet::updateDouble(sal_Int32 column, double /* x */)
*this);
}
-void SAL_CALL OPreparedResultSet::updateString(sal_Int32 column, const rtl::OUString& /* x */)
+void SAL_CALL OPreparedResultSet::updateString(sal_Int32 column, const OUString& /* x */)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(OPreparedResultSet_BASE::rBHelper.bDisposed);
@@ -1036,7 +1036,7 @@ void OPreparedResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,
case PROPERTY_ID_CURSORNAME:
case PROPERTY_ID_RESULTSETCONCURRENCY:
case PROPERTY_ID_RESULTSETTYPE:
- throw uno::Exception("cannot set prop " + rtl::OUString::number(nHandle), nullptr);
+ throw uno::Exception("cannot set prop " + OUString::number(nHandle), nullptr);
case PROPERTY_ID_FETCHDIRECTION:
break;
case PROPERTY_ID_FETCHSIZE:
@@ -1083,11 +1083,11 @@ css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL OPreparedResultSet::g
void OPreparedResultSet::checkColumnIndex(sal_Int32 index)
{
if (!m_aData)
- throw SQLException("Cursor out of range", *this, rtl::OUString(), 1, Any());
+ throw SQLException("Cursor out of range", *this, OUString(), 1, Any());
if (index < 1 || index > static_cast<int>(m_nFieldCount))
{
/* static object for efficiency or thread safety is a problem ? */
- throw SQLException("index out of range", *this, rtl::OUString(), 1, Any());
+ throw SQLException("index out of range", *this, OUString(), 1, Any());
}
}
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
index 7f5d6852c539..647d872c50d8 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
@@ -95,11 +95,11 @@ class OPreparedResultSet final : public OBase_Mutex,
virtual ~OPreparedResultSet() override = default;
public:
- virtual rtl::OUString SAL_CALL getImplementationName() override;
+ virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override;
- virtual css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
OPreparedResultSet(OConnection& rConn, OPreparedStatement* pStmt, MYSQL_STMT* pMyStmt);
@@ -147,7 +147,7 @@ public:
// XRow
sal_Bool SAL_CALL wasNull() override;
- rtl::OUString SAL_CALL getString(sal_Int32 column) override;
+ OUString SAL_CALL getString(sal_Int32 column) override;
sal_Bool SAL_CALL getBoolean(sal_Int32 column) override;
sal_Int8 SAL_CALL getByte(sal_Int32 column) override;
@@ -205,7 +205,7 @@ public:
void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x) override;
void SAL_CALL updateFloat(sal_Int32 column, float x) override;
void SAL_CALL updateDouble(sal_Int32 column, double x) override;
- void SAL_CALL updateString(sal_Int32 column, const rtl::OUString& x) override;
+ void SAL_CALL updateString(sal_Int32 column, const OUString& x) override;
void SAL_CALL updateBytes(sal_Int32 column, const css::uno::Sequence<sal_Int8>& x) override;
void SAL_CALL updateDate(sal_Int32 column, const css::util::Date& x) override;
void SAL_CALL updateTime(sal_Int32 column, const css::util::Time& x) override;
@@ -220,7 +220,7 @@ public:
void SAL_CALL updateNumericObject(sal_Int32 column, const Any& x, sal_Int32 scale) override;
// XColumnLocate
- sal_Int32 SAL_CALL findColumn(const rtl::OUString& columnName) override;
+ sal_Int32 SAL_CALL findColumn(const OUString& columnName) override;
// XRowLocate
Any SAL_CALL getBookmark() override;
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
index 05204fe652a0..9b687f74e8ad 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
@@ -42,19 +42,19 @@ using namespace com::sun::star::io;
using namespace com::sun::star::util;
using ::osl::MutexGuard;
-rtl::OUString OPreparedStatement::getImplementationName()
+OUString OPreparedStatement::getImplementationName()
{
- return rtl::OUString("com.sun.star.sdbcx.mysqlc.PreparedStatement");
+ return OUString("com.sun.star.sdbcx.mysqlc.PreparedStatement");
}
-css::uno::Sequence<rtl::OUString> OPreparedStatement::getSupportedServiceNames()
+css::uno::Sequence<OUString> OPreparedStatement::getSupportedServiceNames()
{
- css::uno::Sequence<rtl::OUString> s(1);
+ css::uno::Sequence<OUString> s(1);
s[0] = "com.sun.star.sdbc.PreparedStatement";
return s;
}
-sal_Bool OPreparedStatement::supportsService(rtl::OUString const& ServiceName)
+sal_Bool OPreparedStatement::supportsService(OUString const& ServiceName)
{
return cppu::supportsService(this, ServiceName);
}
@@ -176,13 +176,13 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate()
return affectedRows;
}
-void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const rtl::OUString& x)
+void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const OUString& x)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(OPreparedStatement::rBHelper.bDisposed);
checkParameterIndex(parameter);
- rtl::OString stringie(rtl::OUStringToOString(x, m_xConnection->getConnectionEncoding()));
+ OString stringie(OUStringToOString(x, m_xConnection->getConnectionEncoding()));
const sal_Int32 nIndex = parameter - 1;
m_binds[nIndex].buffer_type = MYSQL_TYPE_STRING;
mysqlc_sdbc_driver::resetSqlVar(&m_binds[nIndex].buffer, stringie.getStr(), MYSQL_TYPE_STRING,
@@ -425,7 +425,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 parameterIndex, co
case DataType::NUMERIC:
{
double nValue(0.0);
- rtl::OUString sValue;
+ OUString sValue;
if (value >>= nValue)
{
setDouble(parameterIndex, nValue);
@@ -433,8 +433,8 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 parameterIndex, co
}
else if (value >>= sValue)
{
- rtl::OString sAscii
- = rtl::OUStringToOString(sValue, getOwnConnection()->getConnectionEncoding());
+ OString sAscii
+ = OUStringToOString(sValue, getOwnConnection()->getConnectionEncoding());
std::stringstream sStream{ sAscii.getStr() };
sStream >> nValue;
m_binds[nIndex].buffer_type = MYSQL_TYPE_DOUBLE;
@@ -461,7 +461,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 parameterIndex, co
}
void SAL_CALL OPreparedStatement::setObjectNull(sal_Int32 parameter, sal_Int32 /* sqlType */,
- const rtl::OUString& /* typeName */)
+ const OUString& /* typeName */)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -580,7 +580,7 @@ void OPreparedStatement::checkParameterIndex(sal_Int32 column)
{
if (column < 1 || column > static_cast<sal_Int32>(m_paramCount))
{
- throw SQLException("Parameter index out of range", *this, rtl::OUString(), 1, Any());
+ throw SQLException("Parameter index out of range", *this, OUString(), 1, Any());
}
}
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
index 5d985de72e4b..1df2c704a38d 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
@@ -65,11 +65,11 @@ class OPreparedStatement final : public OCommonStatement, public OPreparedStatem
virtual ~OPreparedStatement() override;
public:
- virtual rtl::OUString SAL_CALL getImplementationName() override;
+ virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override;
- virtual css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
OPreparedStatement(OConnection* _pConnection, MYSQL_STMT* pStmt);
@@ -96,7 +96,7 @@ public:
void SAL_CALL setNull(sal_Int32 parameter, sal_Int32 sqlType) override;
void SAL_CALL setObjectNull(sal_Int32 parameter, sal_Int32 sqlType,
- const rtl::OUString& typeName) override;
+ const OUString& typeName) override;
void SAL_CALL setBoolean(sal_Int32 parameter, sal_Bool x) override;
@@ -112,7 +112,7 @@ public:
void SAL_CALL setDouble(sal_Int32 parameter, double x) override;
- void SAL_CALL setString(sal_Int32 parameter, const rtl::OUString& x) override;
+ void SAL_CALL setString(sal_Int32 parameter, const OUString& x) override;
void SAL_CALL setBytes(sal_Int32 parameter, const css::uno::Sequence<sal_Int8>& x) override;
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
index 3a6e063d7dbf..ab018ef9a777 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
@@ -79,24 +79,24 @@ void OResultSet::checkRowIndex()
{
if (m_nRowPosition <= 0 || m_nRowPosition > m_nRowCount)
{
- throw SQLException("Cursor position out of range", *this, rtl::OUString(), 1, Any());
+ throw SQLException("Cursor position out of range", *this, OUString(), 1, Any());
}
}
-rtl::OUString SAL_CALL OResultSet::getImplementationName()
+OUString SAL_CALL OResultSet::getImplementationName()
{
- return rtl::OUString("com.sun.star.sdbcx.mysqlc.ResultSet");
+ return OUString("com.sun.star.sdbcx.mysqlc.ResultSet");
}
-uno::Sequence<rtl::OUString> SAL_CALL OResultSet::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL OResultSet::getSupportedServiceNames()
{
- uno::Sequence<rtl::OUString> aSupported(2);
+ uno::Sequence<OUString> aSupported(2);
aSupported[0] = "com.sun.star.sdbc.ResultSet";
aSupported[1] = "com.sun.star.sdbcx.ResultSet";
return aSupported;
}
-sal_Bool SAL_CALL OResultSet::supportsService(const rtl::OUString& _rServiceName)
+sal_Bool SAL_CALL OResultSet::supportsService(const OUString& _rServiceName)
{
return cppu::supportsService(this, _rServiceName);
}
@@ -149,7 +149,7 @@ uno::Sequence<Type> SAL_CALL OResultSet::getTypes()
return concatSequences(aTypes.getTypes(), OResultSet_BASE::getTypes());
}
-sal_Int32 SAL_CALL OResultSet::findColumn(const rtl::OUString& columnName)
+sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& columnName)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -255,8 +255,8 @@ Date SAL_CALL OResultSet::getDate(sal_Int32 column)
return d;
}
- rtl::OString dateString(dateStr);
- rtl::OString token;
+ OString dateString(dateStr);
+ OString token;
sal_Int32 nIndex = 0, i = 0;
do
{
@@ -443,7 +443,7 @@ sal_Int16 SAL_CALL OResultSet::getShort(sal_Int32 column)
return std::atoi(pValue);
}
-rtl::OUString SAL_CALL OResultSet::getString(sal_Int32 column)
+OUString SAL_CALL OResultSet::getString(sal_Int32 column)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -454,10 +454,10 @@ rtl::OUString SAL_CALL OResultSet::getString(sal_Int32 column)
if (!pValue)
{
m_bWasNull = true;
- return rtl::OUString{};
+ return OUString{};
}
m_bWasNull = false;
- return rtl::OUString(pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding);
+ return OUString(pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding);
}
Time SAL_CALL OResultSet::getTime(sal_Int32 column)
@@ -474,8 +474,8 @@ Time SAL_CALL OResultSet::getTime(sal_Int32 column)
m_bWasNull = true;
return t;
}
- rtl::OUString timeString{ pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding };
- rtl::OUString token;
+ OUString timeString{ pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding };
+ OUString token;
sal_Int32 nIndex, i = 0;
nIndex = timeString.indexOf(' ') + 1;
@@ -516,8 +516,8 @@ DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 column)
}
// YY-MM-DD HH:MM:SS
- std::vector<rtl::OUString> dateAndTime = lcl_split(
- rtl::OUString{ pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding }, u' ');
+ std::vector<OUString> dateAndTime = lcl_split(
+ OUString{ pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding }, u' ');
auto dateParts = lcl_split(dateAndTime.at(0), u'-');
auto timeParts = lcl_split(dateAndTime.at(1), u':');
@@ -859,7 +859,7 @@ void SAL_CALL OResultSet::updateDouble(sal_Int32 column, double /* x */)
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateDouble", *this);
}
-void SAL_CALL OResultSet::updateString(sal_Int32 column, const rtl::OUString& /* x */)
+void SAL_CALL OResultSet::updateString(sal_Int32 column, const OUString& /* x */)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1062,7 +1062,7 @@ void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any&
case PROPERTY_ID_CURSORNAME:
case PROPERTY_ID_RESULTSETCONCURRENCY:
case PROPERTY_ID_RESULTSETTYPE:
- throw uno::Exception("cannot set prop " + rtl::OUString::number(nHandle), nullptr);
+ throw uno::Exception("cannot set prop " + OUString::number(nHandle), nullptr);
case PROPERTY_ID_FETCHDIRECTION:
break;
case PROPERTY_ID_FETCHSIZE:
@@ -1111,7 +1111,7 @@ void OResultSet::checkColumnIndex(sal_Int32 index)
if (index < 1 || index > static_cast<int>(fieldCount))
{
/* static object for efficiency or thread safety is a problem ? */
- throw SQLException("index out of range", *this, rtl::OUString(), 1, Any());
+ throw SQLException("index out of range", *this, OUString(), 1, Any());
}
}
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
index 59b956850487..ce9f7bd61db8 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
@@ -91,11 +91,11 @@ class OResultSet final : public OBase_Mutex,
virtual ~OResultSet() override = default;
public:
- virtual rtl::OUString SAL_CALL getImplementationName() override;
+ virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override;
- virtual css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
OResultSet(OConnection& rConn, OCommonStatement* pStmt, MYSQL_RES* pResult,
rtl_TextEncoding _encoding);
@@ -144,7 +144,7 @@ public:
// XRow
sal_Bool SAL_CALL wasNull() override;
- rtl::OUString SAL_CALL getString(sal_Int32 column) override;
+ OUString SAL_CALL getString(sal_Int32 column) override;
sal_Bool SAL_CALL getBoolean(sal_Int32 column) override;
sal_Int8 SAL_CALL getByte(sal_Int32 column) override;
@@ -202,7 +202,7 @@ public:
void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x) override;
void SAL_CALL updateFloat(sal_Int32 column, float x) override;
void SAL_CALL updateDouble(sal_Int32 column, double x) override;
- void SAL_CALL updateString(sal_Int32 column, const rtl::OUString& x) override;
+ void SAL_CALL updateString(sal_Int32 column, const OUString& x) override;
void SAL_CALL updateBytes(sal_Int32 column, const css::uno::Sequence<sal_Int8>& x) override;
void SAL_CALL updateDate(sal_Int32 column, const css::util::Date& x) override;
void SAL_CALL updateTime(sal_Int32 column, const css::util::Time& x) override;
@@ -217,7 +217,7 @@ public:
void SAL_CALL updateNumericObject(sal_Int32 column, const Any& x, sal_Int32 scale) override;
// XColumnLocate
- sal_Int32 SAL_CALL findColumn(const rtl::OUString& columnName) override;
+ sal_Int32 SAL_CALL findColumn(const OUString& columnName) override;
// XRowLocate
Any SAL_CALL getBookmark() override;
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx
index 106ad775e7e5..f5962a2a54ff 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx
@@ -56,8 +56,8 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column)
// MYSQL_FIELD::charsetnr is the collation identifier
// _ci postfix means it's insensitive
MYSQL_FIELD* pField = getField(column);
- rtl::OUStringBuffer sql{ "SHOW COLLATION WHERE Id =" };
- sql.append(rtl::OUString::number(pField->charsetnr));
+ OUStringBuffer sql{ "SHOW COLLATION WHERE Id =" };
+ sql.append(OUString::number(pField->charsetnr));
Reference<XStatement> stmt = m_rConnection.createStatement();
Reference<XResultSet> rs = stmt->executeQuery(sql.makeStringAndClear());
@@ -66,42 +66,42 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column)
if (!rs->next()) // fetch first and only row
return false;
- rtl::OUString sColName = xRow->getString(1); // first column is Collation name
+ OUString sColName = xRow->getString(1); // first column is Collation name
return !sColName.isEmpty() && !sColName.endsWith("_ci");
}
-rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column)
+OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column)
{
checkColumnIndex(column);
MYSQL_FIELD* pField = getField(column);
- return rtl::OStringToOUString(pField->db, m_rConnection.getConnectionEncoding());
+ return OStringToOUString(pField->db, m_rConnection.getConnectionEncoding());
}
-rtl::OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column)
+OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column)
{
checkColumnIndex(column);
MYSQL_FIELD* pField = getField(column);
- return rtl::OStringToOUString(pField->name, m_rConnection.getConnectionEncoding());
+ return OStringToOUString(pField->name, m_rConnection.getConnectionEncoding());
}
-rtl::OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column)
+OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column)
{
checkColumnIndex(column);
MYSQL_FIELD* pField = getField(column);
- return rtl::OStringToOUString(pField->table, m_rConnection.getConnectionEncoding());
+ return OStringToOUString(pField->table, m_rConnection.getConnectionEncoding());
}
-rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column)
+OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column)
{
checkColumnIndex(column);
MYSQL_FIELD* pField = getField(column);
- return rtl::OStringToOUString(pField->catalog, m_rConnection.getConnectionEncoding());
+ return OStringToOUString(pField->catalog, m_rConnection.getConnectionEncoding());
}
-rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column)
+OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column)
{
checkColumnIndex(column);
MYSQL_FIELD* pField = getField(column);
@@ -109,18 +109,18 @@ rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column)
return mysqlc_sdbc_driver::mysqlTypeToStr(pField);
}
-rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column)
+OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column)
{
checkColumnIndex(column);
MYSQL_FIELD* pField = getField(column);
- return rtl::OStringToOUString(pField->name, m_rConnection.getConnectionEncoding());
+ return OStringToOUString(pField->name, m_rConnection.getConnectionEncoding());
}
-rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column)
+OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column)
{
checkColumnIndex(column);
- rtl::OUString aRet = rtl::OUString();
+ OUString aRet = OUString();
return aRet;
}
@@ -192,13 +192,13 @@ void OResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex)
unsigned nColCount = mysql_num_fields(m_pRes);
if (columnIndex < 1 || columnIndex > static_cast<sal_Int32>(nColCount))
{
- rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
buf.append("Column index out of range (expected 1 to ");
buf.append(sal_Int32(nColCount));
buf.append(", got ");
buf.append(columnIndex);
buf.append('.');
- throw SQLException(buf.makeStringAndClear(), *this, rtl::OUString(), 1, Any());
+ throw SQLException(buf.makeStringAndClear(), *this, OUString(), 1, Any());
}
}
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx
index 56ca55c7b025..346695def388 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx
@@ -70,25 +70,25 @@ public:
sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column) override;
- rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) override;
- rtl::OUString SAL_CALL getColumnName(sal_Int32 column) override;
- rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) override;
+ OUString SAL_CALL getColumnLabel(sal_Int32 column) override;
+ OUString SAL_CALL getColumnName(sal_Int32 column) override;
+ OUString SAL_CALL getSchemaName(sal_Int32 column) override;
sal_Int32 SAL_CALL getPrecision(sal_Int32 column) override;
sal_Int32 SAL_CALL getScale(sal_Int32 column) override;
- rtl::OUString SAL_CALL getTableName(sal_Int32 column) override;
- rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) override;
+ OUString SAL_CALL getTableName(sal_Int32 column) override;
+ OUString SAL_CALL getCatalogName(sal_Int32 column) override;
sal_Int32 SAL_CALL getColumnType(sal_Int32 column) override;
- rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) override;
+ OUString SAL_CALL getColumnTypeName(sal_Int32 column) override;
sal_Bool SAL_CALL isReadOnly(sal_Int32 column) override;
sal_Bool SAL_CALL isWritable(sal_Int32 column) override;
sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column) override;
- rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column) override;
+ OUString SAL_CALL getColumnServiceName(sal_Int32 column) override;
/// @throws SQLException
/// @throws RuntimeException
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_services.cxx b/connectivity/source/drivers/mysqlc/mysqlc_services.cxx
index 002f4df40272..d23cf66aba06 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_services.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_services.cxx
@@ -31,23 +31,23 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
typedef Reference<XSingleServiceFactory> (*createFactoryFunc)(
- const Reference<XMultiServiceFactory>& rServiceManager, const rtl::OUString& rComponentName,
- ::cppu::ComponentInstantiation pCreateFunction, const Sequence<rtl::OUString>& rServiceNames,
+ const Reference<XMultiServiceFactory>& rServiceManager, const OUString& rComponentName,
+ ::cppu::ComponentInstantiation pCreateFunction, const Sequence<OUString>& rServiceNames,
rtl_ModuleCount*);
struct ProviderRequest
{
Reference<XSingleServiceFactory> xRet;
Reference<XMultiServiceFactory> const xServiceManager;
- rtl::OUString const sImplementationName;
+ OUString const sImplementationName;
ProviderRequest(void* pServiceManager, sal_Char const* pImplementationName)
: xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
- , sImplementationName(rtl::OUString::createFromAscii(pImplementationName))
+ , sImplementationName(OUString::createFromAscii(pImplementationName))
{
}
- bool CREATE_PROVIDER(const rtl::OUString& Implname, const Sequence<rtl::OUString>& Services,
+ bool CREATE_PROVIDER(const OUString& Implname, const Sequence<OUString>& Services,
::cppu::ComponentInstantiation Factory, createFactoryFunc creator)
{
if (!xRet.is() && (Implname == sImplementationName))
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
index cc6bf1492502..ce970113945f 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
@@ -121,14 +121,14 @@ void SAL_CALL OStatement::clearBatch()
// if you support batches clear it here
}
-sal_Bool SAL_CALL OCommonStatement::execute(const rtl::OUString& sql)
+sal_Bool SAL_CALL OCommonStatement::execute(const OUString& sql)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
- const rtl::OUString sSqlStatement = m_xConnection->transFormPreparedStatement(sql);
+ const OUString sSqlStatement = m_xConnection->transFormPreparedStatement(sql);
- rtl::OString toExec
- = rtl::OUStringToOString(sSqlStatement, m_xConnection->getConnectionSettings().encoding);
+ OString toExec
+ = OUStringToOString(sSqlStatement, m_xConnection->getConnectionSettings().encoding);
MYSQL* pMySql = m_xConnection->getMysqlConnection();
@@ -145,14 +145,13 @@ sal_Bool SAL_CALL OCommonStatement::execute(const rtl::OUString& sql)
return !failure;
}
-Reference<XResultSet> SAL_CALL OCommonStatement::executeQuery(const rtl::OUString& sql)
+Reference<XResultSet> SAL_CALL OCommonStatement::executeQuery(const OUString& sql)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
- const rtl::OUString sSqlStatement
- = sql; // TODO m_xConnection->transFormPreparedStatement( sql );
- rtl::OString toExec
- = rtl::OUStringToOString(sSqlStatement, m_xConnection->getConnectionSettings().encoding);
+ const OUString sSqlStatement = sql; // TODO m_xConnection->transFormPreparedStatement( sql );
+ OString toExec
+ = OUStringToOString(sSqlStatement, m_xConnection->getConnectionSettings().encoding);
MYSQL* pMySql = m_xConnection->getMysqlConnection();
// toExec = mysqlc_sdbc_driver::escapeSql(toExec);
@@ -194,7 +193,7 @@ Any SAL_CALL OStatement::queryInterface(const Type& rType)
return aRet;
}
-void SAL_CALL OStatement::addBatch(const rtl::OUString&)
+void SAL_CALL OStatement::addBatch(const OUString&)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
@@ -209,7 +208,7 @@ Sequence<sal_Int32> SAL_CALL OStatement::executeBatch()
return aRet;
}
-sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const rtl::OUString& sql)
+sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const OUString& sql)
{
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
@@ -255,7 +254,7 @@ void SAL_CALL OCommonStatement::clearWarnings()
Property* pProperties = aProps.getArray();
sal_Int32 nPos = 0;
pProperties[nPos++]
- = Property("CursorName", PROPERTY_ID_CURSORNAME, cppu::UnoType<rtl::OUString>::get(), 0);
+ = Property("CursorName", PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), 0);
pProperties[nPos++]
= Property("EscapeProcessing", PROPERTY_ID_ESCAPEPROCESSING, cppu::UnoType<bool>::get(), 0);
pProperties[nPos++] = Property("FetchDirection", PROPERTY_ID_FETCHDIRECTION,
@@ -328,19 +327,16 @@ void OCommonStatement::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) con
}
}
-rtl::OUString OStatement::getImplementationName()
-{
- return rtl::OUString("com.sun.star.sdbcx.OStatement");
-}
+OUString OStatement::getImplementationName() { return OUString("com.sun.star.sdbcx.OStatement"); }
-css::uno::Sequence<rtl::OUString> OStatement::getSupportedServiceNames()
+css::uno::Sequence<OUString> OStatement::getSupportedServiceNames()
{
- css::uno::Sequence<rtl::OUString> s(1);
+ css::uno::Sequence<OUString> s(1);
s[0] = "com.sun.star.sdbc.Statement";
return s;
}
-sal_Bool OStatement::supportsService(rtl::OUString const& ServiceName)
+sal_Bool OStatement::supportsService(OUString const& ServiceName)
{
return cppu::supportsService(this, ServiceName);
}
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx
index a9e00f915789..9b0d3c952763 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx
@@ -111,12 +111,11 @@ public:
css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override;
// XStatement
- css::uno::Reference<css::sdbc::XResultSet>
- SAL_CALL executeQuery(const rtl::OUString& sql) override;
+ css::uno::Reference<css::sdbc::XResultSet> SAL_CALL executeQuery(const OUString& sql) override;
- sal_Int32 SAL_CALL executeUpdate(const rtl::OUString& sql) override;
+ sal_Int32 SAL_CALL executeUpdate(const OUString& sql) override;
- sal_Bool SAL_CALL execute(const rtl::OUString& sql) override;
+ sal_Bool SAL_CALL execute(const OUString& sql) override;
css::uno::Reference<css::sdbc::XConnection> SAL_CALL getConnection() override;
@@ -159,11 +158,11 @@ public:
{
}
- virtual rtl::OUString SAL_CALL getImplementationName() override;
+ virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override;
- virtual css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
Any SAL_CALL queryInterface(const css::uno::Type& rType) override;
@@ -171,7 +170,7 @@ public:
void SAL_CALL release() throw() override;
// XBatchExecution
- void SAL_CALL addBatch(const rtl::OUString& sql) override;
+ void SAL_CALL addBatch(const OUString& sql) override;
void SAL_CALL clearBatch() override;
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index c14f13351377..fc085ae9df57 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -82,9 +82,9 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = nullptr;
#define SQL_NEW_KEYWORD(token) \
SQLyylval.pParseNode = new OSQLInternalNode("", SQLNodeType::Keyword, (token)); return token;
-#define SQL_NEW_INTNUM SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::IntNum); return SQL_TOKEN_INTNUM;
-#define SQL_NEW_APPROXNUM SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::ApproxNum); return SQL_TOKEN_APPROXNUM;
-#define SQL_NEW_DATE SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::AccessDate); return SQL_TOKEN_ACCESS_DATE;
+#define SQL_NEW_INTNUM SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::IntNum); return SQL_TOKEN_INTNUM;
+#define SQL_NEW_APPROXNUM SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::ApproxNum); return SQL_TOKEN_APPROXNUM;
+#define SQL_NEW_DATE SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::AccessDate); return SQL_TOKEN_ACCESS_DATE;
#define YY_INPUT(buf,result,max_size) \
{ \
@@ -422,14 +422,14 @@ YEARDAY {SQL_NEW_KEYWORD(SQL_TOKEN_YEARDAY); }
ZONE {SQL_NEW_KEYWORD(SQL_TOKEN_ZONE); }
-"<" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Less);return SQL_LESS;}
-">" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Great);return SQL_GREAT;}
-"=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Equal);return SQL_EQUAL;}
-"<=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::LessEq);return SQL_LESSEQ;}
-">=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::GreatEq);return SQL_GREATEQ;}
-"<>" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::NotEqual);return SQL_NOTEQUAL;}
-"!=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::NotEqual);return SQL_NOTEQUAL;}
-"||" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Concat);return SQL_CONCAT;}
+"<" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Less);return SQL_LESS;}
+">" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Great);return SQL_GREAT;}
+"=" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Equal);return SQL_EQUAL;}
+"<=" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::LessEq);return SQL_LESSEQ;}
+">=" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::GreatEq);return SQL_GREATEQ;}
+"<>" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::NotEqual);return SQL_NOTEQUAL;}
+"!=" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::NotEqual);return SQL_NOTEQUAL;}
+"||" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Concat);return SQL_CONCAT;}
[-+*/:(),.;?{}] { return SQLyytext[0]; }
@@ -523,7 +523,7 @@ inline bool checkeof(int c) { return c == 0 || c == EOF; }
sal_Int32 gatherString(int delim, sal_Int32 nTyp)
{
int ch;
- ::rtl::OStringBuffer sBuffer(256);
+ OStringBuffer sBuffer(256);
while (!checkeof(ch = yyinput()))
{
@@ -537,13 +537,13 @@ sal_Int32 gatherString(int delim, sal_Int32 nTyp)
switch(nTyp)
{
case 0:
- SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::Name);
+ SQL_NEW_NODE(OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::Name);
return SQL_TOKEN_NAME;
case 1:
- SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::String);
+ SQL_NEW_NODE(OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::String);
return SQL_TOKEN_STRING;
case 2:
- SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::AccessDate);
+ SQL_NEW_NODE(OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::AccessDate);
return SQL_TOKEN_ACCESS_DATE;
}
}
@@ -638,7 +638,7 @@ sal_Int32 gatherName(const sal_Char* text)
SQL_NEW_KEYWORD(nToken);
break;
default:
- SQL_NEW_NODE(::rtl::OUString(text,strlen(text),RTL_TEXTENCODING_UTF8), SQLNodeType::Name);
+ SQL_NEW_NODE(OUString(text,strlen(text),RTL_TEXTENCODING_UTF8), SQLNodeType::Name);
return SQL_TOKEN_NAME;
}
}
@@ -684,17 +684,17 @@ sal_Int32 gatherNamePre(const sal_Char* text)
default:
// we need a special handling for parameter
{
- ::rtl::OString sStmt = xxx_pGLOBAL_SQLSCAN->getStatement();
+ OString sStmt = xxx_pGLOBAL_SQLSCAN->getStatement();
sal_Int32 nLength = strlen(text);
sal_Int32 nPos = xxx_pGLOBAL_SQLSCAN->GetCurrentPos() - nLength - 2;
if (sStmt.getStr()[nPos] == ':')
{
- SQL_NEW_NODE(::rtl::OUString(text,nLength,RTL_TEXTENCODING_UTF8), SQLNodeType::Name);
+ SQL_NEW_NODE(OUString(text,nLength,RTL_TEXTENCODING_UTF8), SQLNodeType::Name);
nToken = SQL_TOKEN_NAME;
}
else
{
- SQL_NEW_NODE(::rtl::OUString(text,nLength,RTL_TEXTENCODING_UTF8), SQLNodeType::String);
+ SQL_NEW_NODE(OUString(text,nLength,RTL_TEXTENCODING_UTF8), SQLNodeType::String);
nToken = SQL_TOKEN_STRING;
}
}
@@ -728,12 +728,12 @@ void OSQLScanner::SQLyyerror(char const *fmt)
IN_SQLyyerror = true;
OSL_ENSURE(m_pContext, "OSQLScanner::SQLyyerror: No Context set");
- m_sErrorMessage = ::rtl::OUString(fmt,strlen(fmt),RTL_TEXTENCODING_UTF8);
+ m_sErrorMessage = OUString(fmt,strlen(fmt),RTL_TEXTENCODING_UTF8);
if (m_nCurrentPos < m_sStatement.getLength())
{
m_sErrorMessage += ": ";
- ::rtl::OUString aError;
+ OUString aError;
OUStringBuffer Buffer(256);
int ch = SQLyytext ? (SQLyytext[0] == 0 ? ' ' : SQLyytext[0]): ' ';
@@ -762,13 +762,13 @@ void OSQLScanner::SQLyyerror(char const *fmt)
}
//------------------------------------------------------------------------------
-void OSQLScanner::prepareScan(const ::rtl::OUString & rNewStatement, const IParseContext* pContext, bool bInternational)
+void OSQLScanner::prepareScan(const OUString & rNewStatement, const IParseContext* pContext, bool bInternational)
{
YY_FLUSH_BUFFER;
BEGIN(m_nRule);
- m_sErrorMessage = ::rtl::OUString();
- m_sStatement = ::rtl::OUStringToOString(rNewStatement, RTL_TEXTENCODING_UTF8);
+ m_sErrorMessage = OUString();
+ m_sStatement = OUStringToOString(rNewStatement, RTL_TEXTENCODING_UTF8);
m_nCurrentPos = 0;
m_bInternational = bInternational;
m_pContext = pContext;
@@ -786,7 +786,7 @@ sal_Int32 OSQLScanner::SQLyygetc(void)
IParseContext::InternationalKeyCode OSQLScanner::getInternationalTokenID(const sal_Char* sToken) const
{
OSL_ENSURE(m_pContext, "OSQLScanner::getInternationalTokenID: No Context set");
- return (m_bInternational) ? m_pContext->getIntlKeyCode(::rtl::OString(sToken) ) : IParseContext::InternationalKeyCode::None;
+ return (m_bInternational) ? m_pContext->getIntlKeyCode(OString(sToken) ) : IParseContext::InternationalKeyCode::None;
}
sal_Int32 OSQLScanner::GetGERRule() { return PREDICATE_GER; }
sal_Int32 OSQLScanner::GetENGRule() { return PREDICATE_ENG; }
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index c95c61a905b3..e73a502333f8 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -472,7 +472,7 @@ void Test::testBigStruct() {
void Test::testPolyStruct() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(
+ OUString(
"test.codemaker.cppumaker.Struct<char,short>"),
(css::uno::makeAny(
test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()).
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index 1ee826387191..7787176ffd3b 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -289,9 +289,9 @@ void Test::testVoid() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "rtl::OUString", OUString("2"), b );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -303,11 +303,11 @@ void Test::testVoid() {
cppu::UnoType<OUString>::get(), b);
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>", !(a >>= b));
+ "css::uno::Sequence<OUString>", !(a >>= b));
CPPUNIT_ASSERT_EQUAL_MESSAGE(
- "css::uno::Sequence<rtl::OUString>", sal_Int32(2), b.getLength());
+ "css::uno::Sequence<OUString>", sal_Int32(2), b.getLength());
}
{
Enum1 b = Enum1_M2;
@@ -321,7 +321,7 @@ void Test::testVoid() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b));
CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member);
}
@@ -397,9 +397,9 @@ void Test::testBoolean() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "rtl::OUString", OUString("2"), b );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -411,12 +411,12 @@ void Test::testBoolean() {
cppu::UnoType<OUString>::get(), b);
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b));
CPPUNIT_ASSERT_EQUAL_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
sal_Int32(2), b.getLength());
}
{
@@ -431,7 +431,7 @@ void Test::testBoolean() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b));
CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member);
}
@@ -502,8 +502,8 @@ void Test::testByte() {
}
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -512,9 +512,9 @@ void Test::testByte() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -527,7 +527,7 @@ void Test::testByte() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
@@ -593,8 +593,8 @@ void Test::testShort() {
}
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -603,9 +603,9 @@ void Test::testShort() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -618,7 +618,7 @@ void Test::testShort() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
@@ -686,8 +686,8 @@ void Test::testUnsignedShort() {
}
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -696,9 +696,9 @@ void Test::testUnsignedShort() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -711,7 +711,7 @@ void Test::testUnsignedShort() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
@@ -773,8 +773,8 @@ void Test::testLong() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -783,9 +783,9 @@ void Test::testLong() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -798,7 +798,7 @@ void Test::testLong() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
@@ -860,8 +860,8 @@ void Test::testUnsignedLong() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -870,9 +870,9 @@ void Test::testUnsignedLong() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -885,7 +885,7 @@ void Test::testUnsignedLong() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
@@ -947,8 +947,8 @@ void Test::testHyper() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -957,9 +957,9 @@ void Test::testHyper() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -972,7 +972,7 @@ void Test::testHyper() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
@@ -1034,8 +1034,8 @@ void Test::testUnsignedHyper() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -1044,9 +1044,9 @@ void Test::testUnsignedHyper() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -1059,7 +1059,7 @@ void Test::testUnsignedHyper() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
@@ -1121,8 +1121,8 @@ void Test::testFloat() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -1131,9 +1131,9 @@ void Test::testFloat() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -1146,7 +1146,7 @@ void Test::testFloat() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
@@ -1208,8 +1208,8 @@ void Test::testDouble() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -1218,9 +1218,9 @@ void Test::testDouble() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -1233,7 +1233,7 @@ void Test::testDouble() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
@@ -1300,8 +1300,8 @@ void Test::testChar() {
}
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -1310,9 +1310,9 @@ void Test::testChar() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -1325,7 +1325,7 @@ void Test::testChar() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
@@ -1336,7 +1336,7 @@ void Test::testChar() {
}
void Test::testString() {
- css::uno::Any a(rtl::OUString("1"));
+ css::uno::Any a(OUString("1"));
CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<OUString>::get()));
{
bool b = true;
@@ -1387,8 +1387,8 @@ void Test::testString() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", (a >>= b) && b == "1" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", (a >>= b) && b == "1" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -1397,9 +1397,9 @@ void Test::testString() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -1412,7 +1412,7 @@ void Test::testString() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
@@ -1474,8 +1474,8 @@ void Test::testType() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -1483,9 +1483,9 @@ void Test::testType() {
"css::uno::Type", (a >>= b) && b == cppu::UnoType<sal_Int32>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -1498,7 +1498,7 @@ void Test::testType() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
@@ -1563,8 +1563,8 @@ void Test::testSequence() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -1573,9 +1573,9 @@ void Test::testSequence() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -1594,7 +1594,7 @@ void Test::testSequence() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
@@ -1656,8 +1656,8 @@ void Test::testEnum() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -1666,9 +1666,9 @@ void Test::testEnum() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -1685,7 +1685,7 @@ void Test::testEnum() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
@@ -1747,8 +1747,8 @@ void Test::testStruct() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -1757,9 +1757,9 @@ void Test::testStruct() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -1785,7 +1785,7 @@ void Test::testStruct() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
@@ -1807,7 +1807,7 @@ void Test::testPoly() {
void Test::testException() {
css::uno::Any a(
Exception2a(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 1,
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 1,
3));
CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<Exception2a>::get()));
{
@@ -1859,8 +1859,8 @@ void Test::testException() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -1869,9 +1869,9 @@ void Test::testException() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -1884,24 +1884,24 @@ void Test::testException() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
Exception2 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception2", (a >>= b) && b.member == 1);
}
{
Exception2a b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2,
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2,
2);
CPPUNIT_ASSERT_MESSAGE(
"Exception2a", (a >>= b) && b.member == 1 && b.member2 == 3);
}
{
Exception2b b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2,
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2,
2);
CPPUNIT_ASSERT_MESSAGE("Exception2b", !(a >>= b) && b.member == 2);
}
@@ -1965,8 +1965,8 @@ void Test::testInterface() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -1975,9 +1975,9 @@ void Test::testInterface() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -1990,7 +1990,7 @@ void Test::testInterface() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
@@ -2069,8 +2069,8 @@ void Test::testNull() {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
}
{
- rtl::OUString b("2");
- CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
+ OUString b("2");
+ CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" );
}
{
css::uno::Type b(cppu::UnoType<OUString>::get());
@@ -2079,9 +2079,9 @@ void Test::testNull() {
!(a >>= b) && b == cppu::UnoType<OUString>::get());
}
{
- css::uno::Sequence< rtl::OUString > b(2);
+ css::uno::Sequence< OUString > b(2);
CPPUNIT_ASSERT_MESSAGE(
- "css::uno::Sequence<rtl::OUString>",
+ "css::uno::Sequence<OUString>",
!(a >>= b) && b.getLength() == 2);
}
{
@@ -2094,7 +2094,7 @@ void Test::testNull() {
}
{
Exception1 b(
- rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
+ OUString(), css::uno::Reference< css::uno::XInterface >(), 2);
CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2);
}
{
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index 2a14b3c890d8..1e2a45ac84cf 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -66,7 +66,7 @@ public:
virtual void v_enter() override;
virtual void v_leave() override;
- virtual bool v_isValid(rtl::OUString * pReason) override;
+ virtual bool v_isValid(OUString * pReason) override;
void innerDispatch();
void outerDispatch(bool loop);
@@ -311,7 +311,7 @@ void AffineBridge::v_leave()
m_innerMutex.release();
}
-bool AffineBridge::v_isValid(rtl::OUString * pReason)
+bool AffineBridge::v_isValid(OUString * pReason)
{
bool result = m_enterCount > 0;
if (!result)
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index da8b1e64e702..4d7b922e50ce 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -51,7 +51,7 @@ public:
virtual void v_enter() override;
virtual void v_leave() override;
- virtual bool v_isValid(rtl::OUString * pReason) override;
+ virtual bool v_isValid(OUString * pReason) override;
};
LogBridge::LogBridge()
@@ -108,7 +108,7 @@ void LogBridge::v_leave()
m_mutex.release();
}
-bool LogBridge::v_isValid(rtl::OUString * pReason)
+bool LogBridge::v_isValid(OUString * pReason)
{
bool result = m_count > 0;
if (!result)
@@ -134,7 +134,7 @@ bool LogBridge::v_isValid(rtl::OUString * pReason)
switch(_pTypeRef->eTypeClass)
{
case typelib_TypeClass_STRING:
- SAL_INFO("cppu.log", "" << *static_cast< ::rtl::OUString*>(pArg));
+ SAL_INFO("cppu.log", "" << *static_cast< OUString*>(pArg));
break;
case typelib_TypeClass_BOOLEAN:
SAL_INFO("cppu.log", "" << *static_cast<sal_Bool*>(pArg));
@@ -201,9 +201,9 @@ static void LogProbe(
void * pArgs[],
uno_Any ** ppException )
{
- ::rtl::OString sTemp;
+ OString sTemp;
if ( pMemberType && pMemberType->pTypeName )
- sTemp = ::rtl::OUStringToOString(pMemberType->pTypeName,RTL_TEXTENCODING_ASCII_US);
+ sTemp = OUStringToOString(pMemberType->pTypeName,RTL_TEXTENCODING_ASCII_US);
if ( pre )
{
SAL_INFO("cppu.log", "{ LogBridge () " << sTemp );
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 892390b7a263..7cf945d44391 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -43,7 +43,7 @@ public:
virtual void v_enter() override;
virtual void v_leave() override;
- virtual bool v_isValid(rtl::OUString * pReason) override;
+ virtual bool v_isValid(OUString * pReason) override;
};
UnsafeBridge::UnsafeBridge()
@@ -103,7 +103,7 @@ void UnsafeBridge::v_leave()
m_mutex.release();
}
-bool UnsafeBridge::v_isValid(rtl::OUString * pReason)
+bool UnsafeBridge::v_isValid(OUString * pReason)
{
bool result = m_count > 0;
if (!result)
diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx
index f53702ef93d3..6f99ee7d42be 100644
--- a/cppu/source/helper/purpenv/Proxy.hxx
+++ b/cppu/source/helper/purpenv/Proxy.hxx
@@ -42,7 +42,7 @@ class Proxy : public uno_Interface
// mapping information
uno_Interface * m_pUnoI; // wrapped interface
typelib_InterfaceTypeDescription * m_pTypeDescr;
- rtl::OUString m_aOId;
+ OUString m_aOId;
cppu::helper::purpenv::ProbeFun * m_probeFun;
void * m_pProbeContext;
@@ -53,7 +53,7 @@ public:
uno_Environment * pFrom,
uno_Interface * pUnoI,
typelib_InterfaceTypeDescription * pTypeDescr,
- rtl::OUString const & rOId,
+ OUString const & rOId,
cppu::helper::purpenv::ProbeFun * probeFun,
void * pProbeContext);
~Proxy();
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index 9bead78d0ce0..ceeee6eb0deb 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -72,19 +72,19 @@ public:
void registerProxyInterface (void ** ppProxy,
uno_freeProxyFunc freeProxy,
- rtl::OUString const & oid,
+ OUString const & oid,
typelib_InterfaceTypeDescription * pTypeDescr);
void revokeInterface (void * pInterface);
void getObjectIdentifier (void * pInterface,
- rtl::OUString * pOid);
+ OUString * pOid);
void getRegisteredInterface (void **,
- rtl::OUString const & oid,
+ OUString const & oid,
typelib_InterfaceTypeDescription *);
void getRegisteredInterfaces(void ***,
sal_Int32 * pnLen,
uno_memAlloc memAlloc);
void computeObjectIdentifier(void * pInterface,
- rtl::OUString * pOid);
+ OUString * pOid);
void acquireInterface (void * pInterface);
void releaseInterface (void * pInterface);
@@ -92,7 +92,7 @@ public:
virtual void v_leave() override;
virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) override;
virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) override;
- virtual bool v_isValid (rtl::OUString * pReason) override;
+ virtual bool v_isValid (OUString * pReason) override;
protected:
oslInterlockedCount m_nRef;
@@ -170,7 +170,7 @@ static void s_getObjectIdentifier(uno_ExtEnvironment * pExtEnv,
void * pInterface)
{
Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved);
- pBase->getObjectIdentifier(pInterface, reinterpret_cast<rtl::OUString *>(ppOId));
+ pBase->getObjectIdentifier(pInterface, reinterpret_cast<OUString *>(ppOId));
}
static void s_getRegisteredInterface(uno_ExtEnvironment * pExtEnv,
@@ -196,7 +196,7 @@ static void s_computeObjectIdentifier(uno_ExtEnvironment * pExtEnv,
void * pInterface)
{
Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved);
- pBase->computeObjectIdentifier(pInterface, reinterpret_cast<rtl::OUString *>(ppOId));
+ pBase->computeObjectIdentifier(pInterface, reinterpret_cast<OUString *>(ppOId));
}
static void s_acquireInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) {
@@ -317,7 +317,7 @@ extern "C" { static void s_registerProxyInterface_v(va_list * pParam)
void Base::registerProxyInterface(void ** ppProxy,
uno_freeProxyFunc freeProxy,
- rtl::OUString const & oid,
+ OUString const & oid,
typelib_InterfaceTypeDescription * pTypeDescr)
{
uno_Environment_invoke(m_pEnv,
@@ -354,14 +354,14 @@ extern "C" { static void s_getObjectIdentifier_v(va_list * pParam)
{
uno_ExtEnvironment * pExtEnv = va_arg(*pParam, uno_ExtEnvironment *);
void * pInterface = va_arg(*pParam, void *);
- rtl::OUString * pOId = va_arg(*pParam, rtl::OUString *);
+ OUString * pOId = va_arg(*pParam, OUString *);
ExtEnv_getObjectIdentifier * pGetObjectIdentifier
= va_arg(*pParam, ExtEnv_getObjectIdentifier *);
pGetObjectIdentifier(pExtEnv, reinterpret_cast<rtl_uString **>(pOId), pInterface);
}}
-void Base::getObjectIdentifier(void * pInterface, rtl::OUString * pOid)
+void Base::getObjectIdentifier(void * pInterface, OUString * pOid)
{
uno_Environment_invoke(m_pEnv,
s_getObjectIdentifier_v,
@@ -385,7 +385,7 @@ extern "C" { static void s_getRegisteredInterface_v(va_list * pParam)
}}
void Base::getRegisteredInterface(void ** ppInterface,
- rtl::OUString const & oid,
+ OUString const & oid,
typelib_InterfaceTypeDescription * pTypeDescr)
{
uno_Environment_invoke(m_pEnv,
@@ -428,14 +428,14 @@ extern "C" { static void s_computeObjectIdentifier_v(va_list * pParam)
{
uno_ExtEnvironment * pExtEnv = va_arg(*pParam, uno_ExtEnvironment *);
void * pInterface = va_arg(*pParam, void *);
- rtl::OUString * pOId = va_arg(*pParam, rtl::OUString *);
+ OUString * pOId = va_arg(*pParam, OUString *);
ExtEnv_computeObjectIdentifier * pComputeObjectIdentifier
= va_arg(*pParam, ExtEnv_computeObjectIdentifier *);
pComputeObjectIdentifier(pExtEnv, reinterpret_cast<rtl_uString **>(pOId), pInterface);
}}
-void Base::computeObjectIdentifier(void * pInterface, rtl::OUString * pOid)
+void Base::computeObjectIdentifier(void * pInterface, OUString * pOid)
{
uno_Environment_invoke(m_pEnv,
s_computeObjectIdentifier_v,
@@ -501,7 +501,7 @@ void Base::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam)
m_pEnterable->callOut_v(pCallee, pParam);
}
-bool Base::v_isValid(rtl::OUString * pReason)
+bool Base::v_isValid(OUString * pReason)
{
return m_pEnterable->isValid(pReason);
}
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
index 7ee3a4dadb0d..a781ff1d7796 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
@@ -195,7 +195,7 @@ Proxy::Proxy(uno::Mapping const & to_from,
uno_Environment * pFrom,
uno_Interface * pUnoI,
typelib_InterfaceTypeDescription * pTypeDescr,
- rtl::OUString const & rOId,
+ OUString const & rOId,
cppu::helper::purpenv::ProbeFun * probeFun,
void * pProbeContext
)
diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx
index b5c839b193cd..ed8891fabf8f 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -239,7 +239,7 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext(
// release inout parameter
if (*ppCurrentContext)
{
- target_env = Environment(rtl::OUString(pEnvTypeName), pEnvContext);
+ target_env = Environment(OUString(pEnvTypeName), pEnvContext);
OSL_ASSERT( target_env.is() );
if (! target_env.is())
return false;
@@ -258,7 +258,7 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext(
if (! target_env.is())
{
- target_env = Environment(rtl::OUString(pEnvTypeName), pEnvContext);
+ target_env = Environment(OUString(pEnvTypeName), pEnvContext);
OSL_ASSERT( target_env.is() );
if (! target_env.is())
return false;
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index fe16b365b7f3..2ccac42f5df1 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -35,9 +35,6 @@
using namespace osl;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-
extern "C"
{
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 1c8f17761cb8..ccfe85c9abe7 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -44,10 +44,6 @@
using namespace std;
using namespace osl;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OString;
-
#ifdef _WIN32
#pragma pack(push, 8)
#endif
@@ -292,7 +288,7 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl()
typelib_TypeDescriptionReference * pTDR = (*aIt).second;
if (pTDR)
{
- OString aTypeName( rtl::OUStringToOString( pTDR->pTypeName, RTL_TEXTENCODING_ASCII_US ) );
+ OString aTypeName( OUStringToOString( pTDR->pTypeName, RTL_TEXTENCODING_ASCII_US ) );
SAL_INFO("cppu.typelib", "remaining type: " << aTypeName << "; ref count = " << pTDR->nRefCount);
}
else
@@ -749,7 +745,7 @@ void newTypeDescription(
pTmp->ppTypeRefs = new typelib_TypeDescriptionReference *[ nMembers ];
pTmp->ppMemberNames = new rtl_uString *[ nMembers ];
bool polymorphic = eTypeClass == typelib_TypeClass_STRUCT
- && rtl::OUString::unacquired(&pTypeName).indexOf('<') >= 0;
+ && OUString::unacquired(&pTypeName).indexOf('<') >= 0;
OSL_ASSERT(!polymorphic || pStructMembers != nullptr);
if (polymorphic) {
reinterpret_cast< typelib_StructTypeDescription * >(pTmp)->
@@ -915,7 +911,7 @@ public:
sal_Int32 getBaseMembers() const { return members; }
private:
- typedef std::set< rtl::OUString > Set;
+ typedef std::set< OUString > Set;
void calculate(
sal_Int32 directBaseIndex, Set & directBaseSet,
@@ -1035,14 +1031,14 @@ extern "C" void SAL_CALL typelib_typedescription_newMIInterface(
for (sal_Int32 j = 0; j < pBase->nMembers; ++j) {
typelib_TypeDescriptionReference const * pDirectBaseMember
= pDirectBase->ppAllMembers[i->directBaseMemberOffset + j];
- rtl::OUStringBuffer aBuf(pDirectBaseMember->pTypeName);
+ OUStringBuffer aBuf(pDirectBaseMember->pTypeName);
aBuf.append(":@");
aBuf.append(i->directBaseIndex);
aBuf.append(',');
aBuf.append(i->memberOffset + j);
aBuf.append(':');
aBuf.append(pITD->aBase.pTypeName);
- rtl::OUString aName(aBuf.makeStringAndClear());
+ OUString aName(aBuf.makeStringAndClear());
typelib_TypeDescriptionReference * pDerivedMember = nullptr;
typelib_typedescriptionreference_new(
&pDerivedMember, pDirectBaseMember->eTypeClass,
@@ -1119,7 +1115,7 @@ extern "C" void SAL_CALL typelib_typedescription_newInterfaceMethod(
OSL_FAIL("Bad interface method type name");
return;
}
- rtl::OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1);
+ OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1);
typelib_InterfaceTypeDescription * pInterface = nullptr;
typelib_typedescription_getByName(
reinterpret_cast< typelib_TypeDescription ** >(&pInterface),
@@ -1211,7 +1207,7 @@ extern "C" void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute(
OSL_FAIL("Bad interface attribute type name");
return;
}
- rtl::OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1);
+ OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1);
typelib_InterfaceTypeDescription * pInterface = nullptr;
typelib_typedescription_getByName(
reinterpret_cast< typelib_TypeDescription ** >(&pInterface),
@@ -1753,7 +1749,7 @@ typelib_TypeDescriptionReference ** copyExceptions(
}
bool createDerivedInterfaceMemberDescription(
- typelib_TypeDescription ** result, rtl::OUString const & name,
+ typelib_TypeDescription ** result, OUString const & name,
typelib_TypeDescriptionReference * baseRef,
typelib_TypeDescription const * base, typelib_TypeDescription * interface,
sal_Int32 index, sal_Int32 position)
diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx
index 4a2fd8146328..9907011987f9 100644
--- a/cppu/source/uno/EnvStack.cxx
+++ b/cppu/source/uno/EnvStack.cxx
@@ -111,7 +111,7 @@ extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl
*ppEnv = nullptr;
}
- rtl::OUString currPurpose;
+ OUString currPurpose;
uno_Environment * pCurrEnv = s_getCurrent();
if (pCurrEnv) // no environment means no purpose
@@ -119,7 +119,7 @@ extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl
if (pTypeName && rtl_uString_getLength(pTypeName))
{
- rtl::OUString envDcp(pTypeName);
+ OUString envDcp(pTypeName);
envDcp += currPurpose;
uno_getEnvironment(ppEnv, envDcp.pData, nullptr);
@@ -133,20 +133,20 @@ extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl
}
else
{
- rtl::OUString uno_envDcp(UNO_LB_UNO);
+ OUString uno_envDcp(UNO_LB_UNO);
uno_getEnvironment(ppEnv, uno_envDcp.pData, nullptr);
}
}
}
-static rtl::OUString s_getPrefix(rtl::OUString const & str1, rtl::OUString const & str2)
+static OUString s_getPrefix(OUString const & str1, OUString const & str2)
{
sal_Int32 nIndex1 = 0;
sal_Int32 nIndex2 = 0;
sal_Int32 sim = 0;
- rtl::OUString token1;
- rtl::OUString token2;
+ OUString token1;
+ OUString token2;
do
{
@@ -158,7 +158,7 @@ static rtl::OUString s_getPrefix(rtl::OUString const & str1, rtl::OUString const
}
while(nIndex1 == nIndex2 && nIndex1 >= 0 && token1 == token2);
- rtl::OUString result;
+ OUString result;
if (sim)
result = str1.copy(0, sim - 1);
@@ -170,17 +170,17 @@ static int s_getNextEnv(uno_Environment ** ppEnv, uno_Environment * pCurrEnv, un
{
int res = 0;
- rtl::OUString nextPurpose;
+ OUString nextPurpose;
- rtl::OUString currPurpose;
+ OUString currPurpose;
if (pCurrEnv)
currPurpose = cppu::EnvDcp::getPurpose(pCurrEnv->pTypeName);
- rtl::OUString targetPurpose;
+ OUString targetPurpose;
if (pTargetEnv)
targetPurpose = cppu::EnvDcp::getPurpose(pTargetEnv->pTypeName);
- rtl::OUString intermPurpose(s_getPrefix(currPurpose, targetPurpose));
+ OUString intermPurpose(s_getPrefix(currPurpose, targetPurpose));
if (currPurpose.getLength() > intermPurpose.getLength())
{
sal_Int32 idx = currPurpose.lastIndexOf(':');
@@ -202,7 +202,7 @@ static int s_getNextEnv(uno_Environment ** ppEnv, uno_Environment * pCurrEnv, un
if (!nextPurpose.isEmpty())
{
- rtl::OUString next_envDcp(UNO_LB_UNO);
+ OUString next_envDcp(UNO_LB_UNO);
next_envDcp += nextPurpose;
uno_getEnvironment(ppEnv, next_envDcp.pData, nullptr);
@@ -360,21 +360,21 @@ int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pRea
{
int result = 1;
- rtl::OUString typeName(cppu::EnvDcp::getTypeName(pEnv->pTypeName));
+ OUString typeName(cppu::EnvDcp::getTypeName(pEnv->pTypeName));
if (typeName == UNO_LB_UNO)
{
cppu::Enterable * pEnterable = static_cast<cppu::Enterable *>(pEnv->pReserved);
if (pEnterable)
- result = pEnterable->isValid(reinterpret_cast<rtl::OUString *>(pReason));
+ result = pEnterable->isValid(reinterpret_cast<OUString *>(pReason));
}
else
{
- rtl::OUString envDcp(UNO_LB_UNO);
+ OUString envDcp(UNO_LB_UNO);
envDcp += cppu::EnvDcp::getPurpose(pEnv->pTypeName);
uno::Environment env(envDcp);
- result = env.isValid(reinterpret_cast<rtl::OUString *>(pReason));
+ result = env.isValid(reinterpret_cast<OUString *>(pReason));
}
return result;
diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx
index 36f0d15192c4..6b7ad09f98c6 100644
--- a/cppu/source/uno/IdentityMapping.cxx
+++ b/cppu/source/uno/IdentityMapping.cxx
@@ -46,7 +46,7 @@ static void s_free(uno_Mapping * pMapping)
static void s_acquire(uno_Mapping * pMapping)
{
- static rtl::OUString s_purpose;
+ static OUString s_purpose;
if (1 == osl_atomic_increment(&static_cast<IdentityMapping *>(pMapping)->m_nRef))
{
diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx
index 60a8704e8347..3cb34a65bb1c 100644
--- a/cppu/source/uno/cascade_mapping.cxx
+++ b/cppu/source/uno/cascade_mapping.cxx
@@ -151,14 +151,14 @@ extern "C" { static void s_MediatorMapping_free(uno_Mapping * pMapping)
}}
-static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const & str2)
+static OUString getPrefix(OUString const & str1, OUString const & str2)
{
sal_Int32 nIndex1 = 0;
sal_Int32 nIndex2 = 0;
sal_Int32 sim = 0;
- rtl::OUString token1;
- rtl::OUString token2;
+ OUString token1;
+ OUString token2;
do
{
@@ -170,7 +170,7 @@ static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const &
}
while(nIndex1 == nIndex2 && nIndex1 >= 0 && token1 == token2);
- rtl::OUString result;
+ OUString result;
if (sim)
result = str1.copy(0, sim - 1);
@@ -178,12 +178,12 @@ static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const &
return result;
}
-// rtl::OUString str1("abc:def:ghi");
-// rtl::OUString str2("abc:def");
-// rtl::OUString str3("abc");
-// rtl::OUString str4("");
+// OUString str1("abc:def:ghi");
+// OUString str2("abc:def");
+// OUString str3("abc");
+// OUString str4("");
-// rtl::OUString pref;
+// OUString pref;
// pref = getPrefix(str1, str1);
// pref = getPrefix(str1, str2);
@@ -203,16 +203,16 @@ void getCascadeMapping(uno_Mapping ** ppMapping,
if (pAddPurpose && pAddPurpose->length)
return;
- rtl::OUString uno_envType(UNO_LB_UNO);
+ OUString uno_envType(UNO_LB_UNO);
- rtl::OUString from_envType = cppu::EnvDcp::getTypeName(pFrom->pTypeName);
- rtl::OUString to_envType = cppu::EnvDcp::getTypeName(pTo->pTypeName);
- rtl::OUString from_envPurpose = cppu::EnvDcp::getPurpose(pFrom->pTypeName);
- rtl::OUString to_envPurpose = cppu::EnvDcp::getPurpose(pTo->pTypeName);
+ OUString from_envType = cppu::EnvDcp::getTypeName(pFrom->pTypeName);
+ OUString to_envType = cppu::EnvDcp::getTypeName(pTo->pTypeName);
+ OUString from_envPurpose = cppu::EnvDcp::getPurpose(pFrom->pTypeName);
+ OUString to_envPurpose = cppu::EnvDcp::getPurpose(pTo->pTypeName);
#ifdef LOG_CALLING_named_purpose_getMapping
- rtl::OString s_from_name = rtl::OUStringToOString(pFrom->pTypeName, RTL_TEXTENCODING_ASCII_US);
- rtl::OString s_to_name = rtl::OUStringToOString(pTo->pTypeName, RTL_TEXTENCODING_ASCII_US);
+ OString s_from_name = OUStringToOString(pFrom->pTypeName, RTL_TEXTENCODING_ASCII_US);
+ OString s_to_name = OUStringToOString(pTo->pTypeName, RTL_TEXTENCODING_ASCII_US);
std::cerr << __FUNCTION__ << " - creating mediation ";
std::cerr << "pFrom: " << s_from_name.getStr();
@@ -229,16 +229,16 @@ void getCascadeMapping(uno_Mapping ** ppMapping,
// chained uno -> uno
if (from_envType == uno_envType && to_envType == uno_envType)
{
- rtl::OUString purpose = getPrefix(from_envPurpose, to_envPurpose);
+ OUString purpose = getPrefix(from_envPurpose, to_envPurpose);
- rtl::OUString uno_envDcp = uno_envType;
+ OUString uno_envDcp = uno_envType;
uno_envDcp += purpose;
// direct mapping possible?
// uno:bla-->uno:bla:blubb
if (from_envPurpose == purpose)
{
- rtl::OUString rest = to_envPurpose.copy(purpose.getLength());
+ OUString rest = to_envPurpose.copy(purpose.getLength());
sal_Int32 index = rest.indexOf(':', 1);
if (index == -1)
@@ -251,7 +251,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping,
}
else if (to_envPurpose == purpose)
{
- rtl::OUString rest = from_envPurpose.copy(purpose.getLength());
+ OUString rest = from_envPurpose.copy(purpose.getLength());
sal_Int32 index = rest.indexOf(':', 1);
if (index == -1)
@@ -268,7 +268,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping,
else if (from_envType != uno_envType && to_envType == uno_envType) // <ANY> -> UNO ?
// mediate via uno:purpose(fromEnv)
{
- rtl::OUString envDcp = uno_envType;
+ OUString envDcp = uno_envType;
envDcp += from_envPurpose;
uno_getEnvironment(&pInterm, envDcp.pData, nullptr);
@@ -276,7 +276,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping,
else if (from_envType == uno_envType && to_envType != uno_envType) // UNO -> <ANY>?
// mediate via uno(context)
{
- rtl::OUString envDcp = uno_envType;
+ OUString envDcp = uno_envType;
envDcp += to_envPurpose;
uno_getEnvironment(&pInterm, envDcp.pData, nullptr);
@@ -284,9 +284,9 @@ void getCascadeMapping(uno_Mapping ** ppMapping,
else // everything else
// mediate via uno:purpose
{
- rtl::OUString purpose = getPrefix(from_envPurpose, to_envPurpose);
+ OUString purpose = getPrefix(from_envPurpose, to_envPurpose);
- rtl::OUString uno_envDcp = uno_envType;
+ OUString uno_envDcp = uno_envType;
uno_envDcp += purpose;
uno_getEnvironment(&pInterm, uno_envDcp.pData, nullptr);
diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx
index df0be91ed0b1..a2191a34222f 100644
--- a/cppu/source/uno/eq.hxx
+++ b/cppu/source/uno/eq.hxx
@@ -166,7 +166,7 @@ inline bool _equalSequence(
{
for ( sal_Int32 nPos = nElements; nPos--; )
{
- if ( static_cast<OUString *>(pDestElements)[nPos] != static_cast<const ::rtl::OUString *>(pSourceElements)[nPos] )
+ if ( static_cast<OUString *>(pDestElements)[nPos] != static_cast<const OUString *>(pSourceElements)[nPos] )
return false;
}
return true;
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index d442ca0bc7d7..a336dd33eaf8 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -45,8 +45,6 @@
#include <stdio.h>
-using ::rtl::OUString;
-
namespace
{
@@ -677,7 +675,7 @@ void writeLine(
void writeLine(
void * stream, const OUString & rLine, const sal_Char * pFilter )
{
- ::rtl::OString aLine( ::rtl::OUStringToOString(
+ OString aLine( OUStringToOString(
rLine, RTL_TEXTENCODING_ASCII_US ) );
writeLine( stream, aLine.getStr(), pFilter );
}
@@ -689,7 +687,7 @@ extern "C" void SAL_CALL uno_dumpEnvironment(
SAL_THROW_EXTERN_C()
{
OSL_ENSURE( pEnv, "### null ptr!" );
- ::rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
if (! pEnv->pExtEnv)
{
@@ -781,7 +779,7 @@ extern "C" void SAL_CALL uno_dumpEnvironmentByName(
}
else
{
- ::rtl::OUStringBuffer buf( 32 );
+ OUStringBuffer buf( 32 );
buf.append( "environment \"" );
buf.append( pEnvDcp );
buf.append( "\" does not exist!" );
@@ -798,7 +796,7 @@ namespace
public:
makeOIdPart()
{
- ::rtl::OUStringBuffer aRet( 64 );
+ OUStringBuffer aRet( 64 );
aRet.append( "];" );
// pid
oslProcessInfo info;
@@ -855,7 +853,7 @@ static void unoenv_computeObjectIdentifier(
{
(*pUnoI->release)( pUnoI );
// interface
- ::rtl::OUStringBuffer oid( 64 );
+ OUStringBuffer oid( 64 );
oid.append( reinterpret_cast< sal_Int64 >(pUnoI), 16 );
oid.append( ';' );
// environment[context]
@@ -1084,7 +1082,7 @@ static uno_Environment * initDefaultEnvironment(
OUString envPurpose = cppu::EnvDcp::getPurpose(rEnvDcp);
if (!envPurpose.isEmpty())
{
- rtl::OUString libStem(
+ OUString libStem(
envPurpose.copy(envPurpose.lastIndexOf(':') + 1) + "_uno_uno");
if(!loadEnv(libStem, pEnv))
{
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index c203523efa2c..b5fdf82ac0f6 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -48,8 +48,6 @@
using namespace std;
using namespace osl;
using namespace com::sun::star::uno;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
namespace cppu
{
diff --git a/cppu/source/uno/loadmodule.cxx b/cppu/source/uno/loadmodule.cxx
index ef8e65a7ffb9..c72de19be33d 100644
--- a/cppu/source/uno/loadmodule.cxx
+++ b/cppu/source/uno/loadmodule.cxx
@@ -31,8 +31,8 @@ namespace cppu { namespace detail {
#ifndef DISABLE_DYNLOADING
-bool loadModule(osl::Module& rModule, rtl::OUString const & name) {
- rtl::OUStringBuffer b;
+bool loadModule(osl::Module& rModule, OUString const & name) {
+ OUStringBuffer b;
#if defined SAL_DLLPREFIX
b.append(SAL_DLLPREFIX);
#endif
diff --git a/cppu/source/uno/loadmodule.hxx b/cppu/source/uno/loadmodule.hxx
index 9021118477d6..8a964e088174 100644
--- a/cppu/source/uno/loadmodule.hxx
+++ b/cppu/source/uno/loadmodule.hxx
@@ -37,7 +37,7 @@ namespace cppu { namespace detail {
@return false if the module could not be loaded, otherwise true
*/
-bool loadModule(osl::Module & rModule, ::rtl::OUString const & name);
+bool loadModule(osl::Module & rModule, OUString const & name);
#endif
diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index 2a4bc64ab703..5df856146063 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -209,7 +209,7 @@ namespace cppu_ifcontainer
::cppu::UnoType< ::sal_uInt32 >::get(),
::cppu::UnoType< ::sal_Int32 >::get(),
::cppu::UnoType< ::sal_Int16 >::get(),
- ::cppu::UnoType< ::rtl::OUString >::get(),
+ ::cppu::UnoType< OUString >::get(),
::cppu::UnoType< ::sal_Int8 >::get()
};
doContainerTest< cppu::OMultiTypeInterfaceContainerHelper,
diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
index 5e8ce06b7ef0..2447c816522f 100644
--- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
@@ -63,7 +63,7 @@ public:
css::uno::Reference< css::uno::XComponentContext > const & context):
cppu::PropertySetMixin< css::lang::XComponent >(
context, static_cast< Implements >(0),
- css::uno::Sequence< rtl::OUString >())
+ css::uno::Sequence< OUString >())
{}
virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type)
@@ -121,7 +121,7 @@ public:
static_cast< Implements >(
IMPLEMENTS_PROPERTY_SET | IMPLEMENTS_FAST_PROPERTY_SET
| IMPLEMENTS_PROPERTY_ACCESS),
- css::uno::Sequence< rtl::OUString >())
+ css::uno::Sequence< OUString >())
{}
virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type)
@@ -167,8 +167,8 @@ css::uno::Any Empty2::queryInterface(css::uno::Type const & type)
type);
}
-css::uno::Sequence< rtl::OUString > sequenceThird() {
- css::uno::Sequence<OUString> s { rtl::OUString("Third") };
+css::uno::Sequence< OUString > sequenceThird() {
+ css::uno::Sequence<OUString> s { OUString("Third") };
return s;
}
@@ -273,7 +273,7 @@ sal_Int32 Full::getFirst() throw (css::uno::RuntimeException) {
void Full::setFirst(sal_Int32 value) throw (css::uno::RuntimeException) {
prepareSet(
- rtl::OUString("First"), css::uno::Any(),
+ OUString("First"), css::uno::Any(),
css::uno::Any(), 0);
osl::MutexGuard g(m_mutex);
m_a1 = value;
@@ -302,7 +302,7 @@ void Full::setSecond(
}
BoundListeners l;
prepareSet(
- rtl::OUString("Second"), css::uno::Any(),
+ OUString("Second"), css::uno::Any(),
v, &l);
{
osl::MutexGuard g(m_mutex);
@@ -315,7 +315,7 @@ sal_Int32 Full::getThird()
throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
{
throw css::beans::UnknownPropertyException(
- rtl::OUString("Third"),
+ OUString("Third"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -323,7 +323,7 @@ void Full::setThird(sal_Int32)
throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
{
throw css::beans::UnknownPropertyException(
- rtl::OUString("Third"),
+ OUString("Third"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -331,7 +331,7 @@ sal_Int32 Full::getFourth()
throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
{
throw css::beans::UnknownPropertyException(
- rtl::OUString("Fourth"),
+ OUString("Fourth"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -339,7 +339,7 @@ void Full::setFourth(sal_Int32)
throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
{
throw css::beans::UnknownPropertyException(
- rtl::OUString("Fourth"),
+ OUString("Fourth"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -379,14 +379,14 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
return static_cast< cppu::OWeakObject * >(new Supplier(context));
}
-rtl::OUString SAL_CALL getImplementationName() {
- return rtl::OUString(
+OUString SAL_CALL getImplementationName() {
+ return OUString(
"test.cppuhelper.propertysetmixin.comp.CppSupplier");
}
-css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
+css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
{
- css::uno::Sequence< rtl::OUString > s { "test.cppuhelper.propertysetmixin.CppSupplier") };
+ css::uno::Sequence< OUString > s { "test.cppuhelper.propertysetmixin.CppSupplier") };
return s;
}
diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
index 5fa8cd1794ce..cff87436ce2c 100644
--- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
@@ -68,8 +68,8 @@ namespace com { namespace sun { namespace star {
namespace {
-std::ostream & operator <<(std::ostream & out, rtl::OUString const & value) {
- return out << rtl::OUStringToOString(value, RTL_TEXTENCODING_UTF8).getStr();
+std::ostream & operator <<(std::ostream & out, OUString const & value) {
+ return out << OUStringToOString(value, RTL_TEXTENCODING_UTF8).getStr();
}
std::ostream & operator <<(std::ostream & out, css::uno::Type const & value) {
@@ -254,34 +254,34 @@ void Test::testEmpty2(
static_cast< sal_Int32 >(0), info->getProperties().getLength());
try {
info->getPropertyByName(
- rtl::OUString("any"));
+ OUString("any"));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
CPPUNIT_ASSERT(
!info->hasPropertyByName(
- rtl::OUString("any")));
+ OUString("any")));
try {
empty2p->setPropertyValue(
- rtl::OUString("any"), css::uno::Any());
+ OUString("any"), css::uno::Any());
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
empty2p->getPropertyValue(
- rtl::OUString("any"));
+ OUString("any"));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
rtl::Reference< BoundListener > boundListener1(new BoundListener);
- empty2p->addPropertyChangeListener(rtl::OUString(), boundListener1.get());
- empty2p->addPropertyChangeListener(rtl::OUString(), boundListener1.get());
+ empty2p->addPropertyChangeListener(OUString(), boundListener1.get());
+ empty2p->addPropertyChangeListener(OUString(), boundListener1.get());
rtl::Reference< BoundListener > boundListener2(new BoundListener);
empty2p->removePropertyChangeListener(
- rtl::OUString(), boundListener2.get());
+ OUString(), boundListener2.get());
rtl::Reference< VetoListener > vetoListener1(new VetoListener);
- empty2p->addVetoableChangeListener(rtl::OUString(), vetoListener1.get());
- empty2p->addVetoableChangeListener(rtl::OUString(), vetoListener1.get());
+ empty2p->addVetoableChangeListener(OUString(), vetoListener1.get());
+ empty2p->addVetoableChangeListener(OUString(), vetoListener1.get());
rtl::Reference< VetoListener > vetoListener2(new VetoListener);
- empty2p->addVetoableChangeListener(rtl::OUString(), vetoListener2.get());
- empty2p->removeVetoableChangeListener(rtl::OUString(), vetoListener2.get());
+ empty2p->addVetoableChangeListener(OUString(), vetoListener2.get());
+ empty2p->removeVetoableChangeListener(OUString(), vetoListener2.get());
css::uno::Reference< css::beans::XFastPropertySet > empty2f(
empty2, css::uno::UNO_QUERY);
CPPUNIT_ASSERT(empty2f.is());
@@ -309,10 +309,10 @@ void Test::testEmpty2(
empty2a->setPropertyValues(
css::uno::Sequence< css::beans::PropertyValue >());
css::uno::Sequence< css::beans::PropertyValue > vs(2);
- vs[0].Name = rtl::OUString("any1");
+ vs[0].Name = OUString("any1");
vs[0].Handle = -1;
vs[0].State = css::beans::PropertyState_DIRECT_VALUE;
- vs[0].Name = rtl::OUString("any2");
+ vs[0].Name = OUString("any2");
vs[0].Handle = -1;
vs[0].State = css::beans::PropertyState_DIRECT_VALUE;
try {
@@ -329,23 +329,23 @@ void Test::testEmpty2(
CPPUNIT_ASSERT_EQUAL(2, vetoListener1->count());
CPPUNIT_ASSERT_EQUAL(0, vetoListener2->count());
empty2p->removePropertyChangeListener(
- rtl::OUString(), boundListener1.get());
+ OUString(), boundListener1.get());
empty2p->removePropertyChangeListener(
- rtl::OUString(), boundListener2.get());
- empty2p->removeVetoableChangeListener(rtl::OUString(), vetoListener1.get());
- empty2p->removeVetoableChangeListener(rtl::OUString(), vetoListener2.get());
- empty2p->addPropertyChangeListener(rtl::OUString(), boundListener1.get());
- empty2p->addPropertyChangeListener(rtl::OUString(), boundListener2.get());
- empty2p->addVetoableChangeListener(rtl::OUString(), vetoListener1.get());
- empty2p->addVetoableChangeListener(rtl::OUString(), vetoListener2.get());
+ OUString(), boundListener2.get());
+ empty2p->removeVetoableChangeListener(OUString(), vetoListener1.get());
+ empty2p->removeVetoableChangeListener(OUString(), vetoListener2.get());
+ empty2p->addPropertyChangeListener(OUString(), boundListener1.get());
+ empty2p->addPropertyChangeListener(OUString(), boundListener2.get());
+ empty2p->addVetoableChangeListener(OUString(), vetoListener1.get());
+ empty2p->addVetoableChangeListener(OUString(), vetoListener2.get());
try {
empty2p->addPropertyChangeListener(
- rtl::OUString(),
+ OUString(),
css::uno::Reference< css::beans::XPropertyChangeListener >());
} catch (css::uno::RuntimeException &) {}
try {
empty2p->addVetoableChangeListener(
- rtl::OUString(),
+ OUString(),
css::uno::Reference< css::beans::XVetoableChangeListener >());
} catch (css::uno::RuntimeException &) {}
CPPUNIT_ASSERT_EQUAL(3, boundListener1->count());
@@ -370,16 +370,16 @@ void Test::testFull(
static_cast< sal_Int32 >(3), info->getProperties().getLength());
css::beans::Property prop(
info->getPropertyByName(
- rtl::OUString("First")));
+ OUString("First")));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("First"), prop.Name);
+ OUString("First"), prop.Name);
CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), prop.Handle);
CPPUNIT_ASSERT_EQUAL(cppu::UnoType<sal_Int32>::get(), prop.Type);
CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int16 >(0), prop.Attributes);
prop = info->getPropertyByName(
- rtl::OUString("Second"));
+ OUString("Second"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("Second"), prop.Name);
+ OUString("Second"), prop.Name);
CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(1), prop.Handle);
CPPUNIT_ASSERT_EQUAL(cppu::UnoType<sal_Int32>::get(), prop.Type);
CPPUNIT_ASSERT_EQUAL(
@@ -393,13 +393,13 @@ void Test::testFull(
prop.Attributes);
try {
info->getPropertyByName(
- rtl::OUString("Third"));
+ OUString("Third"));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
prop = info->getPropertyByName(
- rtl::OUString("Fourth"));
+ OUString("Fourth"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("Fourth"), prop.Name);
+ OUString("Fourth"), prop.Name);
CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(3), prop.Handle);
CPPUNIT_ASSERT_EQUAL(cppu::UnoType<sal_Int32>::get(), prop.Type);
CPPUNIT_ASSERT_EQUAL(
@@ -407,93 +407,93 @@ void Test::testFull(
prop.Attributes);
try {
info->getPropertyByName(
- rtl::OUString("first"));
+ OUString("first"));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
CPPUNIT_ASSERT(
info->hasPropertyByName(
- rtl::OUString("First")));
+ OUString("First")));
CPPUNIT_ASSERT(
info->hasPropertyByName(
- rtl::OUString("Second")));
+ OUString("Second")));
CPPUNIT_ASSERT(
!info->hasPropertyByName(
- rtl::OUString("Third")));
+ OUString("Third")));
CPPUNIT_ASSERT(
info->hasPropertyByName(
- rtl::OUString("Fourth")));
+ OUString("Fourth")));
CPPUNIT_ASSERT(
!info->hasPropertyByName(
- rtl::OUString("first")));
+ OUString("first")));
CPPUNIT_ASSERT_EQUAL(
css::uno::Any(static_cast< sal_Int32 >(0)),
fullp->getPropertyValue(
- rtl::OUString("First")));
+ OUString("First")));
fullp->setPropertyValue(
- rtl::OUString("First"),
+ OUString("First"),
css::uno::Any(static_cast< sal_Int32 >(-100)));
CPPUNIT_ASSERT_EQUAL(
css::uno::Any(static_cast< sal_Int32 >(-100)),
fullp->getPropertyValue(
- rtl::OUString("First")));
+ OUString("First")));
css::uno::Any voidAny;
CPPUNIT_ASSERT_EQUAL(
voidAny,
fullp->getPropertyValue(
- rtl::OUString("Second")));
+ OUString("Second")));
fullp->setPropertyValue(
- rtl::OUString("Second"),
+ OUString("Second"),
css::uno::Any(static_cast< sal_Int32 >(100)));
CPPUNIT_ASSERT_EQUAL(
css::uno::Any(static_cast< sal_Int32 >(100)),
fullp->getPropertyValue(
- rtl::OUString("Second")));
+ OUString("Second")));
CPPUNIT_ASSERT(full->getSecond().Value.Value.IsPresent);
CPPUNIT_ASSERT_EQUAL(
static_cast< sal_Int32 >(100), full->getSecond().Value.Value.Value);
CPPUNIT_ASSERT(!full->getSecond().Value.IsDefaulted);
CPPUNIT_ASSERT(!full->getSecond().IsAmbiguous);
fullp->setPropertyValue(
- rtl::OUString("Second"),
+ OUString("Second"),
css::uno::Any());
CPPUNIT_ASSERT_EQUAL(
voidAny,
fullp->getPropertyValue(
- rtl::OUString("Second")));
+ OUString("Second")));
CPPUNIT_ASSERT(!full->getSecond().Value.Value.IsPresent);
CPPUNIT_ASSERT(!full->getSecond().Value.IsDefaulted);
CPPUNIT_ASSERT(!full->getSecond().IsAmbiguous);
try {
fullp->setPropertyValue(
- rtl::OUString("Third"),
+ OUString("Third"),
css::uno::Any(static_cast< sal_Int32 >(100)));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->getPropertyValue(
- rtl::OUString("Third"));
+ OUString("Third"));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->setPropertyValue(
- rtl::OUString("Fourth"),
+ OUString("Fourth"),
css::uno::Any(static_cast< sal_Int32 >(100)));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->getPropertyValue(
- rtl::OUString("Fourth"));
+ OUString("Fourth"));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->setPropertyValue(
- rtl::OUString("first"),
+ OUString("first"),
css::uno::Any());
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->getPropertyValue(
- rtl::OUString("first"));
+ OUString("first"));
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
css::uno::Reference< css::beans::XFastPropertySet > fullf(
@@ -520,13 +520,13 @@ void Test::testFull(
fulla->getPropertyValues());
CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(2), vs.getLength());
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("First"), vs[0].Name);
+ OUString("First"), vs[0].Name);
CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), vs[0].Handle);
CPPUNIT_ASSERT_EQUAL(
css::uno::Any(static_cast< sal_Int32 >(0)), vs[0].Value);
CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[0].State);
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("Second"), vs[1].Name);
+ OUString("Second"), vs[1].Name);
CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(1), vs[1].Handle);
CPPUNIT_ASSERT_EQUAL(voidAny, vs[1].Value);
CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[1].State);
@@ -537,12 +537,12 @@ void Test::testFull(
vs = fulla->getPropertyValues();
CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(2), vs.getLength());
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("First"), vs[0].Name);
+ OUString("First"), vs[0].Name);
CPPUNIT_ASSERT_EQUAL(
css::uno::Any(static_cast< sal_Int32 >(-100)), vs[0].Value);
CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[0].State);
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("Second"), vs[1].Name);
+ OUString("Second"), vs[1].Name);
CPPUNIT_ASSERT_EQUAL(
css::uno::Any(static_cast< sal_Int32 >(100)), vs[1].Value);
CPPUNIT_ASSERT_EQUAL(
@@ -555,76 +555,76 @@ void Test::testFull(
css::uno::Reference< css::beans::XPropertyChangeListener > boundListener(
new BoundListener);
fullp->addPropertyChangeListener(
- rtl::OUString("First"), boundListener);
+ OUString("First"), boundListener);
fullp->removePropertyChangeListener(
- rtl::OUString("First"), boundListener);
+ OUString("First"), boundListener);
fullp->addPropertyChangeListener(
- rtl::OUString("Second"), boundListener);
+ OUString("Second"), boundListener);
fullp->removePropertyChangeListener(
- rtl::OUString("Second"), boundListener);
+ OUString("Second"), boundListener);
try {
fullp->addPropertyChangeListener(
- rtl::OUString("Third"),
+ OUString("Third"),
boundListener);
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->removePropertyChangeListener(
- rtl::OUString("Third"),
+ OUString("Third"),
boundListener);
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
fullp->addPropertyChangeListener(
- rtl::OUString("Fourth"), boundListener);
+ OUString("Fourth"), boundListener);
fullp->removePropertyChangeListener(
- rtl::OUString("Fourth"), boundListener);
+ OUString("Fourth"), boundListener);
try {
fullp->addPropertyChangeListener(
- rtl::OUString("Fifth"),
+ OUString("Fifth"),
boundListener);
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->removePropertyChangeListener(
- rtl::OUString("Fifth"),
+ OUString("Fifth"),
boundListener);
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
css::uno::Reference< css::beans::XVetoableChangeListener > vetoListener(
new VetoListener);
fullp->addVetoableChangeListener(
- rtl::OUString("First"), vetoListener);
+ OUString("First"), vetoListener);
fullp->removeVetoableChangeListener(
- rtl::OUString("First"), vetoListener);
+ OUString("First"), vetoListener);
fullp->addVetoableChangeListener(
- rtl::OUString("Second"), vetoListener);
+ OUString("Second"), vetoListener);
fullp->removeVetoableChangeListener(
- rtl::OUString("Second"), vetoListener);
+ OUString("Second"), vetoListener);
try {
fullp->addVetoableChangeListener(
- rtl::OUString("Third"),
+ OUString("Third"),
vetoListener);
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->removeVetoableChangeListener(
- rtl::OUString("Third"),
+ OUString("Third"),
vetoListener);
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
fullp->addVetoableChangeListener(
- rtl::OUString("Fourth"), vetoListener);
+ OUString("Fourth"), vetoListener);
fullp->removeVetoableChangeListener(
- rtl::OUString("Fourth"), vetoListener);
+ OUString("Fourth"), vetoListener);
try {
fullp->addVetoableChangeListener(
- rtl::OUString("Fifth"),
+ OUString("Fifth"),
vetoListener);
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
try {
fullp->removeVetoableChangeListener(
- rtl::OUString("Fifth"),
+ OUString("Fifth"),
vetoListener);
CPPUNIT_FAIL("exception expected");
} catch (css::beans::UnknownPropertyException &) {}
diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx
index c9883993f37a..90f193620d87 100644
--- a/cppuhelper/qa/unourl/cppu_unourl.cxx
+++ b/cppuhelper/qa/unourl/cppu_unourl.cxx
@@ -75,7 +75,7 @@ namespace cppu_unourl
bool bValid = false;
try
{
- cppu::UnoUrlDescriptor aDescriptor(rtl::OUString::createFromAscii(
+ cppu::UnoUrlDescriptor aDescriptor(OUString::createFromAscii(
aTests[i].pInput));
(void)aDescriptor;
bValid = true;
@@ -123,10 +123,10 @@ namespace cppu_unourl
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
{
bool bValid = false;
- rtl::OUString aDescriptor;
+ OUString aDescriptor;
try
{
- aDescriptor = cppu::UnoUrlDescriptor(rtl::OUString::createFromAscii(
+ aDescriptor = cppu::UnoUrlDescriptor(OUString::createFromAscii(
aTests[i].pInput)).
getDescriptor();
bValid = true;
@@ -171,10 +171,10 @@ namespace cppu_unourl
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
{
bool bValid = false;
- rtl::OUString aName;
+ OUString aName;
try
{
- aName = cppu::UnoUrlDescriptor(rtl::OUString::createFromAscii(
+ aName = cppu::UnoUrlDescriptor(OUString::createFromAscii(
aTests[i].pInput)).getName();
bValid = true;
}
@@ -219,9 +219,9 @@ namespace cppu_unourl
bool bPresent = false;
try
{
- bPresent = cppu::UnoUrlDescriptor(rtl::OUString::createFromAscii(
+ bPresent = cppu::UnoUrlDescriptor(OUString::createFromAscii(
aTests[i].pInput)).
- hasParameter(rtl::OUString::createFromAscii(aTests[i].pKey));
+ hasParameter(OUString::createFromAscii(aTests[i].pKey));
bValid = true;
}
catch (rtl::MalformedUriException &)
@@ -286,12 +286,12 @@ namespace cppu_unourl
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
{
bool bValid = false;
- rtl::OUString aValue;
+ OUString aValue;
try
{
- aValue = cppu::UnoUrlDescriptor(rtl::OUString::createFromAscii(
+ aValue = cppu::UnoUrlDescriptor(OUString::createFromAscii(
aTests[i].pInput)).
- getParameter(rtl::OUString::createFromAscii(aTests[i].pKey));
+ getParameter(OUString::createFromAscii(aTests[i].pKey));
bValid = true;
}
catch (rtl::MalformedUriException &)
@@ -331,7 +331,7 @@ namespace cppu_unourl
bool bValid = false;
try
{
- cppu::UnoUrl aUrl(rtl::OUString::createFromAscii(aTests[i].pInput));
+ cppu::UnoUrl aUrl(OUString::createFromAscii(aTests[i].pInput));
(void)aUrl;
bValid = true;
}
@@ -367,10 +367,10 @@ namespace cppu_unourl
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
{
bool bValid = false;
- rtl::OUString aConnection;
+ OUString aConnection;
try
{
- aConnection = cppu::UnoUrl(rtl::OUString::createFromAscii(
+ aConnection = cppu::UnoUrl(OUString::createFromAscii(
aTests[i].pInput)).
getConnection().getDescriptor();
bValid = true;
@@ -401,10 +401,10 @@ namespace cppu_unourl
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
{
bool bValid = false;
- rtl::OUString aProtocol;
+ OUString aProtocol;
try
{
- aProtocol = cppu::UnoUrl(rtl::OUString::createFromAscii(
+ aProtocol = cppu::UnoUrl(OUString::createFromAscii(
aTests[i].pInput)).
getProtocol().getDescriptor();
bValid = true;
@@ -438,10 +438,10 @@ namespace cppu_unourl
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
{
bool bValid = false;
- rtl::OUString aObjectName;
+ OUString aObjectName;
try
{
- aObjectName = cppu::UnoUrl(rtl::OUString::createFromAscii(
+ aObjectName = cppu::UnoUrl(OUString::createFromAscii(
aTests[i].pInput)).getObjectName();
bValid = true;
}
diff --git a/cppuhelper/source/access_control.cxx b/cppuhelper/source/access_control.cxx
index 164db03314eb..6af654408ed0 100644
--- a/cppuhelper/source/access_control.cxx
+++ b/cppuhelper/source/access_control.cxx
@@ -30,8 +30,6 @@ using namespace ::osl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using rtl::OUString;
-
namespace
{
OUString str_ac_singleton()
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index c16d90681ab4..1eb11bfb486e 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -48,7 +48,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using rtl::Bootstrap;
-using rtl::OUString;
namespace cppu
{
@@ -57,7 +56,7 @@ BootstrapException::BootstrapException()
{
}
-BootstrapException::BootstrapException( const ::rtl::OUString & rMessage )
+BootstrapException::BootstrapException( const OUString & rMessage )
:m_aMessage( rMessage )
{
}
@@ -77,7 +76,7 @@ BootstrapException & BootstrapException::operator=( const BootstrapException & e
return *this;
}
-const ::rtl::OUString & BootstrapException::getMessage() const
+const OUString & BootstrapException::getMessage() const
{
return m_aMessage;
}
@@ -93,7 +92,7 @@ Reference< XComponentContext > SAL_CALL bootstrap()
throw BootstrapException(
"no soffice installation found!");
}
- rtl::OUString p2;
+ OUString p2;
#if defined(_WIN32)
p2 = o3tl::toU(p1);
free(p1);
@@ -148,7 +147,7 @@ Reference< XComponentContext > SAL_CALL bootstrap()
!= rtl_Random_E_None )
throw BootstrapException( "random pool error!" );
rtl_random_destroyPool( hPool );
- ::rtl::OUStringBuffer buf("uno");
+ OUStringBuffer buf("uno");
for (unsigned char byte : bytes)
buf.append( static_cast< sal_Int32 >( byte ) );
OUString sPipeName( buf.makeStringAndClear() );
diff --git a/cppuhelper/source/compat.cxx b/cppuhelper/source/compat.cxx
index 50e19bfa5b8e..a019626f4a6a 100644
--- a/cppuhelper/source/compat.cxx
+++ b/cppuhelper/source/compat.cxx
@@ -51,7 +51,7 @@ namespace cppu {
SAL_DLLPUBLIC_EXPORT
css::uno::Reference< css::lang::XMultiComponentFactory > bootstrapInitialSF(
- rtl::OUString const &)
+ OUString const &)
{
for (;;) { std::abort(); } // avoid "must return a value" warnings
}
@@ -59,55 +59,55 @@ css::uno::Reference< css::lang::XMultiComponentFactory > bootstrapInitialSF(
SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::uno::XComponentContext > SAL_CALL
bootstrap_InitialComponentContext(
css::uno::Reference< css::registry::XSimpleRegistry > const &,
- rtl::OUString const &)
+ OUString const &)
{
for (;;) { std::abort(); } // avoid "must return a value" warnings
}
SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::registry::XSimpleRegistry >
-SAL_CALL createNestedRegistry(rtl::OUString const &) {
+SAL_CALL createNestedRegistry(OUString const &) {
for (;;) { std::abort(); } // avoid "must return a value" warnings
}
SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::lang::XMultiServiceFactory >
SAL_CALL createRegistryServiceFactory(
- rtl::OUString const &, rtl::OUString const &, sal_Bool,
- rtl::OUString const &)
+ OUString const &, OUString const &, sal_Bool,
+ OUString const &)
{
for (;;) { std::abort(); } // avoid "must return a value" warnings
}
SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::registry::XSimpleRegistry >
-SAL_CALL createSimpleRegistry(rtl::OUString const &) {
+SAL_CALL createSimpleRegistry(OUString const &) {
for (;;) { std::abort(); } // avoid "must return a value" warnings
}
SAL_DLLPUBLIC_EXPORT css::reflection::XIdlClass * SAL_CALL
createStandardClassWithSequence(
css::uno::Reference< css::lang::XMultiServiceFactory > const &,
- rtl::OUString const &,
+ OUString const &,
css::uno::Reference< css::reflection::XIdlClass > const &,
- css::uno::Sequence< rtl::OUString > const &)
+ css::uno::Sequence< OUString > const &)
{
for (;;) { std::abort(); } // avoid "must return a value" warnings
}
SAL_DLLPUBLIC_EXPORT css::uno::Reference<css::uno::XInterface> SAL_CALL
invokeStaticComponentFactory(
- oslGenericFunction, rtl::OUString const &,
+ oslGenericFunction, OUString const &,
css::uno::Reference<css::lang::XMultiServiceFactory> const &,
css::uno::Reference<css::registry::XRegistryKey> const &,
- rtl::OUString const &)
+ OUString const &)
{
for (;;) { std::abort(); } // avoid "must return a value" warnings
}
SAL_DLLPUBLIC_EXPORT css::uno::Reference<css::uno::XInterface> SAL_CALL
loadSharedLibComponentFactory(
- rtl::OUString const &, rtl::OUString const &, rtl::OUString const &,
+ OUString const &, OUString const &, OUString const &,
css::uno::Reference<css::lang::XMultiServiceFactory> const &,
css::uno::Reference<css::registry::XRegistryKey> const &,
- rtl::OUString const &)
+ OUString const &)
{
for (;;) { std::abort(); } // avoid "must return a value" warnings
}
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index c9bd6a4a9b28..02019d53f254 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -32,9 +32,6 @@ using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using ::rtl::OString;
-using ::rtl::OUStringToOString;
-
namespace cppu
{
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 62839c64d491..b64d8b624849 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -53,9 +53,6 @@ using namespace ::osl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
-using rtl::OUString;
-using rtl::OUStringBuffer;
-
namespace cppu
{
diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index 9f67fc8d3dd1..945268bf6444 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -23,8 +23,6 @@
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
-using rtl::OUString;
-
#include "macro_expander.hxx"
#include "paths.hxx"
#include "servicemanager.hxx"
@@ -32,10 +30,10 @@ using rtl::OUString;
namespace {
-rtl::OUString getBootstrapVariable(
- rtl::Bootstrap const & bootstrap, rtl::OUString const & name)
+OUString getBootstrapVariable(
+ rtl::Bootstrap const & bootstrap, OUString const & name)
{
- rtl::OUString v;
+ OUString v;
if (!bootstrap.getFrom(name, v)) {
throw css::uno::DeploymentException(
"Cannot obtain " + name + " from uno ini");
@@ -46,7 +44,7 @@ rtl::OUString getBootstrapVariable(
}
css::uno::Reference< css::uno::XComponentContext >
-cppu::defaultBootstrap_InitialComponentContext(rtl::OUString const & iniUri)
+cppu::defaultBootstrap_InitialComponentContext(OUString const & iniUri)
{
rtl::Bootstrap bs(iniUri);
if (bs.getHandle() == nullptr) {
@@ -83,12 +81,12 @@ cppu::defaultBootstrap_InitialComponentContext(rtl::OUString const & iniUri)
context_values.push_back(
cppu::ContextEntry_Init(
"/services/com.sun.star.security.AccessController/mode",
- css::uno::Any(rtl::OUString("off")), false));
+ css::uno::Any(OUString("off")), false));
context_values.push_back(
cppu::ContextEntry_Init(
"/singletons/com.sun.star.security.theAccessController",
css::uno::Any(
- rtl::OUString("com.sun.star.security.AccessController")),
+ OUString("com.sun.star.security.AccessController")),
true));
assert(!context_values.empty());
css::uno::Reference< css::uno::XComponentContext > context(
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index ee08c612e4e1..97eb8f851077 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -54,8 +54,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::loader;
using namespace com::sun::star::registry;
-using ::rtl::OUString;
-
namespace cppu
{
diff --git a/cppuhelper/source/gcc3.map b/cppuhelper/source/gcc3.map
index f1537e874020..d5af50655c1a 100644
--- a/cppuhelper/source/gcc3.map
+++ b/cppuhelper/source/gcc3.map
@@ -384,7 +384,7 @@ UDK_3.3 { # OOo 2.3
UDK_3.4 { # OOo 2.4
global:
- _ZN4cppu19bootstrap_expandUriERKN3rtl8OUStringE; # rtl::OUString cppu::bootstrap_expandUri(rtl::OUString const &)
+ _ZN4cppu19bootstrap_expandUriERKN3rtl8OUStringE; # OUString cppu::bootstrap_expandUri(OUString const &)
} UDK_3.3;
UDK_3.5 { # OOo 3.0
@@ -427,7 +427,7 @@ global:
LIBO_UDK_3.9 { # LibO 3.7
global:
- _ZN4cppu15supportsServiceEPN3com3sun4star4lang12XServiceInfoERKN3rtl8OUStringE; # cppu::supportsService(com::sun::star::lang::XServiceInfo*, rtl::OUString const&)
+ _ZN4cppu15supportsServiceEPN3com3sun4star4lang12XServiceInfoERKN3rtl8OUStringE; # cppu::supportsService(com::sun::star::lang::XServiceInfo*, OUString const&)
} UDK_3.8;
LIBO_UDK_5.3 { # LibO 5.3
diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx
index c0f5477d2029..4372630a81a4 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/cppuhelper/source/implbase_ex.cxx
@@ -35,8 +35,6 @@ using namespace ::osl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using rtl::OUString;
-
namespace
{
class theImplHelperInitMutex : public rtl::Static<Mutex, theImplHelperInitMutex>{};
diff --git a/cppuhelper/source/implementationentry.cxx b/cppuhelper/source/implementationentry.cxx
index bd4ce00ffcc7..466d766558af 100644
--- a/cppuhelper/source/implementationentry.cxx
+++ b/cppuhelper/source/implementationentry.cxx
@@ -27,8 +27,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-using rtl::OUString;
-
namespace cppu {
sal_Bool component_writeInfoHelper(
diff --git a/cppuhelper/source/loadsharedlibcomponentfactory.hxx b/cppuhelper/source/loadsharedlibcomponentfactory.hxx
index df6e2269e381..f496d61e687f 100644
--- a/cppuhelper/source/loadsharedlibcomponentfactory.hxx
+++ b/cppuhelper/source/loadsharedlibcomponentfactory.hxx
@@ -28,12 +28,12 @@ namespace rtl { class OUString; }
namespace cppuhelper { namespace detail {
css::uno::Environment getEnvironment(
- rtl::OUString const & name, rtl::OUString const & implementation);
+ OUString const & name, OUString const & implementation);
void loadSharedLibComponentFactory(
- rtl::OUString const & uri, rtl::OUString const & environment,
- rtl::OUString const & prefix, rtl::OUString const & implementation,
- rtl::OUString const & constructor,
+ OUString const & uri, OUString const & environment,
+ OUString const & prefix, OUString const & implementation,
+ OUString const & constructor,
css::uno::Reference<css::lang::XMultiServiceFactory> const & serviceManager,
WrapperConstructorFn * constructorFunction,
css::uno::Reference<css::uno::XInterface> * factory);
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 2b8d5407ce81..7d9b763aac05 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -45,7 +45,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using rtl::Bootstrap;
-using rtl::OUString;
namespace cppu
{
@@ -76,8 +75,8 @@ static Bootstrap const & get_unorc()
namespace cppuhelper { namespace detail {
-rtl::OUString expandMacros(rtl::OUString const & text) {
- rtl::OUString t(text);
+OUString expandMacros(OUString const & text) {
+ OUString t(text);
rtl_bootstrap_expandMacros_from_handle(
cppu::get_unorc().getHandle(), &t.pData);
return t;
diff --git a/cppuhelper/source/macro_expander.hxx b/cppuhelper/source/macro_expander.hxx
index 275fa1c4a57b..dc753de9663a 100644
--- a/cppuhelper/source/macro_expander.hxx
+++ b/cppuhelper/source/macro_expander.hxx
@@ -49,7 +49,7 @@ namespace detail {
* If uriReference is a vnd.sun.star.expand URL reference that contains unknown
* macros.
*/
-::rtl::OUString expandMacros(rtl::OUString const & text);
+OUString expandMacros(OUString const & text);
css::uno::Reference< css::lang::XSingleComponentFactory >
create_bootstrap_macro_expander_factory();
diff --git a/cppuhelper/source/paths.cxx b/cppuhelper/source/paths.cxx
index 38584b38ee4d..6b7dcd443038 100644
--- a/cppuhelper/source/paths.cxx
+++ b/cppuhelper/source/paths.cxx
@@ -37,10 +37,10 @@
namespace {
#ifndef ANDROID
-rtl::OUString get_this_libpath() {
- static rtl::OUString s_uri;
+OUString get_this_libpath() {
+ static OUString s_uri;
if (s_uri.isEmpty()) {
- rtl::OUString uri;
+ OUString uri;
osl::Module::getUrlFromAddress(
reinterpret_cast< oslGenericFunction >(get_this_libpath), uri);
sal_Int32 i = uri.lastIndexOf('/');
@@ -59,7 +59,7 @@ rtl::OUString get_this_libpath() {
#endif
}
-rtl::OUString cppu::getUnoIniUri() {
+OUString cppu::getUnoIniUri() {
#if defined ANDROID
// Wouldn't it be lovely to avoid this ugly hard-coding.
// The problem is that the 'create_bootstrap_macro_expander_factory()'
@@ -68,9 +68,9 @@ rtl::OUString cppu::getUnoIniUri() {
// defaultBootstrap_InitialComponentContext
// and since rtlBootstrapHandle is not ref-counted doing anything
// clean here is hardish.
- rtl::OUString uri("file:///assets/program");
+ OUString uri("file:///assets/program");
#else
- rtl::OUString uri(get_this_libpath());
+ OUString uri(get_this_libpath());
#ifdef MACOSX
// We keep both the LO and URE dylibs directly in "Frameworks"
// (that is, LIBO_LIB_FOLDER) and rc files in "Resources"
@@ -88,7 +88,7 @@ rtl::OUString cppu::getUnoIniUri() {
return uri + "/" SAL_CONFIGFILE("uno");
}
-bool cppu::nextDirectoryItem(osl::Directory & directory, rtl::OUString * url) {
+bool cppu::nextDirectoryItem(osl::Directory & directory, OUString * url) {
assert(url != nullptr);
for (;;) {
osl::DirectoryItem i;
@@ -110,7 +110,7 @@ bool cppu::nextDirectoryItem(osl::Directory & directory, rtl::OUString * url) {
}
if (stat.getFileType() != osl::FileStatus::Directory) { //TODO: symlinks
// Ignore backup files:
- rtl::OUString name(stat.getFileName());
+ OUString name(stat.getFileName());
if (!(name.match(".") || name.endsWith("~"))) {
*url = stat.getFileURL();
return true;
@@ -119,7 +119,7 @@ bool cppu::nextDirectoryItem(osl::Directory & directory, rtl::OUString * url) {
}
}
-void cppu::decodeRdbUri(rtl::OUString * uri, bool * optional, bool * directory)
+void cppu::decodeRdbUri(OUString * uri, bool * optional, bool * directory)
{
assert(uri != nullptr && optional != nullptr && directory != nullptr);
if(!(uri->isEmpty()))
diff --git a/cppuhelper/source/paths.hxx b/cppuhelper/source/paths.hxx
index b7fde71d0726..f757d906b171 100644
--- a/cppuhelper/source/paths.hxx
+++ b/cppuhelper/source/paths.hxx
@@ -27,11 +27,11 @@ namespace rtl { class OUString; }
namespace cppu {
-rtl::OUString getUnoIniUri();
+OUString getUnoIniUri();
-bool nextDirectoryItem(osl::Directory & directory, rtl::OUString * url);
+bool nextDirectoryItem(osl::Directory & directory, OUString * url);
-void decodeRdbUri(rtl::OUString * uri, bool * optional, bool * directory);
+void decodeRdbUri(OUString * uri, bool * optional, bool * directory);
}
diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx
index 0c4898fb00df..d04119cafe5b 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -90,29 +90,29 @@ struct PropertyData {
};
struct Data: public salhelper::SimpleReferenceObject {
- typedef std::map< rtl::OUString, PropertyData > PropertyMap;
+ typedef std::map< OUString, PropertyData > PropertyMap;
PropertyMap properties;
PropertyMap::const_iterator get(
css::uno::Reference< css::uno::XInterface > const & object,
- rtl::OUString const & name) const;
+ OUString const & name) const;
protected:
void initProperties(
css::uno::Reference< css::reflection::XTypeDescription > const & type,
- css::uno::Sequence< rtl::OUString > const & absentOptional,
- std::vector< rtl::OUString > * handleNames)
+ css::uno::Sequence< OUString > const & absentOptional,
+ std::vector< OUString > * handleNames)
{
- std::set<rtl::OUString> seen;
+ std::set<OUString> seen;
initProperties(type, absentOptional, handleNames, &seen);
}
private:
void initProperties(
css::uno::Reference< css::reflection::XTypeDescription > const & type,
- css::uno::Sequence< rtl::OUString > const & absentOptional,
- std::vector< rtl::OUString > * handleNames, std::set<rtl::OUString> * seen);
+ css::uno::Sequence< OUString > const & absentOptional,
+ std::vector< OUString > * handleNames, std::set<OUString> * seen);
static css::uno::Reference< css::reflection::XTypeDescription >
resolveTypedefs(
@@ -121,7 +121,7 @@ private:
Data::PropertyMap::const_iterator Data::get(
css::uno::Reference< css::uno::XInterface > const & object,
- rtl::OUString const & name) const
+ OUString const & name) const
{
PropertyMap::const_iterator i(properties.find(name));
if (i == properties.end() || !i->second.present) {
@@ -132,8 +132,8 @@ Data::PropertyMap::const_iterator Data::get(
void Data::initProperties(
css::uno::Reference< css::reflection::XTypeDescription > const & type,
- css::uno::Sequence< rtl::OUString > const & absentOptional,
- std::vector< rtl::OUString > * handleNames, std::set<rtl::OUString> * seen)
+ css::uno::Sequence< OUString > const & absentOptional,
+ std::vector< OUString > * handleNames, std::set<OUString> * seen)
{
css::uno::Reference< css::reflection::XInterfaceTypeDescription2 > ifc(
resolveTypedefs(type), css::uno::UNO_QUERY_THROW);
@@ -148,8 +148,8 @@ void Data::initProperties(
css::uno::Reference<
css::reflection::XInterfaceMemberTypeDescription > > members(
ifc->getMembers());
- rtl::OUString const * absentBegin = absentOptional.getConstArray();
- rtl::OUString const * absentEnd =
+ OUString const * absentBegin = absentOptional.getConstArray();
+ OUString const * absentEnd =
absentBegin + absentOptional.getLength();
for (sal_Int32 i = 0; i < members.getLength(); ++i) {
if (members[i]->getTypeClass()
@@ -234,13 +234,13 @@ void Data::initProperties(
}
t = args[0];
}
- std::vector< rtl::OUString >::size_type handles
+ std::vector< OUString >::size_type handles
= handleNames->size();
if (handles > SAL_MAX_INT32) {
throw css::uno::RuntimeException(
"interface type has too many attributes");
}
- rtl::OUString name(members[i]->getMemberName());
+ OUString name(members[i]->getMemberName());
if (!properties.emplace(
name,
PropertyData(
@@ -280,9 +280,9 @@ public:
virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() override;
virtual css::beans::Property SAL_CALL getPropertyByName(
- rtl::OUString const & name) override;
+ OUString const & name) override;
- virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & name) override;
+ virtual sal_Bool SAL_CALL hasPropertyByName(OUString const & name) override;
private:
rtl::Reference< Data > m_data;
@@ -305,13 +305,13 @@ css::uno::Sequence< css::beans::Property > Info::getProperties()
return s;
}
-css::beans::Property Info::getPropertyByName(rtl::OUString const & name)
+css::beans::Property Info::getPropertyByName(OUString const & name)
{
return m_data->get(static_cast< cppu::OWeakObject * >(this), name)->
second.property;
}
-sal_Bool Info::hasPropertyByName(rtl::OUString const & name)
+sal_Bool Info::hasPropertyByName(OUString const & name)
{
Data::PropertyMap::iterator i(m_data->properties.find(name));
return i != m_data->properties.end() && i->second.present;
@@ -359,33 +359,33 @@ public:
Impl(
css::uno::Reference< css::uno::XComponentContext > const & context,
Implements theImplements,
- css::uno::Sequence< rtl::OUString > const & absentOptional,
+ css::uno::Sequence< OUString > const & absentOptional,
css::uno::Type const & type);
- rtl::OUString const & translateHandle(
+ OUString const & translateHandle(
css::uno::Reference< css::uno::XInterface > const & object,
sal_Int32 handle) const;
void setProperty(
css::uno::Reference< css::uno::XInterface > const & object,
- rtl::OUString const & name, css::uno::Any const & value,
+ OUString const & name, css::uno::Any const & value,
bool isAmbiguous, bool isDefaulted, sal_Int16 illegalArgumentPosition)
const;
css::uno::Any getProperty(
css::uno::Reference< css::uno::XInterface > const & object,
- rtl::OUString const & name, css::beans::PropertyState * state) const;
+ OUString const & name, css::beans::PropertyState * state) const;
PropertySetMixinImpl::Implements implements;
- css::uno::Sequence< rtl::OUString > handleMap;
+ css::uno::Sequence< OUString > handleMap;
- typedef std::map< rtl::OUString, BoundListenerBag > BoundListenerMap;
+ typedef std::map< OUString, BoundListenerBag > BoundListenerMap;
typedef
std::multiset< css::uno::Reference< css::beans::XVetoableChangeListener > >
VetoListenerBag;
- typedef std::map< rtl::OUString, VetoListenerBag > VetoListenerMap;
+ typedef std::map< OUString, VetoListenerBag > VetoListenerMap;
mutable osl::Mutex mutex;
BoundListenerMap boundListeners;
@@ -394,7 +394,7 @@ public:
private:
css::uno::Reference< css::reflection::XIdlClass > getReflection(
- rtl::OUString const & typeName) const;
+ OUString const & typeName) const;
static css::uno::Any wrapValue(
css::uno::Reference< css::uno::XInterface > const & object,
@@ -411,7 +411,7 @@ private:
PropertySetMixinImpl::Impl::Impl(
css::uno::Reference< css::uno::XComponentContext > const & context,
Implements theImplements,
- css::uno::Sequence< rtl::OUString > const & absentOptional,
+ css::uno::Sequence< OUString > const & absentOptional,
css::uno::Type const & type):
implements(theImplements), disposed(false), m_context(context),
m_type(type)
@@ -440,28 +440,28 @@ PropertySetMixinImpl::Impl::Impl(
+ e.Message,
nullptr, anyEx );
}
- std::vector< rtl::OUString > handleNames;
+ std::vector< OUString > handleNames;
initProperties(ifc, absentOptional, &handleNames);
- std::vector< rtl::OUString >::size_type size = handleNames.size();
+ std::vector< OUString >::size_type size = handleNames.size();
assert(size <= SAL_MAX_INT32);
handleMap.realloc(static_cast< sal_Int32 >(size));
std::copy(handleNames.begin(), handleNames.end(), handleMap.getArray());
}
-rtl::OUString const & PropertySetMixinImpl::Impl::translateHandle(
+OUString const & PropertySetMixinImpl::Impl::translateHandle(
css::uno::Reference< css::uno::XInterface > const & object,
sal_Int32 handle) const
{
if (handle < 0 || handle >= handleMap.getLength()) {
throw css::beans::UnknownPropertyException(
- "bad handle " + rtl::OUString::number(handle), object);
+ "bad handle " + OUString::number(handle), object);
}
return handleMap[handle];
}
void PropertySetMixinImpl::Impl::setProperty(
css::uno::Reference< css::uno::XInterface > const & object,
- rtl::OUString const & name, css::uno::Any const & value, bool isAmbiguous,
+ OUString const & name, css::uno::Any const & value, bool isAmbiguous,
bool isDefaulted, sal_Int16 illegalArgumentPosition) const
{
PropertyMap::const_iterator i(properties.find(name));
@@ -553,7 +553,7 @@ void PropertySetMixinImpl::Impl::setProperty(
css::uno::Any PropertySetMixinImpl::Impl::getProperty(
css::uno::Reference< css::uno::XInterface > const & object,
- rtl::OUString const & name, css::beans::PropertyState * state) const
+ OUString const & name, css::beans::PropertyState * state) const
{
PropertyMap::const_iterator i(properties.find(name));
if (i == properties.end()) {
@@ -710,7 +710,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
}
css::uno::Reference< css::reflection::XIdlClass >
-PropertySetMixinImpl::Impl::getReflection(rtl::OUString const & typeName) const
+PropertySetMixinImpl::Impl::getReflection(OUString const & typeName) const
{
return css::uno::Reference< css::reflection::XIdlClass >(
css::reflection::theCoreReflection::get(m_context)->forName(typeName),
@@ -832,7 +832,7 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue(
PropertySetMixinImpl::PropertySetMixinImpl(
css::uno::Reference< css::uno::XComponentContext > const & context,
Implements implements,
- css::uno::Sequence< rtl::OUString > const & absentOptional,
+ css::uno::Sequence< OUString > const & absentOptional,
css::uno::Type const & type)
{
m_impl = new Impl(context, implements, absentOptional, type);
@@ -843,7 +843,7 @@ PropertySetMixinImpl::~PropertySetMixinImpl() {
m_impl->release();
}
-void PropertySetMixinImpl::checkUnknown(rtl::OUString const & propertyName) {
+void PropertySetMixinImpl::checkUnknown(OUString const & propertyName) {
if (!propertyName.isEmpty()) {
m_impl->get(
static_cast< css::beans::XPropertySet * >(this), propertyName);
@@ -851,7 +851,7 @@ void PropertySetMixinImpl::checkUnknown(rtl::OUString const & propertyName) {
}
void PropertySetMixinImpl::prepareSet(
- rtl::OUString const & propertyName, css::uno::Any const & oldValue,
+ OUString const & propertyName, css::uno::Any const & oldValue,
css::uno::Any const & newValue, BoundListeners * boundListeners)
{
Impl::PropertyMap::const_iterator it(m_impl->properties.find(propertyName));
@@ -990,7 +990,7 @@ PropertySetMixinImpl::getPropertySetInfo()
}
void PropertySetMixinImpl::setPropertyValue(
- rtl::OUString const & propertyName, css::uno::Any const & value)
+ OUString const & propertyName, css::uno::Any const & value)
{
m_impl->setProperty(
static_cast< css::beans::XPropertySet * >(this), propertyName, value,
@@ -998,14 +998,14 @@ void PropertySetMixinImpl::setPropertyValue(
}
css::uno::Any PropertySetMixinImpl::getPropertyValue(
- rtl::OUString const & propertyName)
+ OUString const & propertyName)
{
return m_impl->getProperty(
static_cast< css::beans::XPropertySet * >(this), propertyName, nullptr);
}
void PropertySetMixinImpl::addPropertyChangeListener(
- rtl::OUString const & propertyName,
+ OUString const & propertyName,
css::uno::Reference< css::beans::XPropertyChangeListener > const & listener)
{
css::uno::Reference< css::beans::XPropertyChangeListener >(
@@ -1027,7 +1027,7 @@ void PropertySetMixinImpl::addPropertyChangeListener(
}
void PropertySetMixinImpl::removePropertyChangeListener(
- rtl::OUString const & propertyName,
+ OUString const & propertyName,
css::uno::Reference< css::beans::XPropertyChangeListener > const & listener)
{
assert(listener.is());
@@ -1044,7 +1044,7 @@ void PropertySetMixinImpl::removePropertyChangeListener(
}
void PropertySetMixinImpl::addVetoableChangeListener(
- rtl::OUString const & propertyName,
+ OUString const & propertyName,
css::uno::Reference< css::beans::XVetoableChangeListener > const & listener)
{
css::uno::Reference< css::beans::XVetoableChangeListener >(
@@ -1066,7 +1066,7 @@ void PropertySetMixinImpl::addVetoableChangeListener(
}
void PropertySetMixinImpl::removeVetoableChangeListener(
- rtl::OUString const & propertyName,
+ OUString const & propertyName,
css::uno::Reference< css::beans::XVetoableChangeListener > const & listener)
{
assert(listener.is());
@@ -1138,7 +1138,7 @@ void PropertySetMixinImpl::setPropertyValues(
{
throw css::beans::UnknownPropertyException(
("name " + props[i].Name + " does not match handle "
- + rtl::OUString::number(props[i].Handle)),
+ + OUString::number(props[i].Handle)),
static_cast< css::beans::XPropertySet * >(this));
}
m_impl->setProperty(
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 83e7726f0a35..46494e00c827 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -35,8 +35,6 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
using namespace cppu;
-using ::rtl::OUString;
-
namespace cppu {
IPropertyArrayHelper::~IPropertyArrayHelper()
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index 3fac957ebc3a..a9c06fa1bce9 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -74,14 +74,14 @@ void insertImplementationMap(
void removeFromImplementationMap(
cppuhelper::ServiceManager::Data::ImplementationMap * map,
- std::vector< rtl::OUString > const & elements,
+ std::vector< OUString > const & elements,
std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation >
const & implementation)
{
// The underlying data structures make this function somewhat inefficient,
// but the assumption is that it is rarely called:
assert(map != nullptr);
- for (std::vector< rtl::OUString >::const_iterator i(elements.begin());
+ for (std::vector< OUString >::const_iterator i(elements.begin());
i != elements.end(); ++i)
{
cppuhelper::ServiceManager::Data::ImplementationMap::iterator j(
@@ -105,7 +105,7 @@ void removeFromImplementationMap(
class Parser {
public:
Parser(
- rtl::OUString const & uri,
+ OUString const & uri,
css::uno::Reference< css::uno::XComponentContext > const & alienContext,
cppuhelper::ServiceManager::Data * data);
@@ -121,21 +121,21 @@ private:
void handleSingleton();
- rtl::OUString getNameAttribute();
+ OUString getNameAttribute();
xmlreader::XmlReader reader_;
css::uno::Reference< css::uno::XComponentContext > alienContext_;
cppuhelper::ServiceManager::Data * data_;
- rtl::OUString attrLoader_;
- rtl::OUString attrUri_;
- rtl::OUString attrEnvironment_;
- rtl::OUString attrPrefix_;
+ OUString attrLoader_;
+ OUString attrUri_;
+ OUString attrEnvironment_;
+ OUString attrPrefix_;
std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation >
implementation_;
};
Parser::Parser(
- rtl::OUString const & uri,
+ OUString const & uri,
css::uno::Reference< css::uno::XComponentContext > const & alienContext,
cppuhelper::ServiceManager::Data * data):
reader_(uri), alienContext_(alienContext), data_(data)
@@ -239,10 +239,10 @@ Parser::Parser(
}
void Parser::handleComponent() {
- attrLoader_ = rtl::OUString();
- attrUri_ = rtl::OUString();
- attrEnvironment_ = rtl::OUString();
- attrPrefix_ = rtl::OUString();
+ attrLoader_ = OUString();
+ attrUri_ = OUString();
+ attrEnvironment_ = OUString();
+ attrPrefix_ = OUString();
xmlreader::Span name;
int nsId;
while (reader_.nextAttribute(&nsId, &name)) {
@@ -328,8 +328,8 @@ void Parser::handleComponent() {
}
void Parser::handleImplementation() {
- rtl::OUString attrName;
- rtl::OUString attrConstructor;
+ OUString attrName;
+ OUString attrConstructor;
xmlreader::Span name;
int nsId;
while (reader_.nextAttribute(&nsId, &name)) {
@@ -394,19 +394,19 @@ void Parser::handleImplementation() {
}
void Parser::handleService() {
- rtl::OUString name(getNameAttribute());
+ OUString name(getNameAttribute());
implementation_->info->services.push_back(name);
data_->services[name].push_back(implementation_);
}
void Parser::handleSingleton() {
- rtl::OUString name(getNameAttribute());
+ OUString name(getNameAttribute());
implementation_->info->singletons.push_back(name);
data_->singletons[name].push_back(implementation_);
}
-rtl::OUString Parser::getNameAttribute() {
- rtl::OUString attrName;
+OUString Parser::getNameAttribute() {
+ OUString attrName;
xmlreader::Span name;
int nsId;
while (reader_.nextAttribute(&nsId, &name)) {
@@ -566,11 +566,11 @@ private:
createInstanceWithArguments(
css::uno::Sequence< css::uno::Any > const & Arguments) override;
- virtual rtl::OUString SAL_CALL getImplementationName() override;
+ virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
rtl::Reference< cppuhelper::ServiceManager > manager_;
@@ -614,19 +614,19 @@ ImplementationWrapper::createInstanceWithArguments(
Arguments, manager_->getContext());
}
-rtl::OUString ImplementationWrapper::getImplementationName()
+OUString ImplementationWrapper::getImplementationName()
{
std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock();
assert(impl);
return impl->info->name;
}
-sal_Bool ImplementationWrapper::supportsService(rtl::OUString const & ServiceName)
+sal_Bool ImplementationWrapper::supportsService(OUString const & ServiceName)
{
return cppu::supportsService(this, ServiceName);
}
-css::uno::Sequence< rtl::OUString >
+css::uno::Sequence< OUString >
ImplementationWrapper::getSupportedServiceNames()
{
std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock();
@@ -639,10 +639,10 @@ ImplementationWrapper::getSupportedServiceNames()
+ " supports too many services"),
static_cast< cppu::OWeakObject * >(this));
}
- css::uno::Sequence< rtl::OUString > names(
+ css::uno::Sequence< OUString > names(
static_cast< sal_Int32 >(impl->info->services.size()));
sal_Int32 i = 0;
- for (std::vector< rtl::OUString >::const_iterator j(
+ for (std::vector< OUString >::const_iterator j(
impl->info->services.begin());
j != impl->info->services.end(); ++j)
{
@@ -762,7 +762,7 @@ void cppuhelper::ServiceManager::loadImplementation(
return;
}
}
- rtl::OUString uri;
+ OUString uri;
try {
uri = cppu::bootstrap_expandUri(implementation->info->uri);
} catch (css::lang::IllegalArgumentException & e) {
@@ -813,7 +813,7 @@ void cppuhelper::ServiceManager::loadImplementation(
smgr->createInstanceWithContext(implementation->info->loader, ctxt),
css::uno::UNO_QUERY_THROW);
f0 = loader->activate(
- implementation->info->name, rtl::OUString(), uri,
+ implementation->info->name, OUString(), uri,
css::uno::Reference< css::registry::XRegistryKey >());
}
css::uno::Reference<css::lang::XSingleComponentFactory> f1;
@@ -916,22 +916,22 @@ void cppuhelper::ServiceManager::initialize(
preloadImplementations();
}
-rtl::OUString cppuhelper::ServiceManager::getImplementationName()
+OUString cppuhelper::ServiceManager::getImplementationName()
{
- return rtl::OUString(
+ return OUString(
"com.sun.star.comp.cppuhelper.bootstrap.ServiceManager");
}
sal_Bool cppuhelper::ServiceManager::supportsService(
- rtl::OUString const & ServiceName)
+ OUString const & ServiceName)
{
return cppu::supportsService(this, ServiceName);
}
-css::uno::Sequence< rtl::OUString >
+css::uno::Sequence< OUString >
cppuhelper::ServiceManager::getSupportedServiceNames()
{
- css::uno::Sequence< rtl::OUString > names(2);
+ css::uno::Sequence< OUString > names(2);
names[0] = "com.sun.star.lang.MultiServiceFactory";
names[1] = "com.sun.star.lang.ServiceManager";
return names;
@@ -939,7 +939,7 @@ cppuhelper::ServiceManager::getSupportedServiceNames()
css::uno::Reference< css::uno::XInterface >
cppuhelper::ServiceManager::createInstance(
- rtl::OUString const & aServiceSpecifier)
+ OUString const & aServiceSpecifier)
{
assert(context_.is());
return createInstanceWithContext(aServiceSpecifier, context_);
@@ -947,7 +947,7 @@ cppuhelper::ServiceManager::createInstance(
css::uno::Reference< css::uno::XInterface >
cppuhelper::ServiceManager::createInstanceWithArguments(
- rtl::OUString const & ServiceSpecifier,
+ OUString const & ServiceSpecifier,
css::uno::Sequence< css::uno::Any > const & Arguments)
{
assert(context_.is());
@@ -955,12 +955,12 @@ cppuhelper::ServiceManager::createInstanceWithArguments(
ServiceSpecifier, Arguments, context_);
}
-css::uno::Sequence< rtl::OUString >
+css::uno::Sequence< OUString >
cppuhelper::ServiceManager::getAvailableServiceNames()
{
osl::MutexGuard g(rBHelper.rMutex);
if (isDisposed()) {
- return css::uno::Sequence< rtl::OUString >();
+ return css::uno::Sequence< OUString >();
}
Data::ImplementationMap::size_type n = data_.services.size();
if (n > static_cast< sal_uInt32 >(SAL_MAX_INT32)) {
@@ -968,7 +968,7 @@ cppuhelper::ServiceManager::getAvailableServiceNames()
"getAvailableServiceNames: too many services",
static_cast< cppu::OWeakObject * >(this));
}
- css::uno::Sequence< rtl::OUString > names(static_cast< sal_Int32 >(n));
+ css::uno::Sequence< OUString > names(static_cast< sal_Int32 >(n));
sal_Int32 i = 0;
for (Data::ImplementationMap::const_iterator j(data_.services.begin());
j != data_.services.end(); ++j)
@@ -981,7 +981,7 @@ cppuhelper::ServiceManager::getAvailableServiceNames()
css::uno::Reference< css::uno::XInterface >
cppuhelper::ServiceManager::createInstanceWithContext(
- rtl::OUString const & aServiceSpecifier,
+ OUString const & aServiceSpecifier,
css::uno::Reference< css::uno::XComponentContext > const & Context)
{
std::shared_ptr< Data::Implementation > impl(
@@ -992,7 +992,7 @@ cppuhelper::ServiceManager::createInstanceWithContext(
css::uno::Reference< css::uno::XInterface >
cppuhelper::ServiceManager::createInstanceWithArgumentsAndContext(
- rtl::OUString const & ServiceSpecifier,
+ OUString const & ServiceSpecifier,
css::uno::Sequence< css::uno::Any > const & Arguments,
css::uno::Reference< css::uno::XComponentContext > const & Context)
{
@@ -1034,11 +1034,11 @@ void cppuhelper::ServiceManager::insert(css::uno::Any const & aElement)
{
css::uno::Sequence< css::beans::NamedValue > args;
if (aElement >>= args) {
- std::vector< rtl::OUString > uris;
+ std::vector< OUString > uris;
css::uno::Reference< css::uno::XComponentContext > alienContext;
for (sal_Int32 i = 0; i < args.getLength(); ++i) {
if (args[i].Name == "uri") {
- rtl::OUString uri;
+ OUString uri;
if (!(args[i].Value >>= uri)) {
throw css::lang::IllegalArgumentException(
"Bad uri argument",
@@ -1097,13 +1097,13 @@ void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement)
{
css::uno::Sequence< css::beans::NamedValue > args;
if (aElement >>= args) {
- std::vector< rtl::OUString > uris;
+ std::vector< OUString > uris;
for (sal_Int32 i = 0; i < args.getLength(); ++i) {
if (args[i].Name != "uri") {
throw css::lang::IllegalArgumentException(
"Bad argument " + args[i].Name,
static_cast< cppu::OWeakObject * >(this), 0);
- } rtl::OUString uri;
+ } OUString uri;
if (!(args[i].Value >>= uri)) {
throw css::lang::IllegalArgumentException(
"Bad uri argument",
@@ -1123,7 +1123,7 @@ void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement)
}
return;
}
- rtl::OUString impl;
+ OUString impl;
if (aElement >>= impl) {
// For live-removal of extensions:
removeImplementation(impl);
@@ -1135,7 +1135,7 @@ void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement)
css::uno::Reference< css::container::XEnumeration >
cppuhelper::ServiceManager::createContentEnumeration(
- rtl::OUString const & aServiceName)
+ OUString const & aServiceName)
{
std::vector< std::shared_ptr< Data::Implementation > > impls;
{
@@ -1191,7 +1191,7 @@ cppuhelper::ServiceManager::getPropertySetInfo()
}
void cppuhelper::ServiceManager::setPropertyValue(
- rtl::OUString const & aPropertyName, css::uno::Any const &)
+ OUString const & aPropertyName, css::uno::Any const &)
{
if (aPropertyName == "DefaultContext") {
throw css::beans::PropertyVetoException(
@@ -1203,7 +1203,7 @@ void cppuhelper::ServiceManager::setPropertyValue(
}
css::uno::Any cppuhelper::ServiceManager::getPropertyValue(
- rtl::OUString const & PropertyName)
+ OUString const & PropertyName)
{
if (PropertyName != "DefaultContext") {
throw css::beans::UnknownPropertyException(
@@ -1214,7 +1214,7 @@ css::uno::Any cppuhelper::ServiceManager::getPropertyValue(
}
void cppuhelper::ServiceManager::addPropertyChangeListener(
- rtl::OUString const & aPropertyName,
+ OUString const & aPropertyName,
css::uno::Reference< css::beans::XPropertyChangeListener > const &
xListener)
{
@@ -1227,7 +1227,7 @@ void cppuhelper::ServiceManager::addPropertyChangeListener(
}
void cppuhelper::ServiceManager::removePropertyChangeListener(
- rtl::OUString const & aPropertyName,
+ OUString const & aPropertyName,
css::uno::Reference< css::beans::XPropertyChangeListener > const &
aListener)
{
@@ -1240,7 +1240,7 @@ void cppuhelper::ServiceManager::removePropertyChangeListener(
}
void cppuhelper::ServiceManager::addVetoableChangeListener(
- rtl::OUString const & PropertyName,
+ OUString const & PropertyName,
css::uno::Reference< css::beans::XVetoableChangeListener > const &
aListener)
{
@@ -1253,7 +1253,7 @@ void cppuhelper::ServiceManager::addVetoableChangeListener(
}
void cppuhelper::ServiceManager::removeVetoableChangeListener(
- rtl::OUString const & PropertyName,
+ OUString const & PropertyName,
css::uno::Reference< css::beans::XVetoableChangeListener > const &
aListener)
{
@@ -1273,7 +1273,7 @@ cppuhelper::ServiceManager::getProperties() {
}
css::beans::Property cppuhelper::ServiceManager::getPropertyByName(
- rtl::OUString const & aName)
+ OUString const & aName)
{
if (aName != "DefaultContext") {
throw css::beans::UnknownPropertyException(
@@ -1283,7 +1283,7 @@ css::beans::Property cppuhelper::ServiceManager::getPropertyByName(
}
sal_Bool cppuhelper::ServiceManager::hasPropertyByName(
- rtl::OUString const & Name)
+ OUString const & Name)
{
return Name == "DefaultContext";
}
@@ -1312,9 +1312,9 @@ void cppuhelper::ServiceManager::removeEventListenerFromComponent(
}
}
-void cppuhelper::ServiceManager::init(rtl::OUString const & rdbUris) {
+void cppuhelper::ServiceManager::init(OUString const & rdbUris) {
for (sal_Int32 i = 0; i != -1;) {
- rtl::OUString uri(rdbUris.getToken(0, ' ', i));
+ OUString uri(rdbUris.getToken(0, ' ', i));
if (uri.isEmpty()) {
continue;
}
@@ -1330,7 +1330,7 @@ void cppuhelper::ServiceManager::init(rtl::OUString const & rdbUris) {
}
void cppuhelper::ServiceManager::readRdbDirectory(
- rtl::OUString const & uri, bool optional)
+ OUString const & uri, bool optional)
{
osl::Directory dir(uri);
switch (dir.open()) {
@@ -1348,7 +1348,7 @@ void cppuhelper::ServiceManager::readRdbDirectory(
static_cast< cppu::OWeakObject * >(this));
}
for (;;) {
- rtl::OUString url;
+ OUString url;
if (!cppu::nextDirectoryItem(dir, &url)) {
break;
}
@@ -1357,7 +1357,7 @@ void cppuhelper::ServiceManager::readRdbDirectory(
}
void cppuhelper::ServiceManager::readRdbFile(
- rtl::OUString const & uri, bool optional)
+ OUString const & uri, bool optional)
{
try {
Parser(
@@ -1382,7 +1382,7 @@ void cppuhelper::ServiceManager::readRdbFile(
}
}
-bool cppuhelper::ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) {
+bool cppuhelper::ServiceManager::readLegacyRdbFile(OUString const & uri) {
Registry reg;
switch (reg.open(uri, RegAccessMode::READONLY)) {
case RegError::NO_ERROR:
@@ -1427,7 +1427,7 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) {
for (sal_uInt32 i = 0; i != impls.getLength(); ++i) {
RegistryKey implKey(impls.getElement(i));
assert(implKey.getName().match("/IMPLEMENTATIONS/"));
- rtl::OUString name(
+ OUString name(
implKey.getName().copy(RTL_CONSTASCII_LENGTH("/IMPLEMENTATIONS/")));
std::shared_ptr< Data::Implementation > impl(
new Data::Implementation(
@@ -1441,7 +1441,7 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) {
}
readLegacyRdbStrings(
uri, implKey, "UNO/SERVICES", &impl->info->services);
- for (std::vector< rtl::OUString >::const_iterator j(
+ for (std::vector< OUString >::const_iterator j(
impl->info->services.begin());
j != impl->info->services.end(); ++j)
{
@@ -1449,7 +1449,7 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) {
}
readLegacyRdbStrings(
uri, implKey, "UNO/SINGLETONS", &impl->info->singletons);
- for (std::vector< rtl::OUString >::const_iterator j(
+ for (std::vector< OUString >::const_iterator j(
impl->info->singletons.begin());
j != impl->info->singletons.end(); ++j)
{
@@ -1459,14 +1459,14 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) {
return true;
}
-rtl::OUString cppuhelper::ServiceManager::readLegacyRdbString(
- rtl::OUString const & uri, RegistryKey & key, rtl::OUString const & path)
+OUString cppuhelper::ServiceManager::readLegacyRdbString(
+ OUString const & uri, RegistryKey & key, OUString const & path)
{
RegistryKey subkey;
RegValueType t;
sal_uInt32 s(0);
if (key.openKey(path, subkey) != RegError::NO_ERROR
- || subkey.getValueInfo(rtl::OUString(), &t, &s) != RegError::NO_ERROR
+ || subkey.getValueInfo(OUString(), &t, &s) != RegError::NO_ERROR
|| t != RegValueType::STRING
|| s == 0 || s > static_cast< sal_uInt32 >(SAL_MAX_INT32))
{
@@ -1474,9 +1474,9 @@ rtl::OUString cppuhelper::ServiceManager::readLegacyRdbString(
"Failure reading legacy rdb file " + uri,
static_cast< cppu::OWeakObject * >(this));
}
- rtl::OUString val;
+ OUString val;
std::vector< char > v(s); // assuming sal_uInt32 fits into vector::size_type
- if (subkey.getValue(rtl::OUString(), &v[0]) != RegError::NO_ERROR
+ if (subkey.getValue(OUString(), &v[0]) != RegError::NO_ERROR
|| v.back() != '\0'
|| !rtl_convertStringToUString(
&val.pData, &v[0], static_cast< sal_Int32 >(s - 1),
@@ -1493,8 +1493,8 @@ rtl::OUString cppuhelper::ServiceManager::readLegacyRdbString(
}
void cppuhelper::ServiceManager::readLegacyRdbStrings(
- rtl::OUString const & uri, RegistryKey & key, rtl::OUString const & path,
- std::vector< rtl::OUString > * strings)
+ OUString const & uri, RegistryKey & key, OUString const & path,
+ std::vector< OUString > * strings)
{
assert(strings != nullptr);
RegistryKey subkey;
@@ -1508,9 +1508,9 @@ void cppuhelper::ServiceManager::readLegacyRdbStrings(
"Failure reading legacy rdb file " + uri,
static_cast< cppu::OWeakObject * >(this));
}
- rtl::OUString prefix(subkey.getName() + "/");
+ OUString prefix(subkey.getName() + "/");
RegistryKeyNames names;
- if (subkey.getKeyNames(rtl::OUString(), names) != RegError::NO_ERROR) {
+ if (subkey.getKeyNames(OUString(), names) != RegError::NO_ERROR) {
throw css::uno::DeploymentException(
"Failure reading legacy rdb file " + uri,
static_cast< cppu::OWeakObject * >(this));
@@ -1522,11 +1522,11 @@ void cppuhelper::ServiceManager::readLegacyRdbStrings(
}
void cppuhelper::ServiceManager::insertRdbFiles(
- std::vector< rtl::OUString > const & uris,
+ std::vector< OUString > const & uris,
css::uno::Reference< css::uno::XComponentContext > const & alienContext)
{
Data extra;
- for (std::vector< rtl::OUString >::const_iterator i(uris.begin());
+ for (std::vector< OUString >::const_iterator i(uris.begin());
i != uris.end(); ++i)
{
try {
@@ -1548,7 +1548,7 @@ void cppuhelper::ServiceManager::insertLegacyFactory(
css::uno::Reference< css::lang::XServiceInfo > const & factoryInfo)
{
assert(factoryInfo.is());
- rtl::OUString name(factoryInfo->getImplementationName());
+ OUString name(factoryInfo->getImplementationName());
css::uno::Reference< css::lang::XSingleComponentFactory > f1(
factoryInfo, css::uno::UNO_QUERY);
css::uno::Reference< css::lang::XSingleServiceFactory > f2;
@@ -1570,7 +1570,7 @@ void cppuhelper::ServiceManager::insertLegacyFactory(
extra.namedImplementations.emplace(name, impl);
}
extra.dynamicImplementations.emplace(factoryInfo, impl);
- css::uno::Sequence< rtl::OUString > services(
+ css::uno::Sequence< OUString > services(
factoryInfo->getSupportedServiceNames());
for (sal_Int32 i = 0; i != services.getLength(); ++i) {
impl->info->services.push_back(services[i]);
@@ -1631,7 +1631,7 @@ bool cppuhelper::ServiceManager::insertExtraData(Data const & extra) {
extra.singletons.begin());
i != extra.singletons.end(); ++i)
{
- rtl::OUString name("/singletons/" + i->first);
+ OUString name("/singletons/" + i->first);
//TODO: Update should be atomic:
try {
cont->removeByName(name + "/arguments");
@@ -1662,7 +1662,7 @@ bool cppuhelper::ServiceManager::insertExtraData(Data const & extra) {
}
void cppuhelper::ServiceManager::removeRdbFiles(
- std::vector< rtl::OUString > const & uris)
+ std::vector< OUString > const & uris)
{
// The underlying data structures make this function somewhat inefficient,
// but the assumption is that it is rarely called (and that if it is called,
@@ -1670,7 +1670,7 @@ void cppuhelper::ServiceManager::removeRdbFiles(
std::vector< std::shared_ptr< Data::Implementation > > clear;
{
osl::MutexGuard g(rBHelper.rMutex);
- for (std::vector< rtl::OUString >::const_iterator i(uris.begin());
+ for (std::vector< OUString >::const_iterator i(uris.begin());
i != uris.end(); ++i)
{
for (Data::NamedImplementations::iterator j(
@@ -1732,7 +1732,7 @@ bool cppuhelper::ServiceManager::removeLegacyFactory(
return true;
}
-void cppuhelper::ServiceManager::removeImplementation(const rtl::OUString & name) {
+void cppuhelper::ServiceManager::removeImplementation(const OUString & name) {
// The underlying data structures make this function somewhat inefficient,
// but the assumption is that it is rarely called:
std::shared_ptr< Data::Implementation > clear;
@@ -1771,7 +1771,7 @@ void cppuhelper::ServiceManager::removeImplementation(const rtl::OUString & name
std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation >
cppuhelper::ServiceManager::findServiceImplementation(
css::uno::Reference< css::uno::XComponentContext > const & context,
- rtl::OUString const & specifier)
+ OUString const & specifier)
{
std::shared_ptr< Data::Implementation > impl;
bool loaded;
@@ -1806,7 +1806,7 @@ cppuhelper::ServiceManager::findServiceImplementation(
/// Make a simpler unique name for preload / progress reporting.
#ifndef DISABLE_DYNLOADING
-static rtl::OUString simplifyModule(const rtl::OUString &uri)
+static OUString simplifyModule(const OUString &uri)
{
sal_Int32 nIdx;
OUStringBuffer edit(uri);
@@ -1837,7 +1837,7 @@ void cppuhelper::ServiceManager::preloadImplementations() {
#ifdef DISABLE_DYNLOADING
abort();
#else
- rtl::OUString aUri;
+ OUString aUri;
osl::MutexGuard g(rBHelper.rMutex);
css::uno::Environment aSourceEnv(css::uno::Environment::getCurrent());
@@ -1851,7 +1851,7 @@ void cppuhelper::ServiceManager::preloadImplementations() {
{
try
{
- const rtl::OUString &aLibrary = iterator->second->info->uri;
+ const OUString &aLibrary = iterator->second->info->uri;
if (aLibrary.isEmpty())
continue;
@@ -1926,7 +1926,7 @@ void cppuhelper::ServiceManager::preloadImplementations() {
if (aSourceEnv.get() == aTargetEnv.get())
{
// invoke function component factory
- OString aImpl(rtl::OUStringToOString(iterator->second->info->name, RTL_TEXTENCODING_ASCII_US));
+ OString aImpl(OUStringToOString(iterator->second->info->name, RTL_TEXTENCODING_ASCII_US));
xFactory.set(css::uno::Reference<css::uno::XInterface>(static_cast<css::uno::XInterface *>(
(*fpComponentFactory)(aImpl.getStr(), this, nullptr)), SAL_NO_ACQUIRE));
}
diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx
index 2f7a749058bd..3d8a265aa750 100644
--- a/cppuhelper/source/servicemanager.hxx
+++ b/cppuhelper/source/servicemanager.hxx
@@ -71,48 +71,48 @@ public:
struct ImplementationInfo {
ImplementationInfo(
- rtl::OUString const & theName, rtl::OUString const & theLoader,
- rtl::OUString const & theUri,
- rtl::OUString const & theEnvironment,
- rtl::OUString const & theConstructor,
- rtl::OUString const & thePrefix,
+ OUString const & theName, OUString const & theLoader,
+ OUString const & theUri,
+ OUString const & theEnvironment,
+ OUString const & theConstructor,
+ OUString const & thePrefix,
css::uno::Reference< css::uno::XComponentContext > const &
theAlienContext,
- rtl::OUString const & theRdbFile):
+ OUString const & theRdbFile):
name(theName), loader(theLoader), uri(theUri),
environment(theEnvironment), constructor(theConstructor),
prefix(thePrefix), alienContext(theAlienContext),
rdbFile(theRdbFile)
{}
- explicit ImplementationInfo(rtl::OUString const & theName):
+ explicit ImplementationInfo(OUString const & theName):
name(theName) {}
ImplementationInfo(const ImplementationInfo&) = delete;
const ImplementationInfo& operator=(const ImplementationInfo&) = delete;
- rtl::OUString const name;
- rtl::OUString const loader;
- rtl::OUString const uri;
- rtl::OUString const environment;
- rtl::OUString const constructor;
- rtl::OUString const prefix;
+ OUString const name;
+ OUString const loader;
+ OUString const uri;
+ OUString const environment;
+ OUString const constructor;
+ OUString const prefix;
css::uno::Reference< css::uno::XComponentContext > const
alienContext;
- rtl::OUString const rdbFile;
- std::vector< rtl::OUString > services;
- std::vector< rtl::OUString > singletons;
+ OUString const rdbFile;
+ std::vector< OUString > services;
+ std::vector< OUString > singletons;
};
struct Implementation {
Implementation(
- rtl::OUString const & name, rtl::OUString const & loader,
- rtl::OUString const & uri, rtl::OUString const & environment,
- rtl::OUString const & constructorName,
- rtl::OUString const & prefix,
+ OUString const & name, OUString const & loader,
+ OUString const & uri, OUString const & environment,
+ OUString const & constructorName,
+ OUString const & prefix,
css::uno::Reference< css::uno::XComponentContext > const &
alienContext,
- rtl::OUString const & rdbFile):
+ OUString const & rdbFile):
info(
new ImplementationInfo(
name, loader, uri, environment, constructorName, prefix,
@@ -121,7 +121,7 @@ public:
{}
Implementation(
- rtl::OUString const & name,
+ OUString const & name,
css::uno::Reference< css::lang::XSingleComponentFactory >
const & theFactory1,
css::uno::Reference< css::lang::XSingleServiceFactory > const &
@@ -178,7 +178,7 @@ public:
css::uno::Reference<css::uno::XInterface> const & instance);
};
- typedef std::map< rtl::OUString, std::shared_ptr< Implementation > >
+ typedef std::map< OUString, std::shared_ptr< Implementation > >
NamedImplementations;
typedef
@@ -189,7 +189,7 @@ public:
typedef
std::map<
- rtl::OUString,
+ OUString,
std::vector< std::shared_ptr< Implementation > > >
ImplementationMap;
@@ -207,7 +207,7 @@ public:
using ServiceManagerBase::acquire;
using ServiceManagerBase::release;
- void init(rtl::OUString const & rdbUris);
+ void init(OUString const & rdbUris);
void setContext(
css::uno::Reference< css::uno::XComponentContext > const & context)
@@ -236,32 +236,32 @@ private:
virtual void SAL_CALL disposing() override;
- virtual rtl::OUString SAL_CALL getImplementationName() override;
+ virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
- rtl::OUString const & aServiceSpecifier) override;
+ OUString const & aServiceSpecifier) override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithArguments(
- rtl::OUString const & ServiceSpecifier,
+ OUString const & ServiceSpecifier,
css::uno::Sequence< css::uno::Any > const & Arguments) override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual css::uno::Sequence< OUString > SAL_CALL
getAvailableServiceNames() override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithContext(
- rtl::OUString const & aServiceSpecifier,
+ OUString const & aServiceSpecifier,
css::uno::Reference< css::uno::XComponentContext > const & Context) override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithArgumentsAndContext(
- rtl::OUString const & ServiceSpecifier,
+ OUString const & ServiceSpecifier,
css::uno::Sequence< css::uno::Any > const & Arguments,
css::uno::Reference< css::uno::XComponentContext > const & Context) override;
@@ -279,43 +279,43 @@ private:
virtual void SAL_CALL remove(css::uno::Any const & aElement) override;
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
- createContentEnumeration(rtl::OUString const & aServiceName) override;
+ createContentEnumeration(OUString const & aServiceName) override;
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo() override;
virtual void SAL_CALL setPropertyValue(
- rtl::OUString const & aPropertyName, css::uno::Any const & aValue) override;
+ OUString const & aPropertyName, css::uno::Any const & aValue) override;
virtual css::uno::Any SAL_CALL getPropertyValue(
- rtl::OUString const & PropertyName) override;
+ OUString const & PropertyName) override;
virtual void SAL_CALL addPropertyChangeListener(
- rtl::OUString const & aPropertyName,
+ OUString const & aPropertyName,
css::uno::Reference< css::beans::XPropertyChangeListener > const &
xListener) override;
virtual void SAL_CALL removePropertyChangeListener(
- rtl::OUString const & aPropertyName,
+ OUString const & aPropertyName,
css::uno::Reference< css::beans::XPropertyChangeListener > const &
aListener) override;
virtual void SAL_CALL addVetoableChangeListener(
- rtl::OUString const & PropertyName,
+ OUString const & PropertyName,
css::uno::Reference< css::beans::XVetoableChangeListener > const &
aListener) override;
virtual void SAL_CALL removeVetoableChangeListener(
- rtl::OUString const & PropertyName,
+ OUString const & PropertyName,
css::uno::Reference< css::beans::XVetoableChangeListener > const &
aListener) override;
virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() override;
virtual css::beans::Property SAL_CALL getPropertyByName(
- rtl::OUString const & aName) override;
+ OUString const & aName) override;
- virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & Name) override;
+ virtual sal_Bool SAL_CALL hasPropertyByName(OUString const & Name) override;
virtual void SAL_CALL disposing(css::lang::EventObject const & Source) override;
@@ -329,22 +329,22 @@ private:
void removeEventListenerFromComponent(
css::uno::Reference< css::lang::XComponent > const & component);
- void readRdbDirectory(rtl::OUString const & uri, bool optional);
+ void readRdbDirectory(OUString const & uri, bool optional);
- void readRdbFile(rtl::OUString const & uri, bool optional);
+ void readRdbFile(OUString const & uri, bool optional);
- bool readLegacyRdbFile(rtl::OUString const & uri);
+ bool readLegacyRdbFile(OUString const & uri);
- rtl::OUString readLegacyRdbString(
- rtl::OUString const & uri, RegistryKey & key,
- rtl::OUString const & path);
+ OUString readLegacyRdbString(
+ OUString const & uri, RegistryKey & key,
+ OUString const & path);
void readLegacyRdbStrings(
- rtl::OUString const & uri, RegistryKey & key,
- rtl::OUString const & path, std::vector< rtl::OUString > * strings);
+ OUString const & uri, RegistryKey & key,
+ OUString const & path, std::vector< OUString > * strings);
void insertRdbFiles(
- std::vector< rtl::OUString > const & uris,
+ std::vector< OUString > const & uris,
css::uno::Reference< css::uno::XComponentContext > const &
alientContext);
@@ -353,17 +353,17 @@ private:
bool insertExtraData(Data const & extra);
- void removeRdbFiles(std::vector< rtl::OUString > const & uris);
+ void removeRdbFiles(std::vector< OUString > const & uris);
bool removeLegacyFactory(
css::uno::Reference< css::lang::XServiceInfo > const & factoryInfo,
bool removeListener);
- void removeImplementation(const rtl::OUString & name);
+ void removeImplementation(const OUString & name);
std::shared_ptr< Data::Implementation > findServiceImplementation(
css::uno::Reference< css::uno::XComponentContext > const & context,
- rtl::OUString const & specifier);
+ OUString const & specifier);
void preloadImplementations();
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index b54d45ed0773..9f23f1160c03 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -39,15 +39,15 @@
#endif
css::uno::Environment cppuhelper::detail::getEnvironment(
- rtl::OUString const & name, rtl::OUString const & implementation)
+ OUString const & name, OUString const & implementation)
{
- rtl::OUString n(name);
+ OUString n(name);
if (!implementation.isEmpty()) {
static char const * log = std::getenv("UNO_ENV_LOG");
if (log != nullptr && *log != 0) {
- rtl::OString imps(log);
+ OString imps(log);
for (sal_Int32 i = 0; i != -1;) {
- rtl::OString imp(imps.getToken(0, ';', i));
+ OString imp(imps.getToken(0, ';', i));
//TODO: this assumes UNO_ENV_LOG only contains ASCII characters:
if (implementation.equalsAsciiL(imp.getStr(), imp.getLength()))
{
@@ -66,11 +66,11 @@ namespace {
css::uno::Environment getEnvironmentFromModule(
osl::Module const & module, css::uno::Environment const & target,
- rtl::OUString const & implementation, rtl::OUString const & prefix)
+ OUString const & implementation, OUString const & prefix)
{
char const * name = nullptr;
css::uno::Environment env;
- rtl::OUString fullPrefix(prefix);
+ OUString fullPrefix(prefix);
if (!fullPrefix.isEmpty()) {
fullPrefix += "_";
}
@@ -80,7 +80,7 @@ css::uno::Environment getEnvironmentFromModule(
if (fp1 != nullptr) {
(*fp1)(
&name, reinterpret_cast<uno_Environment **>(&env),
- (rtl::OUStringToOString(implementation, RTL_TEXTENCODING_ASCII_US)
+ (OUStringToOString(implementation, RTL_TEXTENCODING_ASCII_US)
.getStr()),
target.get());
} else {
@@ -95,7 +95,7 @@ css::uno::Environment getEnvironmentFromModule(
}
if (!env.is() && name != nullptr) {
env = cppuhelper::detail::getEnvironment(
- rtl::OUString::createFromAscii(name), implementation);
+ OUString::createFromAscii(name), implementation);
}
return env;
}
@@ -104,7 +104,7 @@ css::uno::Environment getEnvironmentFromModule(
extern "C" void getFactory(va_list * args) {
component_getFactoryFunc fn = va_arg(*args, component_getFactoryFunc);
- rtl::OString const * implementation = va_arg(*args, rtl::OString const *);
+ OString const * implementation = va_arg(*args, OString const *);
void * smgr = va_arg(*args, void *);
void ** factory = va_arg(*args, void **);
*factory = (*fn)(implementation->getStr(), smgr, nullptr);
@@ -112,8 +112,8 @@ extern "C" void getFactory(va_list * args) {
css::uno::Reference<css::uno::XInterface> invokeComponentFactory(
css::uno::Environment const & source, css::uno::Environment const & target,
- component_getFactoryFunc function, rtl::OUString const & uri,
- rtl::OUString const & implementation,
+ component_getFactoryFunc function, OUString const & uri,
+ OUString const & implementation,
css::uno::Reference<css::lang::XMultiServiceFactory> const & serviceManager)
{
if (!(source.is() && target.is())) {
@@ -121,8 +121,8 @@ css::uno::Reference<css::uno::XInterface> invokeComponentFactory(
"cannot get environments",
css::uno::Reference<css::uno::XInterface>());
}
- rtl::OString impl(
- rtl::OUStringToOString(implementation, RTL_TEXTENCODING_ASCII_US));
+ OString impl(
+ OUStringToOString(implementation, RTL_TEXTENCODING_ASCII_US));
if (source.get() == target.get()) {
return css::uno::Reference<css::uno::XInterface>(
static_cast<css::uno::XInterface *>(
@@ -230,9 +230,9 @@ cppuhelper::WrapperConstructorFn mapConstructorFn(
}
void cppuhelper::detail::loadSharedLibComponentFactory(
- rtl::OUString const & uri, rtl::OUString const & environment,
- rtl::OUString const & prefix, rtl::OUString const & implementation,
- rtl::OUString const & constructor,
+ OUString const & uri, OUString const & environment,
+ OUString const & prefix, OUString const & implementation,
+ OUString const & constructor,
css::uno::Reference<css::lang::XMultiServiceFactory> const & serviceManager,
WrapperConstructorFn * constructorFunction,
css::uno::Reference<css::uno::XInterface> * factory)
@@ -255,7 +255,7 @@ void cppuhelper::detail::loadSharedLibComponentFactory(
if (curEnv.get() != env.get()) {
std::abort();//TODO
}
- rtl::OUString name(prefix == "direct" ? implementation : uri);
+ OUString name(prefix == "direct" ? implementation : uri);
SAL_INFO("cppuhelper.shlib", "prefix=" << prefix << " implementation=" << implementation << " uri=" << uri);
lib_to_factory_mapping const * map = lo_get_factory_map();
component_getFactoryFunc fp = 0;
@@ -299,7 +299,7 @@ void cppuhelper::detail::loadSharedLibComponentFactory(
css::uno::Reference<css::uno::XInterface>());
}
if (constructor.isEmpty()) {
- rtl::OUString sym;
+ OUString sym;
SAL_INFO("cppuhelper.shlib", "prefix=" << prefix << " implementation=" << implementation << " uri=" << uri);
if (prefix == "direct") {
sym = implementation.replace('.', '_') + "_" COMPONENT_GETFACTORY;
@@ -345,8 +345,8 @@ void cppuhelper::detail::loadSharedLibComponentFactory(
}
css::uno::Reference<css::uno::XInterface> cppu::loadSharedLibComponentFactory(
- rtl::OUString const & uri, rtl::OUString const & rPath,
- rtl::OUString const & rImplName,
+ OUString const & uri, OUString const & rPath,
+ OUString const & rImplName,
css::uno::Reference<css::lang::XMultiServiceFactory> const & xMgr,
css::uno::Reference<css::registry::XRegistryKey> const & xKey)
{
@@ -373,7 +373,7 @@ extern "C" void writeInfo(va_list * args) {
}
void cppu::writeSharedLibComponentInfo(
- rtl::OUString const & uri, rtl::OUString const & rPath,
+ OUString const & uri, OUString const & rPath,
css::uno::Reference<css::lang::XMultiServiceFactory> const & xMgr,
css::uno::Reference<css::registry::XRegistryKey> const & xKey)
{
diff --git a/cppuhelper/source/supportsservice.cxx b/cppuhelper/source/supportsservice.cxx
index 612ed37eb7a8..629981310354 100644
--- a/cppuhelper/source/supportsservice.cxx
+++ b/cppuhelper/source/supportsservice.cxx
@@ -18,10 +18,10 @@
#include <sal/types.h>
bool cppu::supportsService(
- css::lang::XServiceInfo * implementation, rtl::OUString const & name)
+ css::lang::XServiceInfo * implementation, OUString const & name)
{
assert(implementation != nullptr);
- css::uno::Sequence< rtl::OUString > s(
+ css::uno::Sequence< OUString > s(
implementation->getSupportedServiceNames());
for (sal_Int32 i = 0; i != s.getLength(); ++i) {
if (s[i] == name) {
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index b4aec385c956..a6336cab7833 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -56,8 +56,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::reflection;
-using rtl::OUString;
-
namespace cppu
{
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx
index ed811f03c44f..15702e624e59 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -55,8 +55,6 @@
#include <sal/macros.h>
#include <sal/types.h>
-using rtl::OUString;
-
#include <unoidl/unoidl.hxx>
#include "paths.hxx"
@@ -64,7 +62,7 @@ using rtl::OUString;
namespace {
-rtl::OUString makePrefix(rtl::OUString const & name) {
+OUString makePrefix(OUString const & name) {
return name.isEmpty() ? name : name + ".";
}
@@ -84,7 +82,7 @@ class SimpleTypeDescription:
{
public:
SimpleTypeDescription(
- css::uno::TypeClass typeClass, rtl::OUString const & name):
+ css::uno::TypeClass typeClass, OUString const & name):
typeClass_(typeClass), name_(name)
{}
@@ -94,11 +92,11 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return typeClass_; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
css::uno::TypeClass typeClass_;
- rtl::OUString name_;
+ OUString name_;
};
class SequenceTypeDescription:
@@ -107,7 +105,7 @@ class SequenceTypeDescription:
public:
SequenceTypeDescription(
rtl::Reference< cppuhelper::TypeManager > const & manager,
- rtl::OUString const & name, rtl::OUString const & componentType):
+ OUString const & name, OUString const & componentType):
manager_(manager), name_(name), componentType_(componentType)
{ assert(manager.is()); }
@@ -117,7 +115,7 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_SEQUENCE; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
@@ -125,8 +123,8 @@ private:
{ return manager_->resolve(componentType_); }
rtl::Reference< cppuhelper::TypeManager > manager_;
- rtl::OUString name_;
- rtl::OUString componentType_;
+ OUString name_;
+ OUString componentType_;
};
class PublishableDescription:
@@ -150,7 +148,7 @@ class ModuleDescription:
public:
ModuleDescription(
rtl::Reference< cppuhelper::TypeManager > const & manager,
- rtl::OUString const & name,
+ OUString const & name,
rtl::Reference< unoidl::ModuleEntity > const & entity):
manager_(manager), name_(name), entity_(entity)
{ assert(manager.is()); assert(entity.is()); }
@@ -161,7 +159,7 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_MODULE; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
virtual
@@ -170,14 +168,14 @@ private:
SAL_CALL getMembers() override;
rtl::Reference< cppuhelper::TypeManager > manager_;
- rtl::OUString name_;
+ OUString name_;
rtl::Reference< unoidl::ModuleEntity > entity_;
};
css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
ModuleDescription::getMembers() {
try {
- std::vector< rtl::OUString > names(entity_->getMemberNames());
+ std::vector< OUString > names(entity_->getMemberNames());
assert(names.size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(names.size());
css::uno::Sequence<
@@ -200,7 +198,7 @@ EnumTypeDescription_Base;
class EnumTypeDescription: public EnumTypeDescription_Base {
public:
EnumTypeDescription(
- rtl::OUString const & name,
+ OUString const & name,
rtl::Reference< unoidl::EnumTypeEntity > const & entity):
EnumTypeDescription_Base(entity->isPublished()), name_(name),
entity_(entity)
@@ -212,25 +210,25 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_ENUM; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
virtual sal_Int32 SAL_CALL getDefaultEnumValue() override
{ return entity_->getMembers()[0].value; }
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getEnumNames() override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getEnumNames() override;
virtual css::uno::Sequence< sal_Int32 > SAL_CALL getEnumValues() override;
- rtl::OUString name_;
+ OUString name_;
rtl::Reference< unoidl::EnumTypeEntity > entity_;
};
-css::uno::Sequence< rtl::OUString > EnumTypeDescription::getEnumNames()
+css::uno::Sequence< OUString > EnumTypeDescription::getEnumNames()
{
assert(entity_->getMembers().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
- css::uno::Sequence< rtl::OUString > s(n);
+ css::uno::Sequence< OUString > s(n);
for (sal_Int32 i = 0; i != n; ++i) {
s[i] = entity_->getMembers()[i].name;
}
@@ -256,7 +254,7 @@ class PlainStructTypeDescription: public PlainStructTypeDescription_Base {
public:
PlainStructTypeDescription(
rtl::Reference< cppuhelper::TypeManager > const & manager,
- rtl::OUString const & name,
+ OUString const & name,
rtl::Reference< unoidl::PlainStructTypeEntity > const & entity):
PlainStructTypeDescription_Base(entity->isPublished()),
manager_(manager), name_(name), entity_(entity)
@@ -268,7 +266,7 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_STRUCT; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
@@ -283,10 +281,10 @@ private:
css::uno::Reference< css::reflection::XTypeDescription > >
SAL_CALL getMemberTypes() override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getMemberNames() override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() override
- { return css::uno::Sequence< rtl::OUString >(); }
+ virtual css::uno::Sequence< OUString > SAL_CALL getTypeParameters() override
+ { return css::uno::Sequence< OUString >(); }
virtual
css::uno::Sequence<
@@ -297,7 +295,7 @@ private:
}
rtl::Reference< cppuhelper::TypeManager > manager_;
- rtl::OUString name_;
+ OUString name_;
rtl::Reference< unoidl::PlainStructTypeEntity > entity_;
};
@@ -314,11 +312,11 @@ PlainStructTypeDescription::getMemberTypes()
return s;
}
-css::uno::Sequence< rtl::OUString > PlainStructTypeDescription::getMemberNames()
+css::uno::Sequence< OUString > PlainStructTypeDescription::getMemberNames()
{
assert(entity_->getDirectMembers().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getDirectMembers().size());
- css::uno::Sequence< rtl::OUString > s(n);
+ css::uno::Sequence< OUString > s(n);
for (sal_Int32 i = 0; i != n; ++i) {
s[i] = entity_->getDirectMembers()[i].name;
}
@@ -330,7 +328,7 @@ class ParameterizedMemberTypeDescription:
{
public:
explicit ParameterizedMemberTypeDescription(
- rtl::OUString const & typeParameterName):
+ OUString const & typeParameterName):
typeParameterName_(typeParameterName)
{}
@@ -340,10 +338,10 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_UNKNOWN; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return typeParameterName_; }
- rtl::OUString typeParameterName_;
+ OUString typeParameterName_;
};
typedef cppu::ImplInheritanceHelper<
@@ -356,7 +354,7 @@ class PolymorphicStructTypeTemplateDescription:
public:
PolymorphicStructTypeTemplateDescription(
rtl::Reference< cppuhelper::TypeManager > const & manager,
- rtl::OUString const & name,
+ OUString const & name,
rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > const &
entity):
PolymorphicStructTypeTemplateDescription_Base(entity->isPublished()),
@@ -369,7 +367,7 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_STRUCT; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
@@ -381,9 +379,9 @@ private:
css::uno::Reference< css::reflection::XTypeDescription > >
SAL_CALL getMemberTypes() override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getMemberNames() override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getTypeParameters() override;
virtual
css::uno::Sequence<
@@ -394,7 +392,7 @@ private:
}
rtl::Reference< cppuhelper::TypeManager > manager_;
- rtl::OUString name_;
+ OUString name_;
rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > entity_;
};
@@ -414,24 +412,24 @@ PolymorphicStructTypeTemplateDescription::getMemberTypes()
return s;
}
-css::uno::Sequence< rtl::OUString >
+css::uno::Sequence< OUString >
PolymorphicStructTypeTemplateDescription::getMemberNames()
{
assert(entity_->getMembers().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
- css::uno::Sequence< rtl::OUString > s(n);
+ css::uno::Sequence< OUString > s(n);
for (sal_Int32 i = 0; i != n; ++i) {
s[i] = entity_->getMembers()[i].name;
}
return s;
}
-css::uno::Sequence< rtl::OUString >
+css::uno::Sequence< OUString >
PolymorphicStructTypeTemplateDescription::getTypeParameters()
{
assert(entity_->getTypeParameters().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getTypeParameters().size());
- css::uno::Sequence< rtl::OUString > s(n);
+ css::uno::Sequence< OUString > s(n);
for (sal_Int32 i = 0; i != n; ++i) {
s[i] = entity_->getTypeParameters()[i];
}
@@ -444,10 +442,10 @@ class InstantiatedPolymorphicStructTypeDescription:
public:
InstantiatedPolymorphicStructTypeDescription(
rtl::Reference< cppuhelper::TypeManager > const & manager,
- rtl::OUString const & name,
+ OUString const & name,
rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > const &
entity,
- std::vector< rtl::OUString > const & arguments):
+ std::vector< OUString > const & arguments):
manager_(manager), name_(name), entity_(entity), arguments_(arguments)
{
assert(manager.is());
@@ -461,7 +459,7 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_STRUCT; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
@@ -473,10 +471,10 @@ private:
css::uno::Reference< css::reflection::XTypeDescription > >
SAL_CALL getMemberTypes() override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getMemberNames() override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() override
- { return css::uno::Sequence< rtl::OUString >(); }
+ virtual css::uno::Sequence< OUString > SAL_CALL getTypeParameters() override
+ { return css::uno::Sequence< OUString >(); }
virtual
css::uno::Sequence<
@@ -484,9 +482,9 @@ private:
SAL_CALL getTypeArguments() override;
rtl::Reference< cppuhelper::TypeManager > manager_;
- rtl::OUString name_;
+ OUString name_;
rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > entity_;
- std::vector< rtl::OUString > arguments_;
+ std::vector< OUString > arguments_;
};
css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
@@ -497,9 +495,9 @@ InstantiatedPolymorphicStructTypeDescription::getMemberTypes()
css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > > s(n);
for (sal_Int32 i = 0; i != n; ++i) {
- rtl::OUString type(entity_->getMembers()[i].type);
+ OUString type(entity_->getMembers()[i].type);
if (entity_->getMembers()[i].parameterized) {
- for (std::vector< rtl::OUString >::const_iterator j(
+ for (std::vector< OUString >::const_iterator j(
entity_->getTypeParameters().begin());
j != entity_->getTypeParameters().end(); ++j)
{
@@ -516,12 +514,12 @@ InstantiatedPolymorphicStructTypeDescription::getMemberTypes()
return s;
}
-css::uno::Sequence< rtl::OUString >
+css::uno::Sequence< OUString >
InstantiatedPolymorphicStructTypeDescription::getMemberNames()
{
assert(entity_->getMembers().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
- css::uno::Sequence< rtl::OUString > s(n);
+ css::uno::Sequence< OUString > s(n);
for (sal_Int32 i = 0; i != n; ++i) {
s[i] = entity_->getMembers()[i].name;
}
@@ -548,7 +546,7 @@ class ExceptionTypeDescription: public ExceptionTypeDescription_Base {
public:
ExceptionTypeDescription(
rtl::Reference< cppuhelper::TypeManager > const & manager,
- rtl::OUString const & name,
+ OUString const & name,
rtl::Reference< unoidl::ExceptionTypeEntity > const & entity):
ExceptionTypeDescription_Base(entity->isPublished()), manager_(manager),
name_(name), entity_(entity)
@@ -560,7 +558,7 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_EXCEPTION; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
@@ -575,10 +573,10 @@ private:
css::uno::Reference< css::reflection::XTypeDescription > >
SAL_CALL getMemberTypes() override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getMemberNames() override;
rtl::Reference< cppuhelper::TypeManager > manager_;
- rtl::OUString name_;
+ OUString name_;
rtl::Reference< unoidl::ExceptionTypeEntity > entity_;
};
@@ -594,11 +592,11 @@ ExceptionTypeDescription::getMemberTypes() {
return s;
}
-css::uno::Sequence< rtl::OUString > ExceptionTypeDescription::getMemberNames()
+css::uno::Sequence< OUString > ExceptionTypeDescription::getMemberNames()
{
assert(entity_->getDirectMembers().size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(entity_->getDirectMembers().size());
- css::uno::Sequence< rtl::OUString > s(n);
+ css::uno::Sequence< OUString > s(n);
for (sal_Int32 i = 0; i != n; ++i) {
s[i] = entity_->getDirectMembers()[i].name;
}
@@ -612,7 +610,7 @@ class AttributeDescription:
public:
AttributeDescription(
rtl::Reference< cppuhelper::TypeManager > const & manager,
- rtl::OUString const & name,
+ OUString const & name,
unoidl::InterfaceTypeEntity::Attribute const & attribute,
sal_Int32 position):
manager_(manager), name_(name), attribute_(attribute),
@@ -625,10 +623,10 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_INTERFACE_ATTRIBUTE; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
- virtual rtl::OUString SAL_CALL getMemberName() override
+ virtual OUString SAL_CALL getMemberName() override
{ return attribute_.name; }
virtual sal_Int32 SAL_CALL getPosition() override
@@ -655,7 +653,7 @@ private:
SAL_CALL getSetExceptions() override;
rtl::Reference< cppuhelper::TypeManager > manager_;
- rtl::OUString name_;
+ OUString name_;
unoidl::InterfaceTypeEntity::Attribute attribute_;
sal_Int32 position_;
};
@@ -704,7 +702,7 @@ public:
private:
virtual ~MethodParameter() override {}
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return parameter_.name; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
@@ -744,7 +742,7 @@ class MethodDescription:
public:
MethodDescription(
rtl::Reference< cppuhelper::TypeManager > const & manager,
- rtl::OUString const & name,
+ OUString const & name,
unoidl::InterfaceTypeEntity::Method const & method, sal_Int32 position):
manager_(manager), name_(name), method_(method), position_(position)
{ assert(manager.is()); }
@@ -755,10 +753,10 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_INTERFACE_METHOD; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
- virtual rtl::OUString SAL_CALL getMemberName() override
+ virtual OUString SAL_CALL getMemberName() override
{ return method_.name; }
virtual sal_Int32 SAL_CALL getPosition() override
@@ -782,7 +780,7 @@ private:
SAL_CALL getExceptions() override;
rtl::Reference< cppuhelper::TypeManager > manager_;
- rtl::OUString name_;
+ OUString name_;
unoidl::InterfaceTypeEntity::Method method_;
sal_Int32 position_;
};
@@ -831,7 +829,7 @@ private:
css::uno::Reference< css::reflection::XInterfaceTypeDescription2 >
const & description);
- std::set< rtl::OUString > set_;
+ std::set< OUString > set_;
sal_Int32 offset_;
};
@@ -876,7 +874,7 @@ class InterfaceTypeDescription: public InterfaceTypeDescription_Base {
public:
InterfaceTypeDescription(
rtl::Reference< cppuhelper::TypeManager > const & manager,
- rtl::OUString const & name,
+ OUString const & name,
rtl::Reference< unoidl::InterfaceTypeEntity > const & entity):
InterfaceTypeDescription_Base(entity->isPublished()), manager_(manager),
name_(name), entity_(entity)
@@ -888,7 +886,7 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_INTERFACE; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
@@ -918,7 +916,7 @@ private:
SAL_CALL getOptionalBaseTypes() override;
rtl::Reference< cppuhelper::TypeManager > manager_;
- rtl::OUString name_;
+ OUString name_;
rtl::Reference< unoidl::InterfaceTypeEntity > entity_;
};
@@ -981,7 +979,7 @@ class ConstantDescription:
{
public:
ConstantDescription(
- rtl::OUString const & constantGroupName,
+ OUString const & constantGroupName,
unoidl::ConstantGroupEntity::Member const & member);
private:
@@ -990,18 +988,18 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_CONSTANT; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Any SAL_CALL getConstantValue() override
{ return value_; }
- rtl::OUString name_;
+ OUString name_;
css::uno::Any value_;
};
ConstantDescription::ConstantDescription(
- rtl::OUString const & constantGroupName,
+ OUString const & constantGroupName,
unoidl::ConstantGroupEntity::Member const & member):
name_(makePrefix(constantGroupName) + member.name)
{
@@ -1048,7 +1046,7 @@ ConstantGroupDescription_Base;
class ConstantGroupDescription: public ConstantGroupDescription_Base {
public:
ConstantGroupDescription(
- rtl::OUString const & name,
+ OUString const & name,
rtl::Reference< unoidl::ConstantGroupEntity > const & entity):
ConstantGroupDescription_Base(entity->isPublished()), name_(name),
entity_(entity)
@@ -1060,7 +1058,7 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_CONSTANTS; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
virtual
@@ -1068,7 +1066,7 @@ private:
css::uno::Reference< css::reflection::XConstantTypeDescription > >
SAL_CALL getConstants() override;
- rtl::OUString name_;
+ OUString name_;
rtl::Reference< unoidl::ConstantGroupEntity > entity_;
};
@@ -1093,7 +1091,7 @@ class TypedefDescription: public TypedefDescription_Base {
public:
TypedefDescription(
rtl::Reference< cppuhelper::TypeManager > const & manager,
- rtl::OUString const & name,
+ OUString const & name,
rtl::Reference< unoidl::TypedefEntity > const & entity):
TypedefDescription_Base(entity->isPublished()), manager_(manager),
name_(name), entity_(entity)
@@ -1105,7 +1103,7 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_TYPEDEF; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
@@ -1113,7 +1111,7 @@ private:
{ return manager_->resolve(entity_->getType()); }
rtl::Reference< cppuhelper::TypeManager > manager_;
- rtl::OUString name_;
+ OUString name_;
rtl::Reference< unoidl::TypedefEntity > entity_;
};
@@ -1132,7 +1130,7 @@ public:
private:
virtual ~ConstructorParameter() override {}
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return parameter_.name; }
virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
@@ -1175,7 +1173,7 @@ private:
virtual sal_Bool SAL_CALL isDefaultConstructor() override
{ return constructor_.defaultConstructor; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return constructor_.name; }
virtual
@@ -1230,7 +1228,7 @@ class SingleInterfaceBasedServiceDescription:
public:
SingleInterfaceBasedServiceDescription(
rtl::Reference< cppuhelper::TypeManager > const & manager,
- rtl::OUString const & name,
+ OUString const & name,
rtl::Reference< unoidl::SingleInterfaceBasedServiceEntity > const &
entity):
SingleInterfaceBasedServiceDescription_Base(entity->isPublished()),
@@ -1243,7 +1241,7 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_SERVICE; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
virtual
@@ -1307,7 +1305,7 @@ private:
SAL_CALL getConstructors() override;
rtl::Reference< cppuhelper::TypeManager > manager_;
- rtl::OUString name_;
+ OUString name_;
rtl::Reference< unoidl::SingleInterfaceBasedServiceEntity > entity_;
};
@@ -1343,7 +1341,7 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_PROPERTY; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return property_.name; }
virtual sal_Int16 SAL_CALL getPropertyFlags() override
@@ -1367,7 +1365,7 @@ class AccumulationBasedServiceDescription:
public:
AccumulationBasedServiceDescription(
rtl::Reference< cppuhelper::TypeManager > const & manager,
- rtl::OUString const & name,
+ OUString const & name,
rtl::Reference< unoidl::AccumulationBasedServiceEntity > const &
entity):
AccumulationBasedServiceDescription_Base(entity->isPublished()),
@@ -1380,7 +1378,7 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_SERVICE; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
virtual
@@ -1426,7 +1424,7 @@ private:
}
rtl::Reference< cppuhelper::TypeManager > manager_;
- rtl::OUString name_;
+ OUString name_;
rtl::Reference< unoidl::AccumulationBasedServiceEntity > entity_;
};
@@ -1531,7 +1529,7 @@ class InterfaceBasedSingletonDescription:
public:
InterfaceBasedSingletonDescription(
rtl::Reference< cppuhelper::TypeManager > const & manager,
- rtl::OUString const & name,
+ OUString const & name,
rtl::Reference< unoidl::InterfaceBasedSingletonEntity > const & entity):
InterfaceBasedSingletonDescription_Base(entity->isPublished()),
manager_(manager), name_(name), entity_(entity)
@@ -1543,7 +1541,7 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_SINGLETON; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XServiceTypeDescription >
@@ -1561,7 +1559,7 @@ private:
{ return manager_->resolve(entity_->getBase()); }
rtl::Reference< cppuhelper::TypeManager > manager_;
- rtl::OUString name_;
+ OUString name_;
rtl::Reference< unoidl::InterfaceBasedSingletonEntity > entity_;
};
@@ -1575,7 +1573,7 @@ class ServiceBasedSingletonDescription:
public:
ServiceBasedSingletonDescription(
rtl::Reference< cppuhelper::TypeManager > const & manager,
- rtl::OUString const & name,
+ OUString const & name,
rtl::Reference< unoidl::ServiceBasedSingletonEntity > const & entity):
ServiceBasedSingletonDescription_Base(entity_->isPublished()),
manager_(manager), name_(name), entity_(entity)
@@ -1587,7 +1585,7 @@ private:
virtual css::uno::TypeClass SAL_CALL getTypeClass() override
{ return css::uno::TypeClass_SINGLETON; }
- virtual rtl::OUString SAL_CALL getName() override
+ virtual OUString SAL_CALL getName() override
{ return name_; }
virtual css::uno::Reference< css::reflection::XServiceTypeDescription >
@@ -1605,7 +1603,7 @@ private:
{ return css::uno::Reference< css::reflection::XTypeDescription >(); }
rtl::Reference< cppuhelper::TypeManager > manager_;
- rtl::OUString name_;
+ OUString name_;
rtl::Reference< unoidl::ServiceBasedSingletonEntity > entity_;
};
@@ -1615,7 +1613,7 @@ class Enumeration:
public:
Enumeration(
rtl::Reference< cppuhelper::TypeManager > const & manager,
- rtl::OUString const & prefix,
+ OUString const & prefix,
rtl::Reference< unoidl::MapCursor > const & cursor,
css::uno::Sequence< css::uno::TypeClass > const & types, bool deep):
manager_(manager), types_(types), deep_(deep)
@@ -1643,13 +1641,13 @@ private:
struct Position {
Position(
- rtl::OUString const & thePrefix,
+ OUString const & thePrefix,
rtl::Reference< unoidl::MapCursor > const & theCursor):
prefix(thePrefix), cursor(theCursor)
{ assert(theCursor.is()); }
Position(
- rtl::OUString const & thePrefix,
+ OUString const & thePrefix,
rtl::Reference< unoidl::ConstantGroupEntity > const &
theConstantGroup):
prefix(thePrefix), constantGroup(theConstantGroup),
@@ -1665,7 +1663,7 @@ private:
}
}
- rtl::OUString prefix;
+ OUString prefix;
rtl::Reference< unoidl::MapCursor > cursor;
rtl::Reference< unoidl::ConstantGroupEntity > constantGroup;
std::vector< unoidl::ConstantGroupEntity::Member >::const_iterator
@@ -1678,13 +1676,13 @@ private:
osl::Mutex mutex_;
std::stack< Position > positions_;
- rtl::OUString current_;
+ OUString current_;
};
css::uno::Reference< css::reflection::XTypeDescription >
Enumeration::nextTypeDescription()
{
- rtl::OUString name;
+ OUString name;
{
osl::MutexGuard g(mutex_);
if (positions_.empty()) {
@@ -1714,7 +1712,7 @@ void Enumeration::findNextMatch() {
try {
for (;;) {
assert(!positions_.empty());
- rtl::OUString name;
+ OUString name;
if (positions_.top().cursor.is()) { // root or module
rtl::Reference< unoidl::Entity > ent(
positions_.top().cursor->getNext(&name));
@@ -1808,7 +1806,7 @@ cppuhelper::TypeManager::TypeManager():
manager_(new unoidl::Manager)
{}
-css::uno::Any cppuhelper::TypeManager::find(rtl::OUString const & name) {
+css::uno::Any cppuhelper::TypeManager::find(OUString const & name) {
//TODO: caching? (here or in unoidl::Manager?)
struct Simple {
OUStringLiteral name;
@@ -1856,7 +1854,7 @@ css::uno::Any cppuhelper::TypeManager::find(rtl::OUString const & name) {
}
i = name.lastIndexOf('.');
if (i != -1) {
- rtl::OUString parent(name.copy(0, i));
+ OUString parent(name.copy(0, i));
ent = findEntity(parent);
if (ent.is()) {
switch (ent->getSort()) {
@@ -1878,7 +1876,7 @@ css::uno::Any cppuhelper::TypeManager::find(rtl::OUString const & name) {
}
css::uno::Reference< css::reflection::XTypeDescription >
-cppuhelper::TypeManager::resolve(rtl::OUString const & name) {
+cppuhelper::TypeManager::resolve(OUString const & name) {
css::uno::Reference< css::reflection::XTypeDescription > desc(
find(name), css::uno::UNO_QUERY);
if (!desc.is()) {
@@ -1893,19 +1891,19 @@ cppuhelper::TypeManager::~TypeManager() throw () {}
void cppuhelper::TypeManager::disposing() {} //TODO
-rtl::OUString cppuhelper::TypeManager::getImplementationName()
+OUString cppuhelper::TypeManager::getImplementationName()
{
- return rtl::OUString(
+ return OUString(
"com.sun.star.comp.cppuhelper.bootstrap.TypeManager");
}
sal_Bool cppuhelper::TypeManager::supportsService(
- rtl::OUString const & ServiceName)
+ OUString const & ServiceName)
{
return cppu::supportsService(this, ServiceName);
}
-css::uno::Sequence< rtl::OUString >
+css::uno::Sequence< OUString >
cppuhelper::TypeManager::getSupportedServiceNames()
{
css::uno::Sequence<OUString> names { "com.sun.star.reflection.TypeDescriptionManager" }; //TODO
@@ -1913,7 +1911,7 @@ cppuhelper::TypeManager::getSupportedServiceNames()
}
css::uno::Any cppuhelper::TypeManager::getByHierarchicalName(
- rtl::OUString const & aName)
+ OUString const & aName)
{
css::uno::Any desc(find(aName));
if (!desc.hasValue()) {
@@ -1924,14 +1922,14 @@ css::uno::Any cppuhelper::TypeManager::getByHierarchicalName(
}
sal_Bool cppuhelper::TypeManager::hasByHierarchicalName(
- rtl::OUString const & aName)
+ OUString const & aName)
{
return find(aName).hasValue();
}
css::uno::Type cppuhelper::TypeManager::getElementType()
{
- return cppu::UnoType< rtl::OUString >::get();
+ return cppu::UnoType< OUString >::get();
}
sal_Bool cppuhelper::TypeManager::hasElements()
@@ -1958,7 +1956,7 @@ sal_Bool cppuhelper::TypeManager::has(css::uno::Any const &)
void cppuhelper::TypeManager::insert(css::uno::Any const & aElement)
{
- rtl::OUString uri;
+ OUString uri;
if (!(aElement >>= uri)) {
throw css::lang::IllegalArgumentException(
("css.uno.theTypeDescriptionManager.insert expects a string URI"
@@ -1972,7 +1970,7 @@ void cppuhelper::TypeManager::insert(css::uno::Any const & aElement)
void cppuhelper::TypeManager::remove(css::uno::Any const & aElement)
{
- rtl::OUString uri;
+ OUString uri;
if (!(aElement >>= uri)) {
throw css::lang::IllegalArgumentException(
("css.uno.theTypeDescriptionManager.remove expects a string URI"
@@ -1984,7 +1982,7 @@ void cppuhelper::TypeManager::remove(css::uno::Any const & aElement)
css::uno::Reference< css::reflection::XTypeDescriptionEnumeration >
cppuhelper::TypeManager::createTypeDescriptionEnumeration(
- rtl::OUString const & moduleName,
+ OUString const & moduleName,
css::uno::Sequence< css::uno::TypeClass > const & types,
css::reflection::TypeDescriptionSearchDepth depth)
{
@@ -2008,9 +2006,9 @@ cppuhelper::TypeManager::createTypeDescriptionEnumeration(
depth == css::reflection::TypeDescriptionSearchDepth_INFINITE);
}
-void cppuhelper::TypeManager::init(rtl::OUString const & rdbUris) {
+void cppuhelper::TypeManager::init(OUString const & rdbUris) {
for (sal_Int32 i = 0; i != -1;) {
- rtl::OUString uri(rdbUris.getToken(0, ' ', i));
+ OUString uri(rdbUris.getToken(0, ' ', i));
if (uri.isEmpty()) {
continue;
}
@@ -2026,7 +2024,7 @@ void cppuhelper::TypeManager::init(rtl::OUString const & rdbUris) {
}
void cppuhelper::TypeManager::readRdbDirectory(
- rtl::OUString const & uri, bool optional)
+ OUString const & uri, bool optional)
{
osl::Directory dir(uri);
switch (dir.open()) {
@@ -2044,7 +2042,7 @@ void cppuhelper::TypeManager::readRdbDirectory(
static_cast< cppu::OWeakObject * >(this));
}
for (;;) {
- rtl::OUString url;
+ OUString url;
if (!cppu::nextDirectoryItem(dir, &url)) {
break;
}
@@ -2053,7 +2051,7 @@ void cppuhelper::TypeManager::readRdbDirectory(
}
void cppuhelper::TypeManager::readRdbFile(
- rtl::OUString const & uri, bool optional)
+ OUString const & uri, bool optional)
{
try {
manager_->addProvider(uri);
@@ -2073,7 +2071,7 @@ void cppuhelper::TypeManager::readRdbFile(
}
css::uno::Any cppuhelper::TypeManager::getSequenceType(
- rtl::OUString const & name)
+ OUString const & name)
{
assert(name.startsWith("[]"));
return css::uno::makeAny<
@@ -2083,7 +2081,7 @@ css::uno::Any cppuhelper::TypeManager::getSequenceType(
}
css::uno::Any cppuhelper::TypeManager::getInstantiatedStruct(
- rtl::OUString const & name, sal_Int32 separator)
+ OUString const & name, sal_Int32 separator)
{
assert(name.indexOf('<') == separator && separator != -1);
rtl::Reference< unoidl::Entity > ent(findEntity(name.copy(0, separator)));
@@ -2096,7 +2094,7 @@ css::uno::Any cppuhelper::TypeManager::getInstantiatedStruct(
rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > ent2(
static_cast< unoidl::PolymorphicStructTypeTemplateEntity * >(
ent.get()));
- std::vector< rtl::OUString > args;
+ std::vector< OUString > args;
sal_Int32 i = separator;
do {
++i; // skip '<' or ','
@@ -2133,7 +2131,7 @@ css::uno::Any cppuhelper::TypeManager::getInstantiatedStruct(
}
css::uno::Any cppuhelper::TypeManager::getInterfaceMember(
- rtl::OUString const & name, sal_Int32 separator)
+ OUString const & name, sal_Int32 separator)
{
assert(name.indexOf("::") == separator && separator != -1);
css::uno::Reference< css::reflection::XInterfaceTypeDescription2 > ifc(
@@ -2141,7 +2139,7 @@ css::uno::Any cppuhelper::TypeManager::getInterfaceMember(
if (!ifc.is()) {
return css::uno::Any();
}
- rtl::OUString member(name.copy(separator + std::strlen("::")));
+ OUString member(name.copy(separator + std::strlen("::")));
css::uno::Sequence<
css::uno::Reference<
css::reflection::XInterfaceMemberTypeDescription > > mems(
@@ -2157,7 +2155,7 @@ css::uno::Any cppuhelper::TypeManager::getInterfaceMember(
}
css::uno::Any cppuhelper::TypeManager::getNamed(
- rtl::OUString const & name, rtl::Reference< unoidl::Entity > const & entity)
+ OUString const & name, rtl::Reference< unoidl::Entity > const & entity)
{
assert(entity.is());
switch (entity->getSort()) {
@@ -2250,7 +2248,7 @@ css::uno::Any cppuhelper::TypeManager::getNamed(
css::uno::Any cppuhelper::TypeManager::getEnumMember(
rtl::Reference< unoidl::EnumTypeEntity > const & entity,
- rtl::OUString const & member)
+ OUString const & member)
{
for (std::vector< unoidl::EnumTypeEntity::Member >::const_iterator i(
entity->getMembers().begin());
@@ -2264,9 +2262,9 @@ css::uno::Any cppuhelper::TypeManager::getEnumMember(
}
css::uno::Any cppuhelper::TypeManager::getConstant(
- rtl::OUString const & constantGroupName,
+ OUString const & constantGroupName,
rtl::Reference< unoidl::ConstantGroupEntity > const & entity,
- rtl::OUString const & member)
+ OUString const & member)
{
for (std::vector< unoidl::ConstantGroupEntity::Member >::const_iterator i(
entity->getMembers().begin());
@@ -2282,7 +2280,7 @@ css::uno::Any cppuhelper::TypeManager::getConstant(
}
rtl::Reference< unoidl::Entity > cppuhelper::TypeManager::findEntity(
- rtl::OUString const & name)
+ OUString const & name)
{
try {
return manager_->findEntity(name);
diff --git a/cppuhelper/source/typemanager.hxx b/cppuhelper/source/typemanager.hxx
index 2ad52f836ff3..f2784aa0ea59 100644
--- a/cppuhelper/source/typemanager.hxx
+++ b/cppuhelper/source/typemanager.hxx
@@ -56,29 +56,29 @@ public:
using TypeManager_Base::acquire;
using TypeManager_Base::release;
- void init(rtl::OUString const & rdbUris);
+ void init(OUString const & rdbUris);
- css::uno::Any find(rtl::OUString const & name);
+ css::uno::Any find(OUString const & name);
css::uno::Reference< css::reflection::XTypeDescription > resolve(
- rtl::OUString const & name);
+ OUString const & name);
private:
virtual ~TypeManager() throw () override;
virtual void SAL_CALL disposing() override;
- virtual rtl::OUString SAL_CALL getImplementationName() override;
+ virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
virtual css::uno::Any SAL_CALL getByHierarchicalName(
- rtl::OUString const & aName) override;
+ OUString const & aName) override;
- virtual sal_Bool SAL_CALL hasByHierarchicalName(rtl::OUString const & aName) override;
+ virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) override;
virtual css::uno::Type SAL_CALL getElementType() override;
@@ -95,36 +95,36 @@ private:
virtual css::uno::Reference< css::reflection::XTypeDescriptionEnumeration >
SAL_CALL createTypeDescriptionEnumeration(
- rtl::OUString const & moduleName,
+ OUString const & moduleName,
css::uno::Sequence< css::uno::TypeClass > const & types,
css::reflection::TypeDescriptionSearchDepth depth) override;
- void readRdbDirectory(rtl::OUString const & uri, bool optional);
+ void readRdbDirectory(OUString const & uri, bool optional);
- void readRdbFile(rtl::OUString const & uri, bool optional);
+ void readRdbFile(OUString const & uri, bool optional);
- css::uno::Any getSequenceType(rtl::OUString const & name);
+ css::uno::Any getSequenceType(OUString const & name);
css::uno::Any getInstantiatedStruct(
- rtl::OUString const & name, sal_Int32 separator);
+ OUString const & name, sal_Int32 separator);
css::uno::Any getInterfaceMember(
- rtl::OUString const & name, sal_Int32 separator);
+ OUString const & name, sal_Int32 separator);
css::uno::Any getNamed(
- rtl::OUString const & name,
+ OUString const & name,
rtl::Reference< unoidl::Entity > const & entity);
static css::uno::Any getEnumMember(
rtl::Reference< unoidl::EnumTypeEntity > const & entity,
- rtl::OUString const & member);
+ OUString const & member);
static css::uno::Any getConstant(
- rtl::OUString const & constantGroupName,
+ OUString const & constantGroupName,
rtl::Reference< unoidl::ConstantGroupEntity > const & entity,
- rtl::OUString const & member);
+ OUString const & member);
- rtl::Reference< unoidl::Entity > findEntity(rtl::OUString const & name);
+ rtl::Reference< unoidl::Entity > findEntity(OUString const & name);
rtl::Reference< unoidl::Manager > manager_;
};
diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx
index f131a81f68a6..c01c83cfa6dd 100644
--- a/cppuhelper/source/unourl.cxx
+++ b/cppuhelper/source/unourl.cxx
@@ -39,26 +39,26 @@ using cppu::UnoUrlDescriptor;
class UnoUrlDescriptor::Impl
{
public:
- typedef std::map< rtl::OUString, rtl::OUString > Parameters;
+ typedef std::map< OUString, OUString > Parameters;
- rtl::OUString m_aDescriptor;
- rtl::OUString m_aName;
+ OUString m_aDescriptor;
+ OUString m_aName;
Parameters m_aParameters;
/** @exception rtl::MalformedUriException
*/
- explicit inline Impl(rtl::OUString const & m_aDescriptor);
+ explicit inline Impl(OUString const & m_aDescriptor);
Impl * clone() const { return new Impl(*this); }
};
-inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor)
+inline UnoUrlDescriptor::Impl::Impl(OUString const & rDescriptor)
{
m_aDescriptor = rDescriptor;
enum State { STATE_NAME0, STATE_NAME, STATE_KEY0, STATE_KEY, STATE_VALUE };
State eState = STATE_NAME0;
sal_Int32 nStart = 0;
- rtl::OUString aKey;
+ OUString aKey;
for (sal_Int32 i = 0;; ++i)
{
bool bEnd = i == rDescriptor.getLength();
@@ -125,7 +125,7 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor)
}
}
-UnoUrlDescriptor::UnoUrlDescriptor(rtl::OUString const & rDescriptor):
+UnoUrlDescriptor::UnoUrlDescriptor(OUString const & rDescriptor):
m_pImpl(new Impl(rDescriptor))
{}
@@ -149,27 +149,27 @@ UnoUrlDescriptor & UnoUrlDescriptor::operator =(UnoUrlDescriptor const & rOther)
return *this;
}
-rtl::OUString const & UnoUrlDescriptor::getDescriptor() const
+OUString const & UnoUrlDescriptor::getDescriptor() const
{
return m_pImpl->m_aDescriptor;
}
-rtl::OUString const & UnoUrlDescriptor::getName() const
+OUString const & UnoUrlDescriptor::getName() const
{
return m_pImpl->m_aName;
}
-bool UnoUrlDescriptor::hasParameter(rtl::OUString const & rKey) const
+bool UnoUrlDescriptor::hasParameter(OUString const & rKey) const
{
return m_pImpl->m_aParameters.find(rKey.toAsciiLowerCase())
!= m_pImpl->m_aParameters.end();
}
-rtl::OUString UnoUrlDescriptor::getParameter(rtl::OUString const & rKey) const
+OUString UnoUrlDescriptor::getParameter(OUString const & rKey) const
{
Impl::Parameters::const_iterator
aIt(m_pImpl->m_aParameters.find(rKey.toAsciiLowerCase()));
- return aIt == m_pImpl->m_aParameters.end() ? rtl::OUString() : aIt->second;
+ return aIt == m_pImpl->m_aParameters.end() ? OUString() : aIt->second;
}
class UnoUrl::Impl
@@ -177,25 +177,25 @@ class UnoUrl::Impl
public:
UnoUrlDescriptor m_aConnection;
UnoUrlDescriptor m_aProtocol;
- rtl::OUString m_aObjectName;
+ OUString m_aObjectName;
Impl * clone() const { return new Impl(*this); }
/** @exception rtl::MalformedUriException
*/
- static inline Impl * create(rtl::OUString const & rUrl);
+ static inline Impl * create(OUString const & rUrl);
private:
- Impl(rtl::OUString const & rConnectionDescriptor,
- rtl::OUString const & rProtocolDescriptor,
- rtl::OUString const & rObjectName):
+ Impl(OUString const & rConnectionDescriptor,
+ OUString const & rProtocolDescriptor,
+ OUString const & rObjectName):
m_aConnection(rConnectionDescriptor),
m_aProtocol(rProtocolDescriptor),
m_aObjectName(rObjectName)
{}
};
-inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl)
+inline UnoUrl::Impl * UnoUrl::Impl::create(OUString const & rUrl)
{
if (!rUrl.startsWithIgnoreAsciiCase("uno:"))
throw rtl::MalformedUriException("UNO URL does not start with \"uno:\"");
@@ -203,12 +203,12 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl)
sal_Int32 j = rUrl.indexOf(';', i);
if (j < 0)
throw rtl::MalformedUriException("UNO URL has too few semicolons");
- rtl::OUString aConnection(rUrl.copy(i, j - i));
+ OUString aConnection(rUrl.copy(i, j - i));
i = j + 1;
j = rUrl.indexOf(0x3B, i); // ';'
if (j < 0)
throw rtl::MalformedUriException("UNO URL has too few semicolons");
- rtl::OUString aProtocol(rUrl.copy(i, j - i));
+ OUString aProtocol(rUrl.copy(i, j - i));
i = j + 1;
if (i == rUrl.getLength())
throw rtl::MalformedUriException("UNO URL contains empty ObjectName");
@@ -227,7 +227,7 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl)
return new Impl(aConnection, aProtocol, rUrl.copy(i));
}
-UnoUrl::UnoUrl(rtl::OUString const & rUrl): m_pImpl(Impl::create(rUrl))
+UnoUrl::UnoUrl(OUString const & rUrl): m_pImpl(Impl::create(rUrl))
{}
UnoUrl::UnoUrl(UnoUrl const & rOther): m_pImpl(rOther.m_pImpl->clone())
@@ -259,7 +259,7 @@ UnoUrlDescriptor const & UnoUrl::getProtocol() const
return m_pImpl->m_aProtocol;
}
-rtl::OUString const & UnoUrl::getObjectName() const
+OUString const & UnoUrl::getObjectName() const
{
return m_pImpl->m_aObjectName;
}
diff --git a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
index 58579cd39c25..74d8a360cc53 100644
--- a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
+++ b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
@@ -83,7 +83,7 @@ OUString lcl_double_dabble(const std::vector<sal_uInt8>& bytes)
digit += '0';
/* Resize and return the resulting string. */
- return rtl::OStringToOUString(OString(scratch.data(), scratch.size()), RTL_TEXTENCODING_UTF8);
+ return OStringToOUString(OString(scratch.data(), scratch.size()), RTL_TEXTENCODING_UTF8);
}
OUString lcl_makeStringFromBigint(const std::vector<sal_uInt8>& bytes)
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 0745116b07ac..52f96dd84d88 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -218,7 +218,7 @@ CommandLineEvent CheckWebQuery(/* in,out */ OUString& arg, CommandLineEvent curE
if (!SkipNewline(pPos))
return curEvt;
- rtl::OStringBuffer aResult(static_cast<unsigned int>(nRead));
+ OStringBuffer aResult(static_cast<unsigned int>(nRead));
do
{
const char* pPos1 = pPos;
diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx
index 29001367bb91..4a702f4420bd 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -46,8 +46,8 @@ namespace {
void writeToStream(std::ofstream& strm, const OUString& rKey, const OUString& rValue)
{
- strm << rtl::OUStringToOString(rKey, RTL_TEXTENCODING_UTF8).getStr() << "=";
- strm << rtl::OUStringToOString(rValue, RTL_TEXTENCODING_UTF8).getStr() << "\n";
+ strm << OUStringToOString(rKey, RTL_TEXTENCODING_UTF8).getStr() << "=";
+ strm << OUStringToOString(rValue, RTL_TEXTENCODING_UTF8).getStr() << "\n";
}
}
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index d45b6ab12f9d..3ae3c7d57269 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -92,7 +92,7 @@ struct DispatchHolder
namespace
{
-std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( const rtl::OUString& rUrl, const rtl::OUString& rFactory )
+std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( const OUString& rUrl, const OUString& rFactory )
{
// create the list of filters
OUStringBuffer sQuery(256);
@@ -116,7 +116,7 @@ std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( const rtl::OUStr
while ( xFilterEnum->hasMoreElements() )
{
comphelper::SequenceAsHashMap aFilterProps( xFilterEnum->nextElement() );
- const rtl::OUString aName( aFilterProps.getUnpackedValueOrDefault( "Name", rtl::OUString() ) );
+ const OUString aName( aFilterProps.getUnpackedValueOrDefault( "Name", OUString() ) );
if ( !aName.isEmpty() )
{
std::shared_ptr<const SfxFilter> pFilter( SfxFilter::GetFilterByName( aName ) );
@@ -132,7 +132,7 @@ std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( const rtl::OUStr
}
std::shared_ptr<const SfxFilter> impl_getExportFilterFromUrl(
- const rtl::OUString& rUrl, const rtl::OUString& rFactory)
+ const OUString& rUrl, const OUString& rFactory)
{
try
{
@@ -140,7 +140,7 @@ std::shared_ptr<const SfxFilter> impl_getExportFilterFromUrl(
const Reference< document::XTypeDetection > xTypeDetector(
xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.document.TypeDetection", xContext ),
UNO_QUERY_THROW );
- const rtl::OUString aTypeName( xTypeDetector->queryTypeByURL( rUrl ) );
+ const OUString aTypeName( xTypeDetector->queryTypeByURL( rUrl ) );
std::shared_ptr<const SfxFilter> pFilter( SfxFilterMatcher( rFactory ).GetFilter4EA( aTypeName, SfxFilterFlags::EXPORT ) );
if ( !pFilter )
@@ -217,9 +217,9 @@ void scriptCat(const Reference< XModel >& xDoc )
std::cout << aObjectNames.getLength() << "\n\n";
for ( sal_Int32 j = 0 ; j < aObjectNames.getLength() ; ++j )
{
- rtl::OUString &rObjectName = aObjectNames[j];
+ OUString &rObjectName = aObjectNames[j];
- rtl::OUString aCodeString;
+ OUString aCodeString;
try
{
Any aCode = xContainer->getByName( rObjectName );
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx
index 0f12544b6a6b..c72ad4b91508 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -69,9 +69,9 @@ public:
css::uno::Reference< css::uno::XComponentContext > const & xContext)
{ return static_cast< cppu::OWeakObject * >(new Provider(xContext)); }
- static rtl::OUString SAL_CALL static_getImplementationName();
+ static OUString SAL_CALL static_getImplementationName();
- static css::uno::Sequence< rtl::OUString > SAL_CALL
+ static css::uno::Sequence< OUString > SAL_CALL
static_getSupportedServiceNames();
private:
@@ -81,18 +81,18 @@ private:
virtual ~Provider() {}
- virtual rtl::OUString SAL_CALL getImplementationName() override
+ virtual OUString SAL_CALL getImplementationName() override
{ return static_getImplementationName(); }
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override
{ return static_getSupportedServiceNames(); }
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
- css::util::URL const &, rtl::OUString const &, sal_Int32) override;
+ css::util::URL const &, OUString const &, sal_Int32) override;
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
SAL_CALL queryDispatches(
@@ -101,18 +101,18 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
};
-rtl::OUString Provider::static_getImplementationName() {
- return rtl::OUString("com.sun.star.comp.test.deployment.active_native");
+OUString Provider::static_getImplementationName() {
+ return OUString("com.sun.star.comp.test.deployment.active_native");
}
-css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
+css::uno::Sequence< OUString > Provider::static_getSupportedServiceNames()
{
- rtl::OUString name("com.sun.star.test.deployment.active_native");
- return css::uno::Sequence< rtl::OUString >(&name, 1);
+ OUString name("com.sun.star.test.deployment.active_native");
+ return css::uno::Sequence< OUString >(&name, 1);
}
css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
- css::util::URL const &, rtl::OUString const &, sal_Int32)
+ css::util::URL const &, OUString const &, sal_Int32)
{
css::uno::Reference< css::frame::XDispatch > dispatch;
if (!(context_->getValueByName(
@@ -156,11 +156,11 @@ public:
css::uno::Reference< css::uno::XComponentContext > const & xContext)
{ return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); }
- static rtl::OUString SAL_CALL static_getImplementationName();
+ static OUString SAL_CALL static_getImplementationName();
- static css::uno::Sequence< rtl::OUString > SAL_CALL
+ static css::uno::Sequence< OUString > SAL_CALL
static_getSupportedServiceNames()
- { return css::uno::Sequence< rtl::OUString >(); }
+ { return css::uno::Sequence< OUString >(); }
private:
explicit Dispatch(
@@ -169,13 +169,13 @@ private:
virtual ~Dispatch() {}
- virtual rtl::OUString SAL_CALL getImplementationName() override
+ virtual OUString SAL_CALL getImplementationName() override
{ return static_getImplementationName(); }
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override
{ return static_getSupportedServiceNames(); }
@@ -196,8 +196,8 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
};
-rtl::OUString Dispatch::static_getImplementationName() {
- return rtl::OUString(
+OUString Dispatch::static_getImplementationName() {
+ return OUString(
"com.sun.star.comp.test.deployment.active_native_singleton");
}
diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx
index 83b955a00313..ea62f7b0112f 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -66,9 +66,9 @@ public:
css::uno::Reference< css::uno::XComponentContext > const & xContext)
{ return static_cast< cppu::OWeakObject * >(new Provider(xContext)); }
- static rtl::OUString SAL_CALL static_getImplementationName();
+ static OUString SAL_CALL static_getImplementationName();
- static css::uno::Sequence< rtl::OUString > SAL_CALL
+ static css::uno::Sequence< OUString > SAL_CALL
static_getSupportedServiceNames();
private:
@@ -78,18 +78,18 @@ private:
virtual ~Provider() {}
- virtual rtl::OUString SAL_CALL getImplementationName() override
+ virtual OUString SAL_CALL getImplementationName() override
{ return static_getImplementationName(); }
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override
{ return static_getSupportedServiceNames(); }
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
- css::util::URL const &, rtl::OUString const &, sal_Int32) override;
+ css::util::URL const &, OUString const &, sal_Int32) override;
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
SAL_CALL queryDispatches(
@@ -98,18 +98,18 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
};
-rtl::OUString Provider::static_getImplementationName() {
- return rtl::OUString("com.sun.star.comp.test.deployment.passive_native");
+OUString Provider::static_getImplementationName() {
+ return OUString("com.sun.star.comp.test.deployment.passive_native");
}
-css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
+css::uno::Sequence< OUString > Provider::static_getSupportedServiceNames()
{
- rtl::OUString name("com.sun.star.test.deployment.passive_native");
- return css::uno::Sequence< rtl::OUString >(&name, 1);
+ OUString name("com.sun.star.test.deployment.passive_native");
+ return css::uno::Sequence< OUString >(&name, 1);
}
css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
- css::util::URL const &, rtl::OUString const &, sal_Int32)
+ css::util::URL const &, OUString const &, sal_Int32)
{
css::uno::Reference< css::frame::XDispatch > dispatch;
if (!(context_->getValueByName(
@@ -153,11 +153,11 @@ public:
css::uno::Reference< css::uno::XComponentContext > const & xContext)
{ return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); }
- static rtl::OUString SAL_CALL static_getImplementationName();
+ static OUString SAL_CALL static_getImplementationName();
- static css::uno::Sequence< rtl::OUString > SAL_CALL
+ static css::uno::Sequence< OUString > SAL_CALL
static_getSupportedServiceNames()
- { return css::uno::Sequence< rtl::OUString >(); }
+ { return css::uno::Sequence< OUString >(); }
private:
explicit Dispatch(
@@ -166,13 +166,13 @@ private:
virtual ~Dispatch() {}
- virtual rtl::OUString SAL_CALL getImplementationName() override
+ virtual OUString SAL_CALL getImplementationName() override
{ return static_getImplementationName(); }
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override
{ return static_getSupportedServiceNames(); }
@@ -193,8 +193,8 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
};
-rtl::OUString Dispatch::static_getImplementationName() {
- return rtl::OUString(
+OUString Dispatch::static_getImplementationName() {
+ return OUString(
"com.sun.star.comp.test.deployment.passive_native_singleton");
}
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 37255f8ed27b..b1164869f91b 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -965,10 +965,10 @@ void DocumentHolder::setTitle(const OUString& aDocumentName)
// set the title
static const sal_Unicode u[] = { ' ','(',0 };
static const sal_Unicode c[] = { ')',0 };
- rtl::OUString aTotalName(m_aFilterName);
- aTotalName += rtl::OUString(u);
+ OUString aTotalName(m_aFilterName);
+ aTotalName += OUString(u);
aTotalName += aDocumentName;
- aTotalName += rtl::OUString(c);
+ aTotalName += OUString(c);
try {
m_xFrame->setTitle( aTotalName );
}
diff --git a/extensions/source/bibliography/bibprop.hxx b/extensions/source/bibliography/bibprop.hxx
index 21261dc5ad76..2df398419f78 100644
--- a/extensions/source/bibliography/bibprop.hxx
+++ b/extensions/source/bibliography/bibprop.hxx
@@ -19,16 +19,16 @@
#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HXX
#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HXX
-extern rtl::OUString FM_PROP_LABEL;
-extern rtl::OUString FM_PROP_NAME;
-extern rtl::OUString FM_PROP_CONTROLSOURCE;
-extern rtl::OUString FM_PROP_FORMATKEY;
-extern rtl::OUString FM_PROP_VALUE;
-extern rtl::OUString FM_PROP_EDITMODE;
-extern rtl::OUString FM_PROP_DATASOURCE;
-extern rtl::OUString FM_PROP_CURSORSOURCE;
-extern rtl::OUString FM_PROP_CURSORSOURCETYPE;
-extern rtl::OUString FM_PROP_TEXT;
+extern OUString FM_PROP_LABEL;
+extern OUString FM_PROP_NAME;
+extern OUString FM_PROP_CONTROLSOURCE;
+extern OUString FM_PROP_FORMATKEY;
+extern OUString FM_PROP_VALUE;
+extern OUString FM_PROP_EDITMODE;
+extern OUString FM_PROP_DATASOURCE;
+extern OUString FM_PROP_CURSORSOURCE;
+extern OUString FM_PROP_CURSORSOURCETYPE;
+extern OUString FM_PROP_TEXT;
#endif
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index 00533977a45e..fe4e5b315446 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -99,27 +99,27 @@ namespace logging
static_cast<int>(aDateTime.Year),
static_cast<int>(aDateTime.Month),
static_cast<int>(aDateTime.Day) );
- rtl::OUString sDate = rtl::OUString::createFromAscii( buffer );
+ OUString sDate = OUString::createFromAscii( buffer );
snprintf( buffer, buffer_size, "%02i-%02i-%02i.%03i",
static_cast<int>(aDateTime.Hours),
static_cast<int>(aDateTime.Minutes),
static_cast<int>(aDateTime.Seconds),
::sal::static_int_cast< sal_Int16 >( aDateTime.NanoSeconds / 10000000 ) );
- rtl::OUString sTime = rtl::OUString::createFromAscii( buffer );
+ OUString sTime = OUString::createFromAscii( buffer );
- rtl::OUStringBuffer aBuff;
+ OUStringBuffer aBuff;
aBuff.append( sDate );
aBuff.append( '.' );
aBuff.append( sTime );
- rtl::OUString sDateTime = aBuff.makeStringAndClear();
+ OUString sDateTime = aBuff.makeStringAndClear();
oslProcessIdentifier aProcessId = 0;
oslProcessInfo info;
info.Size = sizeof (oslProcessInfo);
if ( osl_getProcessInfo ( nullptr, osl_Process_IDENTIFIER, &info ) == osl_Process_E_None)
aProcessId = info.Ident;
- rtl::OUString aPID = OUString::number( aProcessId );
+ OUString aPID = OUString::number( aProcessId );
Variable const aVariables[] =
{
diff --git a/filter/qa/cppunit/priority-test.cxx b/filter/qa/cppunit/priority-test.cxx
index cc2bf2b28ead..88b232684ecf 100644
--- a/filter/qa/cppunit/priority-test.cxx
+++ b/filter/qa/cppunit/priority-test.cxx
@@ -69,7 +69,7 @@ void PriorityFilterTest::testPriority()
aMsg.append("' should be '");
aMsg.append(aFormatCorrect);
aMsg.append("'");
- CPPUNIT_ASSERT_EQUAL_MESSAGE(rtl::OUStringToOString(aMsg.makeStringAndClear(),
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(OUStringToOString(aMsg.makeStringAndClear(),
RTL_TEXTENCODING_UTF8).getStr(),
aFormatCorrect, aTypeName);
}
@@ -79,7 +79,7 @@ void PriorityFilterTest::testPriority()
aMsg.append("'");
aMsg.append(e.Message);
aMsg.append("'");
- CPPUNIT_FAIL(rtl::OUStringToOString(aMsg.makeStringAndClear(),
+ CPPUNIT_FAIL(OUStringToOString(aMsg.makeStringAndClear(),
RTL_TEXTENCODING_UTF8).getStr());
}
}
diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx
index f684b4048667..276287eb7e90 100644
--- a/filter/source/config/cache/contenthandlerfactory.hxx
+++ b/filter/source/config/cache/contenthandlerfactory.hxx
@@ -117,11 +117,11 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine
// Overrides to resolve ambiguity
- virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) override
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override
{ return BaseContainer::getByName(aName); }
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() override
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override
{ return BaseContainer::getElementNames(); }
- virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) override
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
{ return BaseContainer::hasByName(aName); }
virtual css::uno::Type SAL_CALL getElementType() override
@@ -129,7 +129,7 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine
virtual sal_Bool SAL_CALL hasElements() override
{ return BaseContainer::hasElements(); }
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) override
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const OUString& Query ) override
{ return BaseContainer::createSubSetEnumerationByQuery(Query); }
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) override
{ return BaseContainer::createSubSetEnumerationByProperties(Properties); }
diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx
index 7dab5e02b0d9..9d803a63890c 100644
--- a/filter/source/config/cache/frameloaderfactory.hxx
+++ b/filter/source/config/cache/frameloaderfactory.hxx
@@ -116,11 +116,11 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer
static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
// Overrides to resolve ambiguity
- virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) override
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override
{ return BaseContainer::getByName(aName); }
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() override
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override
{ return BaseContainer::getElementNames(); }
- virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) override
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
{ return BaseContainer::hasByName(aName); }
virtual css::uno::Type SAL_CALL getElementType() override
@@ -128,7 +128,7 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer
virtual sal_Bool SAL_CALL hasElements() override
{ return BaseContainer::hasElements(); }
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) override
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const OUString& Query ) override
{ return BaseContainer::createSubSetEnumerationByQuery(Query); }
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) override
{ return BaseContainer::createSubSetEnumerationByProperties(Properties); }
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 953d4c423f9c..03e69c96c716 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -467,7 +467,7 @@ void EscherPropertyContainer::CreateGradientProperties(
pGradient = o3tl::doAccess<awt::Gradient>(aAny);
uno::Any aAnyTemp;
- const rtl::OUString aPropName( "FillStyle" );
+ const OUString aPropName( "FillStyle" );
if ( EscherPropertyValueHelper::GetPropertyValue(
aAnyTemp, rXPropSet, aPropName ) )
{
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index ac9550d7c6ca..bce3e2612b18 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -2303,7 +2303,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void )
void SVGExport::writeMtf( const GDIMetaFile& rMtf )
{
const Size aSize( OutputDevice::LogicToLogic(rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MapMode(MapUnit::MapMM)) );
- rtl::OUString aAttr;
+ OUString aAttr;
Reference< XExtendedDocumentHandler> xExtDocHandler( GetDocHandler(), UNO_QUERY );
if( xExtDocHandler.is() && IsUseDTDString() )
diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx
index 0e06c27a17da..994eda6469f6 100644
--- a/forms/source/component/FormsCollection.hxx
+++ b/forms/source/component/FormsCollection.hxx
@@ -85,17 +85,17 @@ public:
{ return OInterfaceContainer::getElementType(); }
virtual sal_Bool SAL_CALL hasElements() override
{ return OInterfaceContainer::hasElements(); }
- virtual css::uno::Any SAL_CALL getByName(const rtl::OUString& p1) override
+ virtual css::uno::Any SAL_CALL getByName(const OUString& p1) override
{ return OInterfaceContainer::getByName(p1); }
- virtual css::uno::Sequence<rtl::OUString> SAL_CALL getElementNames() override
+ virtual css::uno::Sequence<OUString> SAL_CALL getElementNames() override
{ return OInterfaceContainer::getElementNames(); }
- virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& p1) override
+ virtual sal_Bool SAL_CALL hasByName(const OUString& p1) override
{ return OInterfaceContainer::hasByName(p1); }
- virtual void SAL_CALL replaceByName(const rtl::OUString& p1, const css::uno::Any& p2) override
+ virtual void SAL_CALL replaceByName(const OUString& p1, const css::uno::Any& p2) override
{ OInterfaceContainer::replaceByName(p1, p2); }
- virtual void SAL_CALL insertByName(const rtl::OUString& p1, const css::uno::Any& p2) override
+ virtual void SAL_CALL insertByName(const OUString& p1, const css::uno::Any& p2) override
{ OInterfaceContainer::insertByName(p1, p2); }
- virtual void SAL_CALL removeByName(const rtl::OUString& p1) override
+ virtual void SAL_CALL removeByName(const OUString& p1) override
{ OInterfaceContainer::removeByName(p1); }
virtual sal_Int32 SAL_CALL getCount() override
{ return OInterfaceContainer::getCount(); }
@@ -113,7 +113,7 @@ public:
{ OInterfaceContainer::registerScriptEvent(p1, p2); }
virtual void SAL_CALL registerScriptEvents(sal_Int32 p1, const css::uno::Sequence<css::script::ScriptEventDescriptor>& p2) override
{ OInterfaceContainer::registerScriptEvents(p1, p2); }
- virtual void SAL_CALL revokeScriptEvent(sal_Int32 p1, const rtl::OUString& p2, const rtl::OUString& p3, const rtl::OUString& p4) override
+ virtual void SAL_CALL revokeScriptEvent(sal_Int32 p1, const OUString& p2, const OUString& p3, const OUString& p4) override
{ OInterfaceContainer::revokeScriptEvent(p1, p2, p3, p4); }
virtual void SAL_CALL revokeScriptEvents(sal_Int32 p1) override
{ OInterfaceContainer::revokeScriptEvents(p1); }
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index 97945b54fe14..430d574833f1 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -101,21 +101,21 @@ namespace frm
#define PROPERTY_ID_BORDER (PROPERTY_ID_START + 62) // UINT16
#define PROPERTY_ID_ALIGN (PROPERTY_ID_START + 63) // UINT16
#define PROPERTY_ID_DROPDOWN (PROPERTY_ID_START + 64) // BOOL
-#define PROPERTY_ID_UNCHECKED_REFVALUE (PROPERTY_ID_START + 65) // ::rtl::OUString
+#define PROPERTY_ID_UNCHECKED_REFVALUE (PROPERTY_ID_START + 65) // OUString
#define PROPERTY_ID_HSCROLL (PROPERTY_ID_START + 66) // BOOL
#define PROPERTY_ID_VSCROLL (PROPERTY_ID_START + 67) // BOOL
#define PROPERTY_ID_TABSTOP (PROPERTY_ID_START + 68) // BOOL
-#define PROPERTY_ID_REFVALUE (PROPERTY_ID_START + 69) // ::rtl::OUString
+#define PROPERTY_ID_REFVALUE (PROPERTY_ID_START + 69) // OUString
#define PROPERTY_ID_BUTTONTYPE (PROPERTY_ID_START + 70) // UINT16
-#define PROPERTY_ID_DEFAULT_TEXT (PROPERTY_ID_START + 71) // ::rtl::OUString
+#define PROPERTY_ID_DEFAULT_TEXT (PROPERTY_ID_START + 71) // OUString
#define PROPERTY_ID_SUBMIT_ACTION (PROPERTY_ID_START + 72) // string
#define PROPERTY_ID_SUBMIT_METHOD (PROPERTY_ID_START + 73) // FmSubmitMethod
#define PROPERTY_ID_SUBMIT_ENCODING (PROPERTY_ID_START + 74) // FmSubmitEncoding
-#define PROPERTY_ID_DEFAULT_VALUE (PROPERTY_ID_START + 75) // ::rtl::OUString
-#define PROPERTY_ID_SUBMIT_TARGET (PROPERTY_ID_START + 76) // ::rtl::OUString
+#define PROPERTY_ID_DEFAULT_VALUE (PROPERTY_ID_START + 75) // OUString
+#define PROPERTY_ID_SUBMIT_TARGET (PROPERTY_ID_START + 76) // OUString
#define PROPERTY_ID_DEFAULT_STATE (PROPERTY_ID_START + 77) // UINT16
#define PROPERTY_ID_VALUE_SEQ (PROPERTY_ID_START + 78) // StringSeq
-#define PROPERTY_ID_IMAGE_URL (PROPERTY_ID_START + 79) // ::rtl::OUString
+#define PROPERTY_ID_IMAGE_URL (PROPERTY_ID_START + 79) // OUString
#define PROPERTY_ID_SELECT_VALUE (PROPERTY_ID_START + 80) // StringSeq
#define PROPERTY_ID_SELECT_VALUE_SEQ (PROPERTY_ID_START + 81) // StringSeq
// free
@@ -142,9 +142,9 @@ namespace frm
#define PROPERTY_ID_VALUEMIN (PROPERTY_ID_START +103) // INT32
#define PROPERTY_ID_VALUEMAX (PROPERTY_ID_START +104) // INT32
#define PROPERTY_ID_VALUESTEP (PROPERTY_ID_START +105) // INT32
-#define PROPERTY_ID_CURRENCYSYMBOL (PROPERTY_ID_START +106) // ::rtl::OUString
-#define PROPERTY_ID_EDITMASK (PROPERTY_ID_START +107) // ::rtl::OUString
-#define PROPERTY_ID_LITERALMASK (PROPERTY_ID_START +108) // ::rtl::OUString
+#define PROPERTY_ID_CURRENCYSYMBOL (PROPERTY_ID_START +106) // OUString
+#define PROPERTY_ID_EDITMASK (PROPERTY_ID_START +107) // OUString
+#define PROPERTY_ID_LITERALMASK (PROPERTY_ID_START +108) // OUString
#define PROPERTY_ID_ENABLED (PROPERTY_ID_START +109) // BOOL
#define PROPERTY_ID_AUTOCOMPLETE (PROPERTY_ID_START +110) // BOOL
#define PROPERTY_ID_LINECOUNT (PROPERTY_ID_START +111) // UINT16
@@ -154,9 +154,9 @@ namespace frm
#define PROPERTY_ID_SHOWTHOUSANDSEP (PROPERTY_ID_START +115) // BOOL
#define PROPERTY_ID_HARDLINEBREAKS (PROPERTY_ID_START +116) // BOOL
#define PROPERTY_ID_PRINTABLE (PROPERTY_ID_START +117) // BOOL
-#define PROPERTY_ID_TARGET_URL (PROPERTY_ID_START +118) // ::rtl::OUString
-#define PROPERTY_ID_TARGET_FRAME (PROPERTY_ID_START +119) // ::rtl::OUString
-#define PROPERTY_ID_TAG (PROPERTY_ID_START +120) // ::rtl::OUString
+#define PROPERTY_ID_TARGET_URL (PROPERTY_ID_START +118) // OUString
+#define PROPERTY_ID_TARGET_FRAME (PROPERTY_ID_START +119) // OUString
+#define PROPERTY_ID_TAG (PROPERTY_ID_START +120) // OUString
#define PROPERTY_ID_ECHO_CHAR (PROPERTY_ID_START +121) // UINT16
#define PROPERTY_ID_SHOW_POSITION (PROPERTY_ID_START +122) // sal_Bool
#define PROPERTY_ID_SHOW_NAVIGATION (PROPERTY_ID_START +123) // sal_Bool
@@ -167,13 +167,13 @@ namespace frm
#define PROPERTY_ID_DATE_SHOW_CENTURY (PROPERTY_ID_START +128) // Bool
#define PROPERTY_ID_TRISTATE (PROPERTY_ID_START +129) // Bool
#define PROPERTY_ID_DEFAULT_BUTTON (PROPERTY_ID_START +130) // Bool
-#define PROPERTY_ID_HIDDEN_VALUE (PROPERTY_ID_START +131) // ::rtl::OUString
+#define PROPERTY_ID_HIDDEN_VALUE (PROPERTY_ID_START +131) // OUString
#define PROPERTY_ID_DECIMALS (PROPERTY_ID_START +132) // UINT16
#define PROPERTY_ID_AUTOINCREMENT (PROPERTY_ID_START +133) // UINT16
// free
-#define PROPERTY_ID_FILTER (PROPERTY_ID_START +135) // ::rtl::OUString
-#define PROPERTY_ID_HAVINGCLAUSE (PROPERTY_ID_START +136) // ::rtl::OUString
-#define PROPERTY_ID_QUERY (PROPERTY_ID_START +137) // ::rtl::OUString
+#define PROPERTY_ID_FILTER (PROPERTY_ID_START +135) // OUString
+#define PROPERTY_ID_HAVINGCLAUSE (PROPERTY_ID_START +136) // OUString
+#define PROPERTY_ID_QUERY (PROPERTY_ID_START +137) // OUString
#define PROPERTY_ID_DEFAULT_LONG_VALUE (PROPERTY_ID_START +138) // Double
#define PROPERTY_ID_DEFAULT_DATE (PROPERTY_ID_START +139) // UINT32
#define PROPERTY_ID_DEFAULT_TIME (PROPERTY_ID_START +140)
@@ -188,7 +188,7 @@ namespace frm
#define PROPERTY_ID_FONT_UNDERLINE (PROPERTY_ID_START +149)
#define PROPERTY_ID_FONT_STRIKEOUT (PROPERTY_ID_START +150)
#define PROPERTY_ID_ISPASSTHROUGH (PROPERTY_ID_START +151)
-#define PROPERTY_ID_HELPURL (PROPERTY_ID_START +152) // ::rtl::OUString
+#define PROPERTY_ID_HELPURL (PROPERTY_ID_START +152) // OUString
#define PROPERTY_ID_RECORDMARKER (PROPERTY_ID_START +153)
#define PROPERTY_ID_BOUNDFIELD (PROPERTY_ID_START +154)
#define PROPERTY_ID_FORMATSSUPPLIER (PROPERTY_ID_START +155) // XNumberFormatsSupplier
@@ -215,7 +215,7 @@ namespace frm
#define PROPERTY_ID_ISMODIFIED (PROPERTY_ID_START +177) // BOOL
#define PROPERTY_ID_ISNEW (PROPERTY_ID_START +178) // BOOL
#define PROPERTY_ID_PRIVILEGES (PROPERTY_ID_START +179) // INT32
-#define PROPERTY_ID_DETAILFIELDS (PROPERTY_ID_START +180) // Sequence< ::rtl::OUString >
+#define PROPERTY_ID_DETAILFIELDS (PROPERTY_ID_START +180) // Sequence< OUString >
#define PROPERTY_ID_COMMAND (PROPERTY_ID_START +181) // String
#define PROPERTY_ID_COMMANDTYPE (PROPERTY_ID_START +182) // INT32 (css::sdb::CommandType)
#define PROPERTY_ID_RESULTSET_CONCURRENCY (PROPERTY_ID_START +183)// INT32 (css::sdbc::ResultSetConcurrency)
diff --git a/fpicker/source/aqua/CFStringUtilities.mm b/fpicker/source/aqua/CFStringUtilities.mm
index 2458116a4288..b56f5d38242c 100644
--- a/fpicker/source/aqua/CFStringUtilities.mm
+++ b/fpicker/source/aqua/CFStringUtilities.mm
@@ -20,10 +20,10 @@
#include <sal/log.hxx>
#include "CFStringUtilities.hxx"
-rtl::OUString CFStringToOUString(const CFStringRef sOrig)
+OUString CFStringToOUString(const CFStringRef sOrig)
{
if (nullptr == sOrig) {
- return rtl::OUString();
+ return OUString();
}
CFRetain(sOrig);
@@ -38,23 +38,23 @@ rtl::OUString CFStringToOUString(const CFStringRef sOrig)
//we no longer need the original string
CFRelease(sOrig);
- return rtl::OUString(reinterpret_cast<sal_Unicode *>(unichars));
+ return OUString(reinterpret_cast<sal_Unicode *>(unichars));
}
-CFStringRef CFStringCreateWithOUString(const rtl::OUString& aString)
+CFStringRef CFStringCreateWithOUString(const OUString& aString)
{
CFStringRef ref = CFStringCreateWithCharacters(kCFAllocatorDefault, reinterpret_cast<UniChar const *>(aString.getStr()), aString.getLength());
return ref;
}
-rtl::OUString FSRefToOUString(FSRef const & fsRef, InfoType info)
+OUString FSRefToOUString(FSRef const & fsRef, InfoType info)
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 CFURLCreateFromFSRef
CFURLRef aUrlRef = CFURLCreateFromFSRef(nullptr, &fsRef);
SAL_WNODEPRECATED_DECLARATIONS_POP
- rtl::OUString sResult = CFURLRefToOUString(aUrlRef, info);
+ OUString sResult = CFURLRefToOUString(aUrlRef, info);
//we no longer need the CFURLRef
CFRelease(aUrlRef);
@@ -62,7 +62,7 @@ rtl::OUString FSRefToOUString(FSRef const & fsRef, InfoType info)
return sResult;
}
-rtl::OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info)
+OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info)
{
CFStringRef sURLString = nullptr;
@@ -97,7 +97,7 @@ rtl::OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info)
break;
}
- rtl::OUString sResult = CFStringToOUString(sURLString);
+ OUString sResult = CFStringToOUString(sURLString);
CFRelease(sURLString);
diff --git a/fpicker/source/aqua/ControlHelper.mm b/fpicker/source/aqua/ControlHelper.mm
index 1b10248630b2..cd67c04b037f 100644
--- a/fpicker/source/aqua/ControlHelper.mm
+++ b/fpicker/source/aqua/ControlHelper.mm
@@ -270,7 +270,7 @@ OUString ControlHelper::getLabel( sal_Int16 nControlId )
return OUString();
}
- rtl::OUString retVal;
+ OUString retVal;
if ([pControl class] == [NSPopUpButton class]) {
NSString *temp = m_aMapListLabels[pControl];
if (temp != nil)
diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm
index 3e748021079f..5db89a745f6f 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -32,10 +32,10 @@
namespace {
-void fillSuffixList(OUStringList& aSuffixList, const ::rtl::OUString& suffixString) {
+void fillSuffixList(OUStringList& aSuffixList, const OUString& suffixString) {
sal_Int32 nIndex = 0;
do {
- rtl::OUString aToken = suffixString.getToken( 0, ';', nIndex );
+ OUString aToken = suffixString.getToken( 0, ';', nIndex );
aSuffixList.push_back(aToken.copy(1));
} while ( nIndex >= 0 );
}
@@ -46,7 +46,7 @@ void fillSuffixList(OUStringList& aSuffixList, const ::rtl::OUString& suffixStri
#pragma mark FilterEntry
-FilterEntry::FilterEntry( const rtl::OUString& _rTitle, const UnoFilterList& _rSubFilters )
+FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters )
:m_sTitle( _rTitle )
,m_aSubFilters( _rSubFilters )
{
@@ -71,13 +71,13 @@ sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList )
#pragma mark statics
static bool
-isFilterString( const rtl::OUString& rFilterString, const char *pMatch )
+isFilterString( const OUString& rFilterString, const char *pMatch )
{
sal_Int32 nIndex = 0;
- rtl::OUString aToken;
+ OUString aToken;
bool bIsFilter = true;
- rtl::OUString aMatch(rtl::OUString::createFromAscii(pMatch));
+ OUString aMatch(OUString::createFromAscii(pMatch));
do
{
@@ -95,11 +95,11 @@ isFilterString( const rtl::OUString& rFilterString, const char *pMatch )
-static rtl::OUString
-shrinkFilterName( const rtl::OUString& aFilterName, bool bAllowNoStar = false )
+static OUString
+shrinkFilterName( const OUString& aFilterName, bool bAllowNoStar = false )
{
sal_Int32 nBracketEnd = -1;
- rtl::OUString aRealName(aFilterName);
+ OUString aRealName(aFilterName);
for( sal_Int32 i = aRealName.getLength() - 1; i > 0; i-- )
{
@@ -111,11 +111,11 @@ shrinkFilterName( const rtl::OUString& aFilterName, bool bAllowNoStar = false )
if( nBracketEnd <= 0 )
continue;
if( isFilterString( aFilterName.copy( i + 1, nBracketLen - 1 ), "*." ) )
- aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() );
+ aRealName = aRealName.replaceAt( i, nBracketLen + 1, OUString() );
else if (bAllowNoStar)
{
if( isFilterString( aFilterName.copy( i + 1, nBracketLen - 1 ), ".") )
- aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() );
+ aRealName = aRealName.replaceAt( i, nBracketLen + 1, OUString() );
}
}
}
@@ -129,10 +129,10 @@ namespace {
struct FilterTitleMatch
{
protected:
- const rtl::OUString rTitle;
+ const OUString rTitle;
public:
- FilterTitleMatch( const rtl::OUString& _rTitle ) : rTitle( _rTitle ) { }
+ FilterTitleMatch( const OUString& _rTitle ) : rTitle( _rTitle ) { }
bool operator () ( const FilterEntry& _rEntry )
@@ -140,12 +140,12 @@ public:
bool bMatch;
if( !_rEntry.hasSubFilters() ) {
//first try the complete filter name
- rtl::OUString title = _rEntry.getTitle();
+ OUString title = _rEntry.getTitle();
bMatch = title.equals(rTitle);
if (!bMatch) {
//we didn't find a match using the full name, let's give it another
//try using the shrunk version
- rtl::OUString aShrunkName = shrinkFilterName( _rEntry.getTitle() ).trim();
+ OUString aShrunkName = shrinkFilterName( _rEntry.getTitle() ).trim();
bMatch = aShrunkName.equals(rTitle);
}
}
@@ -161,7 +161,7 @@ public:
bool operator () ( const UnoFilterEntry& _rEntry )
{
- rtl::OUString aShrunkName = shrinkFilterName( _rEntry.First );
+ OUString aShrunkName = shrinkFilterName( _rEntry.First );
bool retVal = aShrunkName.equals(rTitle);
return retVal;
}
@@ -194,7 +194,7 @@ FilterHelper::~FilterHelper()
}
-bool FilterHelper::FilterNameExists( const rtl::OUString& rTitle )
+bool FilterHelper::FilterNameExists( const OUString& rTitle )
{
bool bRet = false;
@@ -229,7 +229,7 @@ bool FilterHelper::FilterNameExists( const UnoFilterList& _rGroupedFilters )
}
-void FilterHelper::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilter )
+void FilterHelper::ensureFilterList( const OUString& _rInitialCurrentFilter )
{
if( nullptr == m_pFilterList )
{
@@ -240,7 +240,7 @@ void FilterHelper::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilt
}
}
-void FilterHelper::SetCurFilter( const rtl::OUString& rFilter )
+void FilterHelper::SetCurFilter( const OUString& rFilter )
{
SolarMutexGuard aGuard;
@@ -260,7 +260,7 @@ void FilterHelper::SetFilters()
}
}
-void FilterHelper::appendFilter(const ::rtl::OUString& aTitle, const ::rtl::OUString& aFilterString)
+void FilterHelper::appendFilter(const OUString& aTitle, const OUString& aFilterString)
{
SolarMutexGuard aGuard;
@@ -277,19 +277,19 @@ void FilterHelper::appendFilter(const ::rtl::OUString& aTitle, const ::rtl::OUSt
m_pFilterList->push_back(FilterEntry( aTitle, suffixList ) );
}
-void FilterHelper::setCurrentFilter( const ::rtl::OUString& aTitle )
+void FilterHelper::setCurrentFilter( const OUString& aTitle )
{
SetCurFilter(aTitle);
}
-::rtl::OUString FilterHelper::getCurrentFilter( )
+OUString FilterHelper::getCurrentFilter( )
{
- ::rtl::OUString sReturn = m_aCurrentFilter;
+ OUString sReturn = m_aCurrentFilter;
return sReturn;
}
-void FilterHelper::appendFilterGroup( const ::rtl::OUString& /* sGroupTitle */, const css::uno::Sequence< css::beans::StringPair >& aFilters )
+void FilterHelper::appendFilterGroup( const OUString& /* sGroupTitle */, const css::uno::Sequence< css::beans::StringPair >& aFilters )
{
SolarMutexGuard aGuard;
@@ -297,7 +297,7 @@ void FilterHelper::appendFilterGroup( const ::rtl::OUString& /* sGroupTitle */,
bool bPrependSeparator = m_pFilterList != nullptr;
// ensure that we have a filter list
- ::rtl::OUString sInitialCurrentFilter;
+ OUString sInitialCurrentFilter;
if( aFilters.getLength() > 0)
sInitialCurrentFilter = aFilters[0].First;
ensureFilterList( sInitialCurrentFilter );
@@ -345,7 +345,7 @@ bool FilterHelper::filenameMatchesFilter(NSString* sFilename)
OUStringList suffixList = filter->getFilterSuffixList();
{
- rtl::OUString aName = [sFilename OUString];
+ OUString aName = [sFilename OUString];
for(OUStringList::iterator iter = suffixList.begin(); iter != suffixList.end(); ++iter) {
if (*iter == ".*" || aName.endsWithIgnoreAsciiCase(*iter)) {
return true;
@@ -401,7 +401,7 @@ int FilterHelper::getCurrentFilterIndex()
if (m_aCurrentFilter.getLength() > 0) {
int i = 0;
for (FilterList::iterator iter = m_pFilterList->begin(); iter != m_pFilterList->end(); ++iter, ++i) {
- rtl::OUString aTitle = iter->getTitle();
+ OUString aTitle = iter->getTitle();
if (m_aCurrentFilter.equals(aTitle)) {
result = i;
break;
@@ -423,7 +423,7 @@ OUStringList FilterHelper::getCurrentFilterSuffixList()
OUStringList retVal;
if (m_aCurrentFilter.getLength() > 0) {
for (FilterList::iterator iter = m_pFilterList->begin(); iter != m_pFilterList->end(); ++iter) {
- rtl::OUString aTitle = iter->getTitle();
+ OUString aTitle = iter->getTitle();
if (m_aCurrentFilter.equals(aTitle)) {
retVal = iter->getFilterSuffixList();
break;
diff --git a/fpicker/source/aqua/NSString_OOoAdditions.mm b/fpicker/source/aqua/NSString_OOoAdditions.mm
index 99075d3c56fe..aaca75a18827 100644
--- a/fpicker/source/aqua/NSString_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSString_OOoAdditions.mm
@@ -22,14 +22,14 @@
@implementation NSString (OOoAdditions)
-+ (id) stringWithOUString:(const rtl::OUString&)ouString
++ (id) stringWithOUString:(const OUString&)ouString
{
NSString *string = [[NSString alloc] initWithCharacters:reinterpret_cast<unichar const *>(ouString.getStr()) length:ouString.getLength()];
return [string autorelease];
}
-- (rtl::OUString) OUString
+- (OUString) OUString
{
unsigned int nFileNameLength = [self length];
@@ -40,7 +40,7 @@
[self getCharacters:unichars];
- return rtl::OUString(reinterpret_cast<sal_Unicode *>(unichars));
+ return OUString(reinterpret_cast<sal_Unicode *>(unichars));
}
@end
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm b/fpicker/source/aqua/NSURL_OOoAdditions.mm
index 7c4ddbade36a..8e5398da6d53 100644
--- a/fpicker/source/aqua/NSURL_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm
@@ -22,7 +22,7 @@
#include <sal/log.hxx>
@implementation NSURL (OOoAdditions)
-- (rtl::OUString) OUStringForInfo:(InfoType)info
+- (OUString) OUStringForInfo:(InfoType)info
{
NSAutoreleasePool *pool = [NSAutoreleasePool new];
@@ -66,7 +66,7 @@
break;
}
- rtl::OUString sResult = [sURLString OUString];
+ OUString sResult = [sURLString OUString];
[sURLString release];
[pool release];
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index ec55964971ba..c46cd9cb8739 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -63,9 +63,9 @@ using namespace ::com::sun::star::uno;
namespace
{
- uno::Sequence<rtl::OUString> FilePicker_getSupportedServiceNames()
+ uno::Sequence<OUString> FilePicker_getSupportedServiceNames()
{
- uno::Sequence<rtl::OUString> aRet(3);
+ uno::Sequence<OUString> aRet(3);
aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker";
aRet[2] = "com.sun.star.ui.dialogs.AquaFilePicker";
@@ -108,7 +108,7 @@ void SAL_CALL SalAquaFilePicker::removeFilePickerListener( const uno::Reference<
#pragma mark XAsynchronousExecutableDialog
-void SAL_CALL SalAquaFilePicker::setTitle( const rtl::OUString& aTitle )
+void SAL_CALL SalAquaFilePicker::setTitle( const OUString& aTitle )
{
SolarMutexGuard aGuard;
implsetTitle(aTitle);
@@ -140,7 +140,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute()
if (nullptr != frontWindow) {
NSString *windowTitle = [frontWindow title];
if (windowTitle != nil) {
- rtl::OUString ouName = [windowTitle OUString];
+ OUString ouName = [windowTitle OUString];
//a window title will typically be something like "Untitled1 - OpenOffice.org Writer"
//but we only want the "Untitled1" part of it
sal_Int32 indexOfDash = ouName.indexOf(" - ");
@@ -200,30 +200,30 @@ void SAL_CALL SalAquaFilePicker::setMultiSelectionMode( sal_Bool /* bMode */ )
}
}
-void SAL_CALL SalAquaFilePicker::setDefaultName( const rtl::OUString& aName )
+void SAL_CALL SalAquaFilePicker::setDefaultName( const OUString& aName )
{
SolarMutexGuard aGuard;
m_sSaveFileName = aName;
}
-void SAL_CALL SalAquaFilePicker::setDisplayDirectory( const rtl::OUString& rDirectory )
+void SAL_CALL SalAquaFilePicker::setDisplayDirectory( const OUString& rDirectory )
{
SolarMutexGuard aGuard;
implsetDisplayDirectory(rDirectory);
}
-rtl::OUString SAL_CALL SalAquaFilePicker::getDisplayDirectory()
+OUString SAL_CALL SalAquaFilePicker::getDisplayDirectory()
{
- rtl::OUString retVal = implgetDisplayDirectory();
+ OUString retVal = implgetDisplayDirectory();
return retVal;
}
-uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles()
+uno::Sequence<OUString> SAL_CALL SalAquaFilePicker::getFiles()
{
- uno::Sequence< rtl::OUString > aSelectedFiles = getSelectedFiles();
+ uno::Sequence< OUString > aSelectedFiles = getSelectedFiles();
// multiselection doesn't really work with getFiles
// so just retrieve the first url
if (aSelectedFiles.getLength() > 1)
@@ -232,7 +232,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles()
return aSelectedFiles;
}
-uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles()
+uno::Sequence<OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles()
{
SolarMutexGuard aGuard;
@@ -258,7 +258,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles()
long nFiles = [files count];
SAL_INFO("fpicker.aqua", "# of items: " << nFiles);
- uno::Sequence< rtl::OUString > aSelectedFiles(nFiles);
+ uno::Sequence< OUString > aSelectedFiles(nFiles);
for(long nIndex = 0; nIndex < nFiles; nIndex += 1)
{
@@ -296,7 +296,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles()
#pragma mark XFilterManager
-void SAL_CALL SalAquaFilePicker::appendFilter( const rtl::OUString& aTitle, const rtl::OUString& aFilter )
+void SAL_CALL SalAquaFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter )
{
SolarMutexGuard aGuard;
@@ -305,7 +305,7 @@ void SAL_CALL SalAquaFilePicker::appendFilter( const rtl::OUString& aTitle, cons
m_pControlHelper->setFilterControlNeeded(true);
}
-void SAL_CALL SalAquaFilePicker::setCurrentFilter( const rtl::OUString& aTitle )
+void SAL_CALL SalAquaFilePicker::setCurrentFilter( const OUString& aTitle )
{
SolarMutexGuard aGuard;
@@ -316,7 +316,7 @@ void SAL_CALL SalAquaFilePicker::setCurrentFilter( const rtl::OUString& aTitle )
updateSaveFileNameExtension();
}
-rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter()
+OUString SAL_CALL SalAquaFilePicker::getCurrentFilter()
{
SolarMutexGuard aGuard;
@@ -327,7 +327,7 @@ rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter()
#pragma mark XFilterGroupManager
-void SAL_CALL SalAquaFilePicker::appendFilterGroup( const rtl::OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters )
+void SAL_CALL SalAquaFilePicker::appendFilterGroup( const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters )
{
SolarMutexGuard aGuard;
@@ -361,7 +361,7 @@ void SAL_CALL SalAquaFilePicker::enableControl( sal_Int16 nControlId, sal_Bool b
m_pControlHelper->enableControl(nControlId, bEnable);
}
-void SAL_CALL SalAquaFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUString& aLabel )
+void SAL_CALL SalAquaFilePicker::setLabel( sal_Int16 nControlId, const OUString& aLabel )
{
SolarMutexGuard aGuard;
@@ -369,7 +369,7 @@ void SAL_CALL SalAquaFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OU
m_pControlHelper->setLabel( nControlId, sLabel ) ;
}
-rtl::OUString SAL_CALL SalAquaFilePicker::getLabel( sal_Int16 nControlId )
+OUString SAL_CALL SalAquaFilePicker::getLabel( sal_Int16 nControlId )
{
return m_pControlHelper->getLabel(nControlId);
}
@@ -476,17 +476,17 @@ void SalAquaFilePicker::disposing( const lang::EventObject& aEvent )
#pragma mark XServiceInfo
-rtl::OUString SAL_CALL SalAquaFilePicker::getImplementationName()
+OUString SAL_CALL SalAquaFilePicker::getImplementationName()
{
return FILE_PICKER_IMPL_NAME;
}
-sal_Bool SAL_CALL SalAquaFilePicker::supportsService( const rtl::OUString& sServiceName )
+sal_Bool SAL_CALL SalAquaFilePicker::supportsService( const OUString& sServiceName )
{
return cppu::supportsService(this, sServiceName);
}
-uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL SalAquaFilePicker::getSupportedServiceNames()
{
return FilePicker_getSupportedServiceNames();
}
@@ -557,7 +557,7 @@ void SalAquaFilePicker::updateSaveFileNameExtension()
if( aStringList.empty()) // #i9328#
return;
- rtl::OUString suffix = (*(aStringList.begin())).copy(1);
+ OUString suffix = (*(aStringList.begin())).copy(1);
NSString *requiredFileType = [NSString stringWithOUString:suffix];
[m_pDialog setAllowedFileTypes:[NSArray arrayWithObjects:requiredFileType, nil]];
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index f9de585be0d3..b47d8138018d 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -51,9 +51,9 @@ using namespace ::com::sun::star::uno;
namespace
{
// controlling event notifications
- uno::Sequence<rtl::OUString> FolderPicker_getSupportedServiceNames()
+ uno::Sequence<OUString> FolderPicker_getSupportedServiceNames()
{
- uno::Sequence<rtl::OUString> aRet(2);
+ uno::Sequence<OUString> aRet(2);
aRet[0] = "com.sun.star.ui.dialogs.SystemFolderPicker";
aRet[1] = "com.sun.star.ui.dialogs.AquaFolderPicker";
return aRet;
@@ -68,7 +68,7 @@ SalAquaFolderPicker::SalAquaFolderPicker( const uno::Reference<lang::XMultiServi
// XExecutableDialog
-void SAL_CALL SalAquaFolderPicker::setTitle( const rtl::OUString& aTitle )
+void SAL_CALL SalAquaFolderPicker::setTitle( const OUString& aTitle )
{
SolarMutexGuard aGuard;
@@ -103,14 +103,14 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute()
// XFolderPicker
-void SAL_CALL SalAquaFolderPicker::setDisplayDirectory( const rtl::OUString& aDirectory )
+void SAL_CALL SalAquaFolderPicker::setDisplayDirectory( const OUString& aDirectory )
{
SolarMutexGuard aGuard;
implsetDisplayDirectory(aDirectory);
}
-rtl::OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory()
+OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory()
{
SolarMutexGuard aGuard;
@@ -119,7 +119,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory()
return aDirectory;
}
-rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory()
+OUString SAL_CALL SalAquaFolderPicker::getDirectory()
{
SolarMutexGuard aGuard;
@@ -135,7 +135,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory()
throw uno::RuntimeException("no directory selected", static_cast< cppu::OWeakObject * >( this ));
}
- rtl::OUString aDirectory;
+ OUString aDirectory;
NSURL *url = [files objectAtIndex:0];
@@ -146,24 +146,24 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory()
return aDirectory;
}
-void SAL_CALL SalAquaFolderPicker::setDescription( const rtl::OUString& rDescription )
+void SAL_CALL SalAquaFolderPicker::setDescription( const OUString& rDescription )
{
[m_pDialog setMessage:[NSString stringWithOUString:rDescription]];
}
// XServiceInfo
-rtl::OUString SAL_CALL SalAquaFolderPicker::getImplementationName()
+OUString SAL_CALL SalAquaFolderPicker::getImplementationName()
{
return FOLDER_PICKER_IMPL_NAME;
}
-sal_Bool SAL_CALL SalAquaFolderPicker::supportsService( const rtl::OUString& sServiceName )
+sal_Bool SAL_CALL SalAquaFolderPicker::supportsService( const OUString& sServiceName )
{
return cppu::supportsService(this, sServiceName);
}
-uno::Sequence<rtl::OUString> SAL_CALL SalAquaFolderPicker::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL SalAquaFolderPicker::getSupportedServiceNames()
{
return FolderPicker_getSupportedServiceNames();
}
diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm
index 1753ad7d80e3..b6f40989e9cb 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -189,7 +189,7 @@ int SalAquaPicker::runandwaitforresult()
return status;
}
-void SalAquaPicker::implsetDisplayDirectory( const rtl::OUString& aDirectory )
+void SalAquaPicker::implsetDisplayDirectory( const OUString& aDirectory )
{
SolarMutexGuard aGuard;
@@ -198,12 +198,12 @@ void SalAquaPicker::implsetDisplayDirectory( const rtl::OUString& aDirectory )
}
}
-rtl::OUString const & SalAquaPicker::implgetDisplayDirectory()
+OUString const & SalAquaPicker::implgetDisplayDirectory()
{
return m_sDisplayDirectory;
}
-void SalAquaPicker::implsetTitle( const rtl::OUString& aTitle )
+void SalAquaPicker::implsetTitle( const OUString& aTitle )
{
SolarMutexGuard aGuard;
diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm
index 1f07273da954..3ad1714aa2ed 100644
--- a/fpicker/source/aqua/resourceprovider.mm
+++ b/fpicker/source/aqua/resourceprovider.mm
@@ -33,7 +33,6 @@
#include <fpsofficeResMgr.hxx>
#include "resourceprovider.hxx"
-using rtl::OUString;
using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
diff --git a/framework/inc/uielement/statusbaritem.hxx b/framework/inc/uielement/statusbaritem.hxx
index 759bf5ef6cac..961f39b7bba0 100644
--- a/framework/inc/uielement/statusbaritem.hxx
+++ b/framework/inc/uielement/statusbaritem.hxx
@@ -40,26 +40,26 @@ public:
explicit StatusbarItem(
StatusBar *pStatusBar,
sal_uInt16 nId,
- const rtl::OUString& aCommand );
+ const OUString& aCommand );
virtual ~StatusbarItem() override;
void SAL_CALL disposing() override;
// css::ui::XStatusbarItem Attributes
- virtual ::rtl::OUString SAL_CALL getCommand() override;
+ virtual OUString SAL_CALL getCommand() override;
virtual ::sal_uInt16 SAL_CALL getItemId() override;
virtual ::sal_uInt32 SAL_CALL getWidth() override;
virtual ::sal_uInt16 SAL_CALL getStyle() override;
virtual ::sal_Int32 SAL_CALL getOffset() override;
virtual css::awt::Rectangle SAL_CALL getItemRect() override;
- virtual ::rtl::OUString SAL_CALL getText() override;
- virtual void SAL_CALL setText( const rtl::OUString& rText ) override;
- virtual ::rtl::OUString SAL_CALL getHelpText() override;
- virtual void SAL_CALL setHelpText( const rtl::OUString& rHelpText ) override;
- virtual ::rtl::OUString SAL_CALL getQuickHelpText() override;
- virtual void SAL_CALL setQuickHelpText( const rtl::OUString& rQuickHelpText ) override;
- virtual ::rtl::OUString SAL_CALL getAccessibleName() override;
- virtual void SAL_CALL setAccessibleName( const rtl::OUString& rAccessibleName ) override;
+ virtual OUString SAL_CALL getText() override;
+ virtual void SAL_CALL setText( const OUString& rText ) override;
+ virtual OUString SAL_CALL getHelpText() override;
+ virtual void SAL_CALL setHelpText( const OUString& rHelpText ) override;
+ virtual OUString SAL_CALL getQuickHelpText() override;
+ virtual void SAL_CALL setQuickHelpText( const OUString& rQuickHelpText ) override;
+ virtual OUString SAL_CALL getAccessibleName() override;
+ virtual void SAL_CALL setAccessibleName( const OUString& rAccessibleName ) override;
virtual sal_Bool SAL_CALL getVisible() override;
virtual void SAL_CALL setVisible( sal_Bool bVisible ) override;
@@ -70,7 +70,7 @@ private:
VclPtr<StatusBar> m_pStatusBar;
sal_uInt16 m_nId;
sal_uInt16 m_nStyle;
- rtl::OUString m_aCommand;
+ OUString m_aCommand;
};
diff --git a/framework/inc/uielement/statusbarmerger.hxx b/framework/inc/uielement/statusbarmerger.hxx
index 0d676b86b35c..4f61ed7c3ff5 100644
--- a/framework/inc/uielement/statusbarmerger.hxx
+++ b/framework/inc/uielement/statusbarmerger.hxx
@@ -28,14 +28,14 @@ namespace framework
struct AddonStatusbarItemData
{
- rtl::OUString aLabel;
+ OUString aLabel;
};
struct AddonStatusbarItem
{
- rtl::OUString aCommandURL;
- rtl::OUString aLabel;
- rtl::OUString aContext;
+ OUString aCommandURL;
+ OUString aLabel;
+ OUString aContext;
StatusBarItemBits nItemBits;
sal_Int16 nWidth;
};
@@ -44,25 +44,25 @@ typedef ::std::vector< AddonStatusbarItem > AddonStatusbarItemContainer;
namespace StatusbarMerger
{
- bool IsCorrectContext( const ::rtl::OUString& aContext );
+ bool IsCorrectContext( const OUString& aContext );
bool ConvertSeqSeqToVector( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSequence,
AddonStatusbarItemContainer& rContainer );
sal_uInt16 FindReferencePos( StatusBar* pStatusbar,
- const ::rtl::OUString& rReferencePoint );
+ const OUString& rReferencePoint );
bool ProcessMergeOperation( StatusBar* pStatusbar,
sal_uInt16 nPos,
sal_uInt16& rItemId,
- const ::rtl::OUString& rMergeCommand,
- const ::rtl::OUString& rMergeCommandParameter,
+ const OUString& rMergeCommand,
+ const OUString& rMergeCommandParameter,
const AddonStatusbarItemContainer& rItems );
bool ProcessMergeFallback( StatusBar* pStatusbar,
sal_uInt16& rItemId,
- const ::rtl::OUString& rMergeCommand,
- const ::rtl::OUString& rMergeFallback,
+ const OUString& rMergeCommand,
+ const OUString& rMergeFallback,
const AddonStatusbarItemContainer& rItems );
}
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index 2fddbebe1aee..861b403ffb00 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -57,7 +57,7 @@ VclPtr<PopupMenu> AddonMenuManager::CreateAddonMenu( const Reference< XFrame >&
if ( rAddonMenuEntries.getLength() > 0 )
{
pAddonMenu = VclPtr<PopupMenu>::Create();
- ::rtl::OUString aModuleIdentifier = vcl::CommandInfoProvider::GetModuleIdentifier( rFrame );
+ OUString aModuleIdentifier = vcl::CommandInfoProvider::GetModuleIdentifier( rFrame );
AddonMenuManager::BuildMenu( pAddonMenu, MENU_APPEND, nUniqueMenuId, rAddonMenuEntries, rFrame, aModuleIdentifier );
// Don't return an empty Add-On menu
@@ -119,7 +119,7 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame,
if ( nInsPos < nItemCount && pHelpMenu->GetItemType( nInsPos ) != MenuItemType::SEPARATOR )
nInsSepAfterPos = nInsPos;
- ::rtl::OUString aModuleIdentifier = vcl::CommandInfoProvider::GetModuleIdentifier(rFrame);
+ OUString aModuleIdentifier = vcl::CommandInfoProvider::GetModuleIdentifier(rFrame);
AddonMenuManager::BuildMenu( pHelpMenu, nInsPos, nUniqueMenuId, rAddonHelpMenuEntries, rFrame, aModuleIdentifier );
if ( pHelpMenu->GetItemCount() > nItemCount )
@@ -197,7 +197,7 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent
sal_uInt16& nUniqueMenuId,
const Sequence< Sequence< PropertyValue > >& aAddonMenuDefinition,
const Reference< XFrame >& rFrame,
- const ::rtl::OUString& rModuleIdentifier )
+ const OUString& rModuleIdentifier )
{
Sequence< Sequence< PropertyValue > > aAddonSubMenu;
bool bInsertSeparator = false;
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 7f2902cab545..10f0b06e67f9 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -274,7 +274,7 @@ class AddonsOptions_Impl : public ConfigItem
Sequence< OUString > GetPropertyNamesMenuItem( const OUString& aPropertyRootNode ) const;
Sequence< OUString > GetPropertyNamesPopupMenu( const OUString& aPropertyRootNode ) const;
Sequence< OUString > GetPropertyNamesToolBarItem( const OUString& aPropertyRootNode ) const;
- Sequence< OUString > GetPropertyNamesStatusbarItem( const ::rtl::OUString& aPropertyRootNode ) const;
+ Sequence< OUString > GetPropertyNamesStatusbarItem( const OUString& aPropertyRootNode ) const;
Sequence< OUString > GetPropertyNamesImages( const OUString& aPropertyRootNode ) const;
bool CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const;
@@ -926,29 +926,29 @@ bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonInstru
void AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& aContainer )
{
- const ::rtl::OUString aStatusbarMergeRootName( "AddonUI/OfficeStatusbarMerging/" );
+ const OUString aStatusbarMergeRootName( "AddonUI/OfficeStatusbarMerging/" );
- Sequence< ::rtl::OUString > aAddonMergeNodesSeq = GetNodeNames( aStatusbarMergeRootName );
+ Sequence< OUString > aAddonMergeNodesSeq = GetNodeNames( aStatusbarMergeRootName );
sal_uInt32 nCount = aAddonMergeNodesSeq.getLength();
- Sequence< ::rtl::OUString > aNodePropNames( 5 );
+ Sequence< OUString > aNodePropNames( 5 );
for ( sal_uInt32 i = 0; i < nCount; i++ )
{
- ::rtl::OUString aMergeAddonInstructions( aStatusbarMergeRootName + aAddonMergeNodesSeq[i] );
+ OUString aMergeAddonInstructions( aStatusbarMergeRootName + aAddonMergeNodesSeq[i] );
- Sequence< ::rtl::OUString > aAddonInstMergeNodesSeq = GetNodeNames( aMergeAddonInstructions );
+ Sequence< OUString > aAddonInstMergeNodesSeq = GetNodeNames( aMergeAddonInstructions );
sal_uInt32 nCountAddons = aAddonInstMergeNodesSeq.getLength();
for ( sal_uInt32 j = 0; j < nCountAddons; j++ )
{
- ::rtl::OUStringBuffer aMergeAddonInstructionBase( aMergeAddonInstructions );
+ OUStringBuffer aMergeAddonInstructionBase( aMergeAddonInstructions );
aMergeAddonInstructionBase.append( m_aPathDelimiter );
aMergeAddonInstructionBase.append( aAddonInstMergeNodesSeq[j] );
aMergeAddonInstructionBase.append( m_aPathDelimiter );
// Create sequence for data access
- ::rtl::OUStringBuffer aBuffer( aMergeAddonInstructionBase );
+ OUStringBuffer aBuffer( aMergeAddonInstructionBase );
aBuffer.append( m_aPropMergeMenuNames[ OFFSET_MERGESTATUSBAR_MERGEPOINT ] );
aNodePropNames[0] = aBuffer.makeStringAndClear();
@@ -986,17 +986,17 @@ void AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructi
}
bool AddonsOptions_Impl::ReadMergeStatusbarData(
- const ::rtl::OUString& aMergeAddonInstructionBase,
+ const OUString& aMergeAddonInstructionBase,
Sequence< Sequence< PropertyValue > >& rMergeStatusbarItems )
{
sal_uInt32 nStatusbarItemCount = rMergeStatusbarItems.getLength();
- ::rtl::OUStringBuffer aBuffer( aMergeAddonInstructionBase );
+ OUStringBuffer aBuffer( aMergeAddonInstructionBase );
aBuffer.append( m_aPropMergeStatusbarNames[ OFFSET_MERGESTATUSBAR_STATUSBARITEMS ] );
- ::rtl::OUString aMergeStatusbarBaseNode = aBuffer.makeStringAndClear();
+ OUString aMergeStatusbarBaseNode = aBuffer.makeStringAndClear();
- ::rtl::OUString aAddonStatusbarItemSetNode( aMergeStatusbarBaseNode + m_aPathDelimiter );
- Sequence< ::rtl::OUString > aAddonStatusbarItemSetNodeSeq = GetNodeNames( aMergeStatusbarBaseNode );
+ OUString aAddonStatusbarItemSetNode( aMergeStatusbarBaseNode + m_aPathDelimiter );
+ Sequence< OUString > aAddonStatusbarItemSetNodeSeq = GetNodeNames( aMergeStatusbarBaseNode );
Sequence< PropertyValue > aStatusbarItem( PROPERTYCOUNT_STATUSBARITEM );
aStatusbarItem[ OFFSET_STATUSBARITEM_URL ].Name = m_aPropNames[ INDEX_URL ];
@@ -1011,7 +1011,7 @@ bool AddonsOptions_Impl::ReadMergeStatusbarData(
sal_uInt32 nCount = aAddonStatusbarItemSetNodeSeq.getLength();
for ( sal_uInt32 n = 0; n < nCount; n++ )
{
- ::rtl::OUString aStatusbarItemNode( aAddonStatusbarItemSetNode + aAddonStatusbarItemSetNodeSeq[n] );
+ OUString aStatusbarItemNode( aAddonStatusbarItemSetNode + aAddonStatusbarItemSetNodeSeq[n] );
if ( ReadStatusBarItem( aStatusbarItemNode, aStatusbarItem ) )
{
@@ -1025,12 +1025,12 @@ bool AddonsOptions_Impl::ReadMergeStatusbarData(
}
bool AddonsOptions_Impl::ReadStatusBarItem(
- const ::rtl::OUString& aStatusarItemNodeName,
+ const OUString& aStatusarItemNodeName,
Sequence< PropertyValue >& aStatusbarItem )
{
bool bResult( false );
- ::rtl::OUString aURL;
- ::rtl::OUString aAddonStatusbarItemTreeNode( aStatusarItemNodeName + m_aPathDelimiter );
+ OUString aURL;
+ OUString aAddonStatusbarItemTreeNode( aStatusarItemNodeName + m_aPathDelimiter );
Sequence< Any > aStatusbarItemNodePropValues;
aStatusbarItemNodePropValues = GetProperties( GetPropertyNamesStatusbarItem( aAddonStatusbarItemTreeNode ) );
@@ -1441,19 +1441,19 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const OUSt
return lResult;
}
-Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesStatusbarItem(
- const ::rtl::OUString& aPropertyRootNode ) const
+Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesStatusbarItem(
+ const OUString& aPropertyRootNode ) const
{
- Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_STATUSBARITEM );
-
- lResult[0] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] );
- lResult[1] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] );
- lResult[2] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] );
- lResult[3] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_ALIGN ] );
- lResult[4] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_AUTOSIZE ] );
- lResult[5] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_OWNERDRAW ] );
- lResult[6] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_MANDATORY ] );
- lResult[7] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_WIDTH ] );
+ Sequence< OUString > lResult( PROPERTYCOUNT_STATUSBARITEM );
+
+ lResult[0] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] );
+ lResult[1] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] );
+ lResult[2] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] );
+ lResult[3] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_ALIGN ] );
+ lResult[4] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_AUTOSIZE ] );
+ lResult[5] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_OWNERDRAW ] );
+ lResult[6] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_MANDATORY ] );
+ lResult[7] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_WIDTH ] );
return lResult;
}
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx
index 2ee8a298ed4e..66755c88ccc9 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -72,10 +72,10 @@ public:
const cssu::Reference<cssu::XInterface>& rxEventFocus) override;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName() override;
+ virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService (
- const ::rtl::OUString& rsServiceName) override;
- virtual cssu::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+ const OUString& rsServiceName) override;
+ virtual cssu::Sequence< OUString> SAL_CALL getSupportedServiceNames() override;
// XEventListener
virtual void SAL_CALL disposing (
@@ -86,8 +86,8 @@ public:
{
public:
ListenerContainer maListeners;
- ::rtl::OUString msCurrentApplicationName;
- ::rtl::OUString msCurrentContextName;
+ OUString msCurrentApplicationName;
+ OUString msCurrentContextName;
};
typedef ::std::map<cssu::Reference<cssu::XInterface>, FocusDescriptor> ListenerMap;
ListenerMap maListeners;
@@ -288,7 +288,7 @@ OUString SAL_CALL ContextChangeEventMultiplexer::getImplementationName()
return OUString("org.apache.openoffice.comp.framework.ContextChangeEventMultiplexer");
}
-sal_Bool SAL_CALL ContextChangeEventMultiplexer::supportsService ( const ::rtl::OUString& rsServiceName)
+sal_Bool SAL_CALL ContextChangeEventMultiplexer::supportsService ( const OUString& rsServiceName)
{
return cppu::supportsService(this, rsServiceName);
}
diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx
index 669e84b880a4..15f01a02e543 100644
--- a/framework/source/uielement/genericstatusbarcontroller.cxx
+++ b/framework/source/uielement/genericstatusbarcontroller.cxx
@@ -31,8 +31,6 @@
#include <com/sun/star/awt/XGraphics2.hpp>
#include <com/sun/star/graphic/GraphicType.hpp>
-using ::rtl::OUString;
-
using namespace ::cppu;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -89,7 +87,7 @@ void SAL_CALL GenericStatusbarController::statusChanged(
m_bEnabled = rEvent.IsEnabled;
- rtl::OUString aStrValue;
+ OUString aStrValue;
Reference< graphic::XGraphic > aGraphic;
if ( rEvent.State >>= aStrValue )
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 93c458ec15e3..022f5d766c5d 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1303,7 +1303,7 @@ void MenuBarManager::RetrieveShortcuts( std::vector< std::unique_ptr<MenuItemHan
const sal_uInt32 nCount = aMenuShortCuts.size();
for ( sal_uInt32 i = 0; i < nCount; ++i )
{
- rtl::OUString aItemURL = aMenuShortCuts[i]->aMenuItemURL;
+ OUString aItemURL = aMenuShortCuts[i]->aMenuItemURL;
if( aItemURL.isEmpty() && aMenuShortCuts[i]->xSubMenuManager.is())
aItemURL = "-"; // tdf#99527 prevent throw in case of empty commands
aSeq[i] = aItemURL;
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 157fc8e3b6cf..631c65603e3f 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -313,7 +313,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > const &
{
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
URL aTargetURL;
- aTargetURL.Complete = rtl::OUString::createFromAscii(m_bNewMenu ? aSlotNewDocDirect : aSlotAutoPilot);
+ aTargetURL.Complete = OUString::createFromAscii(m_bNewMenu ? aSlotNewDocDirect : aSlotAutoPilot);
m_xURLTransformer->parseStrict( aTargetURL );
Reference< XDispatch > xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
if(xMenuItemDispatch == nullptr)
diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx
index 959ea4fbec29..7ceb2a24434f 100644
--- a/framework/source/uielement/statusbaritem.cxx
+++ b/framework/source/uielement/statusbaritem.cxx
@@ -24,8 +24,6 @@
#include <com/sun/star/ui/ItemStyle.hpp>
using namespace com::sun::star::ui;
-
-using rtl::OUString;
using com::sun::star::uno::RuntimeException;
namespace framework
@@ -64,7 +62,7 @@ sal_uInt16 impl_convertItemBitsToItemStyle( StatusBarItemBits nItemBits )
StatusbarItem::StatusbarItem(
StatusBar *pStatusBar,
sal_uInt16 nId,
- const rtl::OUString& aCommand )
+ const OUString& aCommand )
: StatusbarItem_Base( m_aMutex )
, m_pStatusBar( pStatusBar )
, m_nId( nId )
diff --git a/framework/source/uielement/statusbarmerger.cxx b/framework/source/uielement/statusbarmerger.cxx
index 455950458304..3fabfc6ea695 100644
--- a/framework/source/uielement/statusbarmerger.cxx
+++ b/framework/source/uielement/statusbarmerger.cxx
@@ -18,7 +18,6 @@
*/
#include <uielement/statusbarmerger.hxx>
-using rtl::OUString;
using com::sun::star::beans::PropertyValue;
using com::sun::star::uno::Sequence;
@@ -138,7 +137,7 @@ bool lcl_ReplaceItem( StatusBar* pStatusbar,
bool lcl_RemoveItems( StatusBar* pStatusbar,
sal_uInt16 nPos,
- const ::rtl::OUString& rMergeCommandParameter )
+ const OUString& rMergeCommandParameter )
{
sal_Int32 nCount = rMergeCommandParameter.toInt32();
if ( nCount > 0 )
@@ -180,7 +179,7 @@ sal_uInt16 StatusbarMerger::FindReferencePos(
{
for ( sal_uInt16 nPos = 0; nPos < pStatusbar->GetItemCount(); nPos++ )
{
- const ::rtl::OUString rCmd = pStatusbar->GetItemCommand( pStatusbar->GetItemId( nPos ) );
+ const OUString rCmd = pStatusbar->GetItemCommand( pStatusbar->GetItemId( nPos ) );
if ( rReferencePoint == rCmd )
return nPos;
}
@@ -192,8 +191,8 @@ bool StatusbarMerger::ProcessMergeOperation(
StatusBar* pStatusbar,
sal_uInt16 nPos,
sal_uInt16& rItemId,
- const ::rtl::OUString& rMergeCommand,
- const ::rtl::OUString& rMergeCommandParameter,
+ const OUString& rMergeCommand,
+ const OUString& rMergeCommandParameter,
const AddonStatusbarItemContainer& rItems )
{
if ( rMergeCommand == MERGECOMMAND_ADDAFTER )
@@ -211,8 +210,8 @@ bool StatusbarMerger::ProcessMergeOperation(
bool StatusbarMerger::ProcessMergeFallback(
StatusBar* pStatusbar,
sal_uInt16& rItemId,
- const ::rtl::OUString& rMergeCommand,
- const ::rtl::OUString& rMergeFallback,
+ const OUString& rMergeCommand,
+ const OUString& rMergeFallback,
const AddonStatusbarItemContainer& rItems )
{
// fallback IGNORE or REPLACE/REMOVE item not found
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx
index 8603ad0e3643..deaf29485c6c 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -60,7 +60,7 @@ public:
virtual void SAL_CALL deregisterController( const OUString& aCommandURL, const OUString& aModuleName ) override;
protected:
- UIControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString &rUINode );
+ UIControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, const OUString &rUINode );
bool m_bConfigRead;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
rtl::Reference<ConfigurationAccess_ControllerFactory> m_pConfigAccess;
@@ -71,7 +71,7 @@ private:
UIControllerFactory::UIControllerFactory(
const Reference< XComponentContext >& xContext,
- const rtl::OUString &rConfigurationNode )
+ const OUString &rConfigurationNode )
: UIControllerFactory_BASE(m_aMutex)
, m_bConfigRead( false )
, m_xContext( xContext )
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index 9cd8f4465894..74ceb348dc46 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -58,15 +58,10 @@
#define YYDEBUG 1
#define YYERROR_VERBOSE 1
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OStringToOUString;
-using ::rtl::OStringBuffer;
-
extern int yylex(void);
static void yyerror(char const *);
-static void checkIdentifier(::rtl::OString const * id)
+static void checkIdentifier(OString const * id)
{
static short check = 0;
if (check == 0) {
@@ -80,7 +75,7 @@ static void checkIdentifier(::rtl::OString const * id)
if ( (id->pData->buffer[0] >= 97 && id->pData->buffer[0] <= 122)
|| id->pData->buffer[0] == '_') {
if (check == 1) {
- ::rtl::OStringBuffer msg(25 + id->getLength());
+ OStringBuffer msg(25 + id->getLength());
msg.append("mismatched identifier '");
msg.append(*id);
msg.append("'");
@@ -103,8 +98,8 @@ static void reportDoubleMemberDeclarations(
}
static void addInheritedInterface(
- AstInterface * ifc, rtl::OString const & name, bool optional,
- rtl::OUString const & documentation)
+ AstInterface * ifc, OString const & name, bool optional,
+ OUString const & documentation)
{
AstDeclaration * decl = ifc->lookupByName(name);
AstDeclaration const * resolved = resolveTypedefs(decl);
@@ -141,7 +136,7 @@ static void addInheritedInterface(
}
static AstDeclaration const * createNamedType(
- rtl::OString const * scopedName, DeclList const * typeArgs)
+ OString const * scopedName, DeclList const * typeArgs)
{
AstDeclaration * decl = idlc()->scopes()->topNonNull()->lookupByName(
*scopedName);
@@ -219,8 +214,8 @@ static bool includes(AstDeclaration const * type1, AstDeclaration const * type2)
FeDeclarator* fdval; /* declarator value */
FeDeclList* dlval; /* declarator list value */
FeInheritanceHeader* ihval; /* inheritance header value */
- ::rtl::OString* sval; /* OString value */
- std::vector< rtl::OString > * svals;
+ OString* sval; /* OString value */
+ std::vector< OString > * svals;
sal_Char* strval; /* sal_Char* value */
bool bval; /* sal_Boolean* value */
sal_Int64 ival; /* sal_Int64 value */
@@ -631,8 +626,8 @@ interface_dcl :
&& ifc->getScopedName() != "com::sun::star::uno::XInterface")
{
addInheritedInterface(
- ifc, rtl::OString("::com::sun::star::uno::XInterface"), false,
- rtl::OUString());
+ ifc, OString("::com::sun::star::uno::XInterface"), false,
+ OUString());
}
ifc->setDefined();
idlc()->setParseState(PS_InterfaceBodySeen);
@@ -887,8 +882,8 @@ opt_attribute_get_raises:
attribute_get_raises:
IDL_GET raises ';'
{
- $$.documentation = new rtl::OUString(
- rtl::OStringToOUString(
+ $$.documentation = new OUString(
+ OStringToOUString(
idlc()->getDocumentation(), RTL_TEXTENCODING_UTF8));
$$.exceptions = $2;
}
@@ -910,8 +905,8 @@ attribute_set_raises:
}
raises ';'
{
- $$.documentation = new rtl::OUString(
- rtl::OStringToOUString(
+ $$.documentation = new OUString(
+ OStringToOUString(
idlc()->getDocumentation(), RTL_TEXTENCODING_UTF8));
$$.exceptions = $3;
}
@@ -1194,7 +1189,7 @@ interface_inheritance_decl:
} else {
addInheritedInterface(
ifc, *$4, $1,
- rtl::OStringToOUString(
+ OStringToOUString(
idlc()->getDocumentation(), RTL_TEXTENCODING_UTF8));
}
delete $4;
@@ -2176,7 +2171,7 @@ scoped_name :
identifier
{
checkIdentifier($4);
- *$1 += ::rtl::OString("::");
+ *$1 += OString("::");
*$1 += *$4;
delete $4;
$$ = $1;
@@ -2478,7 +2473,7 @@ opt_type_params:
type_params:
identifier
{
- $$ = new std::vector< rtl::OString >;
+ $$ = new std::vector< OString >;
$$->push_back(*$1);
delete $1;
}
diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l
index 180381c3ff38..a7c23f458b96 100644
--- a/idlc/source/scanner.l
+++ b/idlc/source/scanner.l
@@ -58,7 +58,7 @@ int yycolumn = 1;
yycolumn += yyleng;
sal_Int32 beginLine = 0;
-::rtl::OString docu;
+OString docu;
static int asciiToInteger(char const * s, sal_Int64 * sval, sal_uInt64 * uval) {
bool neg = false;
@@ -202,12 +202,12 @@ static double asciiToFloat(const sal_Char *s)
static void idlParsePragma(sal_Char* pPragma)
{
- ::rtl::OString pragma(pPragma);
+ OString pragma(pPragma);
sal_Int32 index = pragma.indexOf("include");
sal_Char* begin = pPragma + index + 8;
sal_Char* offset = begin;
while (*offset != ',') offset++;
- //::rtl::OString include = pragma.copy(index + 8, offset - begin);
+ //OString include = pragma.copy(index + 8, offset - begin);
//unused// idlc()->insertInclude(pragma.copy(index + 8, (sal_Int32)(offset - begin)));
}
@@ -239,9 +239,9 @@ static void parseLineAndFile(sal_Char* pBuf)
for (; *r != '"'; r++) ;
*r = 0;
if (*h == '\0')
- idlc()->setFileName(::rtl::OString("standard input"));
+ idlc()->setFileName(OString("standard input"));
else
- idlc()->setFileName(::rtl::OString(h));
+ idlc()->setFileName(OString(h));
bIsInMain = idlc()->getFileName() == idlc()->getRealFileName();
idlc()->setInMainfile(bIsInMain);
@@ -364,7 +364,7 @@ published return IDL_PUBLISHED;
}
{IDENTIFIER} {
- yylval.sval = new ::rtl::OString(yytext);
+ yylval.sval = new OString(yytext);
return IDL_IDENTIFIER;
}
@@ -383,26 +383,26 @@ published return IDL_PUBLISHED;
"/*" {
BEGIN( COMMENT );
- docu = ::rtl::OString();
+ docu = OString();
beginLine = idlc()->getLineNumber();
}
"/***" {
BEGIN( COMMENT );
- docu = ::rtl::OString();
+ docu = OString();
beginLine = idlc()->getLineNumber();
}
<COMMENT>[^*]+ {
- docu += ::rtl::OString(yytext);
+ docu += OString(yytext);
}
<COMMENT>"*"[^*/]+ {
- docu += ::rtl::OString(yytext);
+ docu += OString(yytext);
}
<COMMENT>"**" {
- docu += ::rtl::OString(yytext);
+ docu += OString(yytext);
}
<COMMENT>[*]+"/" {
@@ -416,26 +416,26 @@ published return IDL_PUBLISHED;
"/**" {
BEGIN( DOCU );
- docu = ::rtl::OString();
+ docu = OString();
beginLine = idlc()->getLineNumber();
}
<DOCU>[^*\n]+ {
- docu += ::rtl::OString(yytext);
+ docu += OString(yytext);
}
<DOCU>"\n"[ \t]*"*"{1} {
idlc()->setLineNumber( idlc()->getLineNumber() + 1);
- docu += ::rtl::OString("\n");
+ docu += OString("\n");
}
<DOCU>"\n" {
idlc()->setLineNumber( idlc()->getLineNumber() + 1);
- docu += ::rtl::OString(yytext);
+ docu += OString(yytext);
}
<DOCU>"*"[^*^/\n]* {
- docu += ::rtl::OString(yytext);
+ docu += OString(yytext);
}
<DOCU>"\n"[ \t]*"*/" {
@@ -474,7 +474,7 @@ published return IDL_PUBLISHED;
"//"[^/]{1}.*"\n" {
/* only a comment */
- ::rtl::OString docStr(yytext);
+ OString docStr(yytext);
docStr = docStr.copy( 0, docStr.lastIndexOf('\n') );
docStr = docStr.copy( docStr.lastIndexOf('/')+1 );
docStr = docStr.trim();
@@ -482,7 +482,7 @@ published return IDL_PUBLISHED;
}
"///".*"\n" {
- ::rtl::OString docStr(yytext);
+ OString docStr(yytext);
docStr = docStr.copy( 0, docStr.lastIndexOf('\n') );
docStr = docStr.copy( docStr.lastIndexOf('/')+1 );
docStr = docStr.trim();
diff --git a/include/comphelper/DisableInteractionHelper.hxx b/include/comphelper/DisableInteractionHelper.hxx
index 7d99112edeaa..da513b9b23eb 100644
--- a/include/comphelper/DisableInteractionHelper.hxx
+++ b/include/comphelper/DisableInteractionHelper.hxx
@@ -29,7 +29,7 @@ public:
private:
virtual ~NoEnableJavaInteractionContext() override {}
- virtual css::uno::Any SAL_CALL getValueByName(rtl::OUString const& Name) override
+ virtual css::uno::Any SAL_CALL getValueByName(OUString const& Name) override
{
if (Name == "DontEnableJava")
return css::uno::Any(true);
diff --git a/include/comphelper/backupfilehelper.hxx b/include/comphelper/backupfilehelper.hxx
index 33042e917ec3..70dd77667826 100644
--- a/include/comphelper/backupfilehelper.hxx
+++ b/include/comphelper/backupfilehelper.hxx
@@ -184,7 +184,7 @@ namespace comphelper
private:
// internal helper methods
- static const rtl::OUString getPackURL();
+ static const OUString getPackURL();
static const std::vector< OUString >& getCustomizationDirNames();
static const std::vector< OUString >& getCustomizationFileNames();
diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx
index 240545848b30..b45d584c9c7a 100644
--- a/include/comphelper/docpasswordhelper.hxx
+++ b/include/comphelper/docpasswordhelper.hxx
@@ -219,11 +219,11 @@ public:
@return the raw hash value as sal_Int8 sequence.
*/
static css::uno::Sequence<sal_Int8> GetOoxHashAsSequence(
- const rtl::OUString& rPassword,
- const rtl::OUString& rSaltValue,
+ const OUString& rPassword,
+ const OUString& rSaltValue,
sal_uInt32 nSpinCount,
comphelper::Hash::IterCount eIterCount,
- const rtl::OUString& rAlgorithmName);
+ const OUString& rAlgorithmName);
/** Convenience function to calculate a salted hash with iterations as
@@ -264,12 +264,12 @@ public:
@return the base64 encoded string of the hash value, that can be
compared against a stored base64 encoded hash value.
*/
- static rtl::OUString GetOoxHashAsBase64(
- const rtl::OUString& rPassword,
- const rtl::OUString& rSaltValue,
+ static OUString GetOoxHashAsBase64(
+ const OUString& rPassword,
+ const OUString& rSaltValue,
sal_uInt32 nSpinCount,
comphelper::Hash::IterCount eIterCount,
- const rtl::OUString& rAlgorithmName);
+ const OUString& rAlgorithmName);
/** Convenience function to calculate a salted hash with iterations as
@@ -309,11 +309,11 @@ public:
@return the raw the hash value.
*/
static std::vector<unsigned char> GetOoxHashAsVector(
- const rtl::OUString& rPassword,
+ const OUString& rPassword,
const std::vector<unsigned char>& rSaltValue,
sal_uInt32 nSpinCount,
comphelper::Hash::IterCount eIterCount,
- const rtl::OUString& rAlgorithmName);
+ const OUString& rAlgorithmName);
/** This helper function generates a random sequence of bytes of
diff --git a/include/drawinglayer/primitive2d/textlayoutdevice.hxx b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
index 6a44d737c5dd..e95c00410249 100644
--- a/include/drawinglayer/primitive2d/textlayoutdevice.hxx
+++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
@@ -82,19 +82,19 @@ namespace drawinglayer
double getStrikeoutOffset() const;
double getTextWidth(
- const rtl::OUString& rText,
+ const OUString& rText,
sal_uInt32 nIndex,
sal_uInt32 nLength) const;
void getTextOutlines(
basegfx::B2DPolyPolygonVector&,
- const rtl::OUString& rText,
+ const OUString& rText,
sal_uInt32 nIndex,
sal_uInt32 nLength,
const ::std::vector< double >& rDXArray) const;
basegfx::B2DRange getTextBoundRect(
- const rtl::OUString& rText,
+ const OUString& rText,
sal_uInt32 nIndex,
sal_uInt32 nLength) const;
@@ -103,12 +103,12 @@ namespace drawinglayer
void addTextRectActions(
const tools::Rectangle& rRectangle,
- const rtl::OUString& rText,
+ const OUString& rText,
DrawTextFlags nStyle,
GDIMetaFile& rGDIMetaFile) const;
::std::vector< double > getTextArray(
- const rtl::OUString& rText,
+ const OUString& rText,
sal_uInt32 nIndex,
sal_uInt32 nLength) const;
};
diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx
index 1f3f8923e062..91f8dc109276 100644
--- a/include/framework/addonmenu.hxx
+++ b/include/framework/addonmenu.hxx
@@ -63,7 +63,7 @@ class FWE_DLLPUBLIC AddonMenuManager
sal_uInt16& nUniqueMenuId,
const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& aAddonMenuDefinition,
const css::uno::Reference< css::frame::XFrame >& rFrame,
- const ::rtl::OUString& rModuleIdentifier );
+ const OUString& rModuleIdentifier );
// Retrieve the menu entry property values from a sequence
static void GetMenuEntry( const css::uno::Sequence< css::beans::PropertyValue >& rAddonMenuEntry,
diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx
index 001d248f7dc5..2da3a8c4f4a3 100644
--- a/include/framework/addonsoptions.hxx
+++ b/include/framework/addonsoptions.hxx
@@ -71,10 +71,10 @@ typedef ::std::vector< MergeToolbarInstruction > MergeToolbarInstructionContaine
struct FWE_DLLPUBLIC MergeStatusbarInstruction
{
- ::rtl::OUString aMergePoint;
- ::rtl::OUString aMergeCommand;
- ::rtl::OUString aMergeCommandParameter;
- ::rtl::OUString aMergeContext;
+ OUString aMergePoint;
+ OUString aMergeCommand;
+ OUString aMergeCommandParameter;
+ OUString aMergeContext;
css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aMergeStatusbarItems;
};
diff --git a/include/o3tl/string_view.hxx b/include/o3tl/string_view.hxx
index 303e4800af79..bdc81e8d7261 100644
--- a/include/o3tl/string_view.hxx
+++ b/include/o3tl/string_view.hxx
@@ -28,7 +28,7 @@
#include <sal/types.h>
// An approximation of C++17 <string_view>, including implicit conversion
-// from rtl::OString and rtl::OUString.
+// from OString and OUString.
namespace o3tl {
@@ -547,7 +547,7 @@ public:
data_(s.data()), size_(s.size()) {}
// For std::string_view, this will be provided by a (LIBO_INTERNAL_ONLY)
- // non-explicit conversion operator from rtl::OString:
+ // non-explicit conversion operator from OString:
template<typename T = charT> basic_string_view(
OString const & s,
typename std::enable_if<
@@ -556,7 +556,7 @@ public:
data_(s.getStr()), size_(s.getLength()) {}
// For std::u16string_view, this will be provided by a (LIBO_INTERNAL_ONLY)
- // non-explicit conversion operator from rtl::OUString:
+ // non-explicit conversion operator from OUString:
template<typename T = charT> basic_string_view(
OUString const & s,
typename std::enable_if<
@@ -566,10 +566,10 @@ public:
// For std::u16string_view, this would either be provided by a
// (LIBO_INTERNAL_ONLY) non-explicit conversion operator from
- // rtl::OUStringLiteral, or rtl::OUStringLiteral would be given up in favor
+ // OUStringLiteral, or OUStringLiteral would be given up in favor
// of std::u16string_view anyway (but this constructor also serves to reject
// as ambiguous construction of a o3tl::u16string_view from a narrow string
- // literal, which would otherwise go via the above rtl::OUString
+ // literal, which would otherwise go via the above OUString
// constructor):
template<typename T = charT> constexpr basic_string_view(
OUStringLiteral literal,
@@ -858,7 +858,7 @@ namespace o3tl {
// LO-specific convenience functions:
// For std::u16string_view, this will be provided by a (LIBO_INTERNAL_ONLY)
-// rtl::OUString constructor:
+// OUString constructor:
inline OUString toOUString(u16string_view s)
{ return OUString(s.data(), s.size()); }
diff --git a/include/oox/drawingml/clrscheme.hxx b/include/oox/drawingml/clrscheme.hxx
index b37b6659a443..8b99b8523d77 100644
--- a/include/oox/drawingml/clrscheme.hxx
+++ b/include/oox/drawingml/clrscheme.hxx
@@ -49,7 +49,7 @@ enum PredefinedClrSchemeId {
Count
};
-static std::map<PredefinedClrSchemeId, rtl::OUString> PredefinedClrNames =
+static std::map<PredefinedClrSchemeId, OUString> PredefinedClrNames =
{
//{ dk1, "dk1" },
//{ lt1, "lt1" },
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 3d67e49b23c3..b53988e2f908 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -598,8 +598,8 @@ public:
sal_uInt32 mnTabStyle;
sal_uInt32 mnTabData;
sal_uInt32 mnVariousPropertyBits;
- std::vector< ::rtl::OUString > maItems; // captions for each tab
- std::vector< ::rtl::OUString > maTabNames; // names for each tab
+ std::vector< OUString > maItems; // captions for each tab
+ std::vector< OUString > maTabNames; // names for each tab
};
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index f8fde406d06a..58199fc463f6 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -198,7 +198,7 @@ private:
OUString maPrjName; ///< Name of the VBA project.
css::uno::Reference< css::container::XNameContainer >
mxOleOverridesSink;
- typedef RefMap< rtl::OUString, VbaModule > VbaModuleMap;
+ typedef RefMap< OUString, VbaModule > VbaModuleMap;
VbaModuleMap maModules;
VbaModuleMap maModulesByStrm;
};
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index 55e7afedcb50..2bab907e884f 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -101,8 +101,8 @@ struct OOX_DLLPUBLIC ShapeTypeModel
OptValue< OUString > moGraphicTitle; ///< Title of the graphic.
OptValue< OUString > moWrapAnchorX; ///< The base object from which our horizontal positioning should be calculated.
OptValue< OUString > moWrapAnchorY; ///< The base object from which our vertical positioning should be calculated.
- OptValue< ::rtl::OUString > moWrapType; ///< How to wrap the text around the object
- OptValue< ::rtl::OUString > moWrapSide; ///< On which side to wrap the text around the object
+ OptValue< OUString > moWrapType; ///< How to wrap the text around the object
+ OptValue< OUString > moWrapSide; ///< On which side to wrap the text around the object
OUString maVTextAnchor; ///< How the text inside the shape is anchored vertically.
OUString maWrapDistanceLeft; ///< Distance from the left side of the shape to the text that wraps around it.
OUString maWrapDistanceRight; ///< Distance from the right side of the shape to the text that wraps around it.
diff --git a/include/registry/reader.hxx b/include/registry/reader.hxx
index d25e719119ed..a41327f5e928 100644
--- a/include/registry/reader.hxx
+++ b/include/registry/reader.hxx
@@ -124,13 +124,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getDocumentation() const {
+ OUString getDocumentation() const {
rtl_uString * s = nullptr;
typereg_reader_getDocumentation(m_handle, &s);
if (s == nullptr) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -142,13 +142,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
@deprecated
*/
- rtl::OUString getFileName() const {
+ OUString getFileName() const {
rtl_uString * s = nullptr;
typereg_reader_getFileName(m_handle, &s);
if (s == nullptr) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -183,13 +183,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getTypeName() const {
+ OUString getTypeName() const {
rtl_uString * s = nullptr;
typereg_reader_getTypeName(m_handle, &s);
if (s == nullptr) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -212,13 +212,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getSuperTypeName(sal_uInt16 index) const {
+ OUString getSuperTypeName(sal_uInt16 index) const {
rtl_uString * s = nullptr;
typereg_reader_getSuperTypeName(m_handle, &s, index);
if (s == nullptr) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -240,13 +240,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getFieldDocumentation(sal_uInt16 index) const {
+ OUString getFieldDocumentation(sal_uInt16 index) const {
rtl_uString * s = nullptr;
typereg_reader_getFieldDocumentation(m_handle, &s, index);
if (s == nullptr) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -259,13 +259,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
@deprecated
*/
- rtl::OUString getFieldFileName(sal_uInt16 index) const {
+ OUString getFieldFileName(sal_uInt16 index) const {
rtl_uString * s = nullptr;
typereg_reader_getFieldFileName(m_handle, &s, index);
if (s == nullptr) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -288,13 +288,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getFieldName(sal_uInt16 index) const {
+ OUString getFieldName(sal_uInt16 index) const {
rtl_uString * s = nullptr;
typereg_reader_getFieldName(m_handle, &s, index);
if (s == nullptr) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -306,13 +306,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getFieldTypeName(sal_uInt16 index) const {
+ OUString getFieldTypeName(sal_uInt16 index) const {
rtl_uString * s = nullptr;
typereg_reader_getFieldTypeName(m_handle, &s, index);
if (s == nullptr) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -353,13 +353,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodDocumentation(sal_uInt16 index) const {
+ OUString getMethodDocumentation(sal_uInt16 index) const {
rtl_uString * s = nullptr;
typereg_reader_getMethodDocumentation(m_handle, &s, index);
if (s == nullptr) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -382,13 +382,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodName(sal_uInt16 index) const {
+ OUString getMethodName(sal_uInt16 index) const {
rtl_uString * s = nullptr;
typereg_reader_getMethodName(m_handle, &s, index);
if (s == nullptr) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -400,13 +400,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodReturnTypeName(sal_uInt16 index) const {
+ OUString getMethodReturnTypeName(sal_uInt16 index) const {
rtl_uString * s = nullptr;
typereg_reader_getMethodReturnTypeName(m_handle, &s, index);
if (s == nullptr) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -451,7 +451,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodParameterName(
+ OUString getMethodParameterName(
sal_uInt16 methodIndex, sal_uInt16 parameterIndex) const
{
rtl_uString * s = nullptr;
@@ -460,7 +460,7 @@ public:
if (s == nullptr) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -476,7 +476,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodParameterTypeName(
+ OUString getMethodParameterTypeName(
sal_uInt16 methodIndex, sal_uInt16 parameterIndex) const
{
rtl_uString * s = nullptr;
@@ -485,7 +485,7 @@ public:
if (s == nullptr) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -512,7 +512,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodExceptionTypeName(
+ OUString getMethodExceptionTypeName(
sal_uInt16 methodIndex, sal_uInt16 exceptionIndex) const
{
rtl_uString * s = nullptr;
@@ -521,7 +521,7 @@ public:
if (s == nullptr) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -544,13 +544,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getReferenceDocumentation(sal_uInt16 index) const {
+ OUString getReferenceDocumentation(sal_uInt16 index) const {
rtl_uString * s = nullptr;
typereg_reader_getReferenceDocumentation(m_handle, &s, index);
if (s == nullptr) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -587,13 +587,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getReferenceTypeName(sal_uInt16 index) const {
+ OUString getReferenceTypeName(sal_uInt16 index) const {
rtl_uString * s = nullptr;
typereg_reader_getReferenceTypeName(m_handle, &s, index);
if (s == nullptr) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
private:
diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx
index 41e86c07c08d..0cd7d576f644 100644
--- a/include/registry/registry.hxx
+++ b/include/registry/registry.hxx
@@ -125,14 +125,14 @@ public:
inline RegError openRootKey(RegistryKey& rRootKey);
/// returns the name of the current registry data file.
- inline rtl::OUString getName();
+ inline OUString getName();
/** creates a new registry with the specified name and creates a root key.
@param registryName specifies the name of the new registry.
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError create(const rtl::OUString& registryName);
+ inline RegError create(const OUString& registryName);
/** opens a registry with the specified name.
@@ -141,7 +141,7 @@ public:
@param accessMode specifies the access mode for the registry, RegAccessMode::READONLY or RegAccessMode::READWRITE.
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError open(const rtl::OUString& registryName,
+ inline RegError open(const OUString& registryName,
RegAccessMode accessMode);
/// closes explicitly the current registry data file.
@@ -153,7 +153,7 @@ public:
itself will be destroyed.
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError destroy(const rtl::OUString& registryName);
+ inline RegError destroy(const OUString& registryName);
/** merges the registry information of the specified key with the registry
information of the specified file.
@@ -170,8 +170,8 @@ public:
restore the state before merging.
*/
inline RegError mergeKey(RegistryKey& rKey,
- const rtl::OUString& keyName,
- const rtl::OUString& regFileName,
+ const OUString& keyName,
+ const OUString& regFileName,
bool bReport);
friend class RegistryKey;
@@ -241,7 +241,7 @@ public:
inline ~RegistryKeyNames();
/// returns the name of the key specified by index.
- inline rtl::OUString getElement(sal_uInt32 index);
+ inline OUString getElement(sal_uInt32 index);
/// returns the length of the array.
inline sal_uInt32 getLength() const;
@@ -368,7 +368,7 @@ public:
inline bool isReadOnly() const;
/// returns the full qualified name of the key beginning with the rootkey.
- inline rtl::OUString getName();
+ inline OUString getName();
/** creates a new key or opens a key if the specified key already exists.
@@ -377,7 +377,7 @@ public:
@param rNewKey references a RegistryKey which will be filled with the new or open key.
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError createKey(const rtl::OUString& keyName,
+ inline RegError createKey(const OUString& keyName,
RegistryKey& rNewKey);
/** opens the specified key.
@@ -387,7 +387,7 @@ public:
@param rOpenKey references a RegistryKey which will be filled with the open key.
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError openKey(const rtl::OUString& keyName,
+ inline RegError openKey(const OUString& keyName,
RegistryKey& rOpenKey);
/** opens all subkeys of the specified key.
@@ -397,7 +397,7 @@ public:
@param rSubKeys reference a RegistryKeyArray which will be filled with the open subkeys.
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError openSubKeys(const rtl::OUString& keyName,
+ inline RegError openSubKeys(const OUString& keyName,
RegistryKeyArray& rSubKeys);
/** returns an array with the names of all subkeys of the specified key.
@@ -407,7 +407,7 @@ public:
@param rSubKeyNames reference a RegistryKeyNames array which will be filled with the subkey names.
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError getKeyNames(const rtl::OUString& keyName,
+ inline RegError getKeyNames(const OUString& keyName,
RegistryKeyNames& rSubKeyNames);
/** deletes the specified key.
@@ -415,7 +415,7 @@ public:
@param keyName specifies the name of the key which will be deleted.
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError deleteKey(const rtl::OUString& keyName);
+ inline RegError deleteKey(const OUString& keyName);
/// closes explicitly the current key
inline RegError closeKey();
@@ -433,7 +433,7 @@ public:
@param valueSize specifies the size of pData in bytes
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError setValue(const rtl::OUString& keyName,
+ inline RegError setValue(const OUString& keyName,
RegValueType valueType,
RegValue pValue,
sal_uInt32 valueSize);
@@ -447,7 +447,7 @@ public:
@param len specifies the length of the list (the array referenced by pValueList).
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError setLongListValue(const rtl::OUString& keyName,
+ inline RegError setLongListValue(const OUString& keyName,
sal_Int32 const * pValueList,
sal_uInt32 len);
@@ -460,7 +460,7 @@ public:
@param len specifies the length of the list (the array referenced by pValueList).
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError setStringListValue(const rtl::OUString& keyName,
+ inline RegError setStringListValue(const OUString& keyName,
sal_Char** pValueList,
sal_uInt32 len);
@@ -473,7 +473,7 @@ public:
@param len specifies the length of the list (the array referenced by pValueList).
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError setUnicodeListValue(const rtl::OUString& keyName,
+ inline RegError setUnicodeListValue(const OUString& keyName,
sal_Unicode** pValueList,
sal_uInt32 len);
@@ -486,7 +486,7 @@ public:
@param pValueSize returns the size of the value in bytes or the length of a list value.
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError getValueInfo(const rtl::OUString& keyName,
+ inline RegError getValueInfo(const OUString& keyName,
RegValueType* pValueType,
sal_uInt32* pValueSize);
@@ -498,7 +498,7 @@ public:
@param pValue points to an allocated memory block receiving the data of the value.
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError getValue(const rtl::OUString& keyName,
+ inline RegError getValue(const OUString& keyName,
RegValue pValue);
/** gets a long list value of a key.
@@ -509,7 +509,7 @@ public:
@param rValueList references a RegistryValueList which will be filled with the long values.
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError getLongListValue(const rtl::OUString& keyName,
+ inline RegError getLongListValue(const OUString& keyName,
RegistryValueList<sal_Int32>& rValueList);
/** gets an ascii list value of a key.
@@ -520,7 +520,7 @@ public:
@param rValueList references a RegistryValueList which will be filled with the ascii values.
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError getStringListValue(const rtl::OUString& keyName,
+ inline RegError getStringListValue(const OUString& keyName,
RegistryValueList<sal_Char*>& rValueList);
/** gets a unicode value of a key.
@@ -531,7 +531,7 @@ public:
@param rValueList reference a RegistryValueList which will be filled with the unicode values.
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError getUnicodeListValue(const rtl::OUString& keyName,
+ inline RegError getUnicodeListValue(const OUString& keyName,
RegistryValueList<sal_Unicode*>& rValueList);
/** resolves a keyname.
@@ -541,11 +541,11 @@ public:
@param[out] rResolvedName the resolved name.
@return RegError::NO_ERROR if succeeds else an error code.
*/
- inline RegError getResolvedKeyName(const rtl::OUString& keyName,
- rtl::OUString& rResolvedName) const;
+ inline RegError getResolvedKeyName(const OUString& keyName,
+ OUString& rResolvedName) const;
/// returns the name of the registry in which the key is defined.
- inline rtl::OUString getRegistryName();
+ inline OUString getRegistryName();
friend class Registry;
public:
@@ -618,13 +618,13 @@ inline RegistryKeyNames::~RegistryKeyNames()
m_registry.m_pApi->freeKeyNames(m_pKeyNames, m_length);
}
-inline rtl::OUString RegistryKeyNames::getElement(sal_uInt32 index)
+inline OUString RegistryKeyNames::getElement(sal_uInt32 index)
{
if (m_pKeyNames && index < m_length)
return m_pKeyNames[index];
else
- return rtl::OUString();
+ return OUString();
}
inline sal_uInt32 RegistryKeyNames::getLength() const
@@ -700,15 +700,15 @@ inline bool RegistryKey::isReadOnly() const
return false;
}
-inline rtl::OUString RegistryKey::getName()
+inline OUString RegistryKey::getName()
{
- rtl::OUString sRet;
+ OUString sRet;
if (m_registry.isValid())
m_registry.m_pApi->getKeyName(m_hImpl, &sRet.pData);
return sRet;
}
-inline RegError RegistryKey::createKey(const rtl::OUString& keyName,
+inline RegError RegistryKey::createKey(const OUString& keyName,
RegistryKey& rNewKey)
{
if (rNewKey.isValid()) rNewKey.closeKey();
@@ -721,7 +721,7 @@ inline RegError RegistryKey::createKey(const rtl::OUString& keyName,
return RegError::INVALID_KEY;
}
-inline RegError RegistryKey::openKey(const rtl::OUString& keyName,
+inline RegError RegistryKey::openKey(const OUString& keyName,
RegistryKey& rOpenKey)
{
if (rOpenKey.isValid()) rOpenKey.closeKey();
@@ -735,7 +735,7 @@ inline RegError RegistryKey::openKey(const rtl::OUString& keyName,
return RegError::INVALID_KEY;
}
-inline RegError RegistryKey::openSubKeys(const rtl::OUString& keyName,
+inline RegError RegistryKey::openSubKeys(const OUString& keyName,
RegistryKeyArray& rSubKeys)
{
if (m_registry.isValid())
@@ -757,7 +757,7 @@ inline RegError RegistryKey::openSubKeys(const rtl::OUString& keyName,
return RegError::INVALID_KEY;
}
-inline RegError RegistryKey::getKeyNames(const rtl::OUString& keyName,
+inline RegError RegistryKey::getKeyNames(const OUString& keyName,
RegistryKeyNames& rSubKeyNames)
{
if (m_registry.isValid())
@@ -779,7 +779,7 @@ inline RegError RegistryKey::getKeyNames(const rtl::OUString& keyName,
return RegError::INVALID_KEY;
}
-inline RegError RegistryKey::deleteKey(const rtl::OUString& keyName)
+inline RegError RegistryKey::deleteKey(const OUString& keyName)
{
if (m_registry.isValid())
return m_registry.m_pApi->deleteKey(m_hImpl, keyName.pData);
@@ -811,7 +811,7 @@ inline void RegistryKey::releaseKey()
}
}
-inline RegError RegistryKey::setValue(const rtl::OUString& keyName,
+inline RegError RegistryKey::setValue(const OUString& keyName,
RegValueType valueType,
RegValue pValue,
sal_uInt32 valueSize)
@@ -823,7 +823,7 @@ inline RegError RegistryKey::setValue(const rtl::OUString& keyName,
return RegError::INVALID_KEY;
}
-inline RegError RegistryKey::setLongListValue(const rtl::OUString& keyName,
+inline RegError RegistryKey::setLongListValue(const OUString& keyName,
sal_Int32 const * pValueList,
sal_uInt32 len)
{
@@ -834,7 +834,7 @@ inline RegError RegistryKey::setLongListValue(const rtl::OUString& keyName,
return RegError::INVALID_KEY;
}
-inline RegError RegistryKey::setStringListValue(const rtl::OUString& keyName,
+inline RegError RegistryKey::setStringListValue(const OUString& keyName,
sal_Char** pValueList,
sal_uInt32 len)
{
@@ -845,7 +845,7 @@ inline RegError RegistryKey::setStringListValue(const rtl::OUString& keyName,
return RegError::INVALID_KEY;
}
-inline RegError RegistryKey::setUnicodeListValue(const rtl::OUString& keyName,
+inline RegError RegistryKey::setUnicodeListValue(const OUString& keyName,
sal_Unicode** pValueList,
sal_uInt32 len)
{
@@ -856,7 +856,7 @@ inline RegError RegistryKey::setUnicodeListValue(const rtl::OUString& keyName,
return RegError::INVALID_KEY;
}
-inline RegError RegistryKey::getValueInfo(const rtl::OUString& keyName,
+inline RegError RegistryKey::getValueInfo(const OUString& keyName,
RegValueType* pValueType,
sal_uInt32* pValueSize)
{
@@ -866,7 +866,7 @@ inline RegError RegistryKey::getValueInfo(const rtl::OUString& keyName,
return RegError::INVALID_KEY;
}
-inline RegError RegistryKey::getValue(const rtl::OUString& keyName,
+inline RegError RegistryKey::getValue(const OUString& keyName,
RegValue pValue)
{
if (m_registry.isValid())
@@ -875,7 +875,7 @@ inline RegError RegistryKey::getValue(const rtl::OUString& keyName,
return RegError::INVALID_KEY;
}
-inline RegError RegistryKey::getLongListValue(const rtl::OUString& keyName,
+inline RegError RegistryKey::getLongListValue(const OUString& keyName,
RegistryValueList<sal_Int32>& rValueList)
{
if (m_registry.isValid())
@@ -898,7 +898,7 @@ inline RegError RegistryKey::getLongListValue(const rtl::OUString& keyName,
return RegError::INVALID_KEY;
}
-inline RegError RegistryKey::getStringListValue(const rtl::OUString& keyName,
+inline RegError RegistryKey::getStringListValue(const OUString& keyName,
RegistryValueList<sal_Char*>& rValueList)
{
if (m_registry.isValid())
@@ -921,7 +921,7 @@ inline RegError RegistryKey::getStringListValue(const rtl::OUString& keyName,
return RegError::INVALID_KEY;
}
-inline RegError RegistryKey::getUnicodeListValue(const rtl::OUString& keyName,
+inline RegError RegistryKey::getUnicodeListValue(const OUString& keyName,
RegistryValueList<sal_Unicode*>& rValueList)
{
if (m_registry.isValid())
@@ -944,8 +944,8 @@ inline RegError RegistryKey::getUnicodeListValue(const rtl::OUString& keyName,
return RegError::INVALID_KEY;
}
-inline RegError RegistryKey::getResolvedKeyName(const rtl::OUString& keyName,
- rtl::OUString& rResolvedName) const
+inline RegError RegistryKey::getResolvedKeyName(const OUString& keyName,
+ OUString& rResolvedName) const
{
if (m_registry.isValid())
return m_registry.m_pApi->getResolvedKeyName(m_hImpl,
@@ -956,13 +956,13 @@ inline RegError RegistryKey::getResolvedKeyName(const rtl::OUString& keyName,
return RegError::INVALID_KEY;
}
-inline rtl::OUString RegistryKey::getRegistryName()
+inline OUString RegistryKey::getRegistryName()
{
if (m_registry.isValid())
{
return m_registry.getName();
} else
- return rtl::OUString();
+ return OUString();
}
@@ -1011,21 +1011,21 @@ inline RegError Registry::openRootKey(RegistryKey& rRootKey)
return m_pApi->openRootKey(m_hImpl, &rRootKey.m_hImpl);
}
-inline rtl::OUString Registry::getName()
+inline OUString Registry::getName()
{
- rtl::OUString sRet;
+ OUString sRet;
m_pApi->getName(m_hImpl, &sRet.pData);
return sRet;
}
-inline RegError Registry::create(const rtl::OUString& registryName)
+inline RegError Registry::create(const OUString& registryName)
{
if (m_hImpl)
m_pApi->release(m_hImpl);
return m_pApi->createRegistry(registryName.pData, &m_hImpl);
}
-inline RegError Registry::open(const rtl::OUString& registryName,
+inline RegError Registry::open(const OUString& registryName,
RegAccessMode accessMode)
{
if (m_hImpl)
@@ -1041,7 +1041,7 @@ inline RegError Registry::close()
return ret;
}
-inline RegError Registry::destroy(const rtl::OUString& registryName)
+inline RegError Registry::destroy(const OUString& registryName)
{
RegError ret = m_pApi->destroyRegistry(m_hImpl, registryName.pData);
if ( ret == RegError::NO_ERROR && registryName.isEmpty() )
@@ -1050,8 +1050,8 @@ inline RegError Registry::destroy(const rtl::OUString& registryName)
}
inline RegError Registry::mergeKey(RegistryKey& rKey,
- const rtl::OUString& keyName,
- const rtl::OUString& regFileName,
+ const OUString& keyName,
+ const OUString& regFileName,
bool bReport)
{ return m_pApi->mergeKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData, false/*bWarnings*/, bReport); }
diff --git a/include/registry/writer.hxx b/include/registry/writer.hxx
index 7e3bfbd7e9bc..17d6838bd831 100644
--- a/include/registry/writer.hxx
+++ b/include/registry/writer.hxx
@@ -70,9 +70,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
Writer(
- typereg_Version version, rtl::OUString const & documentation,
- rtl::OUString const & fileName, RTTypeClass typeClass, bool published,
- rtl::OUString const & typeName, sal_uInt16 superTypeCount,
+ typereg_Version version, OUString const & documentation,
+ OUString const & fileName, RTTypeClass typeClass, bool published,
+ OUString const & typeName, sal_uInt16 superTypeCount,
sal_uInt16 fieldCount, sal_uInt16 methodCount,
sal_uInt16 referenceCount):
m_handle(
@@ -103,7 +103,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- void setSuperTypeName(sal_uInt16 index, rtl::OUString const & typeName) {
+ void setSuperTypeName(sal_uInt16 index, OUString const & typeName) {
if (!typereg_writer_setSuperTypeName(m_handle, index, typeName.pData)) {
throw std::bad_alloc();
}
@@ -129,9 +129,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
void setFieldData(
- sal_uInt16 index, rtl::OUString const & documentation,
- rtl::OUString const & fileName, RTFieldAccess flags, rtl::OUString const & name,
- rtl::OUString const & typeName, RTConstValue const & value)
+ sal_uInt16 index, OUString const & documentation,
+ OUString const & fileName, RTFieldAccess flags, OUString const & name,
+ OUString const & typeName, RTConstValue const & value)
{
if (!typereg_writer_setFieldData(
m_handle, index, documentation.pData, fileName.pData, flags,
@@ -161,9 +161,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
void setMethodData(
- sal_uInt16 index, rtl::OUString const & documentation,
- RTMethodMode flags, rtl::OUString const & name,
- rtl::OUString const & returnTypeName, sal_uInt16 parameterCount,
+ sal_uInt16 index, OUString const & documentation,
+ RTMethodMode flags, OUString const & name,
+ OUString const & returnTypeName, sal_uInt16 parameterCount,
sal_uInt16 exceptionCount)
{
if (!typereg_writer_setMethodData(
@@ -193,8 +193,8 @@ public:
*/
void setMethodParameterData(
sal_uInt16 methodIndex, sal_uInt16 parameterIndex,
- RTParamMode flags, rtl::OUString const & name,
- rtl::OUString const & typeName) const
+ RTParamMode flags, OUString const & name,
+ OUString const & typeName) const
{
if (!typereg_writer_setMethodParameterData(
m_handle, methodIndex, parameterIndex, flags, name.pData,
@@ -219,7 +219,7 @@ public:
*/
void setMethodExceptionTypeName(
sal_uInt16 methodIndex, sal_uInt16 exceptionIndex,
- rtl::OUString const & typeName)
+ OUString const & typeName)
{
if (!typereg_writer_setMethodExceptionTypeName(
m_handle, methodIndex, exceptionIndex, typeName.pData))
@@ -245,9 +245,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
void setReferenceData(
- sal_uInt16 index, rtl::OUString const & documentation,
+ sal_uInt16 index, OUString const & documentation,
RTReferenceType sort, RTFieldAccess flags,
- rtl::OUString const & typeName)
+ OUString const & typeName)
{
if (!typereg_writer_setReferenceData(
m_handle, index, documentation.pData, sort, flags,
diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx
index 7d592f1fe03f..b0323cb11696 100644
--- a/include/sfx2/linksrc.hxx
+++ b/include/sfx2/linksrc.hxx
@@ -68,14 +68,14 @@ public:
void SetUpdateTimeout( sal_uInt64 nTimeMs );
// notify the sink, the mime type is not
// a selection criterion
- void DataChanged( const rtl::OUString & rMimeType,
+ void DataChanged( const OUString & rMimeType,
const css::uno::Any & rVal );
void SendDataChanged();
void NotifyDataChanged();
virtual bool Connect( SvBaseLink* );
virtual bool GetData( css::uno::Any & rData /*out param*/,
- const rtl::OUString & rMimeType,
+ const OUString & rMimeType,
bool bSynchron = false );
// sal_True => waitinmg for data
@@ -86,7 +86,7 @@ public:
virtual void Edit(weld::Window *, SvBaseLink *, const Link<const OUString&, void>& rEndEditHdl);
- void AddDataAdvise( SvBaseLink *, const rtl::OUString & rMimeType,
+ void AddDataAdvise( SvBaseLink *, const OUString & rMimeType,
sal_uInt16 nAdviceMode );
void RemoveAllDataAdvise( SvBaseLink const * );
diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx
index dbe529cdab29..0734998c7357 100644
--- a/include/sfx2/progress.hxx
+++ b/include/sfx2/progress.hxx
@@ -42,12 +42,12 @@ class SFX2_DLLPUBLIC SfxProgress
public:
SfxProgress( SfxObjectShell* pObjSh,
- const rtl::OUString& rText,
+ const OUString& rText,
sal_uInt32 nRange,
bool bWait = true);
virtual ~SfxProgress();
- void SetStateText( sal_uInt32 nVal, const rtl::OUString &rVal );
+ void SetStateText( sal_uInt32 nVal, const OUString &rVal );
void SetState( sal_uInt32 nVal, sal_uInt32 nNewRange = 0 );
sal_uInt32 GetState() const { return nVal; }
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index fa7ad8aeadbe..c6c7b243f62c 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -99,8 +99,8 @@ class SfxAbstractPasteDialog : virtual public VclAbstractDialog
protected:
virtual ~SfxAbstractPasteDialog() override = default;
public:
- virtual void Insert( SotClipboardFormatId nFormat, const rtl::OUString & rFormatName ) = 0;
- virtual void SetObjName( const SvGlobalName & rClass, const rtl::OUString & rObjName ) = 0;
+ virtual void Insert( SotClipboardFormatId nFormat, const OUString & rFormatName ) = 0;
+ virtual void SetObjName( const SvGlobalName & rClass, const OUString & rObjName ) = 0;
virtual SotClipboardFormatId GetFormat( const TransferableDataHelper& aHelper ) = 0;
};
@@ -115,7 +115,7 @@ class AbstractScriptSelectorDialog : virtual public VclAbstractDialog
protected:
virtual ~AbstractScriptSelectorDialog() override = default;
public:
- virtual rtl::OUString GetScriptURL() const = 0;
+ virtual OUString GetScriptURL() const = 0;
virtual void SetRunLabel() = 0;
};
@@ -126,7 +126,7 @@ class SFX2_DLLPUBLIC SfxAbstractDialogFactory : virtual public VclAbstractDialog
public:
virtual ~SfxAbstractDialogFactory() override; // needed for export of vtable
static SfxAbstractDialogFactory* Create();
- virtual VclPtr<VclAbstractDialog> CreateFrameDialog(vcl::Window* pParent, const css::uno::Reference< css::frame::XFrame >& rFrame, sal_uInt32 nResId, const rtl::OUString& rParameter ) = 0;
+ virtual VclPtr<VclAbstractDialog> CreateFrameDialog(vcl::Window* pParent, const css::uno::Reference< css::frame::XFrame >& rFrame, sal_uInt32 nResId, const OUString& rParameter ) = 0;
virtual VclPtr<SfxAbstractTabDialog> CreateAutoCorrTabDialog(vcl::Window* pParent, const SfxItemSet* pAttrSet) = 0;
virtual VclPtr<SfxAbstractTabDialog> CreateCustomizeTabDialog(
const SfxItemSet* pAttrSet,
@@ -140,7 +140,7 @@ public:
const css::uno::Reference < css::embed::XEmbeddedObject >& xObj )=0;
virtual VclPtr<SfxAbstractPasteDialog> CreatePasteDialog(weld::Window* pParent) = 0;
virtual VclPtr<SfxAbstractLinksDialog> CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=nullptr )=0;
- virtual VclPtr<VclAbstractDialog> CreateSvxScriptOrgDialog( vcl::Window* pParent, const rtl::OUString& rLanguage ) = 0;
+ virtual VclPtr<VclAbstractDialog> CreateSvxScriptOrgDialog( vcl::Window* pParent, const OUString& rLanguage ) = 0;
virtual VclPtr<AbstractScriptSelectorDialog>
CreateScriptSelectorDialog(
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 0887c4f3dfe9..f137729540b1 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -458,7 +458,7 @@ public:
/** Set the name of the sidebar context that is broadcast on calls
to Activation().
*/
- void SetContextName (const ::rtl::OUString& rsContextName);
+ void SetContextName (const OUString& rsContextName);
/** Broadcast a sidebar context change.
This method is typically called from Activate() or
diff --git a/include/sfx2/sidebar/Context.hxx b/include/sfx2/sidebar/Context.hxx
index d41b71d88403..aa6b2716cdd3 100644
--- a/include/sfx2/sidebar/Context.hxx
+++ b/include/sfx2/sidebar/Context.hxx
@@ -28,13 +28,13 @@ namespace sfx2 { namespace sidebar {
class Context
{
public:
- ::rtl::OUString msApplication;
- ::rtl::OUString msContext;
+ OUString msApplication;
+ OUString msContext;
Context();
Context (
- const ::rtl::OUString& rsApplication,
- const ::rtl::OUString& rsContext);
+ const OUString& rsApplication,
+ const OUString& rsContext);
/** When two contexts are matched against each other, then
application or context name may have the wildcard value 'any'.
diff --git a/include/sfx2/sidebar/ContextList.hxx b/include/sfx2/sidebar/ContextList.hxx
index 7db19ffeb590..08ee70cb617a 100644
--- a/include/sfx2/sidebar/ContextList.hxx
+++ b/include/sfx2/sidebar/ContextList.hxx
@@ -39,7 +39,7 @@ public:
public:
Context maContext;
bool mbIsInitiallyVisible;
- ::rtl::OUString msMenuCommand;
+ OUString msMenuCommand;
};
/** Return <TRUE/> when the given context matches any of the stored contexts.
@@ -52,7 +52,7 @@ public:
void AddContextDescription (
const Context& rContext,
const bool bIsInitiallyVisible,
- const ::rtl::OUString& rsMenuCommand);
+ const OUString& rsMenuCommand);
void ToggleVisibilityForContext( const Context& rContext,const bool bIsInitiallyVisible );
const ::std::vector<Entry>& GetEntries() const {return maEntries;};
diff --git a/include/sfx2/sidebar/ControllerFactory.hxx b/include/sfx2/sidebar/ControllerFactory.hxx
index feb40343afcb..83d631a1bed8 100644
--- a/include/sfx2/sidebar/ControllerFactory.hxx
+++ b/include/sfx2/sidebar/ControllerFactory.hxx
@@ -37,7 +37,7 @@ public:
static css::uno::Reference<css::frame::XToolbarController> CreateToolBoxController(
ToolBox* pToolBox,
const sal_uInt16 nItemId,
- const ::rtl::OUString& rsCommandName,
+ const OUString& rsCommandName,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
const css::uno::Reference<css::frame::XController>& rxController,
const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
@@ -46,7 +46,7 @@ public:
private:
static css::uno::Reference<css::frame::XToolbarController> CreateToolBarController(
ToolBox* pToolBox,
- const ::rtl::OUString& rsCommandName,
+ const OUString& rsCommandName,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
const css::uno::Reference<css::frame::XController>& rxController,
const sal_Int32 nWidth);
diff --git a/include/sfx2/sidebar/ResourceManager.hxx b/include/sfx2/sidebar/ResourceManager.hxx
index c0d9ed9ba2d9..677391938a7b 100644
--- a/include/sfx2/sidebar/ResourceManager.hxx
+++ b/include/sfx2/sidebar/ResourceManager.hxx
@@ -102,7 +102,7 @@ private:
typedef std::vector<std::shared_ptr<PanelDescriptor>> PanelContainer;
PanelContainer maPanels;
- mutable std::set<rtl::OUString> maProcessedApplications;
+ mutable std::set<OUString> maProcessedApplications;
std::map<OUString, OUString> maLastActiveDecks;
SvtMiscOptions const maMiscOptions;
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index 5064742c2a8b..be3a7a2db1a7 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -155,27 +155,27 @@ public:
// beans::XPropertySet
virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override;
virtual void SAL_CALL setPropertyValue (
- const ::rtl::OUString& rsPropertyName,
+ const OUString& rsPropertyName,
const css::uno::Any& rValue) override;
virtual css::uno::Any SAL_CALL getPropertyValue (
- const ::rtl::OUString& rsPropertyName) override;
+ const OUString& rsPropertyName) override;
virtual void SAL_CALL addPropertyChangeListener(
- const ::rtl::OUString& rsPropertyName,
+ const OUString& rsPropertyName,
const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) override;
virtual void SAL_CALL removePropertyChangeListener(
- const ::rtl::OUString& rsPropertyName,
+ const OUString& rsPropertyName,
const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) override;
virtual void SAL_CALL addVetoableChangeListener(
- const ::rtl::OUString& rsPropertyName,
+ const OUString& rsPropertyName,
const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) override;
virtual void SAL_CALL removeVetoableChangeListener(
- const ::rtl::OUString& rsPropertyName,
+ const OUString& rsPropertyName,
const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) override;
// beans::XPropertySetInfo
virtual css::uno::Sequence<css::beans::Property> SAL_CALL getProperties() override;
- virtual css::beans::Property SAL_CALL getPropertyByName (const ::rtl::OUString& rsName) override;
- virtual sal_Bool SAL_CALL hasPropertyByName (const ::rtl::OUString& rsName) override;
+ virtual css::beans::Property SAL_CALL getPropertyByName (const OUString& rsName) override;
+ virtual sal_Bool SAL_CALL hasPropertyByName (const OUString& rsName) override;
private:
static Theme& GetCurrentTheme();
@@ -189,9 +189,9 @@ private:
bool mbIsHighContrastMode;
bool mbIsHighContrastModeSetManually;
- typedef std::unordered_map<rtl::OUString,ThemeItem> PropertyNameToIdMap;
+ typedef std::unordered_map<OUString,ThemeItem> PropertyNameToIdMap;
PropertyNameToIdMap maPropertyNameToIdMap;
- typedef std::vector<rtl::OUString> PropertyIdToNameMap;
+ typedef std::vector<OUString> PropertyIdToNameMap;
PropertyIdToNameMap maPropertyIdToNameMap;
typedef ::std::vector<css::uno::Any> RawValueContainer;
RawValueContainer maRawValues;
diff --git a/include/sfx2/sidebar/Tools.hxx b/include/sfx2/sidebar/Tools.hxx
index c6b790975ad8..854de39e62da 100644
--- a/include/sfx2/sidebar/Tools.hxx
+++ b/include/sfx2/sidebar/Tools.hxx
@@ -37,23 +37,23 @@ class SFX2_DLLPUBLIC Tools
{
public:
static Image GetImage (
- const ::rtl::OUString& rsImageURL,
- const ::rtl::OUString& rsHighContrastImageURL,
+ const OUString& rsImageURL,
+ const OUString& rsHighContrastImageURL,
const css::uno::Reference<css::frame::XFrame>& rxFrame);
static Image GetImage (
- const ::rtl::OUString& rsURL,
+ const OUString& rsURL,
const css::uno::Reference<css::frame::XFrame>& rxFrame);
static css::awt::Gradient VclToAwtGradient (const Gradient& rGradient);
static Gradient AwtToVclGradient (const css::awt::Gradient& rGradient);
- static css::util::URL GetURL (const ::rtl::OUString& rsCommand);
+ static css::util::URL GetURL (const OUString& rsCommand);
static css::uno::Reference<css::frame::XDispatch> GetDispatch (
const css::uno::Reference<css::frame::XFrame>& rxFrame,
const css::util::URL& rURL);
- static ::rtl::OUString GetModuleName (
+ static OUString GetModuleName (
const css::uno::Reference<css::frame::XController>& rxFrame);
};
diff --git a/include/store/store.hxx b/include/store/store.hxx
index eee47c206577..fb4b430c5f2e 100644
--- a/include/store/store.hxx
+++ b/include/store/store.hxx
@@ -71,8 +71,8 @@ public:
*/
storeError create (
storeFileHandle hFile,
- rtl::OUString const & rPath,
- rtl::OUString const & rName,
+ OUString const & rPath,
+ OUString const & rName,
storeAccessMode eMode)
{
if (m_hImpl)
@@ -181,8 +181,8 @@ public:
*/
storeError create (
storeFileHandle hFile,
- rtl::OUString const & rPath,
- rtl::OUString const & rName,
+ OUString const & rPath,
+ OUString const & rName,
storeAccessMode eMode)
{
if (m_hImpl)
@@ -284,7 +284,7 @@ public:
@see store_openFile()
*/
storeError create(
- rtl::OUString const & rFilename,
+ OUString const & rFilename,
storeAccessMode eAccessMode )
{
if (m_hImpl)
@@ -335,7 +335,7 @@ public:
@see store_remove()
*/
storeError remove (
- rtl::OUString const & rPath, rtl::OUString const & rName)
+ OUString const & rPath, OUString const & rName)
{
if (!m_hImpl)
return store_E_InvalidHandle;
diff --git a/include/svl/IndexedStyleSheets.hxx b/include/svl/IndexedStyleSheets.hxx
index eba5cded45bb..8196767f9a62 100644
--- a/include/svl/IndexedStyleSheets.hxx
+++ b/include/svl/IndexedStyleSheets.hxx
@@ -122,7 +122,7 @@ public:
/** Obtain the positions of all styles which have a given name
*/
std::vector<unsigned>
- FindPositionsByName(const rtl::OUString& name) const;
+ FindPositionsByName(const OUString& name) const;
enum class SearchBehavior { ReturnAll, ReturnFirst };
/** Obtain the positions of all styles which have a certain name and fulfill a certain condition.
@@ -130,7 +130,7 @@ public:
* This method is fast because it can use the name-based index
*/
std::vector<unsigned>
- FindPositionsByNameAndPredicate(const rtl::OUString& name, StyleSheetPredicate& predicate,
+ FindPositionsByNameAndPredicate(const OUString& name, StyleSheetPredicate& predicate,
SearchBehavior behavior = SearchBehavior::ReturnAll) const;
/** Obtain the positions of all styles which fulfill a certain condition.
@@ -178,7 +178,7 @@ private:
*
* @internal
* Must be an unordered map. A regular map is too slow for some files. */
- typedef std::unordered_multimap<rtl::OUString, unsigned> MapType;
+ typedef std::unordered_multimap<OUString, unsigned> MapType;
/** A map which stores the positions of style sheets by their name */
MapType mPositionsByName;
diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx
index d150192c1731..009d152d2dc0 100644
--- a/include/svtools/accessibleruler.hxx
+++ b/include/svtools/accessibleruler.hxx
@@ -63,7 +63,7 @@ class SvtRulerAccessible final : public ::cppu::BaseMutex, public SvtRulerAccess
public:
//===== internal ========================================================
SvtRulerAccessible(
- const css::uno::Reference< css::accessibility::XAccessible>& rxParent, Ruler& rRepresentation, const ::rtl::OUString& rName );
+ const css::uno::Reference< css::accessibility::XAccessible>& rxParent, Ruler& rRepresentation, const OUString& rName );
/// @throws css::uno::RuntimeException
bool
@@ -119,10 +119,10 @@ public:
virtual sal_Int16 SAL_CALL
getAccessibleRole() override;
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getAccessibleDescription() override;
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getAccessibleName() override;
virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL
@@ -143,13 +143,13 @@ public:
//===== XServiceInfo ====================================================
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName() override;
virtual sal_Bool SAL_CALL
- supportsService( const ::rtl::OUString& sServiceName ) override;
+ supportsService( const OUString& sServiceName ) override;
- virtual css::uno::Sequence< ::rtl::OUString> SAL_CALL
+ virtual css::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames() override;
//===== XTypeProvider ===================================================
@@ -180,7 +180,7 @@ private:
tools::Rectangle GetBoundingBox();
/// Name of this object.
- ::rtl::OUString const msName;
+ OUString const msName;
/// Reference to the parent object.
css::uno::Reference< css::accessibility::XAccessible >
diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx
index 34d3bbb5dd3b..feaa9d537e60 100644
--- a/include/svtools/imagemgr.hxx
+++ b/include/svtools/imagemgr.hxx
@@ -116,7 +116,7 @@ struct VolumeInfo
class SvFileInformationManager
{
private:
- static rtl::OUString GetDescription_Impl( const INetURLObject& rObject, bool bDetectFolder );
+ static OUString GetDescription_Impl( const INetURLObject& rObject, bool bDetectFolder );
public:
SVT_DLLPUBLIC static OUString GetImageId( const INetURLObject& rURL );
@@ -126,9 +126,9 @@ public:
SVT_DLLPUBLIC static Image GetImageNoDefault( const INetURLObject& rURL, bool bBig = false );
SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo );
- SVT_DLLPUBLIC static rtl::OUString GetDescription( const INetURLObject& rObject );
- SVT_DLLPUBLIC static rtl::OUString GetFileDescription( const INetURLObject& rObject );
- SVT_DLLPUBLIC static rtl::OUString GetFolderDescription( const svtools::VolumeInfo& rInfo );
+ SVT_DLLPUBLIC static OUString GetDescription( const INetURLObject& rObject );
+ SVT_DLLPUBLIC static OUString GetFileDescription( const INetURLObject& rObject );
+ SVT_DLLPUBLIC static OUString GetFolderDescription( const svtools::VolumeInfo& rInfo );
};
#endif
diff --git a/include/svtools/rtfout.hxx b/include/svtools/rtfout.hxx
index d163abf33f87..2f8751faf29f 100644
--- a/include/svtools/rtfout.hxx
+++ b/include/svtools/rtfout.hxx
@@ -33,7 +33,7 @@ class SvStream;
namespace RTFOutFuncs {
SVT_DLLPUBLIC SvStream& Out_String(
- SvStream&, const rtl::OUString&,
+ SvStream&, const OUString&,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 );
}
diff --git a/include/svtools/rtftoken.h b/include/svtools/rtftoken.h
index 550a36f84321..15061a81c45c 100644
--- a/include/svtools/rtftoken.h
+++ b/include/svtools/rtftoken.h
@@ -25,7 +25,7 @@ namespace rtl {
};
// search the TokenID for the token
-int GetRTFToken( const rtl::OUString& rSearch );
+int GetRTFToken( const OUString& rSearch );
enum RTF_TOKEN_RANGES {
RTF_NOGROUP = 0x0100,
diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx
index e3d9cc80c9c2..1a9ac4f617c3 100644
--- a/include/svx/galleryitem.hxx
+++ b/include/svx/galleryitem.hxx
@@ -39,8 +39,8 @@
class SVX_DLLPUBLIC SvxGalleryItem : public SfxPoolItem
{
sal_Int8 m_nType;
- rtl::OUString m_aURL;
- rtl::OUString m_aFilterName;
+ OUString m_aURL;
+ OUString m_aFilterName;
css::uno::Reference< css::lang::XComponent > m_xDrawing;
css::uno::Reference< css::graphic::XGraphic > m_xGraphic;
@@ -52,7 +52,7 @@ public:
virtual ~SvxGalleryItem() override;
sal_Int8 GetType() const { return m_nType; }
- const rtl::OUString& GetURL() const { return m_aURL; }
+ const OUString& GetURL() const { return m_aURL; }
const css::uno::Reference< css::graphic::XGraphic >& GetGraphic() const { return m_xGraphic; }
// pure virtual methods from SfxPoolItem
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 030b692ec8c3..9379d1da9282 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -50,10 +50,10 @@ class SVX_DLLPUBLIC NumSettings_Impl
SvxAdjust eNumAlign;
long nNumAlignAt;
long nNumIndentAt;
- rtl::OUString sPrefix;
- rtl::OUString sSuffix;
- rtl::OUString sBulletChar;
- rtl::OUString sBulletFont;
+ OUString sPrefix;
+ OUString sSuffix;
+ OUString sBulletChar;
+ OUString sBulletFont;
SvxBrushItem *pBrushItem;
Size aSize;
@@ -103,7 +103,7 @@ class SVX_DLLPUBLIC OutlineSettings_Impl
{
public:
bool bIsCustomized;
- rtl::OUString sDescription;
+ OUString sDescription;
NumSettingsArr_Impl *pNumSettingsArr;
public:
OutlineSettings_Impl() :
diff --git a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx
index 9b94e9067faa..5b315aa3a928 100644
--- a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx
+++ b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx
@@ -56,7 +56,7 @@ public:
const vcl::EnumContext::Context eContext);
private:
- static ::rtl::OUString GetModuleName (
+ static OUString GetModuleName (
const css::uno::Reference<css::frame::XFrame>& rxFrame);
};
diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx
index deaa2581a9a2..45dce18525b9 100644
--- a/include/svx/sidebar/SelectionChangeHandler.hxx
+++ b/include/svx/sidebar/SelectionChangeHandler.hxx
@@ -45,7 +45,7 @@ class SVX_DLLPUBLIC SelectionChangeHandler
{
public:
SelectionChangeHandler (
- const std::function<rtl::OUString ()>& rSelectionChangeCallback,
+ const std::function<OUString ()>& rSelectionChangeCallback,
const css::uno::Reference<css::frame::XController>& rxController,
const vcl::EnumContext::Context eDefaultContext);
virtual ~SelectionChangeHandler() override;
@@ -63,7 +63,7 @@ private:
SelectionChangeHandler(const SelectionChangeHandler&) = delete;
SelectionChangeHandler& operator=(const SelectionChangeHandler&) = delete;
- const std::function<rtl::OUString ()> maSelectionChangeCallback;
+ const std::function<OUString ()> maSelectionChangeCallback;
css::uno::Reference<css::frame::XController> mxController;
const vcl::EnumContext::Context meDefaultContext;
bool mbIsConnected;
diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index 8c0c6a3b59e6..f270754c2df5 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -78,7 +78,7 @@ namespace rtl {
class OUString;
}
-typedef rtl::OUString ChainLinkId;
+typedef OUString ChainLinkId;
enum class CursorChainingEvent
{
diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx
index 5783c894be1f..082e08205f3e 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -139,13 +139,13 @@ public:
{ UnoDialogControl_Base::ControlContainerBase::addPaintListener(p1); }
virtual void SAL_CALL removePaintListener(const css::uno::Reference<css::awt::XPaintListener>& p1) override
{ UnoDialogControl_Base::ControlContainerBase::removePaintListener(p1); }
- virtual void SAL_CALL setStatusText(const rtl::OUString& p1) override
+ virtual void SAL_CALL setStatusText(const OUString& p1) override
{ UnoDialogControl_Base::ControlContainerBase::setStatusText(p1); }
virtual css::uno::Sequence<css::uno::Reference<css::awt::XControl> > SAL_CALL getControls() override
{ return UnoDialogControl_Base::ControlContainerBase::getControls(); }
- virtual css::uno::Reference<css::awt::XControl> SAL_CALL getControl(const rtl::OUString& p1) override
+ virtual css::uno::Reference<css::awt::XControl> SAL_CALL getControl(const OUString& p1) override
{ return UnoDialogControl_Base::ControlContainerBase::getControl(p1); }
- virtual void SAL_CALL addControl(const rtl::OUString& p1, const css::uno::Reference<css::awt::XControl>& p2) override
+ virtual void SAL_CALL addControl(const OUString& p1, const css::uno::Reference<css::awt::XControl>& p2) override
{ UnoDialogControl_Base::ControlContainerBase::addControl(p1, p2); }
virtual void SAL_CALL removeControl(const css::uno::Reference<css::awt::XControl>& p1) override
{ UnoDialogControl_Base::ControlContainerBase::removeControl(p1); }
diff --git a/include/unoidl/unoidl.hxx b/include/unoidl/unoidl.hxx
index 98674f6789e6..24fa7b27ef07 100644
--- a/include/unoidl/unoidl.hxx
+++ b/include/unoidl/unoidl.hxx
@@ -27,25 +27,25 @@ namespace unoidl {
class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL NoSuchFileException final {
public:
- SAL_DLLPRIVATE NoSuchFileException(rtl::OUString const & uri): uri_(uri) {}
+ SAL_DLLPRIVATE NoSuchFileException(OUString const & uri): uri_(uri) {}
SAL_DLLPRIVATE NoSuchFileException(NoSuchFileException const & other):
uri_(other.uri_) {}
SAL_DLLPRIVATE ~NoSuchFileException() throw ();
- const rtl::OUString& getUri() const { return uri_; }
+ const OUString& getUri() const { return uri_; }
private:
void operator =(NoSuchFileException) = delete;
- rtl::OUString const uri_;
+ OUString const uri_;
};
class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL FileFormatException final {
public:
SAL_DLLPRIVATE FileFormatException(
- rtl::OUString const & uri, rtl::OUString const & detail):
+ OUString const & uri, OUString const & detail):
uri_(uri), detail_(detail)
{}
@@ -55,27 +55,27 @@ public:
SAL_DLLPRIVATE ~FileFormatException() throw ();
- const rtl::OUString& getUri() const { return uri_; }
+ const OUString& getUri() const { return uri_; }
- const rtl::OUString& getDetail() const { return detail_; }
+ const OUString& getDetail() const { return detail_; }
private:
void operator =(FileFormatException) = delete;
- rtl::OUString const uri_;
- rtl::OUString const detail_;
+ OUString const uri_;
+ OUString const detail_;
};
struct AnnotatedReference {
AnnotatedReference(
- rtl::OUString const & theName,
- std::vector< rtl::OUString > const & theAnnotations):
+ OUString const & theName,
+ std::vector< OUString > const & theAnnotations):
name(theName), annotations(theAnnotations)
{}
- rtl::OUString name;
+ OUString name;
- std::vector< rtl::OUString > const annotations;
+ std::vector< OUString > const annotations;
};
class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL Entity: public salhelper::SimpleReferenceObject {
@@ -102,7 +102,7 @@ private:
class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL MapCursor: public salhelper::SimpleReferenceObject {
public:
// throws FileFormatException:
- virtual rtl::Reference< Entity > getNext(rtl::OUString * name) = 0;
+ virtual rtl::Reference< Entity > getNext(OUString * name) = 0;
protected:
SAL_DLLPRIVATE MapCursor() {}
@@ -113,7 +113,7 @@ protected:
class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ModuleEntity: public Entity {
public:
// throws FileFormatException:
- virtual std::vector< rtl::OUString > getMemberNames() const = 0;
+ virtual std::vector< OUString > getMemberNames() const = 0;
// throws FileFormatException:
virtual rtl::Reference< MapCursor > createCursor() const = 0;
@@ -128,13 +128,13 @@ class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PublishableEntity: public Entity {
public:
bool isPublished() const { return published_; }
- std::vector< rtl::OUString > const & getAnnotations() const
+ std::vector< OUString > const & getAnnotations() const
{ return annotations_; }
protected:
SAL_DLLPRIVATE PublishableEntity(
Sort sort, bool published,
- std::vector< rtl::OUString > const & annotations):
+ std::vector< OUString > const & annotations):
Entity(sort), published_(published), annotations_(annotations)
{}
@@ -143,28 +143,28 @@ protected:
private:
bool const published_;
- std::vector< rtl::OUString > const annotations_;
+ std::vector< OUString > const annotations_;
};
class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL EnumTypeEntity: public PublishableEntity {
public:
struct Member {
Member(
- rtl::OUString const & theName, sal_Int32 theValue,
- std::vector< rtl::OUString > const & theAnnotations):
+ OUString const & theName, sal_Int32 theValue,
+ std::vector< OUString > const & theAnnotations):
name(theName), value(theValue), annotations(theAnnotations)
{}
- rtl::OUString name;
+ OUString name;
sal_Int32 value;
- std::vector< rtl::OUString > const annotations;
+ std::vector< OUString > const annotations;
};
SAL_DLLPRIVATE EnumTypeEntity(
bool published, std::vector< Member > const & members,
- std::vector< rtl::OUString > const & annotations):
+ std::vector< OUString > const & annotations):
PublishableEntity(SORT_ENUM_TYPE, published, annotations),
members_(members)
{ assert(!members.empty()); }
@@ -180,27 +180,27 @@ private:
class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PlainStructTypeEntity: public PublishableEntity {
public:
struct Member {
- Member(rtl::OUString const & theName, rtl::OUString const & theType,
- std::vector< rtl::OUString > const & theAnnotations):
+ Member(OUString const & theName, OUString const & theType,
+ std::vector< OUString > const & theAnnotations):
name(theName), type(theType), annotations(theAnnotations)
{}
- rtl::OUString name;
+ OUString name;
- rtl::OUString type;
+ OUString type;
- std::vector< rtl::OUString > const annotations;
+ std::vector< OUString > const annotations;
};
SAL_DLLPRIVATE PlainStructTypeEntity(
- bool published, rtl::OUString const & directBase,
+ bool published, OUString const & directBase,
std::vector< Member > const & directMembers,
- std::vector< rtl::OUString > const & annotations):
+ std::vector< OUString > const & annotations):
PublishableEntity(SORT_PLAIN_STRUCT_TYPE, published, annotations),
directBase_(directBase), directMembers_(directMembers)
{}
- const rtl::OUString& getDirectBase() const { return directBase_; }
+ const OUString& getDirectBase() const { return directBase_; }
std::vector< Member > const & getDirectMembers() const
{ return directMembers_; }
@@ -208,7 +208,7 @@ public:
private:
virtual SAL_DLLPRIVATE ~PlainStructTypeEntity() throw () override;
- rtl::OUString const directBase_;
+ OUString const directBase_;
std::vector< Member > const directMembers_;
};
@@ -218,32 +218,32 @@ class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PolymorphicStructTypeTemplateEntity:
public:
struct Member {
Member(
- rtl::OUString const & theName, rtl::OUString const & theType,
+ OUString const & theName, OUString const & theType,
bool theParameterized,
- std::vector< rtl::OUString > const & theAnnotations):
+ std::vector< OUString > const & theAnnotations):
name(theName), type(theType), parameterized(theParameterized),
annotations(theAnnotations)
{}
- rtl::OUString name;
+ OUString name;
- rtl::OUString type;
+ OUString type;
bool parameterized;
- std::vector< rtl::OUString > const annotations;
+ std::vector< OUString > const annotations;
};
SAL_DLLPRIVATE PolymorphicStructTypeTemplateEntity(
- bool published, std::vector< rtl::OUString > const & typeParameters,
+ bool published, std::vector< OUString > const & typeParameters,
std::vector< Member > const & members,
- std::vector< rtl::OUString > const & annotations):
+ std::vector< OUString > const & annotations):
PublishableEntity(
SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE, published, annotations),
typeParameters_(typeParameters), members_(members)
{}
- std::vector< rtl::OUString > const & getTypeParameters() const
+ std::vector< OUString > const & getTypeParameters() const
{ return typeParameters_; }
std::vector< Member > const & getMembers() const { return members_; }
@@ -251,7 +251,7 @@ public:
private:
virtual SAL_DLLPRIVATE ~PolymorphicStructTypeTemplateEntity() throw () override;
- std::vector< rtl::OUString > const typeParameters_;
+ std::vector< OUString > const typeParameters_;
std::vector< Member > const members_;
};
@@ -259,27 +259,27 @@ class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ExceptionTypeEntity: public Publishabl
public:
struct Member {
Member(
- rtl::OUString const & theName, rtl::OUString const & theType,
- std::vector< rtl::OUString > const & theAnnotations):
+ OUString const & theName, OUString const & theType,
+ std::vector< OUString > const & theAnnotations):
name(theName), type(theType), annotations(theAnnotations)
{}
- rtl::OUString name;
+ OUString name;
- rtl::OUString type;
+ OUString type;
- std::vector< rtl::OUString > const annotations;
+ std::vector< OUString > const annotations;
};
SAL_DLLPRIVATE ExceptionTypeEntity(
- bool published, rtl::OUString const & directBase,
+ bool published, OUString const & directBase,
std::vector< Member > const & directMembers,
- std::vector< rtl::OUString > const & annotations):
+ std::vector< OUString > const & annotations):
PublishableEntity(SORT_EXCEPTION_TYPE, published, annotations),
directBase_(directBase), directMembers_(directMembers)
{}
- const rtl::OUString& getDirectBase() const { return directBase_; }
+ const OUString& getDirectBase() const { return directBase_; }
std::vector< Member > const & getDirectMembers() const
{ return directMembers_; }
@@ -287,7 +287,7 @@ public:
private:
virtual SAL_DLLPRIVATE ~ExceptionTypeEntity() throw () override;
- rtl::OUString const directBase_;
+ OUString const directBase_;
std::vector< Member > const directMembers_;
};
@@ -295,29 +295,29 @@ class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL InterfaceTypeEntity: public Publishabl
public:
struct Attribute {
Attribute(
- rtl::OUString const & theName, rtl::OUString const & theType,
+ OUString const & theName, OUString const & theType,
bool theBound, bool theReadOnly,
- std::vector< rtl::OUString > const & theGetExceptions,
- std::vector< rtl::OUString > const & theSetExceptions,
- std::vector< rtl::OUString > const & theAnnotations):
+ std::vector< OUString > const & theGetExceptions,
+ std::vector< OUString > const & theSetExceptions,
+ std::vector< OUString > const & theAnnotations):
name(theName), type(theType), bound(theBound),
readOnly(theReadOnly), getExceptions(theGetExceptions),
setExceptions(theSetExceptions), annotations(theAnnotations)
{ assert(!theReadOnly || theSetExceptions.empty()); }
- rtl::OUString name;
+ OUString name;
- rtl::OUString type;
+ OUString type;
bool bound;
bool readOnly;
- std::vector< rtl::OUString > getExceptions;
+ std::vector< OUString > getExceptions;
- std::vector< rtl::OUString > setExceptions;
+ std::vector< OUString > setExceptions;
- std::vector< rtl::OUString > const annotations;
+ std::vector< OUString > const annotations;
};
struct Method {
@@ -325,36 +325,36 @@ public:
enum Direction { DIRECTION_IN, DIRECTION_OUT, DIRECTION_IN_OUT };
Parameter(
- rtl::OUString const & theName, rtl::OUString const & theType,
+ OUString const & theName, OUString const & theType,
Direction theDirection):
name(theName), type(theType), direction(theDirection)
{}
- rtl::OUString name;
+ OUString name;
- rtl::OUString type;
+ OUString type;
Direction direction;
};
Method(
- rtl::OUString const & theName, rtl::OUString const & theReturnType,
+ OUString const & theName, OUString const & theReturnType,
std::vector< Parameter > const & theParameters,
- std::vector< rtl::OUString > const & theExceptions,
- std::vector< rtl::OUString > const & theAnnotations):
+ std::vector< OUString > const & theExceptions,
+ std::vector< OUString > const & theAnnotations):
name(theName), returnType(theReturnType), parameters(theParameters),
exceptions(theExceptions), annotations(theAnnotations)
{}
- rtl::OUString name;
+ OUString name;
- rtl::OUString returnType;
+ OUString returnType;
std::vector< Parameter > parameters;
- std::vector< rtl::OUString > exceptions;
+ std::vector< OUString > exceptions;
- std::vector< rtl::OUString > const annotations;
+ std::vector< OUString > const annotations;
};
SAL_DLLPRIVATE InterfaceTypeEntity(
@@ -363,7 +363,7 @@ public:
std::vector< AnnotatedReference > const & directOptionalBases,
std::vector< Attribute > const & directAttributes,
std::vector< Method > const & directMethods,
- std::vector< rtl::OUString > const & annotations):
+ std::vector< OUString > const & annotations):
PublishableEntity(SORT_INTERFACE_TYPE, published, annotations),
directMandatoryBases_(directMandatoryBases),
directOptionalBases_(directOptionalBases),
@@ -394,17 +394,17 @@ private:
class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL TypedefEntity: public PublishableEntity {
public:
SAL_DLLPRIVATE TypedefEntity(
- bool published, rtl::OUString const & type,
- std::vector< rtl::OUString > const & annotations):
+ bool published, OUString const & type,
+ std::vector< OUString > const & annotations):
PublishableEntity(SORT_TYPEDEF, published, annotations), type_(type)
{}
- const rtl::OUString& getType() const { return type_; }
+ const OUString& getType() const { return type_; }
private:
virtual SAL_DLLPRIVATE ~TypedefEntity() throw () override;
- rtl::OUString const type_;
+ OUString const type_;
};
struct SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ConstantValue {
@@ -459,21 +459,21 @@ class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ConstantGroupEntity: public Publishabl
public:
struct Member {
Member(
- rtl::OUString const & theName, ConstantValue const & theValue,
- std::vector< rtl::OUString > const & theAnnotations):
+ OUString const & theName, ConstantValue const & theValue,
+ std::vector< OUString > const & theAnnotations):
name(theName), value(theValue), annotations(theAnnotations)
{}
- rtl::OUString name;
+ OUString name;
ConstantValue value;
- std::vector< rtl::OUString > const annotations;
+ std::vector< OUString > const annotations;
};
SAL_DLLPRIVATE ConstantGroupEntity(
bool published, std::vector< Member > const & members,
- std::vector< rtl::OUString > const & annotations):
+ std::vector< OUString > const & annotations):
PublishableEntity(SORT_CONSTANT_GROUP, published, annotations),
members_(members)
{}
@@ -493,14 +493,14 @@ public:
struct Constructor {
struct Parameter {
Parameter(
- rtl::OUString const & theName, rtl::OUString const & theType,
+ OUString const & theName, OUString const & theType,
bool theRest):
name(theName), type(theType), rest(theRest)
{}
- rtl::OUString name;
+ OUString name;
- rtl::OUString const type;
+ OUString const type;
bool const rest;
};
@@ -512,35 +512,35 @@ public:
defaultConstructor(true) {}
Constructor(
- rtl::OUString const & theName,
+ OUString const & theName,
std::vector< Parameter > const & theParameters,
- std::vector< rtl::OUString > const & theExceptions,
- std::vector< rtl::OUString > const & theAnnotations):
+ std::vector< OUString > const & theExceptions,
+ std::vector< OUString > const & theAnnotations):
name(theName), parameters(theParameters), exceptions(theExceptions),
annotations(theAnnotations), defaultConstructor(false)
{}
- rtl::OUString name;
+ OUString name;
std::vector< Parameter > parameters;
- std::vector< rtl::OUString > exceptions;
+ std::vector< OUString > exceptions;
- std::vector< rtl::OUString > const annotations;
+ std::vector< OUString > const annotations;
bool defaultConstructor;
};
SAL_DLLPRIVATE SingleInterfaceBasedServiceEntity(
- bool published, rtl::OUString const & base,
+ bool published, OUString const & base,
std::vector< Constructor > const & constructors,
- std::vector< rtl::OUString > const & annotations):
+ std::vector< OUString > const & annotations):
PublishableEntity(
SORT_SINGLE_INTERFACE_BASED_SERVICE, published, annotations),
base_(base), constructors_(constructors)
{}
- const rtl::OUString& getBase() const { return base_; }
+ const OUString& getBase() const { return base_; }
std::vector< Constructor > const & getConstructors() const
{ return constructors_; }
@@ -548,7 +548,7 @@ public:
private:
virtual SAL_DLLPRIVATE ~SingleInterfaceBasedServiceEntity() throw () override;
- rtl::OUString const base_;
+ OUString const base_;
std::vector< Constructor > const constructors_;
};
@@ -570,20 +570,20 @@ public:
};
Property(
- rtl::OUString const & theName, rtl::OUString const & theType,
+ OUString const & theName, OUString const & theType,
Attributes theAttributes,
- std::vector< rtl::OUString > const & theAnnotations):
+ std::vector< OUString > const & theAnnotations):
name(theName), type(theType), attributes(theAttributes),
annotations(theAnnotations)
{}
- rtl::OUString name;
+ OUString name;
- rtl::OUString type;
+ OUString type;
Attributes const attributes;
- std::vector< rtl::OUString > const annotations;
+ std::vector< OUString > const annotations;
};
SAL_DLLPRIVATE AccumulationBasedServiceEntity(
@@ -593,7 +593,7 @@ public:
std::vector< AnnotatedReference > const & directMandatoryBaseInterfaces,
std::vector< AnnotatedReference > const & directOptionalBaseInterfaces,
std::vector< Property > const & directProperties,
- std::vector< rtl::OUString > const & annotations):
+ std::vector< OUString > const & annotations):
PublishableEntity(
SORT_ACCUMULATION_BASED_SERVICE, published, annotations),
directMandatoryBaseServices_(directMandatoryBaseServices),
@@ -637,37 +637,37 @@ class LO_DLLPUBLIC_UNOIDL InterfaceBasedSingletonEntity:
{
public:
SAL_DLLPRIVATE InterfaceBasedSingletonEntity(
- bool published, rtl::OUString const & base,
- std::vector< rtl::OUString > const & annotations):
+ bool published, OUString const & base,
+ std::vector< OUString > const & annotations):
PublishableEntity(
SORT_INTERFACE_BASED_SINGLETON, published, annotations),
base_(base)
{}
- const rtl::OUString& getBase() const { return base_; }
+ const OUString& getBase() const { return base_; }
private:
virtual SAL_DLLPRIVATE ~InterfaceBasedSingletonEntity() throw () override;
- rtl::OUString const base_;
+ OUString const base_;
};
class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ServiceBasedSingletonEntity: public PublishableEntity
{
public:
SAL_DLLPRIVATE ServiceBasedSingletonEntity(
- bool published, rtl::OUString const & base,
- std::vector< rtl::OUString > const & annotations):
+ bool published, OUString const & base,
+ std::vector< OUString > const & annotations):
PublishableEntity(SORT_SERVICE_BASED_SINGLETON, published, annotations),
base_(base)
{}
- const rtl::OUString& getBase() const { return base_; }
+ const OUString& getBase() const { return base_; }
private:
virtual SAL_DLLPRIVATE ~ServiceBasedSingletonEntity() throw () override;
- rtl::OUString const base_;
+ OUString const base_;
};
class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL Provider: public salhelper::SimpleReferenceObject {
@@ -676,7 +676,7 @@ public:
virtual rtl::Reference< MapCursor > createRootCursor() const = 0;
// throws FileFormatException:
- virtual rtl::Reference< Entity > findEntity(rtl::OUString const & name)
+ virtual rtl::Reference< Entity > findEntity(OUString const & name)
const = 0;
protected:
@@ -690,19 +690,19 @@ public:
Manager() {}
// throws FileFormatException, NoSuchFileException:
- rtl::Reference< Provider > addProvider(rtl::OUString const & uri);
+ rtl::Reference< Provider > addProvider(OUString const & uri);
// throws FileFormatException:
- rtl::Reference< Entity > findEntity(rtl::OUString const & name) const;
+ rtl::Reference< Entity > findEntity(OUString const & name) const;
// throws FileFormatException:
- rtl::Reference< MapCursor > createCursor(rtl::OUString const & name) const;
+ rtl::Reference< MapCursor > createCursor(OUString const & name) const;
private:
virtual SAL_DLLPRIVATE ~Manager() throw () override;
SAL_DLLPRIVATE rtl::Reference< Provider > loadProvider(
- rtl::OUString const & uri);
+ OUString const & uri);
mutable osl::Mutex mutex_;
std::vector< rtl::Reference< Provider > > providers_;
diff --git a/include/unotools/datetime.hxx b/include/unotools/datetime.hxx
index fd35a31d231f..088ae6baf40c 100644
--- a/include/unotools/datetime.hxx
+++ b/include/unotools/datetime.hxx
@@ -42,10 +42,10 @@ namespace utl
UNOTOOLS_DLLPUBLIC void extractDate(const css::util::DateTime& _rDateTime, css::util::Date& _rOut);
- UNOTOOLS_DLLPUBLIC ::rtl::OUString toISO8601(const css::util::DateTime& _rDateTime);
- UNOTOOLS_DLLPUBLIC bool ISO8601parseDateTime(const ::rtl::OUString &i_rIn, css::util::DateTime& o_rDateTime);
- UNOTOOLS_DLLPUBLIC bool ISO8601parseDate(const ::rtl::OUString &i_rIn, css::util::Date& o_rDate);
- UNOTOOLS_DLLPUBLIC bool ISO8601parseTime(const ::rtl::OUString &i_rIn, css::util::Time& o_Time);
+ UNOTOOLS_DLLPUBLIC OUString toISO8601(const css::util::DateTime& _rDateTime);
+ UNOTOOLS_DLLPUBLIC bool ISO8601parseDateTime(const OUString &i_rIn, css::util::DateTime& o_rDateTime);
+ UNOTOOLS_DLLPUBLIC bool ISO8601parseDate(const OUString &i_rIn, css::util::Date& o_rDate);
+ UNOTOOLS_DLLPUBLIC bool ISO8601parseTime(const OUString &i_rIn, css::util::Time& o_Time);
} // namespace utl
diff --git a/include/vcl/EnumContext.hxx b/include/vcl/EnumContext.hxx
index df23520337cb..5a63d00c22e6 100644
--- a/include/vcl/EnumContext.hxx
+++ b/include/vcl/EnumContext.hxx
@@ -118,8 +118,8 @@ public:
const Application eApplication,
const Context eContext);
EnumContext (
- const ::rtl::OUString& rsApplicationName,
- const ::rtl::OUString& rsContextName);
+ const OUString& rsApplicationName,
+ const OUString& rsContextName);
/** This variant of the GetCombinedContext() method treats some
application names as identical to each other. Replacements
@@ -143,11 +143,11 @@ public:
const static sal_Int32 NoMatch;
const static sal_Int32 OptimalMatch;
- static Application GetApplicationEnum (const ::rtl::OUString& rsApplicationName);
- static const ::rtl::OUString& GetApplicationName (const Application eApplication);
+ static Application GetApplicationEnum (const OUString& rsApplicationName);
+ static const OUString& GetApplicationName (const Application eApplication);
- static Context GetContextEnum (const ::rtl::OUString& rsContextName);
- static const ::rtl::OUString& GetContextName (const Context eContext);
+ static Context GetContextEnum (const OUString& rsContextName);
+ static const OUString& GetContextName (const Context eContext);
private:
Application meApplication;
@@ -155,8 +155,8 @@ private:
static void ProvideApplicationContainers();
static void ProvideContextContainers();
- static void AddEntry (const ::rtl::OUString& rsName, const Application eApplication);
- static void AddEntry (const ::rtl::OUString& rsName, const Context eContext);
+ static void AddEntry (const OUString& rsName, const Application eApplication);
+ static void AddEntry (const OUString& rsName, const Context eContext);
};
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index 1253a4f02091..a7b227a687e8 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -180,13 +180,13 @@ protected:
private:
struct ProgramHash
{
- size_t operator()( const rtl::OString& aDigest ) const
+ size_t operator()( const OString& aDigest ) const
{
return static_cast<size_t>( rtl_crc32( 0, aDigest.getStr(), aDigest.getLength() ) );
}
};
- typedef std::unordered_map< rtl::OString, std::shared_ptr<OpenGLProgram>, ProgramHash > ProgramCollection;
+ typedef std::unordered_map< OString, std::shared_ptr<OpenGLProgram>, ProgramHash > ProgramCollection;
ProgramCollection maPrograms;
OpenGLProgram* mpCurrentProgram;
diff --git a/include/vcl/vclstatuslistener.hxx b/include/vcl/vclstatuslistener.hxx
index 42894dd5e98b..f733eaad5067 100644
--- a/include/vcl/vclstatuslistener.hxx
+++ b/include/vcl/vclstatuslistener.hxx
@@ -24,7 +24,7 @@
template <class T> class VclStatusListener : public cppu::WeakImplHelper < css::frame::XStatusListener>
{
public:
- VclStatusListener<T>(T* widget, const rtl::OUString& aCommand);
+ VclStatusListener<T>(T* widget, const OUString& aCommand);
private:
VclPtr<T> mWidget; /** The widget on which actions are performed */
@@ -47,7 +47,7 @@ public:
};
template<class T>
-VclStatusListener<T>::VclStatusListener(T* widget, const rtl::OUString& aCommand) {
+VclStatusListener<T>::VclStatusListener(T* widget, const OUString& aCommand) {
mWidget = widget;
css::uno::Reference<css::uno::XComponentContext> xContext = ::comphelper::getProcessComponentContext();
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index bee1124e63ec..32163f5385dd 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -52,7 +52,7 @@ protected:
// Helper to check if the local maProperties contains the given
// FillStyle tag and if the FillStyle there is different from FillStyle_NONE
bool doNewDrawingLayerFillStyleDefinitionsExist(
- const ::rtl::OUString& rFillStyleTag) const;
+ const OUString& rFillStyleTag) const;
// Helper which will deactivate all old fill definitions (identified by
// the given OldFillStyleDefinitionSet) in the local maProperties. Deactivation
diff --git a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
index 8a715a398dd8..6489feedd717 100644
--- a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
+++ b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
@@ -55,7 +55,7 @@ public:
In contrast to registerReference(), this here overwrites any
earlier registration of the same identifier
*/
- void registerReferenceAlways( const rtl::OUString& rIdentifier, const css::uno::Reference< css::uno::XInterface >& rInterface );
+ void registerReferenceAlways( const OUString& rIdentifier, const css::uno::Reference< css::uno::XInterface >& rInterface );
/** @returns
the identifier for the given uno object. If this uno object is not already
diff --git a/io/qa/textinputstream.cxx b/io/qa/textinputstream.cxx
index 29f8740ac673..75371a0d3863 100644
--- a/io/qa/textinputstream.cxx
+++ b/io/qa/textinputstream.cxx
@@ -117,8 +117,8 @@ void Test::testReadLine() {
css::uno::Reference<css::io::XTextInputStream2> s(
css::io::TextInputStream::create(getComponentContext()));
s->setInputStream(new Input);
- rtl::OUString l(s->readLine());
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("123456789"), l);
+ OUString l(s->readLine());
+ CPPUNIT_ASSERT_EQUAL(OUString("123456789"), l);
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
index 5b3e30487d7d..9b4c715b7ba0 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
@@ -44,9 +44,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-
MacSpellChecker::MacSpellChecker() :
aEvtListeners( GetLinguMutex() )
{
diff --git a/officecfg/registry/cppheader.xsl b/officecfg/registry/cppheader.xsl
index a09043f4f8f8..9a8042b49f0a 100644
--- a/officecfg/registry/cppheader.xsl
+++ b/officecfg/registry/cppheader.xsl
@@ -129,7 +129,7 @@
<xsl:text>: public comphelper::ConfigurationGroup&lt; </xsl:text>
<xsl:value-of select="$name"/>
<xsl:text>&gt; {&#xA;</xsl:text>
- <xsl:text> static rtl::OUString path() { return rtl::OUString(<!--
+ <xsl:text> static OUString path() { return OUString(<!--
-->"</xsl:text>
<xsl:value-of select="$path"/>
<xsl:text>/</xsl:text>
@@ -163,7 +163,7 @@
<xsl:text>: public comphelper::ConfigurationSet&lt; </xsl:text>
<xsl:value-of select="$name"/>
<xsl:text>&gt; {&#xA;</xsl:text>
- <xsl:text> static rtl::OUString path() { return rtl::OUString(<!--
+ <xsl:text> static OUString path() { return OUString(<!--
-->"</xsl:text>
<xsl:value-of select="$path"/>
<xsl:text>/</xsl:text>
@@ -220,7 +220,7 @@
<xsl:text>double</xsl:text>
</xsl:when>
<xsl:when test="@oor:type='xs:string'">
- <xsl:text>rtl::OUString</xsl:text>
+ <xsl:text>OUString</xsl:text>
</xsl:when>
<xsl:when test="@oor:type='xs:hexBinary'">
<xsl:text>com::sun::star::uno::Sequence&lt;sal_Int8&gt; </xsl:text>
@@ -241,7 +241,7 @@
<xsl:text>com::sun::star::uno::Sequence&lt;double&gt; </xsl:text>
</xsl:when>
<xsl:when test="@oor:type='oor:string-list'">
- <xsl:text>com::sun::star::uno::Sequence&lt;rtl::OUString&gt; </xsl:text>
+ <xsl:text>com::sun::star::uno::Sequence&lt;OUString&gt; </xsl:text>
</xsl:when>
<xsl:when test="@oor:type='oor:hexBinary-list'">
<xsl:text>com::sun::star::uno::Sequence&lt;<!--
@@ -252,7 +252,7 @@
<xsl:text>&gt; </xsl:text>
</xsl:if>
<xsl:text>&gt; {&#xA;</xsl:text>
- <xsl:text> static rtl::OUString path() { return rtl::OUString(<!--
+ <xsl:text> static OUString path() { return OUString(<!--
-->"</xsl:text>
<xsl:value-of select="$path"/>
<xsl:text>/</xsl:text>
diff --git a/oox/source/drawingml/colorchoicecontext.cxx b/oox/source/drawingml/colorchoicecontext.cxx
index 756443e6523b..cf6c17ecd3b4 100644
--- a/oox/source/drawingml/colorchoicecontext.cxx
+++ b/oox/source/drawingml/colorchoicecontext.cxx
@@ -64,7 +64,7 @@ void ColorValueContext::onStartElement( const AttributeList& rAttribs )
case A_TOKEN( schemeClr ):
{
mrColor.setSchemeClr( rAttribs.getToken( XML_val, XML_TOKEN_INVALID ) );
- oox::OptValue<rtl::OUString> sSchemeName = rAttribs.getString( XML_val );
+ oox::OptValue<OUString> sSchemeName = rAttribs.getString( XML_val );
if( sSchemeName.has() )
mrColor.setSchemeName( sSchemeName.use() );
}
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 800434923d25..aa52b0e07e65 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -514,7 +514,7 @@ void ChartExport::WriteChartObj( const Reference< XShape >& xShape, sal_Int32 nI
sRelativeStream,
pFS->getOutputStream(),
"application/vnd.openxmlformats-officedocument.drawingml.chart+xml",
- rtl::OUStringToOString(oox::getRelationship(Relationship::CHART), RTL_TEXTENCODING_UTF8).getStr(),
+ OUStringToOString(oox::getRelationship(Relationship::CHART), RTL_TEXTENCODING_UTF8).getStr(),
&sId );
XmlFilterBase* pFB = GetFB();
diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index 213351cc7450..4383930ec0d4 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -103,7 +103,7 @@ OString const & getCacheFolder()
osl::Directory::create(url);
- aCacheFolder = rtl::OUStringToOString(url, RTL_TEXTENCODING_UTF8);
+ aCacheFolder = OUStringToOString(url, RTL_TEXTENCODING_UTF8);
}
return aCacheFolder;
}
@@ -222,7 +222,7 @@ std::vector<std::shared_ptr<osl::File> > binaryGenerated( const char * clFileNam
assert(pDevID == gpuEnv.mpDevID);
OString fileName = createFileName(gpuEnv.mpDevID, clFileName);
- auto pNewFile = std::make_shared<osl::File>(rtl::OStringToOUString(fileName, RTL_TEXTENCODING_UTF8));
+ auto pNewFile = std::make_shared<osl::File>(OStringToOUString(fileName, RTL_TEXTENCODING_UTF8));
if(pNewFile->open(osl_File_OpenFlag_Read) == osl::FileBase::E_None)
{
aGeneratedFiles.push_back(pNewFile);
@@ -238,7 +238,7 @@ std::vector<std::shared_ptr<osl::File> > binaryGenerated( const char * clFileNam
bool writeBinaryToFile( const OString& rFileName, const char* binary, size_t numBytes )
{
- osl::File file(rtl::OStringToOUString(rFileName, RTL_TEXTENCODING_UTF8));
+ osl::File file(OStringToOUString(rFileName, RTL_TEXTENCODING_UTF8));
osl::FileBase::RC status = file.open(
osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
@@ -351,7 +351,7 @@ bool buildProgram(const char* buildOption, GPUEnv* gpuInfo, int idx)
}
OString aBuildLogFileURL = getCacheFolder() + "kernel-build.log";
- osl::File aBuildLogFile(rtl::OStringToOUString(aBuildLogFileURL, RTL_TEXTENCODING_UTF8));
+ osl::File aBuildLogFile(OStringToOUString(aBuildLogFileURL, RTL_TEXTENCODING_UTF8));
osl::FileBase::RC status = aBuildLogFile.open(
osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index 1b0345145989..f090383c6199 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -1677,16 +1677,16 @@ RegistryTypeReader::~RegistryTypeReader()
RTTypeClass RegistryTypeReader::getTypeClass() const
{ return typereg_reader_getTypeClass(m_hImpl); }
-rtl::OUString RegistryTypeReader::getTypeName() const
+OUString RegistryTypeReader::getTypeName() const
{
- rtl::OUString sRet;
+ OUString sRet;
typereg_reader_getTypeName(m_hImpl, &sRet.pData);
return sRet;
}
-rtl::OUString RegistryTypeReader::getSuperTypeName() const
+OUString RegistryTypeReader::getSuperTypeName() const
{
- rtl::OUString sRet;
+ OUString sRet;
::getSuperTypeName(m_hImpl, &sRet.pData);
return sRet;
}
@@ -1694,16 +1694,16 @@ rtl::OUString RegistryTypeReader::getSuperTypeName() const
sal_uInt32 RegistryTypeReader::getFieldCount() const
{ return ::getFieldCount(m_hImpl); }
-rtl::OUString RegistryTypeReader::getFieldName( sal_uInt16 index ) const
+OUString RegistryTypeReader::getFieldName( sal_uInt16 index ) const
{
- rtl::OUString sRet;
+ OUString sRet;
typereg_reader_getFieldName(m_hImpl, &sRet.pData, index);
return sRet;
}
-rtl::OUString RegistryTypeReader::getFieldType( sal_uInt16 index ) const
+OUString RegistryTypeReader::getFieldType( sal_uInt16 index ) const
{
- rtl::OUString sRet;
+ OUString sRet;
typereg_reader_getFieldTypeName(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -1718,16 +1718,16 @@ RTConstValue RegistryTypeReader::getFieldConstValue( sal_uInt16 index ) const
return ret;
}
-rtl::OUString RegistryTypeReader::getFieldDoku( sal_uInt16 index ) const
+OUString RegistryTypeReader::getFieldDoku( sal_uInt16 index ) const
{
- rtl::OUString sRet;
+ OUString sRet;
typereg_reader_getFieldDocumentation(m_hImpl, &sRet.pData, index);
return sRet;
}
-rtl::OUString RegistryTypeReader::getFieldFileName( sal_uInt16 index ) const
+OUString RegistryTypeReader::getFieldFileName( sal_uInt16 index ) const
{
- rtl::OUString sRet;
+ OUString sRet;
typereg_reader_getFieldFileName(m_hImpl, &sRet.pData, index);
return sRet;
}
diff --git a/registry/source/reflread.hxx b/registry/source/reflread.hxx
index ab029bd2cb52..35198e31ec22 100644
--- a/registry/source/reflread.hxx
+++ b/registry/source/reflread.hxx
@@ -59,11 +59,11 @@ public:
/** returns the full qualified name of the type.
*/
- rtl::OUString getTypeName() const;
+ OUString getTypeName() const;
/** returns the full qualified name of the supertype.
*/
- rtl::OUString getSuperTypeName() const;
+ OUString getSuperTypeName() const;
/** returns the number of fields (attributes/properties, enum values or number
of constants in a module).
@@ -73,11 +73,11 @@ public:
/** returns the name of the field specified by index.
*/
- rtl::OUString getFieldName( sal_uInt16 index ) const;
+ OUString getFieldName( sal_uInt16 index ) const;
/** returns the full qualified name of the field specified by index.
*/
- rtl::OUString getFieldType( sal_uInt16 index ) const;
+ OUString getFieldType( sal_uInt16 index ) const;
/** returns the access mode of the field specified by index.
*/
@@ -93,14 +93,14 @@ public:
Each field of a type can have their own documentation.
*/
- rtl::OUString getFieldDoku( sal_uInt16 index ) const;
+ OUString getFieldDoku( sal_uInt16 index ) const;
/** returns the IDL filename of the field specified by index.
The IDL filename of a field can differ from the filename of the ype itself
because modules and also constants can be defined in different IDL files.
*/
- rtl::OUString getFieldFileName( sal_uInt16 index ) const;
+ OUString getFieldFileName( sal_uInt16 index ) const;
private:
RegistryTypeReader(RegistryTypeReader &) = delete;
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 67a5b2552ff5..3fe279b28483 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -1295,8 +1295,8 @@ static TypeWriterImpl TYPEREG_CALLTYPE createEntry(
}
RegistryTypeWriter::RegistryTypeWriter(RTTypeClass RTTypeClass,
- const rtl::OUString& typeName,
- const rtl::OUString& superTypeName,
+ const OUString& typeName,
+ const OUString& superTypeName,
sal_uInt16 fieldCount)
: m_hImpl(nullptr)
{
@@ -1312,10 +1312,10 @@ RegistryTypeWriter::~RegistryTypeWriter()
}
void RegistryTypeWriter::setFieldData( sal_uInt16 index,
- const rtl::OUString& name,
- const rtl::OUString& typeName,
- const rtl::OUString& doku,
- const rtl::OUString& fileName,
+ const OUString& name,
+ const OUString& typeName,
+ const OUString& doku,
+ const OUString& fileName,
RTFieldAccess access,
const RTConstValue& constValue)
{
diff --git a/registry/source/reflwrit.hxx b/registry/source/reflwrit.hxx
index a4161d89b0f3..faecc5c57650 100644
--- a/registry/source/reflwrit.hxx
+++ b/registry/source/reflwrit.hxx
@@ -49,8 +49,8 @@ public:
enum values or constants).
*/
RegistryTypeWriter(RTTypeClass RTTypeClass,
- const rtl::OUString& typeName,
- const rtl::OUString& superTypeName,
+ const OUString& typeName,
+ const OUString& superTypeName,
sal_uInt16 fieldCount);
/** Destructor. The Destructor frees the internal data block.
@@ -71,10 +71,10 @@ public:
for enum values or constants.
*/
void setFieldData( sal_uInt16 index,
- const rtl::OUString& name,
- const rtl::OUString& typeName,
- const rtl::OUString& doku,
- const rtl::OUString& fileName,
+ const OUString& name,
+ const OUString& typeName,
+ const OUString& doku,
+ const OUString& fileName,
RTFieldAccess access,
const RTConstValue& constValue);
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index 3ff102f18410..3e2cdd512e68 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -72,14 +72,14 @@ void usageFailure() {
std::exit(EXIT_FAILURE);
}
-rtl::OUString getArgument(sal_Int32 index) {
- rtl::OUString arg;
+OUString getArgument(sal_Int32 index) {
+ OUString arg;
osl_getCommandArg(index, &arg.pData);
return arg;
}
-std::string convertLazy(rtl::OUString const & s16) {
- rtl::OString s8(rtl::OUStringToOString(s16, osl_getThreadTextEncoding()));
+std::string convertLazy(OUString const & s16) {
+ OString s8(OUStringToOString(s16, osl_getThreadTextEncoding()));
static_assert(sizeof (sal_Int32) <= sizeof (std::string::size_type), "must be at least the same size");
// ensure following cast is legitimate
return std::string(
@@ -398,7 +398,7 @@ SAL_IMPLEMENT_MAIN()
sal_uInt32 index = 0;
while (index < osl_getCommandArgCount())
{
- rtl::OUString arg = getArgument(index);
+ OUString arg = getArgument(index);
if (arg.startsWith("-env:CPPUNITTESTTARGET=", &path))
{
++index;
@@ -413,13 +413,13 @@ SAL_IMPLEMENT_MAIN()
{
if (testlib.empty())
{
- testlib = rtl::OUStringToOString(arg, osl_getThreadTextEncoding()).getStr();
+ testlib = OUStringToOString(arg, osl_getThreadTextEncoding()).getStr();
args += testlib;
}
else
{
args += ' ';
- args += rtl::OUStringToOString(arg, osl_getThreadTextEncoding()).getStr();
+ args += OUStringToOString(arg, osl_getThreadTextEncoding()).getStr();
}
++index;
continue;
@@ -427,8 +427,8 @@ SAL_IMPLEMENT_MAIN()
if (osl_getCommandArgCount() - index < 3) {
usageFailure();
}
- rtl::OUString lib(getArgument(index + 1));
- rtl::OUString sym(getArgument(index + 2));
+ OUString lib(getArgument(index + 1));
+ OUString sym(getArgument(index + 2));
#ifndef DISABLE_DYNLOADING
osl::Module mod(lib, SAL_LOADMODULE_GLOBAL);
oslGenericFunction fn = mod.getFunctionSymbol(sym);
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index fe5affc9d069..209dc55e1e32 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -34,14 +34,14 @@ struct StaticDebugBaseAddressFilter
std::vector<OString> operator()() const {
std::vector<OString> vec;
rtl_uString * pStr = nullptr;
- rtl::OUString const name(
+ OUString const name(
"OSL_DEBUGBASE_STORE_ADDRESSES" );
if (osl_getEnvironment( name.pData, &pStr ) == osl_Process_E_None) {
- rtl::OUString const str(pStr);
+ OUString const str(pStr);
rtl_uString_release(pStr);
sal_Int32 nIndex = 0;
do {
- vec.push_back( rtl::OUStringToOString(
+ vec.push_back( OUStringToOString(
str.getToken( 0, ';', nIndex ),
RTL_TEXTENCODING_ASCII_US ) );
}
@@ -51,7 +51,7 @@ struct StaticDebugBaseAddressFilter
}
};
-bool isSubStr( char const* pStr, rtl::OString const& subStr )
+bool isSubStr( char const* pStr, OString const& subStr )
{
return rtl_str_indexOfStr( pStr, subStr.getStr() ) >= 0;
}
@@ -85,7 +85,7 @@ bool SAL_CALL osl_detail_ObjectRegistry_storeAddresses( char const* pName )
if (rVec.empty())
return false;
// check for "all":
- rtl::OString const& rFirst = rVec[0];
+ OString const& rFirst = rVec[0];
if ( rFirst == "all" )
return true;
auto const iEnd( rVec.cend() );
diff --git a/sal/osl/all/loadmodulerelative.cxx b/sal/osl/all/loadmodulerelative.cxx
index 30c7d600674d..242bb6210a76 100644
--- a/sal/osl/all/loadmodulerelative.cxx
+++ b/sal/osl/all/loadmodulerelative.cxx
@@ -38,12 +38,12 @@ oslModule SAL_CALL osl_loadModuleRelative(
oslGenericFunction const baseModule, rtl_uString * const relativePath,
sal_Int32 const mode)
{
- rtl::OUString base;
+ OUString base;
if (!osl::Module::getUrlFromAddress(baseModule, base)) {
SAL_INFO("sal.osl","osl::Module::getUrlFromAddress failed");
return nullptr;
}
- rtl::OUString abs;
+ OUString abs;
try {
abs = rtl::Uri::convertRelToAbs(base, relativePath);
} catch (const rtl::MalformedUriException & e) {
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 05e72997070b..fb12e4155e14 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -519,7 +519,7 @@ static int create_dir_with_callback(
{
if (aDirectoryCreationCallbackFunc)
{
- rtl::OUString url;
+ OUString url;
osl::FileBase::getFileURLFromSystemPath(directory_path, url);
aDirectoryCreationCallbackFunc(pData, url.pData);
}
@@ -570,7 +570,7 @@ oslFileError SAL_CALL osl_createDirectoryPath(
if (aDirectoryUrl == nullptr)
return osl_File_E_INVAL;
- rtl::OUString sys_path;
+ OUString sys_path;
oslFileError osl_error = osl_getSystemPathFromFileURL_Ex(aDirectoryUrl, &sys_path.pData);
if (osl_error != osl_File_E_None)
@@ -811,12 +811,12 @@ static oslFileError oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char*
{
int nRet=0;
- rtl::OString tmpDestFile;
+ OString tmpDestFile;
if ( DestFileExists )
{
//TODO: better pick a temp file name instead of adding .osl-tmp:
// use the destination file to avoid EXDEV /* Cross-device link */
- tmpDestFile = rtl::OString(pszDestFileName) + ".osl-tmp";
+ tmpDestFile = OString(pszDestFileName) + ".osl-tmp";
if (rename(pszDestFileName, tmpDestFile.getStr()) != 0)
{
int e = errno;
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index 923b588a20c9..7fc2effb5f03 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -28,14 +28,14 @@ const sal_Unicode FPH_CHAR_PATH_SEPARATOR = '/';
const sal_Unicode FPH_CHAR_DOT = '.';
const sal_Unicode FPH_CHAR_COLON = ':';
-static const rtl::OUString FPH_PATH_SEPARATOR()
-{ return rtl::OUString(FPH_CHAR_PATH_SEPARATOR); }
+static const OUString FPH_PATH_SEPARATOR()
+{ return OUString(FPH_CHAR_PATH_SEPARATOR); }
-static const rtl::OUString FPH_LOCAL_DIR_ENTRY()
-{ return rtl::OUString(FPH_CHAR_DOT); }
+static const OUString FPH_LOCAL_DIR_ENTRY()
+{ return OUString(FPH_CHAR_DOT); }
-static const rtl::OUString FPH_PARENT_DIR_ENTRY()
-{ return rtl::OUString(".."); }
+static const OUString FPH_PARENT_DIR_ENTRY()
+{ return OUString(".."); }
void osl_systemPathRemoveSeparator(rtl_uString* pustrPath)
{
@@ -62,7 +62,7 @@ void osl_systemPathEnsureSeparator(rtl_uString** ppustrPath)
OSL_PRECOND((nullptr != ppustrPath) && (nullptr != *ppustrPath), "osl_systemPathEnsureSeparator: Invalid parameter");
if ((ppustrPath != nullptr) && (*ppustrPath != nullptr))
{
- rtl::OUString path(*ppustrPath);
+ OUString path(*ppustrPath);
sal_Int32 lp = path.getLength();
sal_Int32 i = path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR);
@@ -89,8 +89,8 @@ void osl_systemPathMakeAbsolutePath(
const rtl_uString* pustrRelPath,
rtl_uString** ppustrAbsolutePath)
{
- rtl::OUString base(rtl_uString_getStr(const_cast<rtl_uString*>(pustrBasePath)));
- rtl::OUString rel(const_cast<rtl_uString*>(pustrRelPath));
+ OUString base(rtl_uString_getStr(const_cast<rtl_uString*>(pustrBasePath)));
+ OUString rel(const_cast<rtl_uString*>(pustrRelPath));
if (!base.isEmpty())
osl_systemPathEnsureSeparator(&base.pData);
@@ -108,11 +108,11 @@ void osl_systemPathGetFileNameOrLastDirectoryPart(
OSL_PRECOND(pustrPath && ppustrFileNameOrLastDirPart,
"osl_systemPathGetFileNameOrLastDirectoryPart: Invalid parameter");
- rtl::OUString path(const_cast<rtl_uString*>(pustrPath));
+ OUString path(const_cast<rtl_uString*>(pustrPath));
osl_systemPathRemoveSeparator(path.pData);
- rtl::OUString last_part;
+ OUString last_part;
if (path.getLength() > 1 || (path.getLength() == 1 && path[0] != FPH_CHAR_PATH_SEPARATOR))
{
@@ -130,7 +130,7 @@ bool osl_systemPathIsHiddenFileOrDirectoryEntry(
if ((pustrPath == nullptr) || (pustrPath->length == 0))
return false;
- rtl::OUString fdp;
+ OUString fdp;
osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &fdp.pData);
return ((fdp.pData->length > 0) &&
@@ -143,7 +143,7 @@ bool osl_systemPathIsLocalOrParentDirectoryEntry(
{
OSL_PRECOND(pustrPath, "osl_systemPathIsLocalOrParentDirectoryEntry: Invalid parameter");
- rtl::OUString dirent;
+ OUString dirent;
osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &dirent.pData);
@@ -161,7 +161,7 @@ public:
returns the first path in list, no need
to call reset first
*/
- path_list_iterator(const rtl::OUString& path_list, sal_Unicode list_separator = FPH_CHAR_COLON) :
+ path_list_iterator(const OUString& path_list, sal_Unicode list_separator = FPH_CHAR_COLON) :
m_path_list(path_list),
m_end(m_path_list.getStr() + m_path_list.getLength() + 1),
m_separator(list_separator)
@@ -191,9 +191,9 @@ public:
return (m_path_segment_end >= m_end);
}
- rtl::OUString get_current_item() const
+ OUString get_current_item() const
{
- return rtl::OUString(
+ return OUString(
m_path_segment_begin,
(m_path_segment_end - m_path_segment_begin));
}
@@ -211,7 +211,7 @@ private:
}
private:
- rtl::OUString const m_path_list;
+ OUString const m_path_list;
const sal_Unicode* m_end;
const sal_Unicode m_separator;
const sal_Unicode* m_path_segment_begin;
@@ -226,13 +226,13 @@ bool osl_searchPath(
OSL_PRECOND(pustrFilePath && pustrSearchPathList && ppustrPathFound, "osl_searchPath: Invalid parameter");
bool bfound = false;
- rtl::OUString fp(const_cast<rtl_uString*>(pustrFilePath));
- rtl::OUString pl = rtl::OUString(const_cast<rtl_uString*>(pustrSearchPathList));
+ OUString fp(const_cast<rtl_uString*>(pustrFilePath));
+ OUString pl = OUString(const_cast<rtl_uString*>(pustrSearchPathList));
path_list_iterator pli(pl);
while (!pli.done())
{
- rtl::OUString p = pli.get_current_item();
+ OUString p = pli.get_current_item();
osl::systemPathEnsureSeparator(p);
p += fp;
diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx
index 2b2fd8891256..18af761cb310 100644
--- a/sal/osl/unx/file_path_helper.hxx
+++ b/sal/osl/unx/file_path_helper.hxx
@@ -184,7 +184,7 @@ namespace osl
******************************************/
- inline void systemPathRemoveSeparator(/*inout*/ rtl::OUString& Path)
+ inline void systemPathRemoveSeparator(/*inout*/ OUString& Path)
{
osl_systemPathRemoveSeparator(Path.pData);
}
@@ -206,7 +206,7 @@ namespace osl
******************************************/
- inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
+ inline void systemPathEnsureSeparator(/*inout*/ OUString& Path)
{
osl_systemPathEnsureSeparator(&Path.pData);
}
@@ -225,7 +225,7 @@ namespace osl
******************************************/
- inline bool systemPathIsRelativePath(const rtl::OUString& Path)
+ inline bool systemPathIsRelativePath(const OUString& Path)
{
return osl_systemPathIsRelativePath(Path.pData);
}
@@ -265,9 +265,9 @@ namespace osl
*****************************************/
inline void systemPathMakeAbsolutePath(
- const rtl::OUString& BasePath,
- const rtl::OUString& RelPath,
- rtl::OUString& AbsolutePath)
+ const OUString& BasePath,
+ const OUString& RelPath,
+ OUString& AbsolutePath)
{
osl_systemPathMakeAbsolutePath(
BasePath.pData, RelPath.pData, &AbsolutePath.pData);
@@ -291,7 +291,7 @@ namespace osl
*********************************************/
inline bool systemPathIsHiddenFileOrDirectoryEntry(
- const rtl::OUString& Path)
+ const OUString& Path)
{
return osl_systemPathIsHiddenFileOrDirectoryEntry(Path.pData);
}
@@ -301,9 +301,9 @@ namespace osl
***********************************************/
inline bool searchPath(
- const rtl::OUString& ustrFilePath,
- const rtl::OUString& ustrSearchPathList,
- rtl::OUString& ustrPathFound)
+ const OUString& ustrFilePath,
+ const OUString& ustrSearchPathList,
+ OUString& ustrPathFound)
{
return osl_searchPath(
ustrFilePath.pData,
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index 7ba3d90a7037..b25bc3f1ed14 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -99,7 +99,7 @@ namespace
required on network file systems not using unix semantics (AFS, see
fdo#43095).
*/
- void set_file_access_rights(const rtl::OUString& file_path, oslFileStatus* pStat)
+ void set_file_access_rights(const OUString& file_path, oslFileStatus* pStat)
{
pStat->uValidFields |= osl_FileStatus_Mask_Attributes;
@@ -110,7 +110,7 @@ namespace
pStat->uAttributes |= osl_File_Attribute_Executable;
}
- void set_file_hidden_status(const rtl::OUString& file_path, oslFileStatus* pStat)
+ void set_file_hidden_status(const OUString& file_path, oslFileStatus* pStat)
{
pStat->uAttributes = osl::systemPathIsHiddenFileOrDirectoryEntry(file_path) ? osl_File_Attribute_Hidden : 0;
pStat->uValidFields |= osl_FileStatus_Mask_Attributes;
@@ -119,7 +119,7 @@ namespace
/* the set_file_access_rights must be called after set_file_hidden_status(...) and
set_file_access_mask(...) because of the hack in set_file_access_rights(...) */
void set_file_attributes(
- const rtl::OUString& file_path, const struct stat& file_stat, const sal_uInt32 uFieldMask, oslFileStatus* pStat)
+ const OUString& file_path, const struct stat& file_stat, const sal_uInt32 uFieldMask, oslFileStatus* pStat)
{
set_file_hidden_status(file_path, pStat);
set_file_access_mask(file_stat, pStat);
@@ -168,9 +168,9 @@ namespace
(field_mask & osl_FileStatus_Mask_Validate));
}
- oslFileError set_link_target_url(const rtl::OUString& file_path, oslFileStatus* pStat)
+ oslFileError set_link_target_url(const OUString& file_path, oslFileStatus* pStat)
{
- rtl::OUString link_target;
+ OUString link_target;
if (!osl::realpath(file_path, link_target))
return oslTranslateFileError(errno);
@@ -183,12 +183,12 @@ namespace
}
oslFileError setup_osl_getFileStatus(
- DirectoryItem_Impl * pImpl, oslFileStatus* pStat, rtl::OUString& file_path)
+ DirectoryItem_Impl * pImpl, oslFileStatus* pStat, OUString& file_path)
{
if ((pImpl == nullptr) || (pStat == nullptr))
return osl_File_E_INVAL;
- file_path = rtl::OUString(pImpl->m_ustrFilePath);
+ file_path = OUString(pImpl->m_ustrFilePath);
OSL_ASSERT(!file_path.isEmpty());
if (file_path.isEmpty())
return osl_File_E_INVAL;
@@ -203,7 +203,7 @@ oslFileError SAL_CALL osl_getFileStatus(oslDirectoryItem Item, oslFileStatus* pS
{
DirectoryItem_Impl * pImpl = static_cast< DirectoryItem_Impl* >(Item);
- rtl::OUString file_path;
+ OUString file_path;
oslFileError osl_error = setup_osl_getFileStatus(pImpl, pStat, file_path);
if (osl_error != osl_File_E_None)
return osl_error;
@@ -432,8 +432,8 @@ SAL_CALL osl_identicalDirectoryItem( oslDirectoryItem a, oslDirectoryItem b)
struct stat a_stat, b_stat;
- if (osl::lstat(rtl::OUString(pA->m_ustrFilePath), a_stat) != 0 ||
- osl::lstat(rtl::OUString(pB->m_ustrFilePath), b_stat) != 0)
+ if (osl::lstat(OUString(pA->m_ustrFilePath), a_stat) != 0 ||
+ osl::lstat(OUString(pB->m_ustrFilePath), b_stat) != 0)
return false;
return (a_stat.st_ino == b_stat.st_ino);
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 8e6f30f839d1..24fa04c7bfa6 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -454,7 +454,7 @@ namespace
PATH_MAX else osl_File_E_NAMETOOLONG is the result
*/
- oslFileError osl_getAbsoluteFileURL_impl_(const rtl::OUString& unresolved_path, rtl::OUString& resolved_path)
+ oslFileError osl_getAbsoluteFileURL_impl_(const OUString& unresolved_path, OUString& resolved_path)
{
/* the given unresolved path must not exceed PATH_MAX */
if (unresolved_path.getLength() >= (PATH_MAX - 2))
@@ -569,7 +569,7 @@ namespace
OSL_ASSERT(len < PATH_MAX);
- resolved_path = rtl::OUString(path_resolved_so_far, len);
+ resolved_path = OUString(path_resolved_so_far, len);
return osl_File_E_None;
}
@@ -584,13 +584,13 @@ oslFileError osl_getAbsoluteFileURL(
/* Work around the below call to getSystemPathFromFileURL rejecting input
that starts with "/" (for whatever reason it behaves that way; but
changing that would start to break lots of tests at least) */
- rtl::OUString relUrl(ustrRelativeURL);
+ OUString relUrl(ustrRelativeURL);
if (relUrl.startsWith("//"))
relUrl = "file:" + relUrl;
else if (relUrl.startsWith("/"))
relUrl = "file://" + relUrl;
- rtl::OUString unresolved_path;
+ OUString unresolved_path;
FileBase::RC frc = FileBase::getSystemPathFromFileURL(relUrl, unresolved_path);
if (frc != FileBase::E_None)
@@ -598,18 +598,18 @@ oslFileError osl_getAbsoluteFileURL(
if (systemPathIsRelativePath(unresolved_path))
{
- rtl::OUString base_path;
+ OUString base_path;
oslFileError rc = osl_getSystemPathFromFileURL_Ex(ustrBaseDirURL, &base_path.pData);
if (rc != osl_File_E_None)
return rc;
- rtl::OUString abs_path;
+ OUString abs_path;
systemPathMakeAbsolutePath(base_path, unresolved_path, abs_path);
unresolved_path = abs_path;
}
- rtl::OUString resolved_path;
+ OUString resolved_path;
oslFileError rc = osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path);
if (rc == osl_File_E_None)
{
@@ -627,11 +627,11 @@ namespace detail {
No separate error code if unicode to text conversion or getenv fails because for the
caller there is no difference why a file could not be found in $PATH
*/
- bool find_in_PATH(const rtl::OUString& file_path, rtl::OUString& result)
+ bool find_in_PATH(const OUString& file_path, OUString& result)
{
bool bfound = false;
- rtl::OUString path("PATH");
- rtl::OUString env_path;
+ OUString path("PATH");
+ OUString env_path;
if (osl_getEnvironment(path.pData, &env_path.pData) == osl_Process_E_None)
bfound = osl::searchPath(file_path, env_path, result);
@@ -647,23 +647,23 @@ namespace
No separate error code if unicode to text conversion or getcwd fails because for the
caller there is no difference why a file could not be found in CDW
*/
- bool find_in_CWD(const rtl::OUString& file_path, rtl::OUString& result)
+ bool find_in_CWD(const OUString& file_path, OUString& result)
{
bool bfound = false;
- rtl::OUString cwd_url;
+ OUString cwd_url;
if (osl_getProcessWorkingDir(&cwd_url.pData) == osl_Process_E_None)
{
- rtl::OUString cwd;
+ OUString cwd;
FileBase::getSystemPathFromFileURL(cwd_url, cwd);
bfound = osl::searchPath(file_path, cwd, result);
}
return bfound;
}
- bool find_in_searchPath(const rtl::OUString& file_path, rtl_uString* search_path, rtl::OUString& result)
+ bool find_in_searchPath(const OUString& file_path, rtl_uString* search_path, OUString& result)
{
- return (search_path && osl::searchPath(file_path, rtl::OUString(search_path), result));
+ return (search_path && osl::searchPath(file_path, OUString(search_path), result));
}
}
@@ -673,7 +673,7 @@ oslFileError osl_searchFileURL(rtl_uString* ustrFilePath, rtl_uString* ustrSearc
OSL_PRECOND(ustrFilePath && pustrURL, "osl_searchFileURL: invalid parameter");
FileBase::RC rc;
- rtl::OUString file_path;
+ OUString file_path;
// try to interpret search path as file url else assume it's a system path list
rc = FileBase::getSystemPathFromFileURL(ustrFilePath, file_path);
@@ -683,13 +683,13 @@ oslFileError osl_searchFileURL(rtl_uString* ustrFilePath, rtl_uString* ustrSearc
return oslFileError(rc);
bool bfound = false;
- rtl::OUString result;
+ OUString result;
if (find_in_searchPath(file_path, ustrSearchPath, result) ||
osl::detail::find_in_PATH(file_path, result) ||
find_in_CWD(file_path, result))
{
- rtl::OUString resolved;
+ OUString resolved;
if (osl::realpath(result, resolved))
{
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index c9377040894a..01225e631d82 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -807,8 +807,8 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
void imp_getProcessLocale( rtl_Locale ** ppLocale )
{
- rtl::OUString loc16(macosx_getLocale());
- rtl::OString locale;
+ OUString loc16(macosx_getLocale());
+ OString locale;
if (!loc16.convertToString(
&locale, RTL_TEXTENCODING_UTF8,
(RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
diff --git a/sal/osl/unx/nlsupport.hxx b/sal/osl/unx/nlsupport.hxx
index 53a132487c82..dce5d65c3df8 100644
--- a/sal/osl/unx/nlsupport.hxx
+++ b/sal/osl/unx/nlsupport.hxx
@@ -29,7 +29,7 @@ namespace rtl { class OUString; }
void imp_getProcessLocale( rtl_Locale ** );
#if defined IOS || defined MACOSX
-rtl::OUString macosx_getLocale();
+OUString macosx_getLocale();
#endif
#endif
diff --git a/sal/osl/unx/osxlocale.cxx b/sal/osl/unx/osxlocale.cxx
index b1bf89827212..7bd611d85c17 100644
--- a/sal/osl/unx/osxlocale.cxx
+++ b/sal/osl/unx/osxlocale.cxx
@@ -62,7 +62,7 @@ namespace
return CFLocaleCreateCanonicalLocaleIdentifierFromString(kCFAllocatorDefault, sref);
}
- void append(rtl::OUStringBuffer & buffer, CFStringRef string) {
+ void append(OUStringBuffer & buffer, CFStringRef string) {
CFIndex n = CFStringGetLength(string);
CFStringGetCharacters(
string, CFRangeMake(0, n),
@@ -72,7 +72,7 @@ namespace
/** Grab current locale from system.
*/
-rtl::OUString macosx_getLocale()
+OUString macosx_getLocale()
{
CFStringRef sref = getProcessLocale();
CFStringGuard sGuard(sref);
@@ -84,7 +84,7 @@ rtl::OUString macosx_getLocale()
CFArrayRef subs = CFStringCreateArrayBySeparatingStrings(nullptr, sref, CFSTR("-"));
CFArrayGuard arrGuard(subs);
- rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
append(buf, static_cast<CFStringRef>(CFArrayGetValueAtIndex(subs, 0)));
// country also available? Assumption: if the array contains more than one
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index 480bb264a267..fcb074d9b7c0 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -177,7 +177,7 @@ static void ChildStatusProc(void *pData)
if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
SAL_WARN("sal.osl", "Failed to change uid and guid: " << UnixErrnoString(errno));
- const rtl::OUString envVar("HOME");
+ const OUString envVar("HOME");
osl_clearEnvironment(envVar.pData);
}
@@ -393,25 +393,25 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
oslFileHandle *pErrorRead
)
{
- rtl::OUString image;
+ OUString image;
if (ustrImageName == nullptr)
{
if (nArguments == 0)
{
return osl_Process_E_InvalidError;
}
- image = rtl::OUString::unacquired(ustrArguments);
+ image = OUString::unacquired(ustrArguments);
}
else
{
osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
- rtl::OUString::unacquired(&ustrImageName), image);
+ OUString::unacquired(&ustrImageName), image);
if (e != osl::FileBase::E_None)
{
SAL_INFO(
"sal.osl",
"getSystemPathFromFileURL("
- << rtl::OUString::unacquired(&ustrImageName)
+ << OUString::unacquired(&ustrImageName)
<< ") failed with " << e);
return osl_Process_E_Unknown;
}
@@ -419,7 +419,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
if ((Options & osl_Process_SEARCHPATH) != 0)
{
- rtl::OUString path;
+ OUString path;
if (osl::detail::find_in_PATH(image, path))
{
image = path;
@@ -452,7 +452,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
{
SAL_INFO(
"sal.osl",
- "FileURLToPath(" << rtl::OUString::unacquired(&ustrWorkDir)
+ "FileURLToPath(" << OUString::unacquired(&ustrWorkDir)
<< ") failed with " << e);
return osl_Process_E_Unknown;
}
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index b232695cd57f..2b59e9f3147c 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -224,7 +224,7 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
/* see @ osl_getExecutableFile(). */
if (rtl_ustr_indexOfChar (rtl_uString_getStr(ppArgs[0]), '/') == -1)
{
- const rtl::OUString PATH ("PATH");
+ const OUString PATH ("PATH");
rtl_uString * pSearchPath = nullptr;
osl_getEnvironment (PATH.pData, &pSearchPath);
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index a9aaa1f29564..ea48309c3b94 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -31,9 +31,9 @@
#include <osl/detail/android-bootstrap.h>
#endif
-static rtl::OString OUStringToOString(const rtl_uString* s)
+static OString OUStringToOString(const rtl_uString* s)
{
- return rtl::OUStringToOString(rtl::OUString(const_cast<rtl_uString*>(s)),
+ return OUStringToOString(OUString(const_cast<rtl_uString*>(s)),
osl_getThreadTextEncoding());
}
@@ -142,16 +142,16 @@ typedef void accessFilePathState;
#ifdef MACOSX
/*
* Helper function for resolving Mac native alias files (not the same as unix alias files)
- * and to return the resolved alias as rtl::OString
+ * and to return the resolved alias as OString
*/
-static rtl::OString macxp_resolveAliasAndConvert(rtl::OString const & p)
+static OString macxp_resolveAliasAndConvert(OString const & p)
{
sal_Char path[PATH_MAX];
if (p.getLength() < PATH_MAX)
{
strcpy(path, p.getStr());
macxp_resolveAlias(path, PATH_MAX);
- return rtl::OString(path);
+ return OString(path);
}
return p;
}
@@ -159,7 +159,7 @@ static rtl::OString macxp_resolveAliasAndConvert(rtl::OString const & p)
int access_u(const rtl_uString* pustrPath, int mode)
{
- rtl::OString fn = OUStringToOString(pustrPath);
+ OString fn = OUStringToOString(pustrPath);
#ifdef ANDROID
if (fn == "/assets" || fn.startsWith("/assets/"))
{
@@ -197,7 +197,7 @@ int access_u(const rtl_uString* pustrPath, int mode)
bool realpath_u(const rtl_uString* pustrFileName, rtl_uString** ppustrResolvedName)
{
- rtl::OString fn = OUStringToOString(pustrFileName);
+ OString fn = OUStringToOString(pustrFileName);
#ifdef ANDROID
if (fn == "/assets" || fn.startsWith("/assets/"))
{
@@ -229,7 +229,7 @@ bool realpath_u(const rtl_uString* pustrFileName, rtl_uString** ppustrResolvedNa
if (bRet)
{
- rtl::OUString resolved = rtl::OStringToOUString(rtl::OString(static_cast<sal_Char*>(rp)),
+ OUString resolved = OStringToOUString(OString(static_cast<sal_Char*>(rp)),
osl_getThreadTextEncoding());
rtl_uString_assign(ppustrResolvedName, resolved.pData);
@@ -292,7 +292,7 @@ int lstat_c(const char* cpPath, struct stat* buf)
int lstat_u(const rtl_uString* pustrPath, struct stat* buf)
{
- rtl::OString fn = OUStringToOString(pustrPath);
+ OString fn = OUStringToOString(pustrPath);
#ifdef MACOSX
fn = macxp_resolveAliasAndConvert(fn);
@@ -303,7 +303,7 @@ int lstat_u(const rtl_uString* pustrPath, struct stat* buf)
int mkdir_u(const rtl_uString* path, mode_t mode)
{
- rtl::OString fn = OUStringToOString(path);
+ OString fn = OUStringToOString(path);
accessFilePathState *state = prepare_to_access_file_path(fn.getStr());
@@ -388,7 +388,7 @@ int ftruncate_with_name(int fd, sal_uInt64 uSize, rtl_String* path)
* abstraction layer that keeps the pathname around.
*/
- rtl::OString fn = rtl::OString(path);
+ OString fn = OString(path);
#ifdef MACOSX
fn = macxp_resolveAliasAndConvert(fn);
diff --git a/sal/osl/unx/uunxapi.hxx b/sal/osl/unx/uunxapi.hxx
index 4be4fbb28748..5030b75ca214 100644
--- a/sal/osl/unx/uunxapi.hxx
+++ b/sal/osl/unx/uunxapi.hxx
@@ -60,7 +60,7 @@ int ftruncate_with_name(int fd, sal_uInt64 uSize, rtl_String* path);
namespace osl
{
- inline int access(const rtl::OUString& ustrPath, int mode)
+ inline int access(const OUString& ustrPath, int mode)
{
return access_u(ustrPath.pData, mode);
}
@@ -79,18 +79,18 @@ namespace osl
**********************************/
inline bool realpath(
- const rtl::OUString& ustrFileName,
- rtl::OUString& ustrResolvedName)
+ const OUString& ustrFileName,
+ OUString& ustrResolvedName)
{
return realpath_u(ustrFileName.pData, &ustrResolvedName.pData);
}
- inline int lstat(const rtl::OUString& ustrPath, struct stat& buf)
+ inline int lstat(const OUString& ustrPath, struct stat& buf)
{
return lstat_u(ustrPath.pData, &buf);
}
- inline int mkdir(const rtl::OUString& aPath, mode_t aMode)
+ inline int mkdir(const OUString& aPath, mode_t aMode)
{
return mkdir_u(aPath.pData, aMode);
}
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 5e630c95a5ee..b8f8ad4e261f 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -179,7 +179,7 @@ namespace
return has_parent;
}
- inline bool has_path_parent(const rtl::OUString& path)
+ inline bool has_path_parent(const OUString& path)
{ return has_path_parent(path.getStr()); }
}
@@ -589,7 +589,7 @@ static DWORD create_dir_with_callback(
{
if (aDirectoryCreationCallbackFunc)
{
- rtl::OUString url;
+ OUString url;
osl_getFileURLFromSystemPath(dir_path, &(url.pData));
aDirectoryCreationCallbackFunc(pData, url.pData);
}
@@ -654,7 +654,7 @@ oslFileError SAL_CALL osl_createDirectoryPath(
if (aDirectoryUrl == nullptr)
return osl_File_E_INVAL;
- rtl::OUString sys_path;
+ OUString sys_path;
oslFileError osl_error =
osl_getSystemPathFromFileURL_(aDirectoryUrl, &sys_path.pData, false);
@@ -1149,14 +1149,14 @@ static inline bool is_floppy_A_present()
static inline bool is_floppy_B_present()
{ return (GetLogicalDrives() & 2); }
-static bool is_floppy_volume_mount_point(const rtl::OUString& path)
+static bool is_floppy_volume_mount_point(const OUString& path)
{
// determines if a volume mount point shows to a floppy
// disk by comparing the unique volume names
static const LPCWSTR FLOPPY_A = L"A:\\";
static const LPCWSTR FLOPPY_B = L"B:\\";
- rtl::OUString p(path);
+ OUString p(path);
osl::systemPathEnsureSeparator(p);
WCHAR vn[51];
@@ -1176,7 +1176,7 @@ static bool is_floppy_volume_mount_point(const rtl::OUString& path)
return false;
}
-static bool is_floppy_drive(const rtl::OUString& path)
+static bool is_floppy_drive(const OUString& path)
{
static const LPCWSTR FLOPPY_DRV_LETTERS = L"AaBb";
@@ -1190,9 +1190,9 @@ static bool is_floppy_drive(const rtl::OUString& path)
return ((wcschr(FLOPPY_DRV_LETTERS, pszPath[0]) && (L':' == pszPath[1])) || is_floppy_volume_mount_point(path));
}
-static bool is_volume_mount_point(const rtl::OUString& path)
+static bool is_volume_mount_point(const OUString& path)
{
- rtl::OUString p(path);
+ OUString p(path);
osl::systemPathRemoveSeparator(p);
bool is_volume_root = false;
@@ -1220,12 +1220,12 @@ static bool is_volume_mount_point(const rtl::OUString& path)
return is_volume_root;
}
-static UINT get_volume_mount_point_drive_type(const rtl::OUString& path)
+static UINT get_volume_mount_point_drive_type(const OUString& path)
{
if (0 == path.getLength())
return GetDriveTypeW(nullptr);
- rtl::OUString p(path);
+ OUString p(path);
osl::systemPathEnsureSeparator(p);
WCHAR vn[51];
@@ -1241,7 +1241,7 @@ static inline bool is_drivetype_request(sal_uInt32 field_mask)
}
static oslFileError osl_get_drive_type(
- const rtl::OUString& path, oslVolumeInfo* pInfo)
+ const OUString& path, oslVolumeInfo* pInfo)
{
// GetDriveType fails on empty volume mount points
// see Knowledge Base Q244089
@@ -1295,7 +1295,7 @@ static inline bool is_volume_space_info_request(sal_uInt32 field_mask)
}
static void get_volume_space_information(
- const rtl::OUString& path, oslVolumeInfo *pInfo)
+ const OUString& path, oslVolumeInfo *pInfo)
{
BOOL ret = GetDiskFreeSpaceExW(
o3tl::toW(path.getStr()),
@@ -1322,7 +1322,7 @@ static inline bool is_filesystem_attributes_request(sal_uInt32 field_mask)
}
static oslFileError get_filesystem_attributes(
- const rtl::OUString& path, sal_uInt32 field_mask, oslVolumeInfo* pInfo)
+ const OUString& path, sal_uInt32 field_mask, oslVolumeInfo* pInfo)
{
pInfo->uAttributes = 0;
@@ -1374,7 +1374,7 @@ static oslFileError get_filesystem_attributes(
return osl_File_E_None;
}
-static bool path_get_parent(rtl::OUString& path)
+static bool path_get_parent(OUString& path)
{
OSL_PRECOND(path.lastIndexOf(SLASH) == -1, "Path must not have slashes");
@@ -1383,16 +1383,16 @@ static bool path_get_parent(rtl::OUString& path)
sal_Int32 i = path.lastIndexOf(BACKSLASH);
if (-1 < i)
{
- path = rtl::OUString(path.getStr(), i);
+ path = OUString(path.getStr(), i);
return true;
}
}
return false;
}
-static void path_travel_to_volume_root(const rtl::OUString& system_path, rtl::OUString& volume_root)
+static void path_travel_to_volume_root(const OUString& system_path, OUString& volume_root)
{
- rtl::OUString sys_path(system_path);
+ OUString sys_path(system_path);
while(!is_volume_mount_point(sys_path) && path_get_parent(sys_path))
/**/;
@@ -1407,13 +1407,13 @@ oslFileError SAL_CALL osl_getVolumeInformation(
if (!pInfo)
return osl_File_E_INVAL;
- rtl::OUString system_path;
+ OUString system_path;
oslFileError error = osl_getSystemPathFromFileURL_(ustrURL, &system_path.pData, false);
if (osl_File_E_None != error)
return error;
- rtl::OUString volume_root;
+ OUString volume_root;
path_travel_to_volume_root(system_path, volume_root);
pInfo->uValidFields = 0;
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index 82260c85ef07..f34b437fefd2 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -637,7 +637,7 @@ oslFileError osl_getSystemPathFromFileURL_( rtl_uString *strURL, rtl_uString **p
strUTF8->length != strURL->length &&
0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( strURL->buffer, strURL->length, "file:\\\\", 7 )
, "sal.osl"
- ,"osl_getSystemPathFromFileURL: \"" << rtl::OUString(strURL) << "\" is not encoded !!!");
+ ,"osl_getSystemPathFromFileURL: \"" << OUString(strURL) << "\" is not encoded !!!");
bValidEncoded = osl_decodeURL_( strUTF8, &strDecodedURL );
@@ -734,7 +734,7 @@ oslFileError osl_getSystemPathFromFileURL_( rtl_uString *strURL, rtl_uString **p
}
else
SAL_INFO_IF(nError, "sal.osl",
- "osl_getSystemPathFromFileURL: \"" << rtl::OUString(strURL) << "\" is not an absolute FileURL");
+ "osl_getSystemPathFromFileURL: \"" << OUString(strURL) << "\" is not an absolute FileURL");
}
@@ -748,7 +748,7 @@ oslFileError osl_getSystemPathFromFileURL_( rtl_uString *strURL, rtl_uString **p
rtl_uString_release( strTempPath );
SAL_INFO_IF(nError, "sal.osl",
- "osl_getSystemPathFromFileURL: \"" << rtl::OUString(strURL) << "\" is not a FileURL");
+ "osl_getSystemPathFromFileURL: \"" << OUString(strURL) << "\" is not a FileURL");
return nError;
}
@@ -854,7 +854,7 @@ oslFileError osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString** p
rtl_uString_release( strTempURL );
SAL_INFO_IF(nError, "sal.osl",
- "osl_getFileURLFromSystemPath: \"" << rtl::OUString(strPath) << "\" is not a systemPath");
+ "osl_getFileURLFromSystemPath: \"" << OUString(strPath) << "\" is not a systemPath");
return nError;
}
diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx
index 900888bd1544..abbc46f165d8 100644
--- a/sal/osl/w32/path_helper.cxx
+++ b/sal/osl/w32/path_helper.cxx
@@ -25,15 +25,15 @@
#include <algorithm>
#include <wchar.h>
-const rtl::OUString BACKSLASH ("\\");
-const rtl::OUString SLASH ("/");
+const OUString BACKSLASH ("\\");
+const OUString SLASH ("/");
void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath)
{
OSL_PRECOND(ppustrPath && (nullptr != *ppustrPath),
"osl_systemPathEnsureSeparator: Invalid parameter");
- rtl::OUString path(*ppustrPath);
+ OUString path(*ppustrPath);
sal_Int32 i = std::max<sal_Int32>(path.lastIndexOf(BACKSLASH), path.lastIndexOf(SLASH));
if (i < (path.getLength()-1))
@@ -49,7 +49,7 @@ void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath)
void osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath)
{
- rtl::OUString path(*ppustrPath);
+ OUString path(*ppustrPath);
if (!osl::systemPathIsLogicalDrivePattern(path))
{
@@ -57,7 +57,7 @@ void osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath)
if (i > -1 && (i == (path.getLength() - 1)))
{
- path = rtl::OUString(path.getStr(), path.getLength() - 1);
+ path = OUString(path.getStr(), path.getLength() - 1);
rtl_uString_assign(ppustrPath, path.pData);
}
}
diff --git a/sal/osl/w32/path_helper.hxx b/sal/osl/w32/path_helper.hxx
index 237c130f7fd8..bcb4f83af701 100644
--- a/sal/osl/w32/path_helper.hxx
+++ b/sal/osl/w32/path_helper.hxx
@@ -61,7 +61,7 @@ namespace osl
drive alone
*/
-inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
+inline void systemPathEnsureSeparator(/*inout*/ OUString& Path)
{
osl_systemPathEnsureSeparator(&Path.pData);
}
@@ -71,12 +71,12 @@ inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
if the path is not the root path '\'
*/
-inline void systemPathRemoveSeparator(/*inout*/ rtl::OUString& Path)
+inline void systemPathRemoveSeparator(/*inout*/ OUString& Path)
{
osl_systemPathRemoveSeparator(&Path.pData);
}
-inline bool systemPathIsLogicalDrivePattern(/*in*/ const rtl::OUString& path)
+inline bool systemPathIsLogicalDrivePattern(/*in*/ const OUString& path)
{
return osl_systemPathIsLogicalDrivePattern(path.pData);
}
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index a2e4021f0f1f..d9cbaaa19617 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -45,7 +45,7 @@ namespace /* private */
second one. */
struct less_environment_variable
{
- bool operator() (const rtl::OUString& lhs, const rtl::OUString& rhs) const
+ bool operator() (const OUString& lhs, const OUString& rhs) const
{
OSL_ENSURE((lhs.indexOf(L'=') > -1) &&
(rhs.indexOf(L'=') > -1),
@@ -70,7 +70,7 @@ namespace /* private */
sum_of_string_lengths() : sum_(0) {}
- void operator() (const rtl::OUString& string)
+ void operator() (const OUString& string)
{
OSL_ASSERT(string.getLength());
@@ -128,7 +128,7 @@ namespace /* private */
for (sal_uInt32 i = 0; i < env_vars_count; i++)
{
- rtl::OUString env_var = rtl::OUString(env_vars[i]);
+ OUString env_var = OUString(env_vars[i]);
if (env_var.getLength() == 0)
return false;
@@ -236,9 +236,9 @@ namespace /* private */
// Add a quote sign to the start and the end of a string
// if not already present
- rtl::OUString quote_string(const rtl::OUString& string)
+ OUString quote_string(const OUString& string)
{
- rtl::OUStringBuffer quoted;
+ OUStringBuffer quoted;
if (string.indexOf(L'"') != 0)
quoted.append('"');
@@ -256,9 +256,9 @@ namespace /* private */
// may not have the file extension ".exe". However, if the file on disk has the
// ".exe" extension, then the function will fail. In this case a second attempt
// is started by adding the parameter "extension" to "path".
- rtl::OUString getShortPath(rtl::OUString const & path, rtl::OUString const & extension)
+ OUString getShortPath(OUString const & path, OUString const & extension)
{
- rtl::OUString ret(path);
+ OUString ret(path);
if (path.getLength() > 260)
{
std::vector<sal_Unicode> vec(path.getLength() + 1);
@@ -269,16 +269,16 @@ namespace /* private */
if (!len && GetLastError() == ERROR_FILE_NOT_FOUND
&& extension.getLength())
{
- const rtl::OUString extPath(path + extension);
+ const OUString extPath(path + extension);
std::vector<sal_Unicode> vec2(
extPath.getLength() + 1);
const DWORD len2 = GetShortPathNameW(
o3tl::toW(extPath.getStr()), o3tl::toW(&vec2[0]), extPath.getLength() + 1);
- ret = rtl::OUString(&vec2[0], len2);
+ ret = OUString(&vec2[0], len2);
}
else
{
- ret = rtl::OUString(&vec[0], len);
+ ret = OUString(&vec[0], len);
}
}
return ret;
@@ -288,26 +288,26 @@ namespace /* private */
// be provided via the strImageName parameter or as first
// element of the strArguments list.
// The returned path will be quoted if it contains spaces.
- rtl::OUString get_executable_path(
+ OUString get_executable_path(
rtl_uString* image_name,
rtl_uString* cmdline_args[],
sal_uInt32 n_cmdline_args,
bool search_path)
{
- rtl::OUString exe_name;
+ OUString exe_name;
if (image_name)
exe_name = image_name;
else if (n_cmdline_args)
- exe_name = rtl::OUString(cmdline_args[0]);
+ exe_name = OUString(cmdline_args[0]);
- rtl::OUString exe_url = exe_name;
+ OUString exe_url = exe_name;
if (search_path)
osl_searchFileURL(exe_name.pData, nullptr, &exe_url.pData);
- rtl::OUString exe_path;
+ OUString exe_path;
if (osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL(exe_url, exe_path))
- return rtl::OUString();
+ return OUString();
exe_path = getShortPath(exe_path, ".exe");
@@ -317,27 +317,27 @@ namespace /* private */
return exe_path;
}
- rtl::OUString get_file_extension(const rtl::OUString& file_name)
+ OUString get_file_extension(const OUString& file_name)
{
sal_Int32 index = file_name.lastIndexOf('.');
if ((index != -1) && ((index + 1) < file_name.getLength()))
return file_name.copy(index + 1);
- return rtl::OUString();
+ return OUString();
}
- bool is_batch_file(const rtl::OUString& file_name)
+ bool is_batch_file(const OUString& file_name)
{
- rtl::OUString ext = get_file_extension(file_name);
+ OUString ext = get_file_extension(file_name);
return (ext.equalsIgnoreAsciiCase("bat") ||
ext.equalsIgnoreAsciiCase("cmd") ||
ext.equalsIgnoreAsciiCase("btm"));
}
- const rtl::OUString ENV_COMSPEC ("COMSPEC");
- rtl::OUString get_batch_processor()
+ const OUString ENV_COMSPEC ("COMSPEC");
+ OUString get_batch_processor()
{
- rtl::OUString comspec;
+ OUString comspec;
osl_getEnvironment(ENV_COMSPEC.pData, &comspec.pData);
OSL_ASSERT(comspec.getLength());
@@ -390,7 +390,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
oslFileHandle *pProcessOutputRead,
oslFileHandle *pProcessErrorRead)
{
- rtl::OUString exe_path = get_executable_path(
+ OUString exe_path = get_executable_path(
ustrImageName, ustrArguments, nArguments, (Options & osl_Process_SEARCHPATH) != 0);
if (0 == exe_path.getLength())
@@ -400,11 +400,11 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
return osl_Process_E_InvalidError;
DWORD flags = NORMAL_PRIORITY_CLASS;
- rtl::OUStringBuffer command_line;
+ OUStringBuffer command_line;
if (is_batch_file(exe_path))
{
- rtl::OUString batch_processor = get_batch_processor();
+ OUString batch_processor = get_batch_processor();
if (batch_processor.getLength())
{
@@ -430,7 +430,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
command_line.append(" ");
/* Quote arguments containing blanks */
- if (rtl::OUString(ustrArguments[n]).indexOf(' ') != -1)
+ if (OUString(ustrArguments[n]).indexOf(' ') != -1)
command_line.append(quote_string(ustrArguments[n]));
else
command_line.append(ustrArguments[n]);
@@ -449,7 +449,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
p_environment = &environment[0];
}
- rtl::OUString cwd;
+ OUString cwd;
if (ustrDirectory && ustrDirectory->length && (osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL(ustrDirectory, cwd)))
return osl_Process_E_InvalidError;
@@ -510,7 +510,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
startup_info.wShowWindow = SW_NORMAL;
}
- rtl::OUString cmdline = command_line.makeStringAndClear();
+ OUString cmdline = command_line.makeStringAndClear();
PROCESS_INFORMATION process_info;
BOOL bRet = FALSE;
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index b22854fcd6c4..a2111854850a 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -28,8 +28,6 @@
#include <cppunit/plugin/TestPlugIn.h>
#include <string.h>
-using ::rtl::OStringBuffer;
-using ::rtl::OString;
// This file contains cppunit tests for the
// OString and OStringBuffer classes
@@ -42,7 +40,7 @@ namespace rtl_OStringBuffer
void ctor_001()
{
- ::rtl::OStringBuffer aStrBuf;
+ OStringBuffer aStrBuf;
const sal_Char* pStr = aStrBuf.getStr();
CPPUNIT_ASSERT_MESSAGE
@@ -64,14 +62,14 @@ namespace rtl_OStringBuffer
void ctor_002()
{
- ::rtl::OString aStrtmp( kTestStr1 );
- ::rtl::OStringBuffer aStrBuftmp( aStrtmp );
- ::rtl::OStringBuffer aStrBuf( aStrBuftmp );
+ OString aStrtmp( kTestStr1 );
+ OStringBuffer aStrBuftmp( aStrtmp );
+ OStringBuffer aStrBuf( aStrBuftmp );
// sal_Bool res = cmpstr(aStrBuftmp.getStr(),aStrBuf.getStr());
sal_Int32 nLenStrBuftmp = aStrBuftmp.getLength();
- rtl::OString sStr(aStrBuftmp.getStr());
+ OString sStr(aStrBuftmp.getStr());
bool res = aStrtmp == sStr;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -94,8 +92,8 @@ namespace rtl_OStringBuffer
void ctor_003()
{
- ::rtl::OStringBuffer aStrBuf1(kTestStr2Len);
- ::rtl::OStringBuffer aStrBuf2(0);
+ OStringBuffer aStrBuf1(kTestStr2Len);
+ OStringBuffer aStrBuf2(0);
const sal_Char* pStr1 = aStrBuf1.getStr();
const sal_Char* pStr2 = aStrBuf2.getStr();
@@ -135,8 +133,8 @@ namespace rtl_OStringBuffer
void ctor_004()
{
- ::rtl::OString aStrtmp( kTestStr1 );
- ::rtl::OStringBuffer aStrBuf( aStrtmp );
+ OString aStrtmp( kTestStr1 );
+ OStringBuffer aStrBuf( aStrtmp );
sal_Int32 leg = aStrBuf.getLength();
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -158,10 +156,10 @@ namespace rtl_OStringBuffer
}
void ctor_005() {
- rtl::OStringBuffer b1;
+ OStringBuffer b1;
auto dummy = b1.makeStringAndClear();
(void)dummy;
- rtl::OStringBuffer b2(b1);
+ OStringBuffer b2(b1);
(void)b2;
}
@@ -169,7 +167,7 @@ namespace rtl_OStringBuffer
{
//pass in a const char*, get a temp
//OString
- ::rtl::OStringBuffer aStrBuf(kTestStr1);
+ OStringBuffer aStrBuf(kTestStr1);
sal_Int32 leg = aStrBuf.getLength();
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -212,8 +210,8 @@ namespace rtl_OStringBuffer
void makeStringAndClear_001()
{
- ::rtl::OStringBuffer aStrBuf1;
- ::rtl::OString aStr1;
+ OStringBuffer aStrBuf1;
+ OString aStr1;
bool lastRes = (aStrBuf1.makeStringAndClear() == aStr1 );
@@ -237,8 +235,8 @@ namespace rtl_OStringBuffer
void makeStringAndClear_002()
{
- ::rtl::OStringBuffer aStrBuf2(26);
- ::rtl::OString aStr2;
+ OStringBuffer aStrBuf2(26);
+ OString aStr2;
bool lastRes = (aStrBuf2.makeStringAndClear() == aStr2 );
@@ -253,8 +251,8 @@ namespace rtl_OStringBuffer
void makeStringAndClear_003()
{
- ::rtl::OStringBuffer aStrBuf3(arrOUS[0]);
- ::rtl::OString aStr3(arrOUS[0]);
+ OStringBuffer aStrBuf3(arrOUS[0]);
+ OString aStr3(arrOUS[0]);
bool lastRes = (aStrBuf3.makeStringAndClear() == aStr3 );
@@ -269,8 +267,8 @@ namespace rtl_OStringBuffer
void makeStringAndClear_004()
{
- ::rtl::OStringBuffer aStrBuf4(arrOUS[1]);
- ::rtl::OString aStr4(arrOUS[1]);
+ OStringBuffer aStrBuf4(arrOUS[1]);
+ OString aStr4(arrOUS[1]);
bool lastRes = (aStrBuf4.makeStringAndClear() == aStr4 );
@@ -284,8 +282,8 @@ namespace rtl_OStringBuffer
void makeStringAndClear_005()
{
- ::rtl::OStringBuffer aStrBuf5(arrOUS[2]);
- ::rtl::OString aStr5(arrOUS[2]);
+ OStringBuffer aStrBuf5(arrOUS[2]);
+ OString aStr5(arrOUS[2]);
bool lastRes = (aStrBuf5.makeStringAndClear() == aStr5 );
@@ -299,8 +297,8 @@ namespace rtl_OStringBuffer
void makeStringAndClear_006()
{
- ::rtl::OStringBuffer aStrBuf6(arrOUS[3]);
- ::rtl::OString aStr6(arrOUS[3]);
+ OStringBuffer aStrBuf6(arrOUS[3]);
+ OString aStr6(arrOUS[3]);
bool lastRes = (aStrBuf6.makeStringAndClear() == aStr6 );
@@ -314,8 +312,8 @@ namespace rtl_OStringBuffer
void makeStringAndClear_007()
{
- ::rtl::OStringBuffer aStrBuf7(arrOUS[4]);
- ::rtl::OString aStr7(arrOUS[4]);
+ OStringBuffer aStrBuf7(arrOUS[4]);
+ OString aStr7(arrOUS[4]);
bool lastRes = (aStrBuf7.makeStringAndClear() == aStr7 );
@@ -329,8 +327,8 @@ namespace rtl_OStringBuffer
void makeStringAndClear_008()
{
- ::rtl::OStringBuffer aStrBuf8(arrOUS[5]);
- ::rtl::OString aStr8(arrOUS[5]);
+ OStringBuffer aStrBuf8(arrOUS[5]);
+ OString aStr8(arrOUS[5]);
bool lastRes = (aStrBuf8.makeStringAndClear() == aStr8 );
@@ -359,7 +357,7 @@ namespace rtl_OStringBuffer
public:
void remove_001()
{
- ::rtl::OStringBuffer sb(
+ OStringBuffer sb(
RTL_CONSTASCII_STRINGPARAM("Red Hat, Inc."));
sb.remove(0, 4);
@@ -409,7 +407,7 @@ namespace rtl_OStringBuffer
void getLength_001()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
sal_Int32 expVal = kTestStr1Len;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -422,7 +420,7 @@ namespace rtl_OStringBuffer
void getLength_002()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
sal_Int32 expVal = 1;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -434,7 +432,7 @@ namespace rtl_OStringBuffer
void getLength_003()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
sal_Int32 expVal = 0;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -446,7 +444,7 @@ namespace rtl_OStringBuffer
void getLength_004()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
sal_Int32 expVal = 0;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -458,7 +456,7 @@ namespace rtl_OStringBuffer
void getLength_005()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
sal_Int32 expVal = 1;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -470,7 +468,7 @@ namespace rtl_OStringBuffer
void getLength_006()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[5] );
+ OStringBuffer aStrBuf( arrOUS[5] );
sal_Int32 expVal = kTestStr2Len;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -482,7 +480,7 @@ namespace rtl_OStringBuffer
void getLength_007()
{
- ::rtl::OStringBuffer aStrBuf;
+ OStringBuffer aStrBuf;
sal_Int32 expVal = 0;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -494,7 +492,7 @@ namespace rtl_OStringBuffer
void getLength_008()
{
- ::rtl::OStringBuffer aStrBuf( 26 );
+ OStringBuffer aStrBuf( 26 );
sal_Int32 expVal = 0;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -534,7 +532,7 @@ namespace rtl_OStringBuffer
void getCapacity_001()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
sal_Int32 expVal = kTestStr1Len+16;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -547,7 +545,7 @@ namespace rtl_OStringBuffer
void getCapacity_002()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
sal_Int32 expVal = 1+16;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -559,7 +557,7 @@ namespace rtl_OStringBuffer
void getCapacity_003()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
sal_Int32 expVal = 0+16;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -571,7 +569,7 @@ namespace rtl_OStringBuffer
void getCapacity_004()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
sal_Int32 expVal = 0+16;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -583,7 +581,7 @@ namespace rtl_OStringBuffer
void getCapacity_005()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
sal_Int32 expVal = 1+16;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -595,7 +593,7 @@ namespace rtl_OStringBuffer
void getCapacity_006()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[5] );
+ OStringBuffer aStrBuf( arrOUS[5] );
sal_Int32 expVal = kTestStr2Len+16;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -607,7 +605,7 @@ namespace rtl_OStringBuffer
void getCapacity_007()
{
- ::rtl::OStringBuffer aStrBuf;
+ OStringBuffer aStrBuf;
sal_Int32 expVal = 16;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -619,7 +617,7 @@ namespace rtl_OStringBuffer
void getCapacity_010()
{
- ::rtl::OStringBuffer aStrBuf( 16 );
+ OStringBuffer aStrBuf( 16 );
sal_Int32 expVal = 16;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -631,7 +629,7 @@ namespace rtl_OStringBuffer
void getCapacity_011()
{
- ::rtl::OStringBuffer aStrBuf( 6 );
+ OStringBuffer aStrBuf( 6 );
sal_Int32 expVal = 6;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -643,7 +641,7 @@ namespace rtl_OStringBuffer
void getCapacity_012()
{
- ::rtl::OStringBuffer aStrBuf( 0 );
+ OStringBuffer aStrBuf( 0 );
sal_Int32 expVal = 0;
CPPUNIT_ASSERT_EQUAL_MESSAGE
@@ -672,7 +670,7 @@ namespace rtl_OStringBuffer
void ensureCapacity_001()
{
sal_Int32 expVal = 16;
- ::rtl::OStringBuffer aStrBuf;
+ OStringBuffer aStrBuf;
sal_Int32 input = 5;
aStrBuf.ensureCapacity( input );
@@ -688,7 +686,7 @@ namespace rtl_OStringBuffer
void ensureCapacity_002()
{
sal_Int32 expVal = 16;
- ::rtl::OStringBuffer aStrBuf;
+ OStringBuffer aStrBuf;
sal_Int32 input = -5;
aStrBuf.ensureCapacity( input );
@@ -704,7 +702,7 @@ namespace rtl_OStringBuffer
void ensureCapacity_003()
{
sal_Int32 expVal = 16;
- ::rtl::OStringBuffer aStrBuf;
+ OStringBuffer aStrBuf;
sal_Int32 input = 0;
aStrBuf.ensureCapacity( input );
@@ -720,7 +718,7 @@ namespace rtl_OStringBuffer
void ensureCapacity_004() //the testcase is based on comments
{
sal_Int32 expVal = 20;
- ::rtl::OStringBuffer aStrBuf;
+ OStringBuffer aStrBuf;
sal_Int32 input = 20;
aStrBuf.ensureCapacity( input );
@@ -736,7 +734,7 @@ namespace rtl_OStringBuffer
void ensureCapacity_005()
{
sal_Int32 expVal = 50;
- ::rtl::OStringBuffer aStrBuf;
+ OStringBuffer aStrBuf;
sal_Int32 input = 50;
aStrBuf.ensureCapacity( input );
@@ -752,7 +750,7 @@ namespace rtl_OStringBuffer
void ensureCapacity_006()
{
sal_Int32 expVal = 20;
- ::rtl::OStringBuffer aStrBuf( 6 );
+ OStringBuffer aStrBuf( 6 );
sal_Int32 input = 20;
aStrBuf.ensureCapacity( input );
@@ -768,7 +766,7 @@ namespace rtl_OStringBuffer
void ensureCapacity_007()
{
sal_Int32 expVal = 6;
- ::rtl::OStringBuffer aStrBuf( 6 );
+ OStringBuffer aStrBuf( 6 );
sal_Int32 input = 2;
aStrBuf.ensureCapacity( input );
@@ -784,7 +782,7 @@ namespace rtl_OStringBuffer
void ensureCapacity_008()
{
sal_Int32 expVal = 6;
- ::rtl::OStringBuffer aStrBuf( 6 );
+ OStringBuffer aStrBuf( 6 );
sal_Int32 input = -6;
aStrBuf.ensureCapacity( input );
@@ -800,7 +798,7 @@ namespace rtl_OStringBuffer
void ensureCapacity_009() //the testcase is based on comments
{
sal_Int32 expVal = 10;
- ::rtl::OStringBuffer aStrBuf( 6 );
+ OStringBuffer aStrBuf( 6 );
sal_Int32 input = 10;
aStrBuf.ensureCapacity( input );
@@ -816,7 +814,7 @@ namespace rtl_OStringBuffer
void ensureCapacity_010()
{
sal_Int32 expVal = 6;
- ::rtl::OStringBuffer aStrBuf( 0 );
+ OStringBuffer aStrBuf( 0 );
sal_Int32 input = 6;
aStrBuf.ensureCapacity( input );
@@ -832,7 +830,7 @@ namespace rtl_OStringBuffer
void ensureCapacity_011() //the testcase is based on comments
{
sal_Int32 expVal = 2; // capacity is x = (str->length + 1) * 2; minimum < x ? x : minimum
- ::rtl::OStringBuffer aStrBuf( 0 );
+ OStringBuffer aStrBuf( 0 );
sal_Int32 input = 1;
aStrBuf.ensureCapacity( input );
@@ -848,7 +846,7 @@ namespace rtl_OStringBuffer
void ensureCapacity_012()
{
sal_Int32 expVal = 0;
- ::rtl::OStringBuffer aStrBuf( 0 );
+ OStringBuffer aStrBuf( 0 );
sal_Int32 input = -1;
aStrBuf.ensureCapacity( input );
@@ -895,9 +893,9 @@ namespace rtl_OStringBuffer
void setLength_001()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
sal_Int32 expVal1 = 50;
- ::rtl::OString expVal2( kTestStr1 );
+ OString expVal2( kTestStr1 );
sal_Int32 expVal3 = 50;
sal_Int32 input = 50;
@@ -915,9 +913,9 @@ namespace rtl_OStringBuffer
void setLength_002()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
sal_Int32 expVal1 = kTestStr13Len;
- ::rtl::OString expVal2( kTestStr1 );
+ OString expVal2( kTestStr1 );
sal_Int32 expVal3 = 32;
sal_Int32 input = kTestStr13Len;
@@ -935,9 +933,9 @@ namespace rtl_OStringBuffer
void setLength_003()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
sal_Int32 expVal1 = kTestStr1Len;
- ::rtl::OString expVal2( kTestStr1 );
+ OString expVal2( kTestStr1 );
sal_Int32 expVal3 = 32;
sal_Int32 input = kTestStr1Len;
@@ -955,9 +953,9 @@ namespace rtl_OStringBuffer
void setLength_004()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
sal_Int32 expVal1 = kTestStr7Len;
- ::rtl::OString expVal2( kTestStr7 );
+ OString expVal2( kTestStr7 );
sal_Int32 expVal3 = 32;
sal_Int32 input = kTestStr7Len;
@@ -975,9 +973,9 @@ namespace rtl_OStringBuffer
void setLength_005()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
sal_Int32 expVal1 = 0;
- ::rtl::OString expVal2;
+ OString expVal2;
sal_Int32 expVal3 = 32;
sal_Int32 input = 0;
@@ -995,9 +993,9 @@ namespace rtl_OStringBuffer
void setLength_006()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
sal_Int32 expVal1 = 25;
- ::rtl::OString expVal2( arrOUS[1] );
+ OString expVal2( arrOUS[1] );
sal_Int32 expVal3 = 25;
sal_Int32 input = 25;
@@ -1015,9 +1013,9 @@ namespace rtl_OStringBuffer
void setLength_007()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
sal_Int32 expVal1 = kTestStr27Len;
- ::rtl::OString expVal2( arrOUS[1] );
+ OString expVal2( arrOUS[1] );
sal_Int32 expVal3 = 17;
sal_Int32 input = kTestStr27Len;
@@ -1035,9 +1033,9 @@ namespace rtl_OStringBuffer
void setLength_008()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
sal_Int32 expVal1 = 0;
- ::rtl::OString expVal2;
+ OString expVal2;
sal_Int32 expVal3 = 17;
sal_Int32 input = 0;
@@ -1055,9 +1053,9 @@ namespace rtl_OStringBuffer
void setLength_009()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
sal_Int32 expVal1 = 20;
- ::rtl::OString expVal2;
+ OString expVal2;
sal_Int32 expVal3 = 20;
sal_Int32 input = 20;
@@ -1075,9 +1073,9 @@ namespace rtl_OStringBuffer
void setLength_010()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
sal_Int32 expVal1 = 3;
- ::rtl::OString expVal2;
+ OString expVal2;
sal_Int32 expVal3 = 16;
sal_Int32 input = 3;
@@ -1095,9 +1093,9 @@ namespace rtl_OStringBuffer
void setLength_011()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
sal_Int32 expVal1 = 0;
- ::rtl::OString expVal2;
+ OString expVal2;
sal_Int32 expVal3 = 16;
sal_Int32 input = 0;
@@ -1115,9 +1113,9 @@ namespace rtl_OStringBuffer
void setLength_012()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
sal_Int32 expVal1 = 20;
- ::rtl::OString expVal2;
+ OString expVal2;
sal_Int32 expVal3 = 20;
sal_Int32 input = 20;
@@ -1135,9 +1133,9 @@ namespace rtl_OStringBuffer
void setLength_013()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
sal_Int32 expVal1 = 5;
- ::rtl::OString expVal2;
+ OString expVal2;
sal_Int32 expVal3 = 16;
sal_Int32 input = 5;
@@ -1155,9 +1153,9 @@ namespace rtl_OStringBuffer
void setLength_014()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
sal_Int32 expVal1 = 0;
- ::rtl::OString expVal2;
+ OString expVal2;
sal_Int32 expVal3 = 16;
sal_Int32 input = 0;
@@ -1175,9 +1173,9 @@ namespace rtl_OStringBuffer
void setLength_015()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
sal_Int32 expVal1 = 20;
- ::rtl::OString expVal2;
+ OString expVal2;
sal_Int32 expVal3 = 20;
sal_Int32 input = 20;
@@ -1195,9 +1193,9 @@ namespace rtl_OStringBuffer
void setLength_016()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
sal_Int32 expVal1 = 5;
- ::rtl::OString expVal2;
+ OString expVal2;
sal_Int32 expVal3 = 17;
sal_Int32 input = 5;
@@ -1215,9 +1213,9 @@ namespace rtl_OStringBuffer
void setLength_017()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
sal_Int32 expVal1 = 0;
- ::rtl::OString expVal2;
+ OString expVal2;
sal_Int32 expVal3 = 17;
sal_Int32 input = 0;
@@ -1235,9 +1233,9 @@ namespace rtl_OStringBuffer
void setLength_018()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[5] );
+ OStringBuffer aStrBuf( arrOUS[5] );
sal_Int32 expVal1 = 50;
- ::rtl::OString expVal2( kTestStr2 );
+ OString expVal2( kTestStr2 );
sal_Int32 expVal3 = 66;
sal_Int32 input = 50;
@@ -1255,9 +1253,9 @@ namespace rtl_OStringBuffer
void setLength_019()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[5] );
+ OStringBuffer aStrBuf( arrOUS[5] );
sal_Int32 expVal1 = 40;
- ::rtl::OString expVal2(kTestStr2);
+ OString expVal2(kTestStr2);
sal_Int32 expVal3 = 48;
sal_Int32 input = 40;
@@ -1275,9 +1273,9 @@ namespace rtl_OStringBuffer
void setLength_020()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[5] );
+ OStringBuffer aStrBuf( arrOUS[5] );
sal_Int32 expVal1 = kTestStr2Len;
- ::rtl::OString expVal2(kTestStr2);
+ OString expVal2(kTestStr2);
sal_Int32 expVal3 = 48;
sal_Int32 input = kTestStr2Len;
@@ -1295,9 +1293,9 @@ namespace rtl_OStringBuffer
void setLength_021()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[5] );
+ OStringBuffer aStrBuf( arrOUS[5] );
sal_Int32 expVal1 = kTestStr7Len;
- ::rtl::OString expVal2(kTestStr7);
+ OString expVal2(kTestStr7);
sal_Int32 expVal3 = 48;
sal_Int32 input = kTestStr7Len;
@@ -1315,9 +1313,9 @@ namespace rtl_OStringBuffer
void setLength_022()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[5] );
+ OStringBuffer aStrBuf( arrOUS[5] );
sal_Int32 expVal1 = 0;
- ::rtl::OString expVal2;
+ OString expVal2;
sal_Int32 expVal3 = 48;
sal_Int32 input = 0;
@@ -1364,7 +1362,7 @@ namespace rtl_OStringBuffer
void csuc_001()
{
const sal_Char* expVal = kTestStr1;
- ::rtl::OStringBuffer aStrBuf( kTestStr1 );
+ OStringBuffer aStrBuf( kTestStr1 );
sal_Int32 cmpLen = kTestStr1Len;
// LLA: wrong access! const sal_Char* pstr = *&aStrBuf;
@@ -1382,7 +1380,7 @@ namespace rtl_OStringBuffer
void csuc_002()
{
- ::rtl::OStringBuffer aStrBuf;
+ OStringBuffer aStrBuf;
// LLA: wrong access! const sal_Char* pstr = *&aStrBuf;
const sal_Char* pstr = aStrBuf.getStr();
@@ -1408,7 +1406,7 @@ namespace rtl_OStringBuffer
void getStr_001()
{
const sal_Char* expVal = kTestStr1;
- ::rtl::OStringBuffer aStrBuf( kTestStr1 );
+ OStringBuffer aStrBuf( kTestStr1 );
sal_Int32 cmpLen = kTestStr1Len;
const sal_Char* pstr = aStrBuf.getStr();
@@ -1424,7 +1422,7 @@ namespace rtl_OStringBuffer
void getStr_002()
{
- ::rtl::OStringBuffer aStrBuf;
+ OStringBuffer aStrBuf;
const sal_Char* pstr = aStrBuf.getStr();
CPPUNIT_ASSERT_MESSAGE
(
@@ -1459,7 +1457,7 @@ namespace rtl_OStringBuffer
void append_001_001()
{
OString expVal( kTestStr1 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString input2( kTestStr8 );
aStrBuf.append( input2 );
@@ -1475,7 +1473,7 @@ namespace rtl_OStringBuffer
void append_001_002()
{
OString expVal( kTestStr2 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString input2( kTestStr36 );
aStrBuf.append( input2 );
@@ -1492,7 +1490,7 @@ namespace rtl_OStringBuffer
void append_001_003()
{
OString expVal( kTestStr37 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString input2( kTestStr23 );
aStrBuf.append( input2 );
@@ -1509,7 +1507,7 @@ namespace rtl_OStringBuffer
void append_001_004()
{
OString expVal( kTestStr7 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString input2;
aStrBuf.append( input2 );
@@ -1526,7 +1524,7 @@ namespace rtl_OStringBuffer
void append_001_005()
{
OString expVal( kTestStr7 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString input2( kTestStr7 );
aStrBuf.append( input2 );
@@ -1543,7 +1541,7 @@ namespace rtl_OStringBuffer
void append_001_006()
{
OString expVal( kTestStr2 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString input2( kTestStr2 );
aStrBuf.append( input2 );
@@ -1560,7 +1558,7 @@ namespace rtl_OStringBuffer
void append_001_007()
{
OString expVal( kTestStr1 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString input2( kTestStr1 );
aStrBuf.append( input2 );
@@ -1577,7 +1575,7 @@ namespace rtl_OStringBuffer
void append_001_008()
{
OString expVal;
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString input2;
aStrBuf.append( input2 );
@@ -1594,7 +1592,7 @@ namespace rtl_OStringBuffer
void append_001_009()
{
OString expVal( kTestStr7 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString input2( kTestStr7 );
aStrBuf.append( input2 );
@@ -1611,7 +1609,7 @@ namespace rtl_OStringBuffer
void append_001_010()
{
OString expVal( kTestStr2 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString input2( kTestStr2 );
aStrBuf.append( input2 );
@@ -1628,7 +1626,7 @@ namespace rtl_OStringBuffer
void append_001_011()
{
OString expVal( kTestStr1 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString input2( kTestStr1 );
aStrBuf.append( input2 );
@@ -1645,7 +1643,7 @@ namespace rtl_OStringBuffer
void append_001_012()
{
OString expVal;
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString input2;
aStrBuf.append( input2 );
@@ -1662,7 +1660,7 @@ namespace rtl_OStringBuffer
void append_001_013()
{
OString expVal( kTestStr7 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString input2( kTestStr7 );
aStrBuf.append( input2 );
@@ -1679,7 +1677,7 @@ namespace rtl_OStringBuffer
void append_001_014()
{
OString expVal( kTestStr2 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString input2( kTestStr2 );
aStrBuf.append( input2 );
@@ -1696,7 +1694,7 @@ namespace rtl_OStringBuffer
void append_001_015()
{
OString expVal( kTestStr1 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString input2( kTestStr1 );
aStrBuf.append( input2 );
@@ -1713,7 +1711,7 @@ namespace rtl_OStringBuffer
void append_001_016()
{
OString expVal;
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString input2;
aStrBuf.append( input2 );
@@ -1730,7 +1728,7 @@ namespace rtl_OStringBuffer
void append_001_017()
{
OString expVal( kTestStr29 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString input2( kTestStr38 );
aStrBuf.append( input2 );
@@ -1747,7 +1745,7 @@ namespace rtl_OStringBuffer
void append_001_018()
{
OString expVal( kTestStr39 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString input2( kTestStr17 );
aStrBuf.append( input2 );
@@ -1764,7 +1762,7 @@ namespace rtl_OStringBuffer
void append_001_019()
{
OString expVal( kTestStr40 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString input2( kTestStr31 );
aStrBuf.append( input2 );
@@ -1781,7 +1779,7 @@ namespace rtl_OStringBuffer
void append_001_020()
{
OString expVal( kTestStr28 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString input2;
aStrBuf.append( input2 );
@@ -1797,7 +1795,7 @@ namespace rtl_OStringBuffer
void append_null()
{
- ::rtl::OStringBuffer aStrBuf("hello world");
+ OStringBuffer aStrBuf("hello world");
aStrBuf.append('\0');
aStrBuf.append('\1');
@@ -1860,7 +1858,7 @@ namespace rtl_OStringBuffer
void append_002_001()
{
OString expVal( kTestStr1 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
const sal_Char* input = kTestStr8;
aStrBuf.append( input );
@@ -1876,7 +1874,7 @@ namespace rtl_OStringBuffer
void append_002_002()
{
OString expVal( kTestStr2 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
const sal_Char* input = kTestStr36;
aStrBuf.append( input );
@@ -1892,7 +1890,7 @@ namespace rtl_OStringBuffer
void append_002_003()
{
OString expVal( kTestStr37 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
const sal_Char* input = kTestStr23;
aStrBuf.append( input );
@@ -1908,7 +1906,7 @@ namespace rtl_OStringBuffer
void append_002_004()
{
OString expVal( kTestStr7 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
const sal_Char* input = kTestStr25;
aStrBuf.append( input );
@@ -1924,7 +1922,7 @@ namespace rtl_OStringBuffer
void append_002_005()
{
OString expVal( kTestStr7 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
const sal_Char* input = kTestStr7;
aStrBuf.append( input );
@@ -1940,7 +1938,7 @@ namespace rtl_OStringBuffer
void append_002_006()
{
OString expVal( kTestStr2 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
const sal_Char* input = kTestStr2;
aStrBuf.append( input );
@@ -1956,7 +1954,7 @@ namespace rtl_OStringBuffer
void append_002_007()
{
OString expVal( kTestStr1 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
const sal_Char* input = kTestStr1;
aStrBuf.append( input );
@@ -1972,7 +1970,7 @@ namespace rtl_OStringBuffer
void append_002_008()
{
OString expVal;
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
const sal_Char* input = kTestStr25;
aStrBuf.append( input );
@@ -1988,7 +1986,7 @@ namespace rtl_OStringBuffer
void append_002_009()
{
OString expVal( kTestStr7 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
const sal_Char* input = kTestStr7;
aStrBuf.append( input );
@@ -2004,7 +2002,7 @@ namespace rtl_OStringBuffer
void append_002_010()
{
OString expVal( kTestStr2 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
const sal_Char* input = kTestStr2;
aStrBuf.append( input );
@@ -2020,7 +2018,7 @@ namespace rtl_OStringBuffer
void append_002_011()
{
OString expVal( kTestStr1 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
const sal_Char* input = kTestStr1;
aStrBuf.append( input );
@@ -2036,7 +2034,7 @@ namespace rtl_OStringBuffer
void append_002_012()
{
OString expVal;
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
const sal_Char* input = kTestStr25;
aStrBuf.append( input );
@@ -2052,7 +2050,7 @@ namespace rtl_OStringBuffer
void append_002_013()
{
OString expVal( kTestStr7 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
const sal_Char* input = kTestStr7;
aStrBuf.append( input );
@@ -2068,7 +2066,7 @@ namespace rtl_OStringBuffer
void append_002_014()
{
OString expVal( kTestStr2 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
const sal_Char* input = kTestStr2;
aStrBuf.append( input );
@@ -2084,7 +2082,7 @@ namespace rtl_OStringBuffer
void append_002_015()
{
OString expVal( kTestStr1 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
const sal_Char* input = kTestStr1;
aStrBuf.append( input );
@@ -2100,7 +2098,7 @@ namespace rtl_OStringBuffer
void append_002_016()
{
OString expVal;
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
const sal_Char* input = kTestStr25;
aStrBuf.append( input );
@@ -2116,7 +2114,7 @@ namespace rtl_OStringBuffer
void append_002_017()
{
OString expVal( kTestStr29 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
const sal_Char* input = kTestStr38;
aStrBuf.append( input );
@@ -2132,7 +2130,7 @@ namespace rtl_OStringBuffer
void append_002_018()
{
OString expVal( kTestStr39 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
const sal_Char* input = kTestStr17;
aStrBuf.append( input );
@@ -2148,7 +2146,7 @@ namespace rtl_OStringBuffer
void append_002_019()
{
OString expVal( kTestStr40 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
const sal_Char* input = kTestStr31;
aStrBuf.append( input );
@@ -2164,7 +2162,7 @@ namespace rtl_OStringBuffer
void append_002_020()
{
OString expVal( kTestStr28 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
const sal_Char* input = kTestStr25;
aStrBuf.append( input );
@@ -2181,7 +2179,7 @@ namespace rtl_OStringBuffer
void append_002_021()
{
OString expVal;
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
const sal_Char* input = kTestStr25;
aStrBuf.append( input );
@@ -2240,7 +2238,7 @@ namespace rtl_OStringBuffer
void append_003_001()
{
OString expVal( kTestStr1 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
const sal_Char* input1 = kTestStr36;
sal_Int32 input2 = 12;
@@ -2257,7 +2255,7 @@ namespace rtl_OStringBuffer
void append_003_002()
{
OString expVal( kTestStr2 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
const sal_Char* input1 = kTestStr36;
sal_Int32 input2 = 28;
@@ -2274,7 +2272,7 @@ namespace rtl_OStringBuffer
void append_003_003()
{
OString expVal( kTestStr37 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
const sal_Char* input1 = kTestStr23;
sal_Int32 input2 = 16;
@@ -2291,7 +2289,7 @@ namespace rtl_OStringBuffer
void append_003_004()
{
OString expVal( kTestStr7 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
const sal_Char* input1 = kTestStr2;
sal_Int32 input2 = 0;
@@ -2308,7 +2306,7 @@ namespace rtl_OStringBuffer
void append_003_006()
{
OString expVal( kTestStr7 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
const sal_Char* input1 = kTestStr2;
sal_Int32 input2 = 4;
@@ -2325,7 +2323,7 @@ namespace rtl_OStringBuffer
void append_003_007()
{
OString expVal( kTestStr2 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
const sal_Char* input1 = kTestStr2;
sal_Int32 input2 = 32;
@@ -2342,7 +2340,7 @@ namespace rtl_OStringBuffer
void append_003_008()
{
OString expVal( kTestStr1 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
const sal_Char* input1 = kTestStr2;
sal_Int32 input2 = 16;
@@ -2359,7 +2357,7 @@ namespace rtl_OStringBuffer
void append_003_009()
{
OString expVal;
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
const sal_Char* input1 = kTestStr2;
sal_Int32 input2 = 0;
@@ -2376,7 +2374,7 @@ namespace rtl_OStringBuffer
void append_003_011()
{
OString expVal( kTestStr7 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
const sal_Char* input1 = kTestStr2;
sal_Int32 input2 = 4;
@@ -2393,7 +2391,7 @@ namespace rtl_OStringBuffer
void append_003_012()
{
OString expVal( kTestStr2 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
const sal_Char* input1 = kTestStr2;
sal_Int32 input2 = 32;
@@ -2410,7 +2408,7 @@ namespace rtl_OStringBuffer
void append_003_013()
{
OString expVal( kTestStr1 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
const sal_Char* input1 = kTestStr2;
sal_Int32 input2 = 16;
@@ -2427,7 +2425,7 @@ namespace rtl_OStringBuffer
void append_003_014()
{
OString expVal;
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
const sal_Char* input1 = kTestStr2;
sal_Int32 input2 = 0;
@@ -2444,7 +2442,7 @@ namespace rtl_OStringBuffer
void append_003_016()
{
OString expVal( kTestStr7 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
const sal_Char* input1 = kTestStr2;
sal_Int32 input2 = 4;
@@ -2461,7 +2459,7 @@ namespace rtl_OStringBuffer
void append_003_017()
{
OString expVal( kTestStr2 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
const sal_Char* input1 = kTestStr2;
sal_Int32 input2 = 32;
@@ -2478,7 +2476,7 @@ namespace rtl_OStringBuffer
void append_003_018()
{
OString expVal( kTestStr1 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
const sal_Char* input1 = kTestStr2;
sal_Int32 input2 = 16;
@@ -2495,7 +2493,7 @@ namespace rtl_OStringBuffer
void append_003_019()
{
OString expVal;
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
const sal_Char* input1 = kTestStr2;
sal_Int32 input2 = 0;
@@ -2512,7 +2510,7 @@ namespace rtl_OStringBuffer
void append_003_021()
{
OString expVal( kTestStr29 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
const sal_Char* input1 = kTestStr38;
sal_Int32 input2 = 7;
@@ -2529,7 +2527,7 @@ namespace rtl_OStringBuffer
void append_003_022()
{
OString expVal( kTestStr39 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
const sal_Char* input1 = kTestStr17;
sal_Int32 input2 = 22;
@@ -2546,7 +2544,7 @@ namespace rtl_OStringBuffer
void append_003_023()
{
OString expVal( kTestStr40 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
const sal_Char* input1 = kTestStr31;
sal_Int32 input2 = 16;
@@ -2563,7 +2561,7 @@ namespace rtl_OStringBuffer
void append_003_024()
{
OString expVal( kTestStr28 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
const sal_Char* input1 = kTestStr2;
sal_Int32 input2 = 0;
@@ -2619,7 +2617,7 @@ namespace rtl_OStringBuffer
void append_004_001()
{
OString expVal( kTestStr45 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
bool input = true;
aStrBuf.append( input );
@@ -2635,7 +2633,7 @@ namespace rtl_OStringBuffer
void append_004_002()
{
OString expVal( kTestStr46 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
bool input = false;
aStrBuf.append( input );
@@ -2651,7 +2649,7 @@ namespace rtl_OStringBuffer
void append_004_003()
{
OString expVal( kTestStr47 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
bool input = true;
aStrBuf.append( input );
@@ -2667,7 +2665,7 @@ namespace rtl_OStringBuffer
void append_004_004()
{
OString expVal( kTestStr48 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
bool input = false;
aStrBuf.append( input );
@@ -2683,7 +2681,7 @@ namespace rtl_OStringBuffer
void append_004_005()
{
OString expVal( kTestStr47 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
bool input = true;
aStrBuf.append( input );
@@ -2699,7 +2697,7 @@ namespace rtl_OStringBuffer
void append_004_006()
{
OString expVal( kTestStr48 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
bool input = false;
aStrBuf.append( input );
@@ -2715,7 +2713,7 @@ namespace rtl_OStringBuffer
void append_004_007()
{
OString expVal( kTestStr47 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
bool input = true;
aStrBuf.append( input );
@@ -2731,7 +2729,7 @@ namespace rtl_OStringBuffer
void append_004_008()
{
OString expVal( kTestStr48 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
bool input = false;
aStrBuf.append( input );
@@ -2747,7 +2745,7 @@ namespace rtl_OStringBuffer
void append_004_009()
{
OString expVal( kTestStr49 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
bool input = true;
aStrBuf.append( input );
@@ -2763,7 +2761,7 @@ namespace rtl_OStringBuffer
void append_004_010()
{
OString expVal( kTestStr50 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
bool input = false;
aStrBuf.append( input );
@@ -2780,7 +2778,7 @@ namespace rtl_OStringBuffer
void append_004_011()
{
OString expVal( kTestStr47 );
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
sal_Bool input = sal_True;
aStrBuf.append( input );
@@ -2796,7 +2794,7 @@ namespace rtl_OStringBuffer
void append_004_012()
{
OString expVal( kTestStr48 );
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
sal_Bool input = sal_False;
aStrBuf.append( input );
@@ -2848,7 +2846,7 @@ namespace rtl_OStringBuffer
void append_001()
{
OString expVal( kTestStr51 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
sal_Char input = 'M';
aStrBuf.append( input );
@@ -2864,7 +2862,7 @@ namespace rtl_OStringBuffer
void append_002()
{
OString expVal( kTestStr143 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
sal_Char input = static_cast<sal_Char>(SAL_MAX_UINT8);
aStrBuf.append( input );
@@ -2880,7 +2878,7 @@ namespace rtl_OStringBuffer
void append_003()
{
OString expVal( kTestStr27 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
sal_Char input = 's';
aStrBuf.append( input );
@@ -2896,7 +2894,7 @@ namespace rtl_OStringBuffer
void append_004()
{
OString expVal( kTestStr144 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
sal_Char input = static_cast<sal_Char>(SAL_MAX_UINT8);
aStrBuf.append( input );
@@ -2912,7 +2910,7 @@ namespace rtl_OStringBuffer
void append_005_005()
{
OString expVal( kTestStr27 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
sal_Char input = 's';
aStrBuf.append( input );
@@ -2928,7 +2926,7 @@ namespace rtl_OStringBuffer
void append_006()
{
OString expVal( kTestStr144 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
sal_Char input = static_cast<sal_Char>(SAL_MAX_UINT8);
aStrBuf.append( input );
@@ -2944,7 +2942,7 @@ namespace rtl_OStringBuffer
void append_007()
{
OString expVal( kTestStr27 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
sal_Char input = 's';
aStrBuf.append( input );
@@ -2960,7 +2958,7 @@ namespace rtl_OStringBuffer
void append_008()
{
OString expVal( kTestStr144 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
sal_Char input = static_cast<sal_Char>(SAL_MAX_UINT8);
aStrBuf.append( input );
@@ -2976,7 +2974,7 @@ namespace rtl_OStringBuffer
void append_009()
{
OString expVal( kTestStr56 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
sal_Char input = 's';
aStrBuf.append( input );
@@ -2992,7 +2990,7 @@ namespace rtl_OStringBuffer
void append_010()
{
OString expVal( kTestStr145 );
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
sal_Char input = static_cast<sal_Char>(SAL_MAX_UINT8);
aStrBuf.append( input );
@@ -3009,7 +3007,7 @@ namespace rtl_OStringBuffer
void append_011()
{
OString expVal( kTestStr27 );
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
sal_Char input = 's';
aStrBuf.append( input );
@@ -3025,7 +3023,7 @@ namespace rtl_OStringBuffer
void append_012()
{
OString expVal( kTestStr144 );
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
sal_Char input = static_cast<sal_Char>(SAL_MAX_UINT8);
aStrBuf.append( input );
@@ -3074,7 +3072,7 @@ namespace rtl_OStringBuffer
void append_001()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 2;
@@ -3093,7 +3091,7 @@ namespace rtl_OStringBuffer
void append_002()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 2;
@@ -3112,7 +3110,7 @@ namespace rtl_OStringBuffer
void append_003()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 2;
@@ -3131,7 +3129,7 @@ namespace rtl_OStringBuffer
void append_004()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 2;
@@ -3150,7 +3148,7 @@ namespace rtl_OStringBuffer
void append_005()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 8;
@@ -3169,7 +3167,7 @@ namespace rtl_OStringBuffer
void append_006()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 8;
@@ -3188,7 +3186,7 @@ namespace rtl_OStringBuffer
void append_007()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 8;
@@ -3207,7 +3205,7 @@ namespace rtl_OStringBuffer
void append_008()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 8;
@@ -3226,7 +3224,7 @@ namespace rtl_OStringBuffer
void append_009()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 10;
@@ -3245,7 +3243,7 @@ namespace rtl_OStringBuffer
void append_010()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 10;
@@ -3264,7 +3262,7 @@ namespace rtl_OStringBuffer
void append_011()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 10;
@@ -3283,7 +3281,7 @@ namespace rtl_OStringBuffer
void append_012()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 10;
@@ -3302,7 +3300,7 @@ namespace rtl_OStringBuffer
void append_013()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 16;
@@ -3321,7 +3319,7 @@ namespace rtl_OStringBuffer
void append_014()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 16;
@@ -3340,7 +3338,7 @@ namespace rtl_OStringBuffer
void append_015()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 16;
@@ -3359,7 +3357,7 @@ namespace rtl_OStringBuffer
void append_016()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 16;
@@ -3378,7 +3376,7 @@ namespace rtl_OStringBuffer
void append_017()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 36;
@@ -3397,7 +3395,7 @@ namespace rtl_OStringBuffer
void append_018()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 36;
@@ -3416,7 +3414,7 @@ namespace rtl_OStringBuffer
void append_019()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 36;
@@ -3435,7 +3433,7 @@ namespace rtl_OStringBuffer
void append_020()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 35;
sal_Int16 radix = 36;
@@ -3454,7 +3452,7 @@ namespace rtl_OStringBuffer
void append_021()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 2;
@@ -3473,7 +3471,7 @@ namespace rtl_OStringBuffer
void append_022()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 2;
@@ -3492,7 +3490,7 @@ namespace rtl_OStringBuffer
void append_023()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 2;
@@ -3511,7 +3509,7 @@ namespace rtl_OStringBuffer
void append_024()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 2;
@@ -3530,7 +3528,7 @@ namespace rtl_OStringBuffer
void append_025()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 8;
@@ -3549,7 +3547,7 @@ namespace rtl_OStringBuffer
void append_026()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 8;
@@ -3568,7 +3566,7 @@ namespace rtl_OStringBuffer
void append_027()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 8;
@@ -3587,7 +3585,7 @@ namespace rtl_OStringBuffer
void append_028()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 8;
@@ -3606,7 +3604,7 @@ namespace rtl_OStringBuffer
void append_029()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 10;
@@ -3625,7 +3623,7 @@ namespace rtl_OStringBuffer
void append_030()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 10;
@@ -3644,7 +3642,7 @@ namespace rtl_OStringBuffer
void append_031()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 10;
@@ -3663,7 +3661,7 @@ namespace rtl_OStringBuffer
void append_032()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 10;
@@ -3682,7 +3680,7 @@ namespace rtl_OStringBuffer
void append_033()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 16;
@@ -3701,7 +3699,7 @@ namespace rtl_OStringBuffer
void append_034()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 16;
@@ -3720,7 +3718,7 @@ namespace rtl_OStringBuffer
void append_035()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 16;
@@ -3739,7 +3737,7 @@ namespace rtl_OStringBuffer
void append_036()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 16;
@@ -3758,7 +3756,7 @@ namespace rtl_OStringBuffer
void append_037()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 36;
@@ -3777,7 +3775,7 @@ namespace rtl_OStringBuffer
void append_038()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 36;
@@ -3796,7 +3794,7 @@ namespace rtl_OStringBuffer
void append_039()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 36;
@@ -3815,7 +3813,7 @@ namespace rtl_OStringBuffer
void append_040()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 35;
sal_Int16 radix = 36;
@@ -3834,7 +3832,7 @@ namespace rtl_OStringBuffer
void append_041()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 2;
@@ -3853,7 +3851,7 @@ namespace rtl_OStringBuffer
void append_042()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 2;
@@ -3872,7 +3870,7 @@ namespace rtl_OStringBuffer
void append_043()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 2;
@@ -3891,7 +3889,7 @@ namespace rtl_OStringBuffer
void append_044()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 2;
@@ -3910,7 +3908,7 @@ namespace rtl_OStringBuffer
void append_045()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 8;
@@ -3929,7 +3927,7 @@ namespace rtl_OStringBuffer
void append_046()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 8;
@@ -3948,7 +3946,7 @@ namespace rtl_OStringBuffer
void append_047()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 8;
@@ -3967,7 +3965,7 @@ namespace rtl_OStringBuffer
void append_048()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 8;
@@ -3986,7 +3984,7 @@ namespace rtl_OStringBuffer
void append_049()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 10;
@@ -4005,7 +4003,7 @@ namespace rtl_OStringBuffer
void append_050()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 10;
@@ -4024,7 +4022,7 @@ namespace rtl_OStringBuffer
void append_051()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 10;
@@ -4043,7 +4041,7 @@ namespace rtl_OStringBuffer
void append_052()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 10;
@@ -4062,7 +4060,7 @@ namespace rtl_OStringBuffer
void append_053()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 16;
@@ -4081,7 +4079,7 @@ namespace rtl_OStringBuffer
void append_054()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 16;
@@ -4100,7 +4098,7 @@ namespace rtl_OStringBuffer
void append_055()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 16;
@@ -4119,7 +4117,7 @@ namespace rtl_OStringBuffer
void append_056()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 16;
@@ -4138,7 +4136,7 @@ namespace rtl_OStringBuffer
void append_057()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 36;
@@ -4157,7 +4155,7 @@ namespace rtl_OStringBuffer
void append_058()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 36;
@@ -4176,7 +4174,7 @@ namespace rtl_OStringBuffer
void append_059()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 36;
@@ -4195,7 +4193,7 @@ namespace rtl_OStringBuffer
void append_060()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 35;
sal_Int16 radix = 36;
@@ -4214,7 +4212,7 @@ namespace rtl_OStringBuffer
void append_061()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 2;
@@ -4233,7 +4231,7 @@ namespace rtl_OStringBuffer
void append_062()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 2;
@@ -4252,7 +4250,7 @@ namespace rtl_OStringBuffer
void append_063()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 2;
@@ -4271,7 +4269,7 @@ namespace rtl_OStringBuffer
void append_064()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 2;
@@ -4290,7 +4288,7 @@ namespace rtl_OStringBuffer
void append_065()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 8;
@@ -4309,7 +4307,7 @@ namespace rtl_OStringBuffer
void append_066()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 8;
@@ -4328,7 +4326,7 @@ namespace rtl_OStringBuffer
void append_067()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 8;
@@ -4347,7 +4345,7 @@ namespace rtl_OStringBuffer
void append_068()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 8;
@@ -4366,7 +4364,7 @@ namespace rtl_OStringBuffer
void append_069()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 10;
@@ -4385,7 +4383,7 @@ namespace rtl_OStringBuffer
void append_070()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 10;
@@ -4404,7 +4402,7 @@ namespace rtl_OStringBuffer
void append_071()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 10;
@@ -4423,7 +4421,7 @@ namespace rtl_OStringBuffer
void append_072()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 10;
@@ -4442,7 +4440,7 @@ namespace rtl_OStringBuffer
void append_073()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 16;
@@ -4461,7 +4459,7 @@ namespace rtl_OStringBuffer
void append_074()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 16;
@@ -4480,7 +4478,7 @@ namespace rtl_OStringBuffer
void append_075()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 16;
@@ -4499,7 +4497,7 @@ namespace rtl_OStringBuffer
void append_076()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 16;
@@ -4518,7 +4516,7 @@ namespace rtl_OStringBuffer
void append_077()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 36;
@@ -4537,7 +4535,7 @@ namespace rtl_OStringBuffer
void append_078()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 36;
@@ -4556,7 +4554,7 @@ namespace rtl_OStringBuffer
void append_079()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 36;
@@ -4575,7 +4573,7 @@ namespace rtl_OStringBuffer
void append_080()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 35;
sal_Int16 radix = 36;
@@ -4594,7 +4592,7 @@ namespace rtl_OStringBuffer
void append_081()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 2;
@@ -4613,7 +4611,7 @@ namespace rtl_OStringBuffer
void append_082()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 2;
@@ -4632,7 +4630,7 @@ namespace rtl_OStringBuffer
void append_083()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 2;
@@ -4651,7 +4649,7 @@ namespace rtl_OStringBuffer
void append_084()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 2;
@@ -4670,7 +4668,7 @@ namespace rtl_OStringBuffer
void append_085()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 8;
@@ -4689,7 +4687,7 @@ namespace rtl_OStringBuffer
void append_086()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 8;
@@ -4708,7 +4706,7 @@ namespace rtl_OStringBuffer
void append_087()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 8;
@@ -4727,7 +4725,7 @@ namespace rtl_OStringBuffer
void append_088()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 8;
@@ -4746,7 +4744,7 @@ namespace rtl_OStringBuffer
void append_089()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 10;
@@ -4765,7 +4763,7 @@ namespace rtl_OStringBuffer
void append_090()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 10;
@@ -4784,7 +4782,7 @@ namespace rtl_OStringBuffer
void append_091()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 10;
@@ -4803,7 +4801,7 @@ namespace rtl_OStringBuffer
void append_092()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 10;
@@ -4822,7 +4820,7 @@ namespace rtl_OStringBuffer
void append_093()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 16;
@@ -4841,7 +4839,7 @@ namespace rtl_OStringBuffer
void append_094()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 16;
@@ -4860,7 +4858,7 @@ namespace rtl_OStringBuffer
void append_095()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 16;
@@ -4879,7 +4877,7 @@ namespace rtl_OStringBuffer
void append_096()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 15;
sal_Int16 radix = 16;
@@ -4898,7 +4896,7 @@ namespace rtl_OStringBuffer
void append_097()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 0;
sal_Int16 radix = 36;
@@ -4917,7 +4915,7 @@ namespace rtl_OStringBuffer
void append_098()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 4;
sal_Int16 radix = 36;
@@ -4936,7 +4934,7 @@ namespace rtl_OStringBuffer
void append_099()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 8;
sal_Int16 radix = 36;
@@ -4955,7 +4953,7 @@ namespace rtl_OStringBuffer
void append_100()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = 35;
sal_Int16 radix = 36;
@@ -5053,7 +5051,7 @@ namespace rtl_OStringBuffer
void append_001()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 2;
@@ -5072,7 +5070,7 @@ namespace rtl_OStringBuffer
void append_002()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 2;
@@ -5091,7 +5089,7 @@ namespace rtl_OStringBuffer
void append_003()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 8;
@@ -5110,7 +5108,7 @@ namespace rtl_OStringBuffer
void append_004()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 8;
@@ -5129,7 +5127,7 @@ namespace rtl_OStringBuffer
void append_005()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 10;
@@ -5148,7 +5146,7 @@ namespace rtl_OStringBuffer
void append_006()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 10;
@@ -5167,7 +5165,7 @@ namespace rtl_OStringBuffer
void append_007()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 16;
@@ -5186,7 +5184,7 @@ namespace rtl_OStringBuffer
void append_008()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 16;
@@ -5205,7 +5203,7 @@ namespace rtl_OStringBuffer
void append_009()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 36;
@@ -5224,7 +5222,7 @@ namespace rtl_OStringBuffer
void append_010()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 36;
@@ -5243,7 +5241,7 @@ namespace rtl_OStringBuffer
void append_011()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 2;
@@ -5262,7 +5260,7 @@ namespace rtl_OStringBuffer
void append_012()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 2;
@@ -5281,7 +5279,7 @@ namespace rtl_OStringBuffer
void append_013()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 8;
@@ -5300,7 +5298,7 @@ namespace rtl_OStringBuffer
void append_014()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 8;
@@ -5319,7 +5317,7 @@ namespace rtl_OStringBuffer
void append_015()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 10;
@@ -5338,7 +5336,7 @@ namespace rtl_OStringBuffer
void append_016()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 10;
@@ -5357,7 +5355,7 @@ namespace rtl_OStringBuffer
void append_017()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 16;
@@ -5376,7 +5374,7 @@ namespace rtl_OStringBuffer
void append_018()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 16;
@@ -5395,7 +5393,7 @@ namespace rtl_OStringBuffer
void append_019()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 36;
@@ -5414,7 +5412,7 @@ namespace rtl_OStringBuffer
void append_020()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 36;
@@ -5433,7 +5431,7 @@ namespace rtl_OStringBuffer
void append_021()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 2;
@@ -5452,7 +5450,7 @@ namespace rtl_OStringBuffer
void append_022()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 2;
@@ -5471,7 +5469,7 @@ namespace rtl_OStringBuffer
void append_023()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 8;
@@ -5490,7 +5488,7 @@ namespace rtl_OStringBuffer
void append_024()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 8;
@@ -5509,7 +5507,7 @@ namespace rtl_OStringBuffer
void append_025()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 10;
@@ -5528,7 +5526,7 @@ namespace rtl_OStringBuffer
void append_026()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 10;
@@ -5547,7 +5545,7 @@ namespace rtl_OStringBuffer
void append_027()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 16;
@@ -5566,7 +5564,7 @@ namespace rtl_OStringBuffer
void append_028()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 16;
@@ -5585,7 +5583,7 @@ namespace rtl_OStringBuffer
void append_029()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 36;
@@ -5604,7 +5602,7 @@ namespace rtl_OStringBuffer
void append_030()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 36;
@@ -5623,7 +5621,7 @@ namespace rtl_OStringBuffer
void append_031()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 2;
@@ -5642,7 +5640,7 @@ namespace rtl_OStringBuffer
void append_032()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 2;
@@ -5661,7 +5659,7 @@ namespace rtl_OStringBuffer
void append_033()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 8;
@@ -5680,7 +5678,7 @@ namespace rtl_OStringBuffer
void append_034()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 8;
@@ -5699,7 +5697,7 @@ namespace rtl_OStringBuffer
void append_035()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 10;
@@ -5718,7 +5716,7 @@ namespace rtl_OStringBuffer
void append_036()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 10;
@@ -5737,7 +5735,7 @@ namespace rtl_OStringBuffer
void append_037()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 16;
@@ -5756,7 +5754,7 @@ namespace rtl_OStringBuffer
void append_038()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 16;
@@ -5775,7 +5773,7 @@ namespace rtl_OStringBuffer
void append_039()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 36;
@@ -5794,7 +5792,7 @@ namespace rtl_OStringBuffer
void append_040()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 36;
@@ -5813,7 +5811,7 @@ namespace rtl_OStringBuffer
void append_041()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 2;
@@ -5832,7 +5830,7 @@ namespace rtl_OStringBuffer
void append_042()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 2;
@@ -5851,7 +5849,7 @@ namespace rtl_OStringBuffer
void append_043()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 8;
@@ -5870,7 +5868,7 @@ namespace rtl_OStringBuffer
void append_044()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 8;
@@ -5889,7 +5887,7 @@ namespace rtl_OStringBuffer
void append_045()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 10;
@@ -5908,7 +5906,7 @@ namespace rtl_OStringBuffer
void append_046()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 10;
@@ -5927,7 +5925,7 @@ namespace rtl_OStringBuffer
void append_047()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 16;
@@ -5946,7 +5944,7 @@ namespace rtl_OStringBuffer
void append_048()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 16;
@@ -5965,7 +5963,7 @@ namespace rtl_OStringBuffer
void append_049()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt8Max;
sal_Int16 radix = 36;
@@ -5984,7 +5982,7 @@ namespace rtl_OStringBuffer
void append_050()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = kSInt32Max;
sal_Int16 radix = 36;
@@ -6057,7 +6055,7 @@ namespace rtl_OStringBuffer
void append_001()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 2;
@@ -6076,7 +6074,7 @@ namespace rtl_OStringBuffer
void append_002()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 2;
@@ -6096,7 +6094,7 @@ namespace rtl_OStringBuffer
void append_003()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 2;
@@ -6116,7 +6114,7 @@ namespace rtl_OStringBuffer
void append_004()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 2;
@@ -6136,7 +6134,7 @@ namespace rtl_OStringBuffer
void append_005()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 8;
@@ -6155,7 +6153,7 @@ namespace rtl_OStringBuffer
void append_006()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 8;
@@ -6175,7 +6173,7 @@ namespace rtl_OStringBuffer
void append_007()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 8;
@@ -6195,7 +6193,7 @@ namespace rtl_OStringBuffer
void append_008()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 8;
@@ -6215,7 +6213,7 @@ namespace rtl_OStringBuffer
void append_009()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 10;
@@ -6234,7 +6232,7 @@ namespace rtl_OStringBuffer
void append_010()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 10;
@@ -6254,7 +6252,7 @@ namespace rtl_OStringBuffer
void append_011()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 10;
@@ -6274,7 +6272,7 @@ namespace rtl_OStringBuffer
void append_012()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 10;
@@ -6294,7 +6292,7 @@ namespace rtl_OStringBuffer
void append_013()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 16;
@@ -6313,7 +6311,7 @@ namespace rtl_OStringBuffer
void append_014()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 16;
@@ -6333,7 +6331,7 @@ namespace rtl_OStringBuffer
void append_015()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 16;
@@ -6353,7 +6351,7 @@ namespace rtl_OStringBuffer
void append_016()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 16;
@@ -6373,7 +6371,7 @@ namespace rtl_OStringBuffer
void append_017()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 36;
@@ -6392,7 +6390,7 @@ namespace rtl_OStringBuffer
void append_018()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 36;
@@ -6412,7 +6410,7 @@ namespace rtl_OStringBuffer
void append_019()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 36;
@@ -6432,7 +6430,7 @@ namespace rtl_OStringBuffer
void append_020()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -35;
sal_Int16 radix = 36;
@@ -6452,7 +6450,7 @@ namespace rtl_OStringBuffer
void append_021()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 2;
@@ -6471,7 +6469,7 @@ namespace rtl_OStringBuffer
void append_022()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 2;
@@ -6491,7 +6489,7 @@ namespace rtl_OStringBuffer
void append_023()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 2;
@@ -6511,7 +6509,7 @@ namespace rtl_OStringBuffer
void append_024()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 2;
@@ -6531,7 +6529,7 @@ namespace rtl_OStringBuffer
void append_025()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 8;
@@ -6550,7 +6548,7 @@ namespace rtl_OStringBuffer
void append_026()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 8;
@@ -6570,7 +6568,7 @@ namespace rtl_OStringBuffer
void append_027()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 8;
@@ -6590,7 +6588,7 @@ namespace rtl_OStringBuffer
void append_028()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 8;
@@ -6610,7 +6608,7 @@ namespace rtl_OStringBuffer
void append_029()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 10;
@@ -6629,7 +6627,7 @@ namespace rtl_OStringBuffer
void append_030()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 10;
@@ -6649,7 +6647,7 @@ namespace rtl_OStringBuffer
void append_031()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 10;
@@ -6669,7 +6667,7 @@ namespace rtl_OStringBuffer
void append_032()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 10;
@@ -6689,7 +6687,7 @@ namespace rtl_OStringBuffer
void append_033()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 16;
@@ -6708,7 +6706,7 @@ namespace rtl_OStringBuffer
void append_034()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 16;
@@ -6728,7 +6726,7 @@ namespace rtl_OStringBuffer
void append_035()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 16;
@@ -6748,7 +6746,7 @@ namespace rtl_OStringBuffer
void append_036()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 16;
@@ -6768,7 +6766,7 @@ namespace rtl_OStringBuffer
void append_037()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 36;
@@ -6787,7 +6785,7 @@ namespace rtl_OStringBuffer
void append_038()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 36;
@@ -6807,7 +6805,7 @@ namespace rtl_OStringBuffer
void append_039()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 36;
@@ -6827,7 +6825,7 @@ namespace rtl_OStringBuffer
void append_040()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -35;
sal_Int16 radix = 36;
@@ -6847,7 +6845,7 @@ namespace rtl_OStringBuffer
void append_041()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 2;
@@ -6866,7 +6864,7 @@ namespace rtl_OStringBuffer
void append_042()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 2;
@@ -6886,7 +6884,7 @@ namespace rtl_OStringBuffer
void append_043()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 2;
@@ -6906,7 +6904,7 @@ namespace rtl_OStringBuffer
void append_044()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 2;
@@ -6926,7 +6924,7 @@ namespace rtl_OStringBuffer
void append_045()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 8;
@@ -6945,7 +6943,7 @@ namespace rtl_OStringBuffer
void append_046()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 8;
@@ -6965,7 +6963,7 @@ namespace rtl_OStringBuffer
void append_047()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 8;
@@ -6985,7 +6983,7 @@ namespace rtl_OStringBuffer
void append_048()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 8;
@@ -7005,7 +7003,7 @@ namespace rtl_OStringBuffer
void append_049()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 10;
@@ -7024,7 +7022,7 @@ namespace rtl_OStringBuffer
void append_050()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 10;
@@ -7044,7 +7042,7 @@ namespace rtl_OStringBuffer
void append_051()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 10;
@@ -7064,7 +7062,7 @@ namespace rtl_OStringBuffer
void append_052()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 10;
@@ -7084,7 +7082,7 @@ namespace rtl_OStringBuffer
void append_053()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 16;
@@ -7103,7 +7101,7 @@ namespace rtl_OStringBuffer
void append_054()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 16;
@@ -7123,7 +7121,7 @@ namespace rtl_OStringBuffer
void append_055()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 16;
@@ -7143,7 +7141,7 @@ namespace rtl_OStringBuffer
void append_056()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 16;
@@ -7163,7 +7161,7 @@ namespace rtl_OStringBuffer
void append_057()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 36;
@@ -7182,7 +7180,7 @@ namespace rtl_OStringBuffer
void append_058()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 36;
@@ -7202,7 +7200,7 @@ namespace rtl_OStringBuffer
void append_059()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 36;
@@ -7222,7 +7220,7 @@ namespace rtl_OStringBuffer
void append_060()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -35;
sal_Int16 radix = 36;
@@ -7242,7 +7240,7 @@ namespace rtl_OStringBuffer
void append_061()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 2;
@@ -7261,7 +7259,7 @@ namespace rtl_OStringBuffer
void append_062()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 2;
@@ -7281,7 +7279,7 @@ namespace rtl_OStringBuffer
void append_063()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 2;
@@ -7301,7 +7299,7 @@ namespace rtl_OStringBuffer
void append_064()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 2;
@@ -7321,7 +7319,7 @@ namespace rtl_OStringBuffer
void append_065()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 8;
@@ -7340,7 +7338,7 @@ namespace rtl_OStringBuffer
void append_066()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 8;
@@ -7360,7 +7358,7 @@ namespace rtl_OStringBuffer
void append_067()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 8;
@@ -7380,7 +7378,7 @@ namespace rtl_OStringBuffer
void append_068()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 8;
@@ -7400,7 +7398,7 @@ namespace rtl_OStringBuffer
void append_069()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 10;
@@ -7419,7 +7417,7 @@ namespace rtl_OStringBuffer
void append_070()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 10;
@@ -7439,7 +7437,7 @@ namespace rtl_OStringBuffer
void append_071()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 10;
@@ -7459,7 +7457,7 @@ namespace rtl_OStringBuffer
void append_072()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 10;
@@ -7479,7 +7477,7 @@ namespace rtl_OStringBuffer
void append_073()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 16;
@@ -7498,7 +7496,7 @@ namespace rtl_OStringBuffer
void append_074()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 16;
@@ -7518,7 +7516,7 @@ namespace rtl_OStringBuffer
void append_075()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 16;
@@ -7538,7 +7536,7 @@ namespace rtl_OStringBuffer
void append_076()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 16;
@@ -7558,7 +7556,7 @@ namespace rtl_OStringBuffer
void append_077()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 36;
@@ -7577,7 +7575,7 @@ namespace rtl_OStringBuffer
void append_078()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 36;
@@ -7597,7 +7595,7 @@ namespace rtl_OStringBuffer
void append_079()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 36;
@@ -7617,7 +7615,7 @@ namespace rtl_OStringBuffer
void append_080()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -35;
sal_Int16 radix = 36;
@@ -7637,7 +7635,7 @@ namespace rtl_OStringBuffer
void append_081()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 2;
@@ -7656,7 +7654,7 @@ namespace rtl_OStringBuffer
void append_082()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 2;
@@ -7676,7 +7674,7 @@ namespace rtl_OStringBuffer
void append_083()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 2;
@@ -7696,7 +7694,7 @@ namespace rtl_OStringBuffer
void append_084()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 2;
@@ -7716,7 +7714,7 @@ namespace rtl_OStringBuffer
void append_085()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 8;
@@ -7735,7 +7733,7 @@ namespace rtl_OStringBuffer
void append_086()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 8;
@@ -7755,7 +7753,7 @@ namespace rtl_OStringBuffer
void append_087()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 8;
@@ -7775,7 +7773,7 @@ namespace rtl_OStringBuffer
void append_088()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 8;
@@ -7795,7 +7793,7 @@ namespace rtl_OStringBuffer
void append_089()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 10;
@@ -7814,7 +7812,7 @@ namespace rtl_OStringBuffer
void append_090()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 10;
@@ -7834,7 +7832,7 @@ namespace rtl_OStringBuffer
void append_091()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 10;
@@ -7854,7 +7852,7 @@ namespace rtl_OStringBuffer
void append_092()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 10;
@@ -7874,7 +7872,7 @@ namespace rtl_OStringBuffer
void append_093()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 16;
@@ -7893,7 +7891,7 @@ namespace rtl_OStringBuffer
void append_094()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 16;
@@ -7913,7 +7911,7 @@ namespace rtl_OStringBuffer
void append_095()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 16;
@@ -7933,7 +7931,7 @@ namespace rtl_OStringBuffer
void append_096()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -15;
sal_Int16 radix = 16;
@@ -7953,7 +7951,7 @@ namespace rtl_OStringBuffer
void append_097()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -0;
sal_Int16 radix = 36;
@@ -7972,7 +7970,7 @@ namespace rtl_OStringBuffer
void append_098()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -4;
sal_Int16 radix = 36;
@@ -7991,7 +7989,7 @@ namespace rtl_OStringBuffer
void append_099()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -8;
sal_Int16 radix = 36;
@@ -8010,7 +8008,7 @@ namespace rtl_OStringBuffer
void append_100()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int32 input = -35;
sal_Int16 radix = 36;
@@ -8097,7 +8095,7 @@ namespace rtl_OStringBuffer
void append_001()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( kTestStr59 );
sal_Int32 input = 11;
@@ -8114,7 +8112,7 @@ namespace rtl_OStringBuffer
void append_002()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( kTestStr62 );
sal_Int32 input = 0;
@@ -8131,7 +8129,7 @@ namespace rtl_OStringBuffer
void append_003()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( kTestStr63 );
sal_Int32 input = -11;
@@ -8148,7 +8146,7 @@ namespace rtl_OStringBuffer
void append_004()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( kTestStr64 );
sal_Int32 input = 2147483647;
@@ -8165,7 +8163,7 @@ namespace rtl_OStringBuffer
void append_005()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( kTestStr65 );
sal_Int32 input = kNonSInt32Max;
@@ -8182,7 +8180,7 @@ namespace rtl_OStringBuffer
void append_006()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( kTestStr60 );
sal_Int32 input = 11;
@@ -8199,7 +8197,7 @@ namespace rtl_OStringBuffer
void append_007()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( kTestStr66 );
sal_Int32 input = 0;
@@ -8216,7 +8214,7 @@ namespace rtl_OStringBuffer
void append_008()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( kTestStr67 );
sal_Int32 input = -11;
@@ -8233,7 +8231,7 @@ namespace rtl_OStringBuffer
void append_009()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( kTestStr68 );
sal_Int32 input = 2147483647;
@@ -8250,7 +8248,7 @@ namespace rtl_OStringBuffer
void append_010()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( kTestStr69 );
sal_Int32 input = SAL_MIN_INT32 /*-2147483648*/;
@@ -8267,7 +8265,7 @@ namespace rtl_OStringBuffer
void append_011()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( kTestStr60 );
sal_Int32 input = 11;
@@ -8284,7 +8282,7 @@ namespace rtl_OStringBuffer
void append_012()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( kTestStr66 );
sal_Int32 input = 0;
@@ -8301,7 +8299,7 @@ namespace rtl_OStringBuffer
void append_013()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( kTestStr67 );
sal_Int32 input = -11;
@@ -8318,7 +8316,7 @@ namespace rtl_OStringBuffer
void append_014()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( kTestStr68 );
sal_Int32 input = 2147483647;
@@ -8335,7 +8333,7 @@ namespace rtl_OStringBuffer
void append_015()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( kTestStr69 );
sal_Int32 input = SAL_MIN_INT32;
@@ -8352,7 +8350,7 @@ namespace rtl_OStringBuffer
void append_016()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( kTestStr60 );
sal_Int32 input = 11;
@@ -8369,7 +8367,7 @@ namespace rtl_OStringBuffer
void append_017()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( kTestStr66 );
sal_Int32 input = 0;
@@ -8386,7 +8384,7 @@ namespace rtl_OStringBuffer
void append_018()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( kTestStr67 );
sal_Int32 input = -11;
@@ -8403,7 +8401,7 @@ namespace rtl_OStringBuffer
void append_019()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( kTestStr68 );
sal_Int32 input = 2147483647;
@@ -8420,7 +8418,7 @@ namespace rtl_OStringBuffer
void append_020()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( kTestStr69 );
sal_Int32 input = SAL_MIN_INT32;
@@ -8437,7 +8435,7 @@ namespace rtl_OStringBuffer
void append_021()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( kTestStr61 );
sal_Int32 input = 11;
@@ -8454,7 +8452,7 @@ namespace rtl_OStringBuffer
void append_022()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( kTestStr70 );
sal_Int32 input = 0;
@@ -8471,7 +8469,7 @@ namespace rtl_OStringBuffer
void append_023()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( kTestStr71 );
sal_Int32 input = -11;
@@ -8488,7 +8486,7 @@ namespace rtl_OStringBuffer
void append_024()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( kTestStr72 );
sal_Int32 input = 2147483647;
@@ -8505,7 +8503,7 @@ namespace rtl_OStringBuffer
void append_025()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( kTestStr73 );
sal_Int32 input = SAL_MIN_INT32;
@@ -8522,7 +8520,7 @@ namespace rtl_OStringBuffer
#ifdef WITH_CORE
void append_026()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
OString expVal( kTestStr60 );
sal_Int32 input = 11;
@@ -8539,7 +8537,7 @@ namespace rtl_OStringBuffer
void append_027()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
OString expVal( kTestStr66 );
sal_Int32 input = 0;
@@ -8556,7 +8554,7 @@ namespace rtl_OStringBuffer
void append_028()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
OString expVal( kTestStr67 );
sal_Int32 input = -11;
@@ -8573,7 +8571,7 @@ namespace rtl_OStringBuffer
void append_029()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
OString expVal( kTestStr68 );
sal_Int32 input = 2147483647;
@@ -8590,7 +8588,7 @@ namespace rtl_OStringBuffer
void append_030()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
OString expVal( kTestStr69 );
sal_Int32 input = SAL_MIN_INT32;
@@ -8664,7 +8662,7 @@ namespace rtl_OStringBuffer
void append_001()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 2;
@@ -8683,7 +8681,7 @@ namespace rtl_OStringBuffer
void append_002()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 2;
@@ -8702,7 +8700,7 @@ namespace rtl_OStringBuffer
void append_003()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 2;
@@ -8721,7 +8719,7 @@ namespace rtl_OStringBuffer
void append_004()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 2;
@@ -8740,7 +8738,7 @@ namespace rtl_OStringBuffer
void append_005()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 8;
@@ -8759,7 +8757,7 @@ namespace rtl_OStringBuffer
void append_006()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 8;
@@ -8778,7 +8776,7 @@ namespace rtl_OStringBuffer
void append_007()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 8;
@@ -8797,7 +8795,7 @@ namespace rtl_OStringBuffer
void append_008()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 8;
@@ -8816,7 +8814,7 @@ namespace rtl_OStringBuffer
void append_009()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 10;
@@ -8835,7 +8833,7 @@ namespace rtl_OStringBuffer
void append_010()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 10;
@@ -8854,7 +8852,7 @@ namespace rtl_OStringBuffer
void append_011()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 10;
@@ -8873,7 +8871,7 @@ namespace rtl_OStringBuffer
void append_012()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 10;
@@ -8892,7 +8890,7 @@ namespace rtl_OStringBuffer
void append_013()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 16;
@@ -8911,7 +8909,7 @@ namespace rtl_OStringBuffer
void append_014()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 16;
@@ -8930,7 +8928,7 @@ namespace rtl_OStringBuffer
void append_015()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 16;
@@ -8949,7 +8947,7 @@ namespace rtl_OStringBuffer
void append_016()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 16;
@@ -8968,7 +8966,7 @@ namespace rtl_OStringBuffer
void append_017()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 36;
@@ -8987,7 +8985,7 @@ namespace rtl_OStringBuffer
void append_018()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 36;
@@ -9006,7 +9004,7 @@ namespace rtl_OStringBuffer
void append_019()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 36;
@@ -9025,7 +9023,7 @@ namespace rtl_OStringBuffer
void append_020()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 35;
sal_Int16 radix = 36;
@@ -9044,7 +9042,7 @@ namespace rtl_OStringBuffer
void append_021()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 2;
@@ -9063,7 +9061,7 @@ namespace rtl_OStringBuffer
void append_022()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 2;
@@ -9082,7 +9080,7 @@ namespace rtl_OStringBuffer
void append_023()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 2;
@@ -9101,7 +9099,7 @@ namespace rtl_OStringBuffer
void append_024()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 2;
@@ -9120,7 +9118,7 @@ namespace rtl_OStringBuffer
void append_025()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 8;
@@ -9139,7 +9137,7 @@ namespace rtl_OStringBuffer
void append_026()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 8;
@@ -9158,7 +9156,7 @@ namespace rtl_OStringBuffer
void append_027()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 8;
@@ -9177,7 +9175,7 @@ namespace rtl_OStringBuffer
void append_028()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 8;
@@ -9196,7 +9194,7 @@ namespace rtl_OStringBuffer
void append_029()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 10;
@@ -9215,7 +9213,7 @@ namespace rtl_OStringBuffer
void append_030()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 10;
@@ -9234,7 +9232,7 @@ namespace rtl_OStringBuffer
void append_031()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 10;
@@ -9253,7 +9251,7 @@ namespace rtl_OStringBuffer
void append_032()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 10;
@@ -9272,7 +9270,7 @@ namespace rtl_OStringBuffer
void append_033()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 16;
@@ -9291,7 +9289,7 @@ namespace rtl_OStringBuffer
void append_034()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 16;
@@ -9310,7 +9308,7 @@ namespace rtl_OStringBuffer
void append_035()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 16;
@@ -9329,7 +9327,7 @@ namespace rtl_OStringBuffer
void append_036()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 16;
@@ -9348,7 +9346,7 @@ namespace rtl_OStringBuffer
void append_037()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 36;
@@ -9367,7 +9365,7 @@ namespace rtl_OStringBuffer
void append_038()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 36;
@@ -9386,7 +9384,7 @@ namespace rtl_OStringBuffer
void append_039()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 36;
@@ -9405,7 +9403,7 @@ namespace rtl_OStringBuffer
void append_040()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 35;
sal_Int16 radix = 36;
@@ -9424,7 +9422,7 @@ namespace rtl_OStringBuffer
void append_041()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 2;
@@ -9443,7 +9441,7 @@ namespace rtl_OStringBuffer
void append_042()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 2;
@@ -9462,7 +9460,7 @@ namespace rtl_OStringBuffer
void append_043()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 2;
@@ -9481,7 +9479,7 @@ namespace rtl_OStringBuffer
void append_044()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 2;
@@ -9500,7 +9498,7 @@ namespace rtl_OStringBuffer
void append_045()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 8;
@@ -9519,7 +9517,7 @@ namespace rtl_OStringBuffer
void append_046()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 8;
@@ -9538,7 +9536,7 @@ namespace rtl_OStringBuffer
void append_047()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 8;
@@ -9557,7 +9555,7 @@ namespace rtl_OStringBuffer
void append_048()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 8;
@@ -9576,7 +9574,7 @@ namespace rtl_OStringBuffer
void append_049()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 10;
@@ -9595,7 +9593,7 @@ namespace rtl_OStringBuffer
void append_050()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 10;
@@ -9614,7 +9612,7 @@ namespace rtl_OStringBuffer
void append_051()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 10;
@@ -9633,7 +9631,7 @@ namespace rtl_OStringBuffer
void append_052()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 10;
@@ -9652,7 +9650,7 @@ namespace rtl_OStringBuffer
void append_053()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 16;
@@ -9671,7 +9669,7 @@ namespace rtl_OStringBuffer
void append_054()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 16;
@@ -9690,7 +9688,7 @@ namespace rtl_OStringBuffer
void append_055()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 16;
@@ -9709,7 +9707,7 @@ namespace rtl_OStringBuffer
void append_056()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 16;
@@ -9728,7 +9726,7 @@ namespace rtl_OStringBuffer
void append_057()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 36;
@@ -9747,7 +9745,7 @@ namespace rtl_OStringBuffer
void append_058()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 36;
@@ -9766,7 +9764,7 @@ namespace rtl_OStringBuffer
void append_059()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 36;
@@ -9785,7 +9783,7 @@ namespace rtl_OStringBuffer
void append_060()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 35;
sal_Int16 radix = 36;
@@ -9804,7 +9802,7 @@ namespace rtl_OStringBuffer
void append_061()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 2;
@@ -9823,7 +9821,7 @@ namespace rtl_OStringBuffer
void append_062()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 2;
@@ -9842,7 +9840,7 @@ namespace rtl_OStringBuffer
void append_063()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 2;
@@ -9861,7 +9859,7 @@ namespace rtl_OStringBuffer
void append_064()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 2;
@@ -9880,7 +9878,7 @@ namespace rtl_OStringBuffer
void append_065()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 8;
@@ -9899,7 +9897,7 @@ namespace rtl_OStringBuffer
void append_066()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 8;
@@ -9918,7 +9916,7 @@ namespace rtl_OStringBuffer
void append_067()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 8;
@@ -9937,7 +9935,7 @@ namespace rtl_OStringBuffer
void append_068()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 8;
@@ -9956,7 +9954,7 @@ namespace rtl_OStringBuffer
void append_069()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 10;
@@ -9975,7 +9973,7 @@ namespace rtl_OStringBuffer
void append_070()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 10;
@@ -9994,7 +9992,7 @@ namespace rtl_OStringBuffer
void append_071()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 10;
@@ -10013,7 +10011,7 @@ namespace rtl_OStringBuffer
void append_072()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 10;
@@ -10032,7 +10030,7 @@ namespace rtl_OStringBuffer
void append_073()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 16;
@@ -10051,7 +10049,7 @@ namespace rtl_OStringBuffer
void append_074()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 16;
@@ -10070,7 +10068,7 @@ namespace rtl_OStringBuffer
void append_075()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 16;
@@ -10089,7 +10087,7 @@ namespace rtl_OStringBuffer
void append_076()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 16;
@@ -10108,7 +10106,7 @@ namespace rtl_OStringBuffer
void append_077()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 36;
@@ -10127,7 +10125,7 @@ namespace rtl_OStringBuffer
void append_078()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 36;
@@ -10146,7 +10144,7 @@ namespace rtl_OStringBuffer
void append_079()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 36;
@@ -10165,7 +10163,7 @@ namespace rtl_OStringBuffer
void append_080()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 35;
sal_Int16 radix = 36;
@@ -10184,7 +10182,7 @@ namespace rtl_OStringBuffer
void append_081()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 2;
@@ -10203,7 +10201,7 @@ namespace rtl_OStringBuffer
void append_082()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 2;
@@ -10222,7 +10220,7 @@ namespace rtl_OStringBuffer
void append_083()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 2;
@@ -10241,7 +10239,7 @@ namespace rtl_OStringBuffer
void append_084()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 2;
@@ -10260,7 +10258,7 @@ namespace rtl_OStringBuffer
void append_085()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 8;
@@ -10279,7 +10277,7 @@ namespace rtl_OStringBuffer
void append_086()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 8;
@@ -10298,7 +10296,7 @@ namespace rtl_OStringBuffer
void append_087()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 8;
@@ -10317,7 +10315,7 @@ namespace rtl_OStringBuffer
void append_088()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 8;
@@ -10336,7 +10334,7 @@ namespace rtl_OStringBuffer
void append_089()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 10;
@@ -10355,7 +10353,7 @@ namespace rtl_OStringBuffer
void append_090()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 10;
@@ -10374,7 +10372,7 @@ namespace rtl_OStringBuffer
void append_091()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 10;
@@ -10393,7 +10391,7 @@ namespace rtl_OStringBuffer
void append_092()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 10;
@@ -10412,7 +10410,7 @@ namespace rtl_OStringBuffer
void append_093()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 16;
@@ -10431,7 +10429,7 @@ namespace rtl_OStringBuffer
void append_094()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 16;
@@ -10450,7 +10448,7 @@ namespace rtl_OStringBuffer
void append_095()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 16;
@@ -10469,7 +10467,7 @@ namespace rtl_OStringBuffer
void append_096()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 15;
sal_Int16 radix = 16;
@@ -10488,7 +10486,7 @@ namespace rtl_OStringBuffer
void append_097()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 0;
sal_Int16 radix = 36;
@@ -10507,7 +10505,7 @@ namespace rtl_OStringBuffer
void append_098()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 4;
sal_Int16 radix = 36;
@@ -10526,7 +10524,7 @@ namespace rtl_OStringBuffer
void append_099()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 8;
sal_Int16 radix = 36;
@@ -10545,7 +10543,7 @@ namespace rtl_OStringBuffer
void append_100()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = 35;
sal_Int16 radix = 36;
@@ -10643,7 +10641,7 @@ namespace rtl_OStringBuffer
void append_001()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 2;
@@ -10662,7 +10660,7 @@ namespace rtl_OStringBuffer
void append_002()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 2;
@@ -10681,7 +10679,7 @@ namespace rtl_OStringBuffer
void append_003()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 8;
@@ -10700,7 +10698,7 @@ namespace rtl_OStringBuffer
void append_004()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 8;
@@ -10719,7 +10717,7 @@ namespace rtl_OStringBuffer
void append_005()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 10;
@@ -10738,7 +10736,7 @@ namespace rtl_OStringBuffer
void append_006()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 10;
@@ -10757,7 +10755,7 @@ namespace rtl_OStringBuffer
void append_007()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 16;
@@ -10776,7 +10774,7 @@ namespace rtl_OStringBuffer
void append_008()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 16;
@@ -10795,7 +10793,7 @@ namespace rtl_OStringBuffer
void append_009()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 36;
@@ -10814,7 +10812,7 @@ namespace rtl_OStringBuffer
void append_010()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 36;
@@ -10833,7 +10831,7 @@ namespace rtl_OStringBuffer
void append_011()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 2;
@@ -10852,7 +10850,7 @@ namespace rtl_OStringBuffer
void append_012()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 2;
@@ -10871,7 +10869,7 @@ namespace rtl_OStringBuffer
void append_013()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 8;
@@ -10890,7 +10888,7 @@ namespace rtl_OStringBuffer
void append_014()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 8;
@@ -10909,7 +10907,7 @@ namespace rtl_OStringBuffer
void append_015()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 10;
@@ -10928,7 +10926,7 @@ namespace rtl_OStringBuffer
void append_016()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 10;
@@ -10947,7 +10945,7 @@ namespace rtl_OStringBuffer
void append_017()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 16;
@@ -10966,7 +10964,7 @@ namespace rtl_OStringBuffer
void append_018()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 16;
@@ -10985,7 +10983,7 @@ namespace rtl_OStringBuffer
void append_019()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 36;
@@ -11004,7 +11002,7 @@ namespace rtl_OStringBuffer
void append_020()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 36;
@@ -11023,7 +11021,7 @@ namespace rtl_OStringBuffer
void append_021()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 2;
@@ -11042,7 +11040,7 @@ namespace rtl_OStringBuffer
void append_022()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 2;
@@ -11061,7 +11059,7 @@ namespace rtl_OStringBuffer
void append_023()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 8;
@@ -11080,7 +11078,7 @@ namespace rtl_OStringBuffer
void append_024()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 8;
@@ -11099,7 +11097,7 @@ namespace rtl_OStringBuffer
void append_025()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 10;
@@ -11118,7 +11116,7 @@ namespace rtl_OStringBuffer
void append_026()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 10;
@@ -11137,7 +11135,7 @@ namespace rtl_OStringBuffer
void append_027()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 16;
@@ -11156,7 +11154,7 @@ namespace rtl_OStringBuffer
void append_028()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 16;
@@ -11175,7 +11173,7 @@ namespace rtl_OStringBuffer
void append_029()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 36;
@@ -11194,7 +11192,7 @@ namespace rtl_OStringBuffer
void append_030()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 36;
@@ -11213,7 +11211,7 @@ namespace rtl_OStringBuffer
void append_031()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 2;
@@ -11232,7 +11230,7 @@ namespace rtl_OStringBuffer
void append_032()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 2;
@@ -11251,7 +11249,7 @@ namespace rtl_OStringBuffer
void append_033()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 8;
@@ -11270,7 +11268,7 @@ namespace rtl_OStringBuffer
void append_034()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 8;
@@ -11289,7 +11287,7 @@ namespace rtl_OStringBuffer
void append_035()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 10;
@@ -11308,7 +11306,7 @@ namespace rtl_OStringBuffer
void append_036()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 10;
@@ -11327,7 +11325,7 @@ namespace rtl_OStringBuffer
void append_037()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 16;
@@ -11346,7 +11344,7 @@ namespace rtl_OStringBuffer
void append_038()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 16;
@@ -11365,7 +11363,7 @@ namespace rtl_OStringBuffer
void append_039()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 36;
@@ -11384,7 +11382,7 @@ namespace rtl_OStringBuffer
void append_040()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 36;
@@ -11403,7 +11401,7 @@ namespace rtl_OStringBuffer
void append_041()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 2;
@@ -11422,7 +11420,7 @@ namespace rtl_OStringBuffer
void append_042()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 2;
@@ -11441,7 +11439,7 @@ namespace rtl_OStringBuffer
void append_043()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 8;
@@ -11460,7 +11458,7 @@ namespace rtl_OStringBuffer
void append_044()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 8;
@@ -11479,7 +11477,7 @@ namespace rtl_OStringBuffer
void append_045()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 10;
@@ -11498,7 +11496,7 @@ namespace rtl_OStringBuffer
void append_046()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 10;
@@ -11517,7 +11515,7 @@ namespace rtl_OStringBuffer
void append_047()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 16;
@@ -11536,7 +11534,7 @@ namespace rtl_OStringBuffer
void append_048()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 16;
@@ -11555,7 +11553,7 @@ namespace rtl_OStringBuffer
void append_049()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt8Max;
sal_Int16 radix = 36;
@@ -11574,7 +11572,7 @@ namespace rtl_OStringBuffer
void append_050()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = kSInt64Max;
sal_Int16 radix = 36;
@@ -11647,7 +11645,7 @@ namespace rtl_OStringBuffer
void append_001()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 2;
@@ -11666,7 +11664,7 @@ namespace rtl_OStringBuffer
void append_002()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 2;
@@ -11686,7 +11684,7 @@ namespace rtl_OStringBuffer
void append_003()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 2;
@@ -11706,7 +11704,7 @@ namespace rtl_OStringBuffer
void append_004()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 2;
@@ -11726,7 +11724,7 @@ namespace rtl_OStringBuffer
void append_005()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 8;
@@ -11745,7 +11743,7 @@ namespace rtl_OStringBuffer
void append_006()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 8;
@@ -11765,7 +11763,7 @@ namespace rtl_OStringBuffer
void append_007()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 8;
@@ -11785,7 +11783,7 @@ namespace rtl_OStringBuffer
void append_008()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 8;
@@ -11805,7 +11803,7 @@ namespace rtl_OStringBuffer
void append_009()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 10;
@@ -11824,7 +11822,7 @@ namespace rtl_OStringBuffer
void append_010()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 10;
@@ -11844,7 +11842,7 @@ namespace rtl_OStringBuffer
void append_011()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 10;
@@ -11864,7 +11862,7 @@ namespace rtl_OStringBuffer
void append_012()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 10;
@@ -11884,7 +11882,7 @@ namespace rtl_OStringBuffer
void append_013()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 16;
@@ -11903,7 +11901,7 @@ namespace rtl_OStringBuffer
void append_014()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 16;
@@ -11923,7 +11921,7 @@ namespace rtl_OStringBuffer
void append_015()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 16;
@@ -11943,7 +11941,7 @@ namespace rtl_OStringBuffer
void append_016()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 16;
@@ -11963,7 +11961,7 @@ namespace rtl_OStringBuffer
void append_017()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 36;
@@ -11982,7 +11980,7 @@ namespace rtl_OStringBuffer
void append_018()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 36;
@@ -12002,7 +12000,7 @@ namespace rtl_OStringBuffer
void append_019()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 36;
@@ -12022,7 +12020,7 @@ namespace rtl_OStringBuffer
void append_020()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -35;
sal_Int16 radix = 36;
@@ -12042,7 +12040,7 @@ namespace rtl_OStringBuffer
void append_021()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 2;
@@ -12061,7 +12059,7 @@ namespace rtl_OStringBuffer
void append_022()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 2;
@@ -12081,7 +12079,7 @@ namespace rtl_OStringBuffer
void append_023()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 2;
@@ -12101,7 +12099,7 @@ namespace rtl_OStringBuffer
void append_024()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 2;
@@ -12121,7 +12119,7 @@ namespace rtl_OStringBuffer
void append_025()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 8;
@@ -12140,7 +12138,7 @@ namespace rtl_OStringBuffer
void append_026()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 8;
@@ -12160,7 +12158,7 @@ namespace rtl_OStringBuffer
void append_027()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 8;
@@ -12180,7 +12178,7 @@ namespace rtl_OStringBuffer
void append_028()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 8;
@@ -12200,7 +12198,7 @@ namespace rtl_OStringBuffer
void append_029()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 10;
@@ -12219,7 +12217,7 @@ namespace rtl_OStringBuffer
void append_030()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 10;
@@ -12239,7 +12237,7 @@ namespace rtl_OStringBuffer
void append_031()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 10;
@@ -12259,7 +12257,7 @@ namespace rtl_OStringBuffer
void append_032()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 10;
@@ -12279,7 +12277,7 @@ namespace rtl_OStringBuffer
void append_033()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 16;
@@ -12298,7 +12296,7 @@ namespace rtl_OStringBuffer
void append_034()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 16;
@@ -12318,7 +12316,7 @@ namespace rtl_OStringBuffer
void append_035()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 16;
@@ -12338,7 +12336,7 @@ namespace rtl_OStringBuffer
void append_036()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 16;
@@ -12358,7 +12356,7 @@ namespace rtl_OStringBuffer
void append_037()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 36;
@@ -12377,7 +12375,7 @@ namespace rtl_OStringBuffer
void append_038()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 36;
@@ -12397,7 +12395,7 @@ namespace rtl_OStringBuffer
void append_039()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 36;
@@ -12417,7 +12415,7 @@ namespace rtl_OStringBuffer
void append_040()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -35;
sal_Int16 radix = 36;
@@ -12437,7 +12435,7 @@ namespace rtl_OStringBuffer
void append_041()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 2;
@@ -12456,7 +12454,7 @@ namespace rtl_OStringBuffer
void append_042()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 2;
@@ -12476,7 +12474,7 @@ namespace rtl_OStringBuffer
void append_043()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 2;
@@ -12496,7 +12494,7 @@ namespace rtl_OStringBuffer
void append_044()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 2;
@@ -12516,7 +12514,7 @@ namespace rtl_OStringBuffer
void append_045()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 8;
@@ -12535,7 +12533,7 @@ namespace rtl_OStringBuffer
void append_046()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 8;
@@ -12555,7 +12553,7 @@ namespace rtl_OStringBuffer
void append_047()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 8;
@@ -12575,7 +12573,7 @@ namespace rtl_OStringBuffer
void append_048()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 8;
@@ -12595,7 +12593,7 @@ namespace rtl_OStringBuffer
void append_049()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 10;
@@ -12614,7 +12612,7 @@ namespace rtl_OStringBuffer
void append_050()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 10;
@@ -12634,7 +12632,7 @@ namespace rtl_OStringBuffer
void append_051()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 10;
@@ -12654,7 +12652,7 @@ namespace rtl_OStringBuffer
void append_052()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 10;
@@ -12674,7 +12672,7 @@ namespace rtl_OStringBuffer
void append_053()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 16;
@@ -12693,7 +12691,7 @@ namespace rtl_OStringBuffer
void append_054()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 16;
@@ -12713,7 +12711,7 @@ namespace rtl_OStringBuffer
void append_055()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 16;
@@ -12733,7 +12731,7 @@ namespace rtl_OStringBuffer
void append_056()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 16;
@@ -12753,7 +12751,7 @@ namespace rtl_OStringBuffer
void append_057()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 36;
@@ -12772,7 +12770,7 @@ namespace rtl_OStringBuffer
void append_058()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 36;
@@ -12792,7 +12790,7 @@ namespace rtl_OStringBuffer
void append_059()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 36;
@@ -12812,7 +12810,7 @@ namespace rtl_OStringBuffer
void append_060()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -35;
sal_Int16 radix = 36;
@@ -12832,7 +12830,7 @@ namespace rtl_OStringBuffer
void append_061()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 2;
@@ -12851,7 +12849,7 @@ namespace rtl_OStringBuffer
void append_062()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 2;
@@ -12871,7 +12869,7 @@ namespace rtl_OStringBuffer
void append_063()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 2;
@@ -12891,7 +12889,7 @@ namespace rtl_OStringBuffer
void append_064()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 2;
@@ -12911,7 +12909,7 @@ namespace rtl_OStringBuffer
void append_065()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 8;
@@ -12930,7 +12928,7 @@ namespace rtl_OStringBuffer
void append_066()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 8;
@@ -12950,7 +12948,7 @@ namespace rtl_OStringBuffer
void append_067()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 8;
@@ -12970,7 +12968,7 @@ namespace rtl_OStringBuffer
void append_068()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 8;
@@ -12990,7 +12988,7 @@ namespace rtl_OStringBuffer
void append_069()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 10;
@@ -13009,7 +13007,7 @@ namespace rtl_OStringBuffer
void append_070()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 10;
@@ -13029,7 +13027,7 @@ namespace rtl_OStringBuffer
void append_071()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 10;
@@ -13049,7 +13047,7 @@ namespace rtl_OStringBuffer
void append_072()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 10;
@@ -13069,7 +13067,7 @@ namespace rtl_OStringBuffer
void append_073()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 16;
@@ -13088,7 +13086,7 @@ namespace rtl_OStringBuffer
void append_074()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 16;
@@ -13108,7 +13106,7 @@ namespace rtl_OStringBuffer
void append_075()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 16;
@@ -13128,7 +13126,7 @@ namespace rtl_OStringBuffer
void append_076()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 16;
@@ -13148,7 +13146,7 @@ namespace rtl_OStringBuffer
void append_077()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 36;
@@ -13167,7 +13165,7 @@ namespace rtl_OStringBuffer
void append_078()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 36;
@@ -13187,7 +13185,7 @@ namespace rtl_OStringBuffer
void append_079()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 36;
@@ -13207,7 +13205,7 @@ namespace rtl_OStringBuffer
void append_080()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -35;
sal_Int16 radix = 36;
@@ -13227,7 +13225,7 @@ namespace rtl_OStringBuffer
void append_081()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 2;
@@ -13246,7 +13244,7 @@ namespace rtl_OStringBuffer
void append_082()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 2;
@@ -13266,7 +13264,7 @@ namespace rtl_OStringBuffer
void append_083()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 2;
@@ -13286,7 +13284,7 @@ namespace rtl_OStringBuffer
void append_084()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 2;
@@ -13306,7 +13304,7 @@ namespace rtl_OStringBuffer
void append_085()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 8;
@@ -13325,7 +13323,7 @@ namespace rtl_OStringBuffer
void append_086()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 8;
@@ -13345,7 +13343,7 @@ namespace rtl_OStringBuffer
void append_087()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 8;
@@ -13365,7 +13363,7 @@ namespace rtl_OStringBuffer
void append_088()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 8;
@@ -13385,7 +13383,7 @@ namespace rtl_OStringBuffer
void append_089()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 10;
@@ -13404,7 +13402,7 @@ namespace rtl_OStringBuffer
void append_090()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 10;
@@ -13424,7 +13422,7 @@ namespace rtl_OStringBuffer
void append_091()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 10;
@@ -13444,7 +13442,7 @@ namespace rtl_OStringBuffer
void append_092()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 10;
@@ -13464,7 +13462,7 @@ namespace rtl_OStringBuffer
void append_093()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 16;
@@ -13483,7 +13481,7 @@ namespace rtl_OStringBuffer
void append_094()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 16;
@@ -13503,7 +13501,7 @@ namespace rtl_OStringBuffer
void append_095()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 16;
@@ -13523,7 +13521,7 @@ namespace rtl_OStringBuffer
void append_096()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -15;
sal_Int16 radix = 16;
@@ -13543,7 +13541,7 @@ namespace rtl_OStringBuffer
void append_097()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -0;
sal_Int16 radix = 36;
@@ -13562,7 +13560,7 @@ namespace rtl_OStringBuffer
void append_098()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -4;
sal_Int16 radix = 36;
@@ -13582,7 +13580,7 @@ namespace rtl_OStringBuffer
void append_099()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -8;
sal_Int16 radix = 36;
@@ -13602,7 +13600,7 @@ namespace rtl_OStringBuffer
void append_100()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( aStrBuf.getStr() );
sal_Int64 input = -35;
sal_Int16 radix = 36;
@@ -13690,7 +13688,7 @@ namespace rtl_OStringBuffer
void append_001()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( kTestStr59 );
sal_Int64 input = 11;
@@ -13707,7 +13705,7 @@ namespace rtl_OStringBuffer
void append_002()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( kTestStr62 );
sal_Int64 input = 0;
@@ -13724,7 +13722,7 @@ namespace rtl_OStringBuffer
void append_003()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( kTestStr63 );
sal_Int64 input = -11;
@@ -13741,7 +13739,7 @@ namespace rtl_OStringBuffer
void append_004()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( kTestStr116 );
sal_Int64 input = SAL_CONST_INT64(9223372036854775807);
aStrBuf.append( input );
@@ -13757,7 +13755,7 @@ namespace rtl_OStringBuffer
void append_005()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
OString expVal( kTestStr117 );
sal_Int64 input = SAL_MIN_INT64/*-9223372036854775808*/; // LLA: this is not the same :-( kNonSInt64Max;
@@ -13774,7 +13772,7 @@ namespace rtl_OStringBuffer
void append_006()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( kTestStr60 );
sal_Int64 input = 11;
@@ -13791,7 +13789,7 @@ namespace rtl_OStringBuffer
void append_007()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( kTestStr66 );
sal_Int64 input = 0;
@@ -13808,7 +13806,7 @@ namespace rtl_OStringBuffer
void append_008()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( kTestStr67 );
sal_Int64 input = -11;
@@ -13825,7 +13823,7 @@ namespace rtl_OStringBuffer
void append_009()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( kTestStr118 );
sal_Int64 input = SAL_CONST_INT64(9223372036854775807);
aStrBuf.append( input );
@@ -13841,7 +13839,7 @@ namespace rtl_OStringBuffer
void append_010()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
OString expVal( kTestStr119 );
sal_Int64 input = SAL_MIN_INT64; // LLA: this is not the same :-( kNonSInt64Max;
@@ -13858,7 +13856,7 @@ namespace rtl_OStringBuffer
void append_011()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( kTestStr60 );
sal_Int64 input = 11;
@@ -13875,7 +13873,7 @@ namespace rtl_OStringBuffer
void append_012()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( kTestStr66 );
sal_Int64 input = 0;
@@ -13892,7 +13890,7 @@ namespace rtl_OStringBuffer
void append_013()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( kTestStr67 );
sal_Int64 input = -11;
@@ -13909,7 +13907,7 @@ namespace rtl_OStringBuffer
void append_014()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( kTestStr118 );
sal_Int64 input = SAL_CONST_INT64(9223372036854775807);
aStrBuf.append( input );
@@ -13925,7 +13923,7 @@ namespace rtl_OStringBuffer
void append_015()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
OString expVal( kTestStr119 );
sal_Int64 input = SAL_MIN_INT64; // LLA: this is not the same :-( kNonSInt64Max;
@@ -13942,7 +13940,7 @@ namespace rtl_OStringBuffer
void append_016()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( kTestStr60 );
sal_Int64 input = 11;
@@ -13959,7 +13957,7 @@ namespace rtl_OStringBuffer
void append_017()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( kTestStr66 );
sal_Int64 input = 0;
@@ -13976,7 +13974,7 @@ namespace rtl_OStringBuffer
void append_018()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( kTestStr67 );
sal_Int64 input = -11;
@@ -13993,7 +13991,7 @@ namespace rtl_OStringBuffer
void append_019()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( kTestStr118 );
sal_Int64 input = SAL_CONST_INT64(9223372036854775807);
aStrBuf.append( input );
@@ -14009,7 +14007,7 @@ namespace rtl_OStringBuffer
void append_020()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
OString expVal( kTestStr119 );
sal_Int64 input = SAL_MIN_INT64; // LLA: this is not the same :-( kNonSInt64Max;
@@ -14026,7 +14024,7 @@ namespace rtl_OStringBuffer
void append_021()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( kTestStr61 );
sal_Int64 input = 11;
@@ -14043,7 +14041,7 @@ namespace rtl_OStringBuffer
void append_022()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( kTestStr70 );
sal_Int64 input = 0;
@@ -14060,7 +14058,7 @@ namespace rtl_OStringBuffer
void append_023()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( kTestStr71 );
sal_Int64 input = -11;
@@ -14077,7 +14075,7 @@ namespace rtl_OStringBuffer
void append_024()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( kTestStr120 );
sal_Int64 input = SAL_CONST_INT64(9223372036854775807);
aStrBuf.append( input );
@@ -14093,7 +14091,7 @@ namespace rtl_OStringBuffer
void append_025()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
OString expVal( kTestStr121 );
sal_Int64 input = SAL_MIN_INT64; // LLA: this is not the same :-( kNonSInt64Max;
@@ -14110,7 +14108,7 @@ namespace rtl_OStringBuffer
#ifdef WITH_CORE
void append_026()
{
- ::rtl::OStringBuffer aStrBuf( kSInt64Max );
+ OStringBuffer aStrBuf( kSInt64Max );
OString expVal( kTestStr60 );
sal_Int64 input = 11;
@@ -14127,7 +14125,7 @@ namespace rtl_OStringBuffer
void append_027()
{
- ::rtl::OStringBuffer aStrBuf( kSInt64Max );
+ OStringBuffer aStrBuf( kSInt64Max );
OString expVal( kTestStr66 );
sal_Int64 input = 0;
@@ -14144,7 +14142,7 @@ namespace rtl_OStringBuffer
void append_028()
{
- ::rtl::OStringBuffer aStrBuf( kSInt64Max );
+ OStringBuffer aStrBuf( kSInt64Max );
OString expVal( kTestStr67 );
sal_Int64 input = -11;
@@ -14161,7 +14159,7 @@ namespace rtl_OStringBuffer
void append_029()
{
- ::rtl::OStringBuffer aStrBuf( kSInt64Max );
+ OStringBuffer aStrBuf( kSInt64Max );
OString expVal( kTestStr118 );
sal_Int64 input = 9223372036854775807;
@@ -14178,7 +14176,7 @@ namespace rtl_OStringBuffer
void append_030()
{
- ::rtl::OStringBuffer aStrBuf( kSInt64Max );
+ OStringBuffer aStrBuf( kSInt64Max );
OString expVal( kTestStr119 );
sal_Int64 input = SAL_MIN_INT64; // LLA: this is not the same :-( kNonSInt64Max;
@@ -14235,7 +14233,7 @@ namespace rtl_OStringBuffer
class checkfloat : public CppUnit::TestFixture
{
public:
- bool checkIfStrBufContainAtPosTheFloat(rtl::OStringBuffer const& _sStrBuf, sal_Int32 _nLen, float _nFloat)
+ bool checkIfStrBufContainAtPosTheFloat(OStringBuffer const& _sStrBuf, sal_Int32 _nLen, float _nFloat)
{
OString sFloatValue;
sFloatValue = OString::number(_nFloat);
@@ -14262,7 +14260,7 @@ namespace rtl_OStringBuffer
void append_001()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
float input = static_cast<float>(atof("3.0"));
// LLA:
@@ -14282,7 +14280,7 @@ namespace rtl_OStringBuffer
void append_002()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
float input = static_cast<float>(atof("3.5"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14298,7 +14296,7 @@ namespace rtl_OStringBuffer
void append_003()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
float input = static_cast<float>(atof("3.0625"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14314,7 +14312,7 @@ namespace rtl_OStringBuffer
void append_004()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
float input = static_cast<float>(atof("3.502525"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14330,7 +14328,7 @@ namespace rtl_OStringBuffer
void append_005()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
float input = static_cast<float>(atof("3.141592"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14346,7 +14344,7 @@ namespace rtl_OStringBuffer
void append_006()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
float input = static_cast<float>(atof("3.5025255"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14362,7 +14360,7 @@ namespace rtl_OStringBuffer
void append_007()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
float input = static_cast<float>(atof("3.00390625"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14378,7 +14376,7 @@ namespace rtl_OStringBuffer
void append_008()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
float input = static_cast<float>(atof("3.0"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14394,7 +14392,7 @@ namespace rtl_OStringBuffer
void append_009()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
float input = static_cast<float>(atof("3.5"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14410,7 +14408,7 @@ namespace rtl_OStringBuffer
void append_010()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
float input = static_cast<float>(atof("3.0625"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14426,7 +14424,7 @@ namespace rtl_OStringBuffer
void append_011()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
float input = static_cast<float>(atof("3.502525"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14442,7 +14440,7 @@ namespace rtl_OStringBuffer
void append_012()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
float input = static_cast<float>(atof("3.141592"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14458,7 +14456,7 @@ namespace rtl_OStringBuffer
void append_013()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
float input = static_cast<float>(atof("3.5025255"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14474,7 +14472,7 @@ namespace rtl_OStringBuffer
void append_014()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
float input = static_cast<float>(atof("3.00390625"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14490,7 +14488,7 @@ namespace rtl_OStringBuffer
void append_015()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
float input = static_cast<float>(atof("3.0"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14506,7 +14504,7 @@ namespace rtl_OStringBuffer
void append_016()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
float input = static_cast<float>(atof("3.5"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14522,7 +14520,7 @@ namespace rtl_OStringBuffer
void append_017()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
float input = static_cast<float>(atof("3.0625"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14538,7 +14536,7 @@ namespace rtl_OStringBuffer
void append_018()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
float input = static_cast<float>(atof("3.502525"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14554,7 +14552,7 @@ namespace rtl_OStringBuffer
void append_019()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
float input = static_cast<float>(atof("3.141592"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14570,7 +14568,7 @@ namespace rtl_OStringBuffer
void append_020()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
float input = static_cast<float>(atof("3.5025255"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14586,7 +14584,7 @@ namespace rtl_OStringBuffer
void append_021()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
float input = static_cast<float>(atof("3.00390625"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14602,7 +14600,7 @@ namespace rtl_OStringBuffer
void append_022()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
float input = static_cast<float>(atof("3.0"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14618,7 +14616,7 @@ namespace rtl_OStringBuffer
void append_023()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
float input = static_cast<float>(atof("3.5"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14634,7 +14632,7 @@ namespace rtl_OStringBuffer
void append_024()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
float input = static_cast<float>(atof("3.0625"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14650,7 +14648,7 @@ namespace rtl_OStringBuffer
void append_025()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
float input = static_cast<float>(atof("3.502525"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14667,7 +14665,7 @@ namespace rtl_OStringBuffer
#ifdef WITH_CORE
void append_036()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
float input = (float)atof("3.0");
sal_Int32 nLen = aStrBuf.getLength();
@@ -14683,7 +14681,7 @@ namespace rtl_OStringBuffer
void append_037()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
float input = (float)atof("3.5");
sal_Int32 nLen = aStrBuf.getLength();
@@ -14699,7 +14697,7 @@ namespace rtl_OStringBuffer
void append_038()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
float input = (float)atof("3.0625");
sal_Int32 nLen = aStrBuf.getLength();
@@ -14715,7 +14713,7 @@ namespace rtl_OStringBuffer
void append_039()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
float input = (float)atof("3.502525");
sal_Int32 nLen = aStrBuf.getLength();
@@ -14731,7 +14729,7 @@ namespace rtl_OStringBuffer
void append_040()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
float input = (float)atof("3.141592");
sal_Int32 nLen = aStrBuf.getLength();
@@ -14747,7 +14745,7 @@ namespace rtl_OStringBuffer
void append_041()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
float input = (float)atof("3.5025255");
sal_Int32 nLen = aStrBuf.getLength();
@@ -14763,7 +14761,7 @@ namespace rtl_OStringBuffer
void append_042()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
float input = (float)atof("3.00390625");
sal_Int32 nLen = aStrBuf.getLength();
@@ -14832,7 +14830,7 @@ namespace rtl_OStringBuffer
void append_001()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
float input = static_cast<float>(atof("-3.0"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14848,7 +14846,7 @@ namespace rtl_OStringBuffer
void append_002()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
float input = static_cast<float>(atof("-3.5"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14864,7 +14862,7 @@ namespace rtl_OStringBuffer
void append_003()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
float input = static_cast<float>(atof("-3.0625"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14880,7 +14878,7 @@ namespace rtl_OStringBuffer
void append_004()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
float input = static_cast<float>(atof("-3.502525"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14896,7 +14894,7 @@ namespace rtl_OStringBuffer
void append_005()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
float input = static_cast<float>(atof("-3.141592"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14912,7 +14910,7 @@ namespace rtl_OStringBuffer
void append_006()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
float input = static_cast<float>(atof("-3.5025255"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14928,7 +14926,7 @@ namespace rtl_OStringBuffer
void append_007()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
float input = static_cast<float>(atof("-3.00390625"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14944,7 +14942,7 @@ namespace rtl_OStringBuffer
void append_008()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
float input = static_cast<float>(atof("-3.0"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14960,7 +14958,7 @@ namespace rtl_OStringBuffer
void append_009()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
float input = static_cast<float>(atof("-3.5"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14976,7 +14974,7 @@ namespace rtl_OStringBuffer
void append_010()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
float input = static_cast<float>(atof("-3.0625"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -14992,7 +14990,7 @@ namespace rtl_OStringBuffer
void append_011()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
float input = static_cast<float>(atof("-3.502525"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -15008,7 +15006,7 @@ namespace rtl_OStringBuffer
void append_012()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
float input = static_cast<float>(atof("-3.141592"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -15024,7 +15022,7 @@ namespace rtl_OStringBuffer
void append_013()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
float input = static_cast<float>(atof("-3.5025255"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -15040,7 +15038,7 @@ namespace rtl_OStringBuffer
void append_014()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[1] );
+ OStringBuffer aStrBuf( arrOUS[1] );
float input = static_cast<float>(atof("-3.00390625"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -15056,7 +15054,7 @@ namespace rtl_OStringBuffer
void append_015()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
float input = static_cast<float>(atof("-3.0"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -15072,7 +15070,7 @@ namespace rtl_OStringBuffer
void append_016()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
float input = static_cast<float>(atof("-3.5"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -15088,7 +15086,7 @@ namespace rtl_OStringBuffer
void append_017()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
float input = static_cast<float>(atof("-3.0625"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -15104,7 +15102,7 @@ namespace rtl_OStringBuffer
void append_018()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
float input = static_cast<float>(atof("-3.502525"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -15120,7 +15118,7 @@ namespace rtl_OStringBuffer
void append_019()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
float input = static_cast<float>(atof("-3.141592"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -15136,7 +15134,7 @@ namespace rtl_OStringBuffer
void append_020()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
float input = static_cast<float>(atof("-3.5025255"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -15152,7 +15150,7 @@ namespace rtl_OStringBuffer
void append_021()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[2] );
+ OStringBuffer aStrBuf( arrOUS[2] );
float input = static_cast<float>(atof("-3.00390625"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -15168,7 +15166,7 @@ namespace rtl_OStringBuffer
void append_022()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
float input = static_cast<float>(atof("-3.0"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -15184,7 +15182,7 @@ namespace rtl_OStringBuffer
void append_023()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
float input = static_cast<float>(atof("-3.5"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -15200,7 +15198,7 @@ namespace rtl_OStringBuffer
void append_024()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
float input = static_cast<float>(atof("-3.0625"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -15216,7 +15214,7 @@ namespace rtl_OStringBuffer
void append_025()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[3] );
+ OStringBuffer aStrBuf( arrOUS[3] );
float input = static_cast<float>(atof("-3.502525"));
sal_Int32 nLen = aStrBuf.getLength();
@@ -15233,7 +15231,7 @@ namespace rtl_OStringBuffer
#ifdef WITH_CORE
void append_036()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
float input = (float)atof("-3.0");
sal_Int32 nLen = aStrBuf.getLength();
@@ -15249,7 +15247,7 @@ namespace rtl_OStringBuffer
void append_037()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
float input = (float)atof("-3.5");
sal_Int32 nLen = aStrBuf.getLength();
@@ -15265,7 +15263,7 @@ namespace rtl_OStringBuffer
void append_038()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
float input = (float)atof("-3.0625");
sal_Int32 nLen = aStrBuf.getLength();
@@ -15281,7 +15279,7 @@ namespace rtl_OStringBuffer
void append_039()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
float input = (float)atof("-3.502525");
sal_Int32 nLen = aStrBuf.getLength();
@@ -15297,7 +15295,7 @@ namespace rtl_OStringBuffer
void append_040()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
float input = (float)atof("-3.141592");
sal_Int32 nLen = aStrBuf.getLength();
@@ -15313,7 +15311,7 @@ namespace rtl_OStringBuffer
void append_041()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
float input = (float)atof("-3.5025255");
sal_Int32 nLen = aStrBuf.getLength();
@@ -15329,7 +15327,7 @@ namespace rtl_OStringBuffer
void append_042()
{
- ::rtl::OStringBuffer aStrBuf( kSInt32Max );
+ OStringBuffer aStrBuf( kSInt32Max );
float input = (float)atof("-3.00390625");
sal_Int32 nLen = aStrBuf.getLength();
@@ -15385,7 +15383,7 @@ namespace rtl_OStringBuffer
class checkdouble : public CppUnit::TestFixture
{
public:
- bool checkIfStrBufContainAtPosTheDouble(rtl::OStringBuffer const& _sStrBuf, sal_Int32 _nLen, double _nDouble)
+ bool checkIfStrBufContainAtPosTheDouble(OStringBuffer const& _sStrBuf, sal_Int32 _nLen, double _nDouble)
{
OString sDoubleValue;
sDoubleValue = OString::number(_nDouble);
@@ -15412,7 +15410,7 @@ namespace rtl_OStringBuffer
void append_001()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
double input = atof("3.0");
sal_Int32 nLen = aStrBuf.getLength();
@@ -15428,7 +15426,7 @@ namespace rtl_OStringBuffer
void append_035()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
double input = atof("3.141592653589793238462643");
sal_Int32 nLen = aStrBuf.getLength();
@@ -15466,7 +15464,7 @@ namespace rtl_OStringBuffer
void append_001()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[0] );
+ OStringBuffer aStrBuf( arrOUS[0] );
double input = atof("-3.0");
sal_Int32 nLen = aStrBuf.getLength();
@@ -15482,7 +15480,7 @@ namespace rtl_OStringBuffer
void append_035()
{
- ::rtl::OStringBuffer aStrBuf( arrOUS[4] );
+ OStringBuffer aStrBuf( arrOUS[4] );
double input = atof("-3.141592653589793238462643");
sal_Int32 nLen = aStrBuf.getLength();
diff --git a/sal/qa/inc/stringhelper.hxx b/sal/qa/inc/stringhelper.hxx
index e7a03287a32e..5bce6ebbb7e9 100644
--- a/sal/qa/inc/stringhelper.hxx
+++ b/sal/qa/inc/stringhelper.hxx
@@ -23,9 +23,9 @@
#include <rtl/ustring.hxx>
#include <rtl/string.hxx>
-inline void operator <<= (rtl::OString& _rAsciiString, rtl::OUString const & _rUnicodeString)
+inline void operator <<= (OString& _rAsciiString, OUString const & _rUnicodeString)
{
- _rAsciiString = rtl::OUStringToOString(_rUnicodeString,RTL_TEXTENCODING_ASCII_US);
+ _rAsciiString = OUStringToOString(_rUnicodeString,RTL_TEXTENCODING_ASCII_US);
}
#endif
diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h
index 61082aaba791..6bcf9e73018d 100644
--- a/sal/qa/osl/condition/osl_Condition_Const.h
+++ b/sal/qa/osl/condition/osl_Condition_Const.h
@@ -38,7 +38,7 @@
// condition names
-::rtl::OUString aTestCon( "testcondition" );
+OUString aTestCon( "testcondition" );
const char pTestString[17] = "Sun Microsystems";
diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h
index ed77b6d4484e..40bb81fb807a 100644
--- a/sal/qa/osl/file/osl_File_Const.h
+++ b/sal/qa/osl/file/osl_File_Const.h
@@ -109,7 +109,7 @@ OUString aUserDirectorySys( TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "" );
// common used URL:temp, canonical, root, relative, link,etc
OUString aCanURL1( FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/canonical.name" );
-rtl::OUString aCanURL2(
+OUString aCanURL2(
RTL_CONSTASCII_USTRINGPARAM("ca@#;+.,$///78no\0ni..name"));
OUString aCanURL3( "ca@#;+.,$//tmp/678nonical//name" );
OUString aCanURL4( "canonical.name" );
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx
index f093d5fe1bb8..ee89b836d78b 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -78,8 +78,6 @@ const char * const aSource2[ ] =
};
#endif
-using ::rtl::OUString;
-
void oldtestfile::test_file_001()
{
#ifndef _WIN32
diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx
index a4c1ba44b0f6..41e9f88c9fea 100644
--- a/sal/qa/osl/file/test_cpy_wrt_file.cxx
+++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx
@@ -35,7 +35,7 @@ public:
FileBase::RC err;
//create a tempfile
- rtl::OUString aTmpFile;
+ OUString aTmpFile;
err = FileBase::createTempFile(nullptr, nullptr, &aTmpFile);
CPPUNIT_ASSERT_EQUAL_MESSAGE("temp File creation failed", osl::FileBase::E_None, err);
@@ -43,8 +43,8 @@ public:
File tmp_file(aTmpFile);
err = tmp_file.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
- rtl::OString sErrorMsg = "Expected that '";
- sErrorMsg += rtl::OUStringToOString(aTmpFile, RTL_TEXTENCODING_ASCII_US);
+ OString sErrorMsg = "Expected that '";
+ sErrorMsg += OUStringToOString(aTmpFile, RTL_TEXTENCODING_ASCII_US);
sErrorMsg += "' would exist!";
CPPUNIT_ASSERT_EQUAL_MESSAGE(sErrorMsg.getStr(), FileBase::E_EXIST, err);
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index 9910925e3c5a..97d5cc1beaf4 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -23,19 +23,17 @@
using namespace osl;
-using ::rtl::OUString;
-
/** get dll file URL.
*/
-static ::rtl::OUString getDllURL()
+static OUString getDllURL()
{
#if defined(_WIN32) // lib in Unix and lib in Windows are not same in file name.
- ::rtl::OUString libPath( "test_Module_DLL.dll" );
+ OUString libPath( "test_Module_DLL.dll" );
#else
- ::rtl::OUString libPath( "libtest_Module_DLL.so" );
+ OUString libPath( "libtest_Module_DLL.so" );
#endif
- ::rtl::OUString dirPath, dllPath;
+ OUString dirPath, dllPath;
osl::Module::getUrlFromAddress(
reinterpret_cast<oslGenericFunction>(&getDllURL), dirPath);
dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') + 1);
@@ -61,7 +59,7 @@ namespace osl_Module
/** testing the methods:
Module();
- Module( const ::rtl::OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT);
+ Module( const OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT);
*/
class ctors : public CppUnit::TestFixture
{
@@ -105,7 +103,7 @@ namespace osl_Module
}; // class ctors
/** testing the methods:
- static sal_Bool getUrlFromAddress(void * addr, ::rtl::OUString & libraryUrl)
+ static sal_Bool getUrlFromAddress(void * addr, OUString & libraryUrl)
*/
class getUrlFromAddress : public CppUnit::TestFixture
{
@@ -164,7 +162,7 @@ namespace osl_Module
}; // class getUrlFromAddress
/** testing the method:
- sal_Bool SAL_CALL load( const ::rtl::OUString& strModuleName,
+ sal_Bool SAL_CALL load( const OUString& strModuleName,
sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT)
*/
class load : public CppUnit::TestFixture
@@ -252,7 +250,7 @@ namespace osl_Module
}; // class is
/** testing the methods:
- void* SAL_CALL getSymbol( const ::rtl::OUString& strSymbolName)
+ void* SAL_CALL getSymbol( const OUString& strSymbolName)
*/
class getSymbol : public CppUnit::TestFixture
{
@@ -312,7 +310,7 @@ namespace osl_Module
#if !defined( MACOSX )
// TODO: Find out why this fails on Mac OS X
::osl::Module aMod( getDllURL( ) );
- ::rtl::OUString funcName( "firstfunc" );
+ OUString funcName( "firstfunc" );
FuncPtr pFunc = reinterpret_cast<FuncPtr>(osl_getSymbol( static_cast<oslModule>(aMod), funcName.pData ));
bRes = false;
@@ -333,7 +331,7 @@ namespace osl_Module
}; // class optr_oslModule
/** testing the methods:
- oslGenericFunction SAL_CALL getFunctionSymbol( const ::rtl::OUString& ustrFunctionSymbolName )
+ oslGenericFunction SAL_CALL getFunctionSymbol( const OUString& ustrFunctionSymbolName )
*/
class getFunctionSymbol : public CppUnit::TestFixture
{
@@ -346,7 +344,7 @@ namespace osl_Module
// TODO: Find out why this fails on Mac OS X
::osl::Module aMod( getDllURL( ) );
oslGenericFunction oslFunc = aMod.getFunctionSymbol( "firstfunc" );
- ::rtl::OUString aLibraryURL;
+ OUString aLibraryURL;
bRes = ::osl::Module::getUrlFromAddress( oslFunc, aLibraryURL);
aMod.unload();
CPPUNIT_ASSERT_MESSAGE( "#test comment#: load a dll and get its function addr and get its URL.",
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index d50921d4ff8c..482ae750f36f 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -39,9 +39,6 @@
using namespace osl;
-using ::rtl::OUString;
-using ::rtl::OString;
-
/** print last error of pipe system.
*/
static void printPipeError( ::osl::Pipe const & aPipe )
@@ -90,9 +87,9 @@ static void printPipeError( ::osl::Pipe const & aPipe )
// pipe name and transfer contents
-const rtl::OUString aTestPipeName("testpipe2");
-const rtl::OUString aTestPipe1("testpipe1");
-const rtl::OUString aTestString("Sun Microsystems");
+const OUString aTestPipeName("testpipe2");
+const OUString aTestPipe1("testpipe1");
+const OUString aTestString("Sun Microsystems");
const OString m_pTestString1("Sun Microsystems");
const OString m_pTestString2("test pipe PASS/OK");
@@ -108,8 +105,8 @@ namespace osl_Pipe
/** testing the methods:
inline Pipe();
- inline Pipe(const ::rtl::OUString& strName, oslPipeOptions Options);
- inline Pipe(const ::rtl::OUString& strName, oslPipeOptions Options,const Security & rSecurity);
+ inline Pipe(const OUString& strName, oslPipeOptions Options);
+ inline Pipe(const OUString& strName, oslPipeOptions Options,const Security & rSecurity);
inline Pipe(const Pipe& pipe);
inline Pipe(oslPipe pipe, __sal_NoAcquire noacquire );
inline Pipe(oslPipe Pipe);
@@ -264,9 +261,9 @@ namespace osl_Pipe
};
/** testing the methods:
- inline sal_Bool create( const ::rtl::OUString & strName,
+ inline sal_Bool create( const OUString & strName,
oslPipeOptions Options, const Security &rSec );
- nline sal_Bool create( const ::rtl::OUString & strName,
+ nline sal_Bool create( const OUString & strName,
oslPipeOptions Options = osl_Pipe_OPEN );
*/
class create : public CppUnit::TestFixture
@@ -611,8 +608,8 @@ namespace osl_StreamPipe
inline StreamPipe();
inline StreamPipe(oslPipe Pipe);
inline StreamPipe(const StreamPipe& Pipe);
- inline StreamPipe(const ::rtl::OUString& strName, oslPipeOptions Options = osl_Pipe_OPEN);
- inline StreamPipe(const ::rtl::OUString& strName, oslPipeOptions Options, const Security &rSec );
+ inline StreamPipe(const OUString& strName, oslPipeOptions Options = osl_Pipe_OPEN);
+ inline StreamPipe(const OUString& strName, oslPipeOptions Options, const Security &rSec );
inline StreamPipe( oslPipe pipe, __sal_NoAcquire noacquire );
*/
class ctors : public CppUnit::TestFixture
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index 770b82691286..bfd17db06174 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -48,8 +48,6 @@
using namespace osl;
-using ::rtl::OString;
-
// Small stopwatch
class StopWatch {
TimeValue t1,t2; // Start and stoptime
@@ -935,9 +933,9 @@ namespace osl_Thread
{
public:
// insert your test code here.
- rtl::OString getPrioName(oslThreadPriority _aPriority)
+ OString getPrioName(oslThreadPriority _aPriority)
{
- rtl::OString sPrioStr;
+ OString sPrioStr;
switch (_aPriority)
{
case osl_Thread_PriorityHighest:
@@ -997,7 +995,7 @@ namespace osl_Thread
sal_Int32 nValueNormal2 = 0;
nValueNormal2 = p2Thread->getValue();
- rtl::OString sPrio = getPrioName(_aPriority);
+ OString sPrio = getPrioName(_aPriority);
t_print("After 10 tenth seconds\n");
t_print("nValue in %s Prio Thread is %d\n",sPrio.getStr(), static_cast<int>(nValueNormal));
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 1f484060e393..f08777d4f1ac 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -65,15 +65,11 @@
using namespace osl;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
-
/** get binary Path.
*/
-static ::rtl::OUString getExecutablePath()
+static OUString getExecutablePath()
{
- ::rtl::OUString dirPath;
+ OUString dirPath;
osl::Module::getUrlFromAddress(
reinterpret_cast<oslGenericFunction>(&getExecutablePath), dirPath);
dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') );
@@ -405,9 +401,9 @@ public:
{
oslProcess process;
#if defined(_WIN32)
- rtl::OUString suBatch = suCWD + "/batch.bat";
+ OUString suBatch = suCWD + "/batch.bat";
#else
- rtl::OUString suBatch = suCWD + "/batch.sh";
+ OUString suBatch = suCWD + "/batch.sh";
#endif
oslProcessError osl_error = osl_executeProcess(
suBatch.pData,
diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx
index 46201a258fa3..d1556bb157ae 100644
--- a/sal/qa/osl/profile/osl_old_testprofile.cxx
+++ b/sal/qa/osl/profile/osl_old_testprofile.cxx
@@ -40,11 +40,11 @@ namespace osl_Profile
void oldtests::test_profile()
{
- rtl::OUString baseUrl;
+ OUString baseUrl;
CPPUNIT_ASSERT(rtl::Bootstrap::get("UserInstallation", baseUrl));
// successful write
- oslProfile hProfile = osl_openProfile( rtl::OUString(baseUrl + "/soffice.ini").pData, osl_Profile_WRITELOCK );
+ oslProfile hProfile = osl_openProfile( OUString(baseUrl + "/soffice.ini").pData, osl_Profile_WRITELOCK );
CPPUNIT_ASSERT(hProfile != nullptr);
CPPUNIT_ASSERT_MESSAGE(
"cannot write into init file",
@@ -52,7 +52,7 @@ void oldtests::test_profile()
CPPUNIT_ASSERT(osl_closeProfile( hProfile ));
// unsuccessful open
- CPPUNIT_ASSERT_EQUAL(oslProfile(nullptr), osl_openProfile( rtl::OUString(baseUrl + "/not_existing_path/soffice.ini").pData, osl_Profile_WRITELOCK ));
+ CPPUNIT_ASSERT_EQUAL(oslProfile(nullptr), osl_openProfile( OUString(baseUrl + "/not_existing_path/soffice.ini").pData, osl_Profile_WRITELOCK ));
}
} // namespace osl_Profile
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 85b0e8f0fb0b..8f9980844530 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -38,12 +38,12 @@ using namespace rtl;
/** print a UNI_CODE String.
*/
-static void printUString( const ::rtl::OUString & str )
+static void printUString( const OUString & str )
{
- rtl::OString aString;
+ OString aString;
//t_print("#printUString_u# " );
- aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
+ aString = OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
t_print("%s\n", aString.getStr( ) );
}
@@ -74,11 +74,11 @@ namespace osl_Security
}; // class ctors
/** testing the methods:
- inline sal_Bool SAL_CALL logonUser(const ::rtl::OUString& strName,
- const ::rtl::OUString& strPasswd);
- inline sal_Bool SAL_CALL logonUser(const ::rtl::OUString & strName,
- const ::rtl::OUString & strPasswd,
- const ::rtl::OUString & strFileServer);
+ inline sal_Bool SAL_CALL logonUser(const OUString& strName,
+ const OUString& strPasswd);
+ inline sal_Bool SAL_CALL logonUser(const OUString & strName,
+ const OUString & strPasswd,
+ const OUString & strFileServer);
*/
class logonUser : public CppUnit::TestFixture
{
@@ -118,7 +118,7 @@ namespace osl_Security
}; // class logonUser
/** testing the method:
- inline sal_Bool Security::getUserIdent( rtl::OUString& strIdent) const
+ inline sal_Bool Security::getUserIdent( OUString& strIdent) const
*/
class getUserIdent : public CppUnit::TestFixture
{
@@ -128,14 +128,14 @@ namespace osl_Security
void getUserIdent_001( )
{
::osl::Security aSec;
- ::rtl::OUString strID;
+ OUString strID;
bRes = aSec.getUserIdent( strID );
- rtl::OStringBuffer aMessage;
+ OStringBuffer aMessage;
aMessage.append("strUserID: ");
- aMessage.append(rtl::OUStringToOString(strUserID, osl_getThreadTextEncoding()));
+ aMessage.append(OUStringToOString(strUserID, osl_getThreadTextEncoding()));
aMessage.append(", strID: ");
- aMessage.append(rtl::OUStringToOString(strID, osl_getThreadTextEncoding()));
+ aMessage.append(OUStringToOString(strID, osl_getThreadTextEncoding()));
aMessage.append(", bRes: ");
aMessage.append(bRes);
@@ -149,7 +149,7 @@ namespace osl_Security
}; // class getUserIdent
/** testing the method:
- inline sal_Bool SAL_CALL getUserName( ::rtl::OUString& strName) const;
+ inline sal_Bool SAL_CALL getUserName( OUString& strName) const;
*/
class getUserName : public CppUnit::TestFixture
{
@@ -160,9 +160,9 @@ namespace osl_Security
{
::osl::Security aSec;
#ifdef _WIN32
- ::rtl::OUString strName( strUserName ), strGetName;
+ OUString strName( strUserName ), strGetName;
#else
- ::rtl::OUString strName( strUserName ), strGetName;
+ OUString strName( strUserName ), strGetName;
#endif
bRes = aSec.getUserName( strGetName );
@@ -183,7 +183,7 @@ namespace osl_Security
}; // class getUserName
/** testing the method:
- inline sal_Bool Security::getConfigDir( rtl::OUString& strDirectory ) const
+ inline sal_Bool Security::getConfigDir( OUString& strDirectory ) const
*/
class getConfigDir : public CppUnit::TestFixture
{
@@ -193,7 +193,7 @@ namespace osl_Security
void getConfigDir_001( )
{
::osl::Security aSec;
- ::rtl::OUString strConfig;
+ OUString strConfig;
bRes = aSec.getConfigDir( strConfig );
CPPUNIT_ASSERT_MESSAGE( "failed to find a ConfigDir!", bRes );
@@ -279,9 +279,9 @@ namespace osl_Security
void loginUserOnFileServer_001( )
{
- rtl::OUString suUserName;
- rtl::OUString suPassword;
- rtl::OUString suFileServer;
+ OUString suUserName;
+ OUString suPassword;
+ OUString suFileServer;
::osl::Security aSec;
oslSecurity pSec = aSec.getHandle();
@@ -342,14 +342,14 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
strUserID = OUString::number( getuid( ) );
/// get user Name;
- strUserName = ::rtl::OUString::createFromAscii( pw->pw_name );
+ strUserName = OUString::createFromAscii( pw->pw_name );
/// get home directory;
char *pw_dir = pw->pw_dir;
if( getenv( "FAKEROOTKEY" ) )
pw_dir = getenv("HOME");
CPPUNIT_ASSERT_EQUAL_MESSAGE( "#Convert from system path to URL failed.",
- ::osl::File::E_None, ::osl::File::getFileURLFromSystemPath( ::rtl::OUString::createFromAscii( pw_dir ), strHomeDirectory ) );
+ ::osl::File::E_None, ::osl::File::getFileURLFromSystemPath( OUString::createFromAscii( pw_dir ), strHomeDirectory ) );
/// get config directory;
strConfigDirectory = strHomeDirectory.copy(0);
@@ -553,12 +553,12 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
t_print("Administrator.\n" );
/// get and display forwarded text if available.
- rtl::OUString args[ 3 ];
+ OUString args[ 3 ];
int argsCount = 0;
sal_uInt32 n = rtl_getAppCommandArgCount();
for (sal_uInt32 i = 0; i < n; ++i)
{
- rtl::OUString arg;
+ OUString arg;
rtl_getAppCommandArg(i, &arg.pData);
if( arg.startsWith("-") )
continue;
diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h
index 83dd21f31f14..58f578814693 100644
--- a/sal/qa/osl/security/osl_Security_Const.h
+++ b/sal/qa/osl/security/osl_Security_Const.h
@@ -47,9 +47,9 @@
#define BUFSIZE 1024
const char pTestString[17] = "Sun Microsystems";
-::rtl::OUString aLogonUser, aLogonPasswd, aFileServer, aStringForward;
-::rtl::OUString strUserName, strComputerName, strHomeDirectory;
-::rtl::OUString strConfigDirectory, strUserID;
+OUString aLogonUser, aLogonPasswd, aFileServer, aStringForward;
+OUString strUserName, strComputerName, strHomeDirectory;
+OUString strConfigDirectory, strUserID;
bool isAdmin = false;
diff --git a/sal/qa/rtl/bootstrap/expand.cxx b/sal/qa/rtl/bootstrap/expand.cxx
index a4102d38bc3b..e9799c15f37c 100644
--- a/sal/qa/rtl/bootstrap/expand.cxx
+++ b/sal/qa/rtl/bootstrap/expand.cxx
@@ -40,15 +40,15 @@ void Test::setUp() {
}
void Test::testDollar() {
- rtl::OUString s("$WITH_DOLLAR");
+ OUString s("$WITH_DOLLAR");
rtl::Bootstrap::expandMacros(s);
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("foo$TEST"), s);
+ CPPUNIT_ASSERT_EQUAL(OUString("foo$TEST"), s);
}
void Test::testIndirectDollar() {
- rtl::OUString s("$INDIRECT");
+ OUString s("$INDIRECT");
rtl::Bootstrap::expandMacros(s);
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("foo$TEST"), s);
+ CPPUNIT_ASSERT_EQUAL(OUString("foo$TEST"), s);
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx
index 57c22eb573ac..1f6852184b43 100644
--- a/sal/qa/rtl/cipher/rtl_cipher.cxx
+++ b/sal/qa/rtl/cipher/rtl_cipher.cxx
@@ -154,7 +154,7 @@ class decode : public CppUnit::TestFixture
{
public:
- void test_encode(sal_uInt8 _nKeyValue, sal_uInt8 _nArgValue, rtl::OString const& _sPlainTextStr)
+ void test_encode(sal_uInt8 _nKeyValue, sal_uInt8 _nArgValue, OString const& _sPlainTextStr)
{
rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeECB);
#if defined LIBO_CIPHER_OPENSSL_BACKEND
@@ -209,7 +209,7 @@ public:
#endif
}
- void test_encode_and_decode(sal_uInt8 _nKeyValue, sal_uInt8 _nArgValue, rtl::OString const& _sPlainTextStr)
+ void test_encode_and_decode(sal_uInt8 _nKeyValue, sal_uInt8 _nArgValue, OString const& _sPlainTextStr)
{
rtlCipher aCipher = rtl_cipher_create(rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeECB);
#if defined LIBO_CIPHER_OPENSSL_BACKEND
diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx
index 33b2bfeb3212..6bc9070be05c 100644
--- a/sal/qa/rtl/digest/rtl_digest.cxx
+++ b/sal/qa/rtl/digest/rtl_digest.cxx
@@ -248,7 +248,7 @@ public:
CPPUNIT_ASSERT_EQUAL(rtl_Digest_E_None, aError);
- rtl::OString aKey = createHex(pKeyBuffer.get(), nKeyLen);
+ OString aKey = createHex(pKeyBuffer.get(), nKeyLen);
// OString sSalt = createHex(pSaltData, nSaltDataLen);
// printf("Salt: %s\n", sSalt.getStr());
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index befc16f36e92..1975057e33e3 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -46,9 +46,9 @@
#define CONST_TEST_STRING "gregorian"
namespace {
-struct Gregorian : public rtl::StaticWithInit<rtl::OUString, Gregorian> {
- const rtl::OUString operator () () {
- return rtl::OUString( CONST_TEST_STRING );
+struct Gregorian : public rtl::StaticWithInit<OUString, Gregorian> {
+ const OUString operator () () {
+ return OUString( CONST_TEST_STRING );
}
};
}
@@ -83,7 +83,7 @@ class OGetThread : public osl::Thread
sal_Int32 m_nOK;
sal_Int32 m_nFails;
- rtl::OUString m_sConstStr;
+ OUString m_sConstStr;
public:
OGetThread()
:m_nOK(0),
@@ -105,7 +105,7 @@ protected:
{
while(schedule())
{
- rtl::OUString aStr = Gregorian::get();
+ OUString aStr = Gregorian::get();
if (aStr == m_sConstStr)
{
m_nOK++;
@@ -141,7 +141,7 @@ namespace rtl_DoubleLocking
void getValue_001()
{
- rtl::OUString aStr = Gregorian::get();
+ OUString aStr = Gregorian::get();
CPPUNIT_ASSERT_MESSAGE(
"Gregorian::get() failed, wrong value expected.",
diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx
index 80807d9ecffd..27e30db9f9d4 100644
--- a/sal/qa/rtl/locale/rtl_locale.cxx
+++ b/sal/qa/rtl/locale/rtl_locale.cxx
@@ -30,7 +30,7 @@ namespace rtl_locale
// default locale for test purpose
static void setDefaultLocale()
{
- rtl_locale_setDefault(rtl::OUString("de").getStr(), rtl::OUString("DE").getStr(), /* rtl::OUString() */ rtl::OUString("hochdeutsch").getStr() );
+ rtl_locale_setDefault(OUString("de").getStr(), OUString("DE").getStr(), /* OUString() */ OUString("hochdeutsch").getStr() );
}
class getDefault : public CppUnit::TestFixture
@@ -76,7 +76,7 @@ public:
// insert your test code here.
void setDefault_001()
{
- rtl_locale_setDefault(rtl::OUString("en").getStr(), rtl::OUString("US").getStr(), rtl::OUString().getStr());
+ rtl_locale_setDefault(OUString("en").getStr(), OUString("US").getStr(), OUString().getStr());
rtl_Locale* pData = rtl_locale_getDefault();
CPPUNIT_ASSERT_MESSAGE("locale must not null", pData != nullptr);
@@ -106,13 +106,13 @@ public:
void getLanguage_001()
{
rtl_Locale* pData = rtl_locale_getDefault();
- rtl::OUString suLanguage = pData->Language;
+ OUString suLanguage = pData->Language;
CPPUNIT_ASSERT_EQUAL_MESSAGE( "locale language must be 'de'", OUString("de"), suLanguage );
}
void getLanguage_002()
{
rtl_Locale* pData = rtl_locale_getDefault();
- rtl::OUString suLanguage(rtl_locale_getLanguage(pData), SAL_NO_ACQUIRE);
+ OUString suLanguage(rtl_locale_getLanguage(pData), SAL_NO_ACQUIRE);
CPPUNIT_ASSERT_EQUAL_MESSAGE( "locale language must be 'de'", OUString("de"), suLanguage );
}
@@ -140,13 +140,13 @@ public:
void getCountry_001()
{
rtl_Locale* pData = rtl_locale_getDefault();
- rtl::OUString suCountry = pData->Country;
+ OUString suCountry = pData->Country;
CPPUNIT_ASSERT_EQUAL_MESSAGE( "locale country must be 'DE'", OUString("DE"), suCountry );
}
void getCountry_002()
{
rtl_Locale* pData = rtl_locale_getDefault();
- rtl::OUString suCountry(rtl_locale_getCountry(pData), SAL_NO_ACQUIRE);
+ OUString suCountry(rtl_locale_getCountry(pData), SAL_NO_ACQUIRE);
CPPUNIT_ASSERT_EQUAL_MESSAGE( "locale country must be 'DE'", OUString("DE"), suCountry );
}
@@ -174,13 +174,13 @@ public:
void getVariant_001()
{
rtl_Locale* pData = rtl_locale_getDefault();
- rtl::OUString suVariant = pData->Variant;
+ OUString suVariant = pData->Variant;
CPPUNIT_ASSERT_EQUAL_MESSAGE( "locale variant must be 'hochdeutsch'", OUString("hochdeutsch"), suVariant );
}
void getVariant_002()
{
rtl_Locale* pData = rtl_locale_getDefault();
- rtl::OUString suVariant(rtl_locale_getVariant(pData), SAL_NO_ACQUIRE);
+ OUString suVariant(rtl_locale_getVariant(pData), SAL_NO_ACQUIRE);
CPPUNIT_ASSERT_EQUAL_MESSAGE( "locale variant must be 'hochdeutsch'", OUString("hochdeutsch"), suVariant );
}
@@ -241,8 +241,8 @@ public:
// insert your test code here.
void equals_001()
{
- rtl_Locale* pData1 = rtl_locale_register(rtl::OUString("en").getStr(), rtl::OUString("US").getStr(), rtl::OUString().getStr());
- rtl_Locale* pData2 = rtl_locale_register(rtl::OUString("en").getStr(), rtl::OUString("US").getStr(), rtl::OUString().getStr());
+ rtl_Locale* pData1 = rtl_locale_register(OUString("en").getStr(), OUString("US").getStr(), OUString().getStr());
+ rtl_Locale* pData2 = rtl_locale_register(OUString("en").getStr(), OUString("US").getStr(), OUString().getStr());
bool bLocaleAreEqual = (pData1 == pData2);
@@ -251,8 +251,8 @@ public:
void equals_002()
{
- rtl_Locale* pData1 = rtl_locale_register(rtl::OUString("en").getStr(), rtl::OUString("US").getStr(), rtl::OUString().getStr());
- rtl_Locale* pData2 = rtl_locale_register(rtl::OUString("en").getStr(), rtl::OUString("US").getStr(), rtl::OUString().getStr());
+ rtl_Locale* pData1 = rtl_locale_register(OUString("en").getStr(), OUString("US").getStr(), OUString().getStr());
+ rtl_Locale* pData2 = rtl_locale_register(OUString("en").getStr(), OUString("US").getStr(), OUString().getStr());
sal_Int32 nEqual = rtl_locale_equals(pData1, pData2);
CPPUNIT_ASSERT(nEqual != 0);
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx
index 36e404f122e9..214ddb035177 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -54,49 +54,49 @@ public:
rtl_math_ConversionStatus status;
sal_Int32 end;
double res = rtl::math::stringToDouble(
- rtl::OUString(" +1.E01foo"),
+ OUString(" +1.E01foo"),
'.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(RTL_CONSTASCII_LENGTH(" +1.E01"), end);
CPPUNIT_ASSERT_EQUAL(10.0, res);
res = rtl::math::stringToDouble(
- rtl::OUString("NaN"),
+ OUString("NaN"),
'.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end);
CPPUNIT_ASSERT_EQUAL(true, rtl::math::isNan(res));
res = rtl::math::stringToDouble(
- rtl::OUString("NaN1.23"),
+ OUString("NaN1.23"),
'.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end);
CPPUNIT_ASSERT_EQUAL(true, rtl::math::isNan(res));
res = rtl::math::stringToDouble(
- rtl::OUString("INF"),
+ OUString("INF"),
'.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_OutOfRange, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end);
CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res));
res = rtl::math::stringToDouble(
- rtl::OUString("INF1.23"),
+ OUString("INF1.23"),
'.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_OutOfRange, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end);
CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res));
res = rtl::math::stringToDouble(
- rtl::OUString(".5"),
+ OUString(".5"),
'.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), end);
CPPUNIT_ASSERT_EQUAL(0.5, res);
res = rtl::math::stringToDouble(
- rtl::OUString("5."),
+ OUString("5."),
'.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), end);
@@ -107,28 +107,28 @@ public:
rtl_math_ConversionStatus status;
sal_Int32 end;
double res = rtl::math::stringToDouble(
- rtl::OUString(" +Efoo"),
+ OUString(" +Efoo"),
'.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), end);
CPPUNIT_ASSERT_EQUAL(0.0, res);
res = rtl::math::stringToDouble(
- rtl::OUString("."),
+ OUString("."),
'.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), end);
CPPUNIT_ASSERT_EQUAL(0.0, res);
res = rtl::math::stringToDouble(
- rtl::OUString(" +.Efoo"),
+ OUString(" +.Efoo"),
'.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), end);
CPPUNIT_ASSERT_EQUAL(0.0, res);
res = rtl::math::stringToDouble(
- rtl::OUString(" +,.Efoo"),
+ OUString(" +,.Efoo"),
'.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), end);
@@ -139,13 +139,13 @@ public:
rtl_math_ConversionStatus status;
sal_Int32 end;
double res = rtl::math::stringToDouble(
- rtl::OUString("1e"),
+ OUString("1e"),
'.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(RTL_CONSTASCII_LENGTH("1"), end);
CPPUNIT_ASSERT_EQUAL(1.0, res);
res = rtl::math::stringToDouble(
- rtl::OUString("0e"),
+ OUString("0e"),
'.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(RTL_CONSTASCII_LENGTH("1"), end);
@@ -155,7 +155,7 @@ public:
void test_doubleToString() {
double fVal = 999999999999999.0;
sal_Int32 aGroups[3] = { 3, 2, 0 };
- rtl::OUString aRes( rtl::math::doubleToUString( fVal,
+ OUString aRes( rtl::math::doubleToUString( fVal,
rtl_math_StringFormat_Automatic,
rtl_math_DecimalPlaces_Max,
'.', aGroups, ',', true));
diff --git a/sal/qa/rtl/ostring/rtl_OString2.cxx b/sal/qa/rtl/ostring/rtl_OString2.cxx
index 1e22a96b5e48..2044750848c3 100644
--- a/sal/qa/rtl/ostring/rtl_OString2.cxx
+++ b/sal/qa/rtl/ostring/rtl_OString2.cxx
@@ -33,8 +33,8 @@ class valueOf : public CppUnit::TestFixture
{
void valueOf_float_test_impl(float _nValue)
{
- rtl::OString sValue;
- sValue = rtl::OString::valueOf( _nValue );
+ OString sValue;
+ sValue = OString::valueOf( _nValue );
printf("nFloat := %.9f sValue := %s\n", _nValue, sValue.getStr());
float nValueATOF = static_cast<float>(atof( sValue.getStr() ));
@@ -102,8 +102,8 @@ private:
void valueOf_double_test_impl(double _nValue)
{
- rtl::OString sValue;
- sValue = rtl::OString::valueOf( _nValue );
+ OString sValue;
+ sValue = OString::valueOf( _nValue );
printf("nDouble := %.20f sValue := %s\n", _nValue, sValue.getStr());
double nValueATOF = atof( sValue.getStr() );
@@ -200,23 +200,23 @@ public:
// testPrecision a;
}
- void toDouble_test_impl(rtl::OString const& _sValue)
+ void toDouble_test_impl(OString const& _sValue)
{
double nValueATOF = atof( _sValue.getStr() );
- // rtl::OUString suValue = rtl::OUString::createFromAscii( _sValue.getStr() );
+ // OUString suValue = OUString::createFromAscii( _sValue.getStr() );
double nValueToDouble = _sValue.toDouble();
bool bEqualResult = is_double_equal(nValueToDouble, nValueATOF);
CPPUNIT_ASSERT_MESSAGE("Values are not equal.", bEqualResult == true);
}
- void toDouble_test(rtl::OString const& _sValue)
+ void toDouble_test(OString const& _sValue)
{
toDouble_test_impl(_sValue);
// test also the negative part.
- rtl::OString sNegativValue("-");
+ OString sNegativValue("-");
sNegativValue += _sValue;
toDouble_test_impl(sNegativValue);
}
@@ -246,64 +246,64 @@ public:
void toDouble_test_3()
{
- rtl::OString sValue("3");
+ OString sValue("3");
toDouble_test(sValue);
}
void toDouble_test_3_5()
{
- rtl::OString sValue("3.5");
+ OString sValue("3.5");
toDouble_test(sValue);
}
void toDouble_test_3_0625()
{
- rtl::OString sValue("3.0625");
+ OString sValue("3.0625");
toDouble_test(sValue);
}
void toDouble_test_pi()
{
// value from http://www.angio.net/pi/digits/50.txt
- rtl::OString sValue("3.141592653589793238462643383279502884197169399375");
+ OString sValue("3.141592653589793238462643383279502884197169399375");
toDouble_test(sValue);
}
void toDouble_test_1()
{
- rtl::OString sValue("1");
+ OString sValue("1");
toDouble_test(sValue);
}
void toDouble_test_10()
{
- rtl::OString sValue("10");
+ OString sValue("10");
toDouble_test(sValue);
}
void toDouble_test_100()
{
- rtl::OString sValue("100");
+ OString sValue("100");
toDouble_test(sValue);
}
void toDouble_test_1000()
{
- rtl::OString sValue("1000");
+ OString sValue("1000");
toDouble_test(sValue);
}
void toDouble_test_10000()
{
- rtl::OString sValue("10000");
+ OString sValue("10000");
toDouble_test(sValue);
}
void toDouble_test_1e99()
{
- rtl::OString sValue("1e99");
+ OString sValue("1e99");
toDouble_test(sValue);
}
void toDouble_test_1e_n99()
{
- rtl::OString sValue("1e-99");
+ OString sValue("1e-99");
toDouble_test(sValue);
}
void toDouble_test_1e308()
{
- rtl::OString sValue("1e308");
+ OString sValue("1e308");
toDouble_test(sValue);
}
@@ -337,12 +337,12 @@ class getToken : public CppUnit::TestFixture
public:
void getToken_000()
{
- rtl::OString sTokenStr;
+ OString sTokenStr;
sal_Int32 nIndex = 0;
do
{
- rtl::OString sToken = sTokenStr.getToken( 0, ';', nIndex );
+ OString sToken = sTokenStr.getToken( 0, ';', nIndex );
}
while ( nIndex >= 0 );
// printf("Index %d\n", nIndex);
@@ -351,68 +351,68 @@ public:
void getToken_001()
{
- rtl::OString sTokenStr = "a;b";
+ OString sTokenStr = "a;b";
sal_Int32 nIndex = 0;
- rtl::OString sToken = sTokenStr.getToken( 0, ';', nIndex );
+ OString sToken = sTokenStr.getToken( 0, ';', nIndex );
CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", sToken.equals("a") == sal_True);
- /* rtl::OString */ sToken = sTokenStr.getToken( 0, ';', nIndex );
+ /* OString */ sToken = sTokenStr.getToken( 0, ';', nIndex );
CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", sToken.equals("b") == sal_True);
CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
}
void getToken_002()
{
- rtl::OString sTokenStr = "a;b.c";
+ OString sTokenStr = "a;b.c";
sal_Int32 nIndex = 0;
- rtl::OString sToken = sTokenStr.getToken( 0, ';', nIndex );
+ OString sToken = sTokenStr.getToken( 0, ';', nIndex );
CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", sToken.equals("a") == sal_True);
- /* rtl::OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
+ /* OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", sToken.equals("b") == sal_True);
- /* rtl::OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
+ /* OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
CPPUNIT_ASSERT_MESSAGE("Token should be a 'c'", sToken.equals("c") == sal_True);
CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
}
void getToken_003()
{
- rtl::OString sTokenStr = "a;;b";
+ OString sTokenStr = "a;;b";
sal_Int32 nIndex = 0;
- rtl::OString sToken = sTokenStr.getToken( 0, ';', nIndex );
+ OString sToken = sTokenStr.getToken( 0, ';', nIndex );
CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", sToken.equals("a") == sal_True);
- /* rtl::OString */ sToken = sTokenStr.getToken( 0, ';', nIndex );
+ /* OString */ sToken = sTokenStr.getToken( 0, ';', nIndex );
CPPUNIT_ASSERT_MESSAGE("Token should be empty", sToken.isEmpty());
- /* rtl::OString */ sToken = sTokenStr.getToken( 0, ';', nIndex );
+ /* OString */ sToken = sTokenStr.getToken( 0, ';', nIndex );
CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", sToken.equals("b") == sal_True);
CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
}
void getToken_004()
{
- rtl::OString sTokenStr = "longer.then.ever.";
+ OString sTokenStr = "longer.then.ever.";
sal_Int32 nIndex = 0;
- rtl::OString sToken = sTokenStr.getToken( 0, '.', nIndex );
+ OString sToken = sTokenStr.getToken( 0, '.', nIndex );
CPPUNIT_ASSERT_MESSAGE("Token should be 'longer'", sToken.equals("longer") == sal_True);
- /* rtl::OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
+ /* OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
CPPUNIT_ASSERT_MESSAGE("Token should be 'then'", sToken.equals("then") == sal_True);
- /* rtl::OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
+ /* OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
CPPUNIT_ASSERT_MESSAGE("Token should be 'ever'", sToken.equals("ever") == sal_True);
- /* rtl::OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
+ /* OString */ sToken = sTokenStr.getToken( 0, '.', nIndex );
CPPUNIT_ASSERT_MESSAGE("Token should be empty", sToken.isEmpty());
CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
@@ -437,10 +437,10 @@ class replaceAt : public CppUnit::TestFixture
{
public:
- sal_Bool check_replaceAt( const rtl::OString* expVal, const rtl::OString* input,
- const rtl::OString* newStr, sal_Int32 index, sal_Int32 count)
+ sal_Bool check_replaceAt( const OString* expVal, const OString* input,
+ const OString* newStr, sal_Int32 index, sal_Int32 count)
{
- ::rtl::OString aStr1;
+ OString aStr1;
aStr1= input->replaceAt( index, count, *newStr );
printf("the result OString is %s#\n", aStr1.getStr() );
@@ -451,37 +451,37 @@ public:
void replaceAt_001()
{
- sal_Bool bRes = check_replaceAt(new rtl::OString("Java@Sun"),
- new rtl::OString("Sun java"), new rtl::OString("Java@Sun"), 0, 8 );
+ sal_Bool bRes = check_replaceAt(new OString("Java@Sun"),
+ new OString("Sun java"), new OString("Java@Sun"), 0, 8 );
CPPUNIT_ASSERT_MESSAGE("string differs, replace whole string", bRes == sal_True);
}
void replaceAt_002()
{
- sal_Bool bRes = check_replaceAt(new rtl::OString("Sun Java desktop system"),
- new rtl::OString("Sun "), new rtl::OString("Java desktop system"), 10, 8 );
+ sal_Bool bRes = check_replaceAt(new OString("Sun Java desktop system"),
+ new OString("Sun "), new OString("Java desktop system"), 10, 8 );
CPPUNIT_ASSERT_MESSAGE("index > length of input string", bRes == sal_True);
}
void replaceAt_003()
{
- sal_Bool bRes = check_replaceAt(new rtl::OString("SuJava desktop system"),
- new rtl::OString("Sun "), new rtl::OString("Java desktop system"), 2, 64 );
+ sal_Bool bRes = check_replaceAt(new OString("SuJava desktop system"),
+ new OString("Sun "), new OString("Java desktop system"), 2, 64 );
CPPUNIT_ASSERT_MESSAGE("larger count", bRes == sal_True);
}
void replaceAt_004()
{
- sal_Bool bRes = check_replaceAt(new rtl::OString("Java desktop system"),
- new rtl::OString("Sun "), new rtl::OString("Java desktop system"), -4, 8 );
+ sal_Bool bRes = check_replaceAt(new OString("Java desktop system"),
+ new OString("Sun "), new OString("Java desktop system"), -4, 8 );
CPPUNIT_ASSERT_MESSAGE("navigate index", bRes == sal_True);
}
void replaceAt_005()
{
- sal_Bool bRes = check_replaceAt(new rtl::OString("Sun Jesktop System"),
- new rtl::OString("Sun Java Desktop System"), new rtl::OString(""), 5, 5 );
+ sal_Bool bRes = check_replaceAt(new OString("Sun Jesktop System"),
+ new OString("Sun Java Desktop System"), new OString(""), 5, 5 );
CPPUNIT_ASSERT_MESSAGE("replace with null string", bRes == sal_True);
}
diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx
index 94b741caae32..e2d79d812d77 100644
--- a/sal/qa/rtl/ostring/rtl_str.cxx
+++ b/sal/qa/rtl/ostring/rtl_str.cxx
@@ -39,13 +39,13 @@ namespace rtl_str
void compare_000_1()
{
- rtl::OString aStr1 = "Line must be equal.";
+ OString aStr1 = "Line must be equal.";
rtl_str_compare( aStr1.getStr(), NULL);
}
void compare_001()
{
- rtl::OString aStr1 = "";
- rtl::OString aStr2 = "";
+ OString aStr1 = "";
+ OString aStr2 = "";
sal_Int32 nValue = rtl_str_compare( aStr1.getStr(), aStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -53,8 +53,8 @@ namespace rtl_str
void compare_002()
{
- rtl::OString aStr1 = "Line must be equal.";
- rtl::OString aStr2 = "Line must be equal.";
+ OString aStr1 = "Line must be equal.";
+ OString aStr2 = "Line must be equal.";
sal_Int32 nValue = rtl_str_compare( aStr1.getStr(), aStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -62,8 +62,8 @@ namespace rtl_str
void compare_003()
{
- rtl::OString aStr1 = "Line must differ.";
- rtl::OString aStr2 = "Line foo bar, ok, differ.";
+ OString aStr1 = "Line must differ.";
+ OString aStr2 = "Line foo bar, ok, differ.";
sal_Int32 nValue = rtl_str_compare( aStr1.getStr(), aStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -93,13 +93,13 @@ namespace rtl_str
void compare_000_1()
{
- rtl::OString aStr1 = "Line must be equal.";
+ OString aStr1 = "Line must be equal.";
rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), NULL);
}
void compare_001()
{
- rtl::OString aStr1 = "";
- rtl::OString aStr2 = "";
+ OString aStr1 = "";
+ OString aStr2 = "";
sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -107,8 +107,8 @@ namespace rtl_str
void compare_002()
{
- rtl::OString aStr1 = "Line must be equal.";
- rtl::OString aStr2 = "Line must be equal.";
+ OString aStr1 = "Line must be equal.";
+ OString aStr2 = "Line must be equal.";
sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -116,8 +116,8 @@ namespace rtl_str
void compare_002_1()
{
- rtl::OString aStr1 = "Line must be equal.";
- rtl::OString aStr2 = "LINE MUST BE EQUAL.";
+ OString aStr1 = "Line must be equal.";
+ OString aStr2 = "LINE MUST BE EQUAL.";
sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitive).", nValue == 0);
@@ -125,8 +125,8 @@ namespace rtl_str
void compare_003()
{
- rtl::OString aStr1 = "Line must differ.";
- rtl::OString aStr2 = "Line foo bar, ok, differ.";
+ OString aStr1 = "Line must differ.";
+ OString aStr2 = "Line foo bar, ok, differ.";
sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -157,13 +157,13 @@ namespace rtl_str
void compare_000_1()
{
- rtl::OString aStr1 = "Line must be equal.";
+ OString aStr1 = "Line must be equal.";
rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), NULL, 0, 1);
}
void compare_001()
{
- rtl::OString aStr1 = "";
- rtl::OString aStr2 = "";
+ OString aStr1 = "";
+ OString aStr2 = "";
sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), aStr1.getLength());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -171,8 +171,8 @@ namespace rtl_str
void compare_002()
{
- rtl::OString aStr1 = "Line must be equal.";
- rtl::OString aStr2 = "Line must be equal.";
+ OString aStr1 = "Line must be equal.";
+ OString aStr2 = "Line must be equal.";
sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
aStr2.getStr(), aStr2.getLength(),
@@ -182,8 +182,8 @@ namespace rtl_str
void compare_002_1()
{
- rtl::OString aStr1 = "Line must be equal.";
- rtl::OString aStr2 = "LINE MUST BE EQUAL.";
+ OString aStr1 = "Line must be equal.";
+ OString aStr2 = "LINE MUST BE EQUAL.";
sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
aStr2.getStr(), aStr2.getLength(),
@@ -193,8 +193,8 @@ namespace rtl_str
void compare_003()
{
- rtl::OString aStr1 = "Line must differ.";
- rtl::OString aStr2 = "Line foo bar, ok, differ.";
+ OString aStr1 = "Line must differ.";
+ OString aStr2 = "Line foo bar, ok, differ.";
sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
aStr2.getStr(), aStr2.getLength(),
@@ -204,8 +204,8 @@ namespace rtl_str
void compare_004()
{
- rtl::OString aStr1 = "Line must differ.";
- rtl::OString aStr2 = "Line foo bar, ok, differ.";
+ OString aStr1 = "Line must differ.";
+ OString aStr2 = "Line foo bar, ok, differ.";
sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
aStr2.getStr(), aStr2.getLength(),
@@ -239,7 +239,7 @@ namespace rtl_str
void hashCode_001()
{
- rtl::OString aStr1 = "Line for a hashCode.";
+ OString aStr1 = "Line for a hashCode.";
sal_Int32 nHashCode = rtl_str_hashCode( aStr1.getStr() );
printf("hashcode: %d\n", nHashCode);
// CPPUNIT_ASSERT_MESSAGE("failed.", nValue == 0);
@@ -247,10 +247,10 @@ namespace rtl_str
void hashCode_002()
{
- rtl::OString aStr1 = "Line for a hashCode.";
+ OString aStr1 = "Line for a hashCode.";
sal_Int32 nHashCode1 = rtl_str_hashCode( aStr1.getStr() );
- rtl::OString aStr2 = "Line for a hashCode.";
+ OString aStr2 = "Line for a hashCode.";
sal_Int32 nHashCode2 = rtl_str_hashCode( aStr2.getStr() );
CPPUNIT_ASSERT_MESSAGE("hashcodes must be equal.", nHashCode1 == nHashCode2 );
@@ -258,10 +258,10 @@ namespace rtl_str
void hashCode_003()
{
- rtl::OString aStr1 = "Line for a hashCode.";
+ OString aStr1 = "Line for a hashCode.";
sal_Int32 nHashCode1 = rtl_str_hashCode( aStr1.getStr() );
- rtl::OString aStr2 = "Line for another hashcode.";
+ OString aStr2 = "Line for another hashcode.";
sal_Int32 nHashCode2 = rtl_str_hashCode( aStr2.getStr() );
CPPUNIT_ASSERT_MESSAGE("hashcodes must differ.", nHashCode1 != nHashCode2 );
@@ -290,7 +290,7 @@ namespace rtl_str
void indexOfChar_001()
{
- rtl::OString aStr1 = "Line for a indexOfChar.";
+ OString aStr1 = "Line for a indexOfChar.";
sal_Int32 nIndex = rtl_str_indexOfChar( aStr1.getStr(), 'L' );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
@@ -307,7 +307,7 @@ namespace rtl_str
void indexOfChar_002()
{
- rtl::OString aStr1 = "Line for a indexOfChar.";
+ OString aStr1 = "Line for a indexOfChar.";
sal_Int32 nIndex = rtl_str_indexOfChar( aStr1.getStr(), 'y' );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -335,7 +335,7 @@ namespace rtl_str
void lastIndexOfChar_001()
{
- rtl::OString aStr1 = "Line for a lastIndexOfChar.";
+ OString aStr1 = "Line for a lastIndexOfChar.";
sal_Int32 nIndex = rtl_str_lastIndexOfChar( aStr1.getStr(), 'C' );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 22);
@@ -352,7 +352,7 @@ namespace rtl_str
void lastIndexOfChar_002()
{
- rtl::OString aStr1 = "Line for a lastIndexOfChar.";
+ OString aStr1 = "Line for a lastIndexOfChar.";
sal_Int32 nIndex = rtl_str_lastIndexOfChar( aStr1.getStr(), 'y' );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -380,13 +380,13 @@ namespace rtl_str
void indexOfStr_000_1()
{
- rtl::OString aStr1 = "Line for a indexOfStr.";
+ OString aStr1 = "Line for a indexOfStr.";
rtl_str_indexOfStr( aStr1.getStr(), 0 );
}
void indexOfStr_001()
{
- rtl::OString aStr1 = "Line for a indexOfStr.";
+ OString aStr1 = "Line for a indexOfStr.";
sal_Int32 nIndex = rtl_str_indexOfStr( aStr1.getStr(), "Line" );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
@@ -403,7 +403,7 @@ namespace rtl_str
void indexOfStr_002()
{
- rtl::OString aStr1 = "Line for a indexOfStr.";
+ OString aStr1 = "Line for a indexOfStr.";
sal_Int32 nIndex = rtl_str_indexOfStr( aStr1.getStr(), "not exist" );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -431,31 +431,31 @@ namespace rtl_str
void lastIndexOfStr_000_1()
{
- rtl::OString aStr1 = "Line for a lastIndexOfStr.";
+ OString aStr1 = "Line for a lastIndexOfStr.";
rtl_str_lastIndexOfStr( aStr1.getStr(), NULL );
}
void lastIndexOfStr_001()
{
- rtl::OString aStr1 = "Line for a lastIndexOfStr.";
- rtl::OString aSearchStr = "Index";
+ OString aStr1 = "Line for a lastIndexOfStr.";
+ OString aSearchStr = "Index";
sal_Int32 nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 15);
- /* rtl::OString */ aSearchStr = "Line";
+ /* OString */ aSearchStr = "Line";
/* sal_Int32 */ nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
- /* rtl::OString */ aSearchStr = "";
+ /* OString */ aSearchStr = "";
/* sal_Int32 */ nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1);
}
void lastIndexOfStr_002()
{
- rtl::OString aStr1 = "Line for a lastIndexOfStr.";
- rtl::OString aSearchStr = "foo";
+ OString aStr1 = "Line for a lastIndexOfStr.";
+ OString aSearchStr = "foo";
sal_Int32 nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -463,8 +463,8 @@ namespace rtl_str
void lastIndexOfStr_003()
{
- rtl::OString aStr1 = "Line for a lastIndexOfStr.";
- rtl::OString aSearchStr = "O";
+ OString aStr1 = "Line for a lastIndexOfStr.";
+ OString aSearchStr = "O";
sal_Int32 nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 20 );
@@ -493,8 +493,8 @@ namespace rtl_str
void replaceChar_001()
{
- rtl::OString aStr1 = "replace char.";
- rtl::OString aShouldStr1 = "ruplacu char.";
+ OString aStr1 = "replace char.";
+ OString aShouldStr1 = "ruplacu char.";
sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1);
CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL);
@@ -502,7 +502,7 @@ namespace rtl_str
rtl_str_replaceChar( pStr, 'e', 'u' );
- CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True);
+ CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(OString(pStr)) == sal_True);
free(pStr);
}
@@ -531,8 +531,8 @@ namespace rtl_str
}
void replaceChar_WithLength_001()
{
- rtl::OString aStr1 = "replace char.";
- rtl::OString aShouldStr1 = "ruplace char.";
+ OString aStr1 = "replace char.";
+ OString aShouldStr1 = "ruplace char.";
sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1);
CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL);
@@ -540,7 +540,7 @@ namespace rtl_str
rtl_str_replaceChar_WithLength( pStr, 6, 'e', 'u' );
- CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True);
+ CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(OString(pStr)) == sal_True);
free(pStr);
}
@@ -566,8 +566,8 @@ namespace rtl_str
void toAsciiLowerCase_001()
{
- rtl::OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE.";
- rtl::OString aShouldStr1 = "change this to ascii lower case.";
+ OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE.";
+ OString aShouldStr1 = "change this to ascii lower case.";
sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1);
CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL);
@@ -575,7 +575,7 @@ namespace rtl_str
rtl_str_toAsciiLowerCase( pStr );
- CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True);
+ CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(OString(pStr)) == sal_True);
free(pStr);
}
@@ -600,8 +600,8 @@ namespace rtl_str
void toAsciiLowerCase_WithLength_001()
{
- rtl::OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE.";
- rtl::OString aShouldStr1 = "change thiS TO ASCII LOWER CASE.";
+ OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE.";
+ OString aShouldStr1 = "change thiS TO ASCII LOWER CASE.";
sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1);
CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL);
@@ -610,7 +610,7 @@ namespace rtl_str
rtl_str_toAsciiLowerCase_WithLength( pStr, 10 );
printf("Lowercase with length: '%s'\n", pStr);
- CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True);
+ CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(OString(pStr)) == sal_True);
free(pStr);
}
@@ -635,8 +635,8 @@ namespace rtl_str
void toAsciiUpperCase_001()
{
- rtl::OString aStr1 = "change this to ascii upper case.";
- rtl::OString aShouldStr1 = "CHANGE THIS TO ASCII UPPER CASE.";
+ OString aStr1 = "change this to ascii upper case.";
+ OString aShouldStr1 = "CHANGE THIS TO ASCII UPPER CASE.";
sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1);
CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL);
@@ -644,7 +644,7 @@ namespace rtl_str
rtl_str_toAsciiUpperCase( pStr );
- CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True);
+ CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(OString(pStr)) == sal_True);
free(pStr);
}
@@ -669,8 +669,8 @@ namespace rtl_str
void toAsciiUpperCase_WithLength_001()
{
- rtl::OString aStr1 = "change this to ascii lower case.";
- rtl::OString aShouldStr1 = "CHANGE THIs to ascii lower case.";
+ OString aStr1 = "change this to ascii lower case.";
+ OString aShouldStr1 = "CHANGE THIs to ascii lower case.";
sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1);
CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL);
@@ -679,7 +679,7 @@ namespace rtl_str
rtl_str_toAsciiUpperCase_WithLength( pStr, 10 );
printf("Uppercase with length: '%s'\n", aStr1.getStr());
- CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True);
+ CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(OString(pStr)) == sal_True);
free(pStr);
}
diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx
index 4a92cffb8f8f..71c709519264 100644
--- a/sal/qa/rtl/ostring/rtl_string.cxx
+++ b/sal/qa/rtl/ostring/rtl_string.cxx
@@ -40,7 +40,7 @@ namespace rtl_string
void getLength_001()
{
- rtl::OString aStr("Test Length.");
+ OString aStr("Test Length.");
sal_Int32 nValue = rtl_string_getLength( aStr.pData );
CPPUNIT_ASSERT_MESSAGE("Length must equal getLength()", aStr.getLength() == nValue);
@@ -72,12 +72,12 @@ namespace rtl_string
void newFromString_001()
{
- rtl::OString aStr("Test Length.");
+ OString aStr("Test Length.");
rtl_String *pStr = NULL;
rtl_string_newFromString( &pStr, aStr.pData );
- rtl::OString aNewStr(pStr);
+ OString aNewStr(pStr);
CPPUNIT_ASSERT_MESSAGE("Strings must be equal", aStr.equals(aNewStr) == sal_True);
rtl_string_release(pStr);
@@ -104,44 +104,44 @@ namespace rtl_string
void convertUStringToString_001()
{
- rtl::OUString suString("Hello");
- rtl::OString sString;
+ OUString suString("Hello");
+ OString sString;
sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS);
- CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("Hello")) == sal_True);
+ CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(OString("Hello")) == sal_True);
}
void convertUStringToString_002()
{
- rtl::OString sStr("H\xE4llo");
- rtl::OUString suString = rtl::OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15);
+ OString sStr("H\xE4llo");
+ OUString suString = OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15);
- rtl::OString sString;
+ OString sString;
sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ISO_8859_15, OUSTRING_TO_OSTRING_CVTFLAGS);
- CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("H\xE4llo")) == sal_True);
+ CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(OString("H\xE4llo")) == sal_True);
}
void convertUStringToString_003()
{
- rtl::OString sStr("H\xC3\xA4llo");
- rtl::OUString suString = rtl::OStringToOUString(sStr, RTL_TEXTENCODING_UTF8);
+ OString sStr("H\xC3\xA4llo");
+ OUString suString = OStringToOUString(sStr, RTL_TEXTENCODING_UTF8);
- rtl::OString sString;
+ OString sString;
sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ISO_8859_15, OUSTRING_TO_OSTRING_CVTFLAGS);
- CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("H\xE4llo")) == sal_True);
+ CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(OString("H\xE4llo")) == sal_True);
}
void convertUStringToString_004()
{
- rtl::OString sStr("Tsch\xFC\xDF");
- rtl::OUString suString = rtl::OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15);
- rtl::OString sString;
+ OString sStr("Tsch\xFC\xDF");
+ OUString suString = OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15);
+ OString sString;
sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS);
/* sal_Bool */ bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ISO_8859_15, OUSTRING_TO_OSTRING_CVTFLAGS);
- CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("Tsch\xFC\xDF")) == sal_True);
+ CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(OString("Tsch\xFC\xDF")) == sal_True);
}
// Change the following lines only, if you add, remove or rename
diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index 7dce206300a2..b932e371be3d 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -55,8 +55,8 @@ class number : public CppUnit::TestFixture
{
void number_float_test_impl(float _nValue)
{
- rtl::OUString suValue(rtl::OUString::number(_nValue));
- rtl::OString sValue;
+ OUString suValue(OUString::number(_nValue));
+ OString sValue;
sValue <<= suValue;
printf("nFloat := %.9f sValue := %s\n", _nValue, sValue.getStr());
@@ -125,9 +125,9 @@ private:
void number_double_test_impl(double _nValue)
{
- rtl::OUString suValue;
- suValue = rtl::OUString::number( _nValue );
- rtl::OString sValue;
+ OUString suValue;
+ suValue = OUString::number( _nValue );
+ OString sValue;
sValue <<= suValue;
printf("nDouble := %.20f sValue := %s\n", _nValue, sValue.getStr());
@@ -218,22 +218,22 @@ public:
void test() {
CPPUNIT_ASSERT_EQUAL(
static_cast< sal_Int32 >(-0x76543210),
- (rtl::OUString("-76543210").
+ (OUString("-76543210").
toInt32(16)));
// @return 0 if this string represents no number or one of too large magnitude
CPPUNIT_ASSERT_EQUAL(
static_cast< sal_Int32 >(0),
- (rtl::OUString("+FEDCBA98").
+ (OUString("+FEDCBA98").
toInt32(16)));
CPPUNIT_ASSERT_EQUAL(
static_cast< sal_Int64 >(-SAL_CONST_INT64(0x76543210FEDCBA98)),
- (rtl::OUString(
+ (OUString(
"-76543210FEDCBA98").
toInt64(16)));
// @return 0 if this string represents no number or one of too large magnitude
CPPUNIT_ASSERT_EQUAL(
static_cast< sal_Int64 >(SAL_CONST_INT64(0)),
- (rtl::OUString(
+ (OUString(
"+FEDCBA9876543210").
toInt64(16)));
}
@@ -247,12 +247,12 @@ public:
class toDouble : public CppUnit::TestFixture
{
public:
- void toDouble_test_impl(rtl::OString const& _sValue)
+ void toDouble_test_impl(OString const& _sValue)
{
//printf("the original str is %s\n", _sValue.getStr());
double nValueATOF = atof( _sValue.getStr() );
//printf("original data is %e\n", nValueATOF);
- rtl::OUString suValue = rtl::OUString::createFromAscii( _sValue.getStr() );
+ OUString suValue = OUString::createFromAscii( _sValue.getStr() );
double nValueToDouble = suValue.toDouble();
//printf("result data is %e\n", nValueToDouble);
@@ -260,12 +260,12 @@ public:
CPPUNIT_ASSERT_MESSAGE("Values are not equal.", bEqualResult);
}
- void toDouble_test(rtl::OString const& _sValue)
+ void toDouble_test(OString const& _sValue)
{
toDouble_test_impl(_sValue);
// test also the negative part.
- rtl::OString sNegativValue("-");
+ OString sNegativValue("-");
sNegativValue += _sValue;
toDouble_test_impl(sNegativValue);
}
@@ -295,64 +295,64 @@ public:
void toDouble_test_3()
{
- rtl::OString sValue("3");
+ OString sValue("3");
toDouble_test(sValue);
}
void toDouble_test_3_5()
{
- rtl::OString sValue("3.5");
+ OString sValue("3.5");
toDouble_test(sValue);
}
void toDouble_test_3_0625()
{
- rtl::OString sValue("3.0625");
+ OString sValue("3.0625");
toDouble_test(sValue);
}
void toDouble_test_pi()
{
// value from http://www.angio.net/pi/digits/50.txt
- rtl::OString sValue("3.141592653589793238462643383279502884197169399375");
+ OString sValue("3.141592653589793238462643383279502884197169399375");
toDouble_test(sValue);
}
void toDouble_test_1()
{
- rtl::OString sValue("1");
+ OString sValue("1");
toDouble_test(sValue);
}
void toDouble_test_10()
{
- rtl::OString sValue("10");
+ OString sValue("10");
toDouble_test(sValue);
}
void toDouble_test_100()
{
- rtl::OString sValue("100");
+ OString sValue("100");
toDouble_test(sValue);
}
void toDouble_test_1000()
{
- rtl::OString sValue("1000");
+ OString sValue("1000");
toDouble_test(sValue);
}
void toDouble_test_10000()
{
- rtl::OString sValue("10000");
+ OString sValue("10000");
toDouble_test(sValue);
}
void toDouble_test_1e99()
{
- rtl::OString sValue("1e99");
+ OString sValue("1e99");
toDouble_test(sValue);
}
void toDouble_test_1e_n99()
{
- rtl::OString sValue("1e-99");
+ OString sValue("1e-99");
toDouble_test(sValue);
}
void toDouble_test_1e308()
{
- rtl::OString sValue("1e308");
+ OString sValue("1e308");
toDouble_test(sValue);
}
@@ -382,12 +382,12 @@ public:
class toFloat : public CppUnit::TestFixture
{
public:
- void toFloat_test_impl(rtl::OString const& _sValue)
+ void toFloat_test_impl(OString const& _sValue)
{
//printf("the original str is %s\n", _sValue.getStr());
float nValueATOF = doubleToFloat(atof( _sValue.getStr() ));
//printf("the original str is %.10f\n", nValueATOF);
- rtl::OUString suValue = rtl::OUString::createFromAscii( _sValue.getStr() );
+ OUString suValue = OUString::createFromAscii( _sValue.getStr() );
float nValueToFloat = suValue.toFloat();
//printf("the result str is %.10f\n", nValueToFloat);
@@ -395,12 +395,12 @@ public:
CPPUNIT_ASSERT_MESSAGE("Values are not equal.", bEqualResult);
}
- void toFloat_test(rtl::OString const& _sValue)
+ void toFloat_test(OString const& _sValue)
{
toFloat_test_impl(_sValue);
// test also the negative part.
- rtl::OString sNegativValue("-");
+ OString sNegativValue("-");
sNegativValue += _sValue;
toFloat_test_impl(sNegativValue);
}
@@ -423,74 +423,74 @@ public:
void toFloat_test_3()
{
- rtl::OString sValue("3");
+ OString sValue("3");
toFloat_test(sValue);
}
void toFloat_test_3_5()
{
- rtl::OString sValue("3.5");
+ OString sValue("3.5");
toFloat_test(sValue);
}
void toFloat_test_3_0625()
{
- rtl::OString sValue("3.0625");
+ OString sValue("3.0625");
toFloat_test(sValue);
}
void toFloat_test_3_0625_e()
{
- rtl::OString sValue("3.0625e-4");
+ OString sValue("3.0625e-4");
toFloat_test(sValue);
}
void toFloat_test_pi()
{
// value from http://www.angio.net/pi/digits/50.txt
- rtl::OString sValue("3.141592653589793238462643383279502884197169399375");
+ OString sValue("3.141592653589793238462643383279502884197169399375");
toFloat_test(sValue);
}
void toFloat_test_1()
{
- rtl::OString sValue("1");
+ OString sValue("1");
toFloat_test(sValue);
}
void toFloat_test_10()
{
- rtl::OString sValue("10");
+ OString sValue("10");
toFloat_test(sValue);
}
void toFloat_test_100()
{
- rtl::OString sValue("100");
+ OString sValue("100");
toFloat_test(sValue);
}
void toFloat_test_1000()
{
- rtl::OString sValue("1000");
+ OString sValue("1000");
toFloat_test(sValue);
}
void toFloat_test_10000()
{
- rtl::OString sValue("10000");
+ OString sValue("10000");
toFloat_test(sValue);
}
void toFloat_test_mix()
{
- rtl::OString sValue("456789321455.123456789012");
+ OString sValue("456789321455.123456789012");
toFloat_test(sValue);
}
void toFloat_test_1e99()
{
- rtl::OString sValue("1e99");
+ OString sValue("1e99");
toFloat_test(sValue);
}
void toFloat_test_1e_n99()
{
- rtl::OString sValue("1e-9");
+ OString sValue("1e-9");
toFloat_test(sValue);
}
void toFloat_test_1e308()
{
- rtl::OString sValue("1e308");
+ OString sValue("1e308");
toFloat_test(sValue);
}
@@ -523,17 +523,17 @@ class lastIndexOf : public CppUnit::TestFixture
{
public:
- void lastIndexOf_oustring(rtl::OUString const& _suStr, rtl::OUString const& _suSearchStr, sal_Int32 _nExpectedResultPos)
+ void lastIndexOf_oustring(OUString const& _suStr, OUString const& _suSearchStr, sal_Int32 _nExpectedResultPos)
{
// Algorithm
- // search the string _suSearchStr (rtl::OUString) in the string _suStr.
+ // search the string _suSearchStr (OUString) in the string _suStr.
// check if the _nExpectedResultPos occurs.
sal_Int32 nPos = _suStr.lastIndexOf(_suSearchStr);
CPPUNIT_ASSERT_EQUAL_MESSAGE("expected position is wrong", _nExpectedResultPos, nPos);
}
- void lastIndexOf_salunicode(rtl::OUString const& _suStr, sal_Unicode _cuSearchChar, sal_Int32 _nExpectedResultPos)
+ void lastIndexOf_salunicode(OUString const& _suStr, sal_Unicode _cuSearchChar, sal_Int32 _nExpectedResultPos)
{
// Algorithm
// search the unicode char _suSearchChar (sal_Unicode) in the string _suStr.
@@ -543,13 +543,13 @@ public:
CPPUNIT_ASSERT_EQUAL_MESSAGE("expected position is wrong", _nExpectedResultPos, nPos);
}
- void lastIndexOf_oustring_offset(rtl::OUString const& _suStr, rtl::OUString const& _suSearchStr, sal_Int32 _nExpectedResultPos, sal_Int32 _nStartOffset)
+ void lastIndexOf_oustring_offset(OUString const& _suStr, OUString const& _suSearchStr, sal_Int32 _nExpectedResultPos, sal_Int32 _nStartOffset)
{
sal_Int32 nPos = _suStr.lastIndexOf(_suSearchStr, _nStartOffset);
CPPUNIT_ASSERT_EQUAL_MESSAGE("expected position is wrong", _nExpectedResultPos, nPos);
}
- void lastIndexOf_salunicode_offset(rtl::OUString const& _suStr, sal_Unicode _cuSearchChar, sal_Int32 _nExpectedResultPos, sal_Int32 _nStartOffset)
+ void lastIndexOf_salunicode_offset(OUString const& _suStr, sal_Unicode _cuSearchChar, sal_Int32 _nExpectedResultPos, sal_Int32 _nStartOffset)
{
sal_Int32 nPos = _suStr.lastIndexOf(_cuSearchChar, _nStartOffset);
CPPUNIT_ASSERT_EQUAL_MESSAGE("expected position is wrong", _nExpectedResultPos, nPos);
@@ -558,104 +558,104 @@ public:
void lastIndexOf_test_oustring_offset_001()
{
// search for sun, start at the end, found (pos==0)
- rtl::OUString aStr("sun java system");
- rtl::OUString aSearchStr("sun");
+ OUString aStr("sun java system");
+ OUString aSearchStr("sun");
lastIndexOf_oustring_offset(aStr, aSearchStr, 0, aStr.getLength());
}
void lastIndexOf_test_oustring_offset_002()
{
// search for sun, start at pos = 3, found (pos==0)
- rtl::OUString aStr("sun java system");
- rtl::OUString aSearchStr("sun");
+ OUString aStr("sun java system");
+ OUString aSearchStr("sun");
lastIndexOf_oustring_offset(aStr, aSearchStr, 0, 3);
}
void lastIndexOf_test_oustring_offset_003()
{
// search for sun, start at pos = 2, found (pos==-1)
- rtl::OUString aStr("sun java system");
- rtl::OUString aSearchStr("sun");
+ OUString aStr("sun java system");
+ OUString aSearchStr("sun");
lastIndexOf_oustring_offset(aStr, aSearchStr, -1, 2);
}
void lastIndexOf_test_oustring_offset_004()
{
// search for sun, start at the end, found (pos==0)
- rtl::OUString aStr("sun java system");
- rtl::OUString aSearchStr("sun");
+ OUString aStr("sun java system");
+ OUString aSearchStr("sun");
lastIndexOf_oustring_offset(aStr, aSearchStr, -1, 1);
}
void lastIndexOf_test_oustring_001()
{
// search for sun, found (pos==0)
- rtl::OUString aStr("sun java system");
- rtl::OUString aSearchStr("sun");
+ OUString aStr("sun java system");
+ OUString aSearchStr("sun");
lastIndexOf_oustring(aStr, aSearchStr, 0);
}
void lastIndexOf_test_oustring_002()
{
// search for sun, found (pos==4)
- rtl::OUString aStr("the sun java system");
- rtl::OUString aSearchStr("sun");
+ OUString aStr("the sun java system");
+ OUString aSearchStr("sun");
lastIndexOf_oustring(aStr, aSearchStr, 4);
}
void lastIndexOf_test_oustring_003()
{
// search for sun, found (pos==8)
- rtl::OUString aStr("the sun sun java system");
- rtl::OUString aSearchStr("sun");
+ OUString aStr("the sun sun java system");
+ OUString aSearchStr("sun");
lastIndexOf_oustring(aStr, aSearchStr, 8);
}
void lastIndexOf_test_oustring_004()
{
// search for sun, found (pos==8)
- rtl::OUString aStr("the sun sun");
- rtl::OUString aSearchStr("sun");
+ OUString aStr("the sun sun");
+ OUString aSearchStr("sun");
lastIndexOf_oustring(aStr, aSearchStr, 8);
}
void lastIndexOf_test_oustring_005()
{
// search for sun, found (pos==4)
- rtl::OUString aStr("the sun su");
- rtl::OUString aSearchStr("sun");
+ OUString aStr("the sun su");
+ OUString aSearchStr("sun");
lastIndexOf_oustring(aStr, aSearchStr, 4);
}
void lastIndexOf_test_oustring_006()
{
// search for sun, found (pos==-1)
- rtl::OUString aStr("the su su");
- rtl::OUString aSearchStr("sun");
+ OUString aStr("the su su");
+ OUString aSearchStr("sun");
lastIndexOf_oustring(aStr, aSearchStr, -1);
}
void lastIndexOf_test_oustring_007()
{
// search for earth, not found (-1)
- rtl::OUString aStr("the su su");
- rtl::OUString aSearchStr("earth");
+ OUString aStr("the su su");
+ OUString aSearchStr("earth");
lastIndexOf_oustring(aStr, aSearchStr, -1);
}
void lastIndexOf_test_oustring_008()
{
// search for earth, not found (-1)
- rtl::OUString aStr = rtl::OUString();
- rtl::OUString aSearchStr("earth");
+ OUString aStr = OUString();
+ OUString aSearchStr("earth");
lastIndexOf_oustring(aStr, aSearchStr, -1);
}
void lastIndexOf_test_oustring_009()
{
// search for earth, not found (-1)
- rtl::OUString aStr = rtl::OUString();
- rtl::OUString aSearchStr = rtl::OUString();
+ OUString aStr = OUString();
+ OUString aSearchStr = OUString();
lastIndexOf_oustring(aStr, aSearchStr, -1);
}
@@ -663,7 +663,7 @@ public:
void lastIndexOf_test_salunicode_001()
{
// search for 's', found (19)
- rtl::OUString aStr("the sun sun java system");
+ OUString aStr("the sun sun java system");
sal_Unicode suChar = L's';
lastIndexOf_salunicode(aStr, suChar, 19);
}
@@ -671,7 +671,7 @@ public:
void lastIndexOf_test_salunicode_002()
{
// search for 'x', not found (-1)
- rtl::OUString aStr("the sun sun java system");
+ OUString aStr("the sun sun java system");
sal_Unicode suChar = L'x';
lastIndexOf_salunicode(aStr, suChar, -1);
}
@@ -679,21 +679,21 @@ public:
void lastIndexOf_test_salunicode_offset_001()
{
// search for 's', start from pos last char, found (19)
- rtl::OUString aStr("the sun sun java system");
+ OUString aStr("the sun sun java system");
sal_Unicode cuChar = L's';
lastIndexOf_salunicode_offset(aStr, cuChar, 19, aStr.getLength());
}
void lastIndexOf_test_salunicode_offset_002()
{
// search for 's', start pos is last occur from search behind, found (17)
- rtl::OUString aStr("the sun sun java system");
+ OUString aStr("the sun sun java system");
sal_Unicode cuChar = L's';
lastIndexOf_salunicode_offset(aStr, cuChar, 17, 19);
}
void lastIndexOf_test_salunicode_offset_003()
{
// search for 't', start pos is 1, found (0)
- rtl::OUString aStr("the sun sun java system");
+ OUString aStr("the sun sun java system");
sal_Unicode cuChar = L't';
lastIndexOf_salunicode_offset(aStr, cuChar, 0, 1);
}
@@ -735,7 +735,7 @@ class getToken : public CppUnit::TestFixture
public:
void getToken_000()
{
- rtl::OUString suTokenStr;
+ OUString suTokenStr;
sal_Int32 nIndex = 0;
do
@@ -749,75 +749,75 @@ public:
void getToken_001()
{
- rtl::OUString suTokenStr("a;b");
+ OUString suTokenStr("a;b");
sal_Int32 nIndex = 0;
- rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'a'", rtl::OUString("a"), suToken);
+ OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'a'", OUString("a"), suToken);
- /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'b'", rtl::OUString("b"), suToken);
+ /* OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'b'", OUString("b"), suToken);
CPPUNIT_ASSERT_EQUAL_MESSAGE("index should be negative", static_cast<sal_Int32>(-1), nIndex);
}
void getToken_002()
{
- rtl::OUString suTokenStr("a;b.c");
+ OUString suTokenStr("a;b.c");
sal_Int32 nIndex = 0;
- rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'a'", rtl::OUString("a"), suToken );
+ OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'a'", OUString("a"), suToken );
- /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'b'", rtl::OUString("b"), suToken );
+ /* OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'b'", OUString("b"), suToken );
- /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'c'", rtl::OUString("c"), suToken );
+ /* OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'c'", OUString("c"), suToken );
CPPUNIT_ASSERT_EQUAL_MESSAGE("index should be negative", static_cast<sal_Int32>(-1), nIndex);
}
void getToken_003()
{
- rtl::OUString suTokenStr("a;;b");
+ OUString suTokenStr("a;;b");
sal_Int32 nIndex = 0;
- rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'a'", rtl::OUString("a"), suToken );
+ OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'a'", OUString("a"), suToken );
- /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
+ /* OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
CPPUNIT_ASSERT_MESSAGE("Token should be empty", suToken.isEmpty());
- /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'b'", rtl::OUString("b"), suToken );
+ /* OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be a 'b'", OUString("b"), suToken );
CPPUNIT_ASSERT_EQUAL_MESSAGE("index should be negative", static_cast<sal_Int32>(-1), nIndex);
}
void getToken_004()
{
- rtl::OUString suTokenStr("longer.then.ever.");
+ OUString suTokenStr("longer.then.ever.");
sal_Int32 nIndex = 0;
- rtl::OUString suToken = suTokenStr.getToken( 0, '.', nIndex );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be 'longer'", rtl::OUString("longer"), suToken );
+ OUString suToken = suTokenStr.getToken( 0, '.', nIndex );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be 'longer'", OUString("longer"), suToken );
- /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be 'then'", rtl::OUString("then"), suToken );
+ /* OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be 'then'", OUString("then"), suToken );
- /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be 'ever'", rtl::OUString("ever"), suToken );
+ /* OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE( "Token should be 'ever'", OUString("ever"), suToken );
- /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
+ /* OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
CPPUNIT_ASSERT_MESSAGE("Token should be empty", suToken.isEmpty());
CPPUNIT_ASSERT_EQUAL_MESSAGE("index should be negative", static_cast<sal_Int32>(-1), nIndex);
}
void getToken_005() {
- rtl::OUString ab("ab");
+ OUString ab("ab");
sal_Int32 n = 0;
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"token should be 'ab'", ab, ab.getToken(0, '-', n));
@@ -847,14 +847,14 @@ public:
void convertToString::test() {
static sal_Unicode const utf16[] = { 0x0041, 0x00E4, 0x0061 };
- rtl::OString s;
+ OString s;
CPPUNIT_ASSERT(
- rtl::OUString(utf16, SAL_N_ELEMENTS(utf16)).convertToString(
+ OUString(utf16, SAL_N_ELEMENTS(utf16)).convertToString(
&s, RTL_TEXTENCODING_UTF7,
(RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR |
RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)));
CPPUNIT_ASSERT_EQUAL(
- rtl::OString(RTL_CONSTASCII_STRINGPARAM("A+AOQ-a")), s);
+ OString(RTL_CONSTASCII_STRINGPARAM("A+AOQ-a")), s);
}
// - string construction & interning (tests)
@@ -865,13 +865,13 @@ public:
void construct()
{
#ifdef RTL_INLINE_STRINGS
- ::rtl::OUString aFoo( "foo" );
+ OUString aFoo( "foo" );
CPPUNIT_ASSERT_MESSAGE("string contents", aFoo[0] == 'f');
CPPUNIT_ASSERT_MESSAGE("string contents", aFoo[1] == 'o');
CPPUNIT_ASSERT_MESSAGE("string contents", aFoo[2] == 'o');
CPPUNIT_ASSERT_MESSAGE("string length", aFoo.getLength() == 3);
- ::rtl::OUString aBaa( "this is a very long string with a lot of long things inside it and it goes on and on and on forever etc." );
+ OUString aBaa( "this is a very long string with a lot of long things inside it and it goes on and on and on forever etc." );
CPPUNIT_ASSERT_MESSAGE("string length", aBaa.getLength() == 104);
// Dig at the internals ... FIXME: should we have the bit-flag defines public ?
CPPUNIT_ASSERT_MESSAGE("string static flags", (aBaa.pData->refCount & 1<<30) != 0);
@@ -881,12 +881,12 @@ public:
void intern()
{
// The empty string is 'static' a special case ...
- rtl::OUString().intern();
- rtl::OUString::intern( "",strlen(""),RTL_TEXTENCODING_ASCII_US );
+ OUString().intern();
+ OUString::intern( "",strlen(""),RTL_TEXTENCODING_ASCII_US );
- ::rtl::OUString aFoo( "foo" );
- ::rtl::OUString aFooIntern = aFoo.intern();
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "string contents", rtl::OUString("foo"), aFooIntern);
+ OUString aFoo( "foo" );
+ OUString aFooIntern = aFoo.intern();
+ CPPUNIT_ASSERT_EQUAL_MESSAGE( "string contents", OUString("foo"), aFooIntern);
CPPUNIT_ASSERT_EQUAL_MESSAGE("string length", static_cast<sal_Int32>(3), aFooIntern.getLength());
// We have to dup due to no atomic 'intern' bit-set operation
CPPUNIT_ASSERT_MESSAGE("intern dups", aFoo.pData != aFooIntern.pData);
@@ -894,14 +894,14 @@ public:
// Test interning lots of things
int i;
static const int nSequence = 4096;
- std::unique_ptr<rtl::OUString[]> pStrs(new rtl::OUString[nSequence]);
+ std::unique_ptr<OUString[]> pStrs(new OUString[nSequence]);
for (i = 0; i < nSequence; i++)
{
- pStrs[i] = rtl::OUString::number( sqrt( static_cast<double>(i) ) ).intern();
+ pStrs[i] = OUString::number( sqrt( static_cast<double>(i) ) ).intern();
}
for (i = 0; i < nSequence; i++)
{
- rtl::OUString aNew = rtl::OUString::number( sqrt( static_cast<double>(i) ) ).intern();
+ OUString aNew = OUString::number( sqrt( static_cast<double>(i) ) ).intern();
CPPUNIT_ASSERT_EQUAL_MESSAGE("double intern failed",
pStrs[i].pData, aNew.pData);
}
@@ -923,16 +923,16 @@ public:
};
void indexOfAscii::test() {
- CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), rtl::OUString().indexOf(""));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), rtl::OUString().lastIndexOf(""));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rtl::OUString("foo").indexOf("foo"));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rtl::OUString("foo").lastIndexOf("foo"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), OUString().indexOf(""));
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), OUString().lastIndexOf(""));
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), OUString("foo").indexOf("foo"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), OUString("foo").lastIndexOf("foo"));
CPPUNIT_ASSERT_EQUAL(
- sal_Int32(2), rtl::OUString("fofoobar").indexOf("foo"));
+ sal_Int32(2), OUString("fofoobar").indexOf("foo"));
CPPUNIT_ASSERT_EQUAL(
- sal_Int32(3), rtl::OUString("foofoofob").lastIndexOf("foo"));
+ sal_Int32(3), OUString("foofoofob").lastIndexOf("foo"));
CPPUNIT_ASSERT_EQUAL(
- sal_Int32(3), rtl::OUString("foofoobar").indexOf("foo", 1));
+ sal_Int32(3), OUString("foofoobar").indexOf("foo", 1));
}
class endsWith: public CppUnit::TestFixture {
@@ -945,11 +945,11 @@ public:
};
void endsWith::test() {
- CPPUNIT_ASSERT_EQUAL(true, rtl::OUString().endsWith(""));
- CPPUNIT_ASSERT_EQUAL(false, rtl::OUString().endsWith("foo"));
- CPPUNIT_ASSERT_EQUAL(true, rtl::OUString("bar").endsWith("bar"));
- CPPUNIT_ASSERT_EQUAL(true, rtl::OUString("foobar").endsWith("bar"));
- CPPUNIT_ASSERT_EQUAL(false, rtl::OUString("FOOBAR").endsWith("bar"));
+ CPPUNIT_ASSERT_EQUAL(true, OUString().endsWith(""));
+ CPPUNIT_ASSERT_EQUAL(false, OUString().endsWith("foo"));
+ CPPUNIT_ASSERT_EQUAL(true, OUString("bar").endsWith("bar"));
+ CPPUNIT_ASSERT_EQUAL(true, OUString("foobar").endsWith("bar"));
+ CPPUNIT_ASSERT_EQUAL(false, OUString("FOOBAR").endsWith("bar"));
}
class isEmpty: public CppUnit::TestFixture {
@@ -985,9 +985,9 @@ public:
void createFromCodePoints::test() {
CPPUNIT_ASSERT_EQUAL(
sal_Int32(0),
- rtl::OUString(static_cast< sal_uInt32 const * >(nullptr), 0).getLength());
+ OUString(static_cast< sal_uInt32 const * >(nullptr), 0).getLength());
static sal_uInt32 const cp[] = { 0, 0xD800, 0xFFFF, 0x10000, 0x10FFFF };
- rtl::OUString s(cp, SAL_N_ELEMENTS(cp));
+ OUString s(cp, SAL_N_ELEMENTS(cp));
CPPUNIT_ASSERT_EQUAL(sal_Int32(7), s.getLength());
CPPUNIT_ASSERT_EQUAL(u'\0', s[0]);
CPPUNIT_ASSERT_EQUAL(u'\xD800', s[1]);
@@ -1010,7 +1010,7 @@ public:
void iterateCodePoints::testNotWellFormed() {
static sal_Unicode const utf16[] =
{ 0xD800, 0xDC00, 0x0041, 0xDBFF, 0xDFFF, 0xDDEF, 0xD9AB };
- rtl::OUString s(utf16, SAL_N_ELEMENTS(utf16));
+ OUString s(utf16, SAL_N_ELEMENTS(utf16));
sal_Int32 i = 0;
CPPUNIT_ASSERT_EQUAL(sal_uInt32(0x10000), s.iterateCodePoints(&i));
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), i);
@@ -1050,7 +1050,7 @@ public:
};
void convertFromString::test() {
- rtl::OUString t;
+ OUString t;
CPPUNIT_ASSERT(
!rtl_convertStringToUString(
&t.pData, RTL_CONSTASCII_STRINGPARAM("\x80"), RTL_TEXTENCODING_UTF8,
diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx
index 0b533a363b53..615b171fe23d 100644
--- a/sal/qa/rtl/oustring/rtl_ustr.cxx
+++ b/sal/qa/rtl/oustring/rtl_ustr.cxx
@@ -24,12 +24,12 @@
/** print a UNI_CODE file name.
*/
/*
-inline void printOUString( ::rtl::OUString const & _suStr )
+inline void printOUString( OUString const & _suStr )
{
- rtl::OString aString;
+ OString aString;
printf( "OUString: " );
- aString = ::rtl::OUStringToOString( _suStr, RTL_TEXTENCODING_ASCII_US );
+ aString = OUStringToOString( _suStr, RTL_TEXTENCODING_ASCII_US );
printf( "%s\n", aString.getStr( ) );
}
*/
@@ -49,14 +49,14 @@ namespace rtl_ustr
void compare_000_1()
{
- rtl::OUString aStr1("Line must be equal.");
+ OUString aStr1("Line must be equal.");
rtl_ustr_compare( aStr1.getStr(), NULL);
// should not GPF
}
void compare_001()
{
- rtl::OUString aStr1;
- rtl::OUString aStr2;
+ OUString aStr1;
+ OUString aStr2;
sal_Int32 nValue = rtl_ustr_compare( aStr1.getStr(), aStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -64,8 +64,8 @@ namespace rtl_ustr
void compare_002()
{
- rtl::OUString aStr1("Line must be equal.");
- rtl::OUString aStr2("Line must be equal.");
+ OUString aStr1("Line must be equal.");
+ OUString aStr2("Line must be equal.");
sal_Int32 nValue = rtl_ustr_compare( aStr1.getStr(), aStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -73,8 +73,8 @@ namespace rtl_ustr
void compare_003()
{
- rtl::OUString aStr1("Line must differ.");
- rtl::OUString aStr2("Line foo bar, ok, differ.");
+ OUString aStr1("Line must differ.");
+ OUString aStr2("Line foo bar, ok, differ.");
sal_Int32 nValue = rtl_ustr_compare( aStr1.getStr(), aStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -104,13 +104,13 @@ namespace rtl_ustr
void compare_000_1()
{
- rtl::OUString aStr1("Line must be equal.");
+ OUString aStr1("Line must be equal.");
rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), NULL);
}
void compare_001()
{
- rtl::OUString aStr1;
- rtl::OUString aStr2;
+ OUString aStr1;
+ OUString aStr2;
sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -118,8 +118,8 @@ namespace rtl_ustr
void compare_002()
{
- rtl::OUString aStr1("Line must be equal.");
- rtl::OUString aStr2("Line must be equal.");
+ OUString aStr1("Line must be equal.");
+ OUString aStr2("Line must be equal.");
sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -127,8 +127,8 @@ namespace rtl_ustr
void compare_002_1()
{
- rtl::OUString aStr1("Line must be equal.");
- rtl::OUString aStr2("LINE MUST BE EQUAL.");
+ OUString aStr1("Line must be equal.");
+ OUString aStr2("LINE MUST BE EQUAL.");
sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitive).", nValue == 0);
@@ -136,8 +136,8 @@ namespace rtl_ustr
void compare_003()
{
- rtl::OUString aStr1("Line must differ.");
- rtl::OUString aStr2("Line foo bar, ok, differ.");
+ OUString aStr1("Line must differ.");
+ OUString aStr2("Line foo bar, ok, differ.");
sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -168,13 +168,13 @@ namespace rtl_ustr
void compare_000_1()
{
- rtl::OUString aStr1("Line must be equal.");
+ OUString aStr1("Line must be equal.");
rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), NULL, 0, 1);
}
void compare_001()
{
- rtl::OUString aStr1;
- rtl::OUString aStr2;
+ OUString aStr1;
+ OUString aStr2;
sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), aStr1.getLength());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -182,8 +182,8 @@ namespace rtl_ustr
void compare_002()
{
- rtl::OUString aStr1("Line must be equal.");
- rtl::OUString aStr2("Line must be equal.");
+ OUString aStr1("Line must be equal.");
+ OUString aStr2("Line must be equal.");
sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
aStr2.getStr(), aStr2.getLength(),
@@ -193,8 +193,8 @@ namespace rtl_ustr
void compare_002_1()
{
- rtl::OUString aStr1("Line must be equal.");
- rtl::OUString aStr2("LINE MUST BE EQUAL.");
+ OUString aStr1("Line must be equal.");
+ OUString aStr2("LINE MUST BE EQUAL.");
sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
aStr2.getStr(), aStr2.getLength(),
@@ -204,8 +204,8 @@ namespace rtl_ustr
void compare_003()
{
- rtl::OUString aStr1("Line must differ.");
- rtl::OUString aStr2("Line foo bar, ok, differ.");
+ OUString aStr1("Line must differ.");
+ OUString aStr2("Line foo bar, ok, differ.");
sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
aStr2.getStr(), aStr2.getLength(),
@@ -215,8 +215,8 @@ namespace rtl_ustr
void compare_004()
{
- rtl::OUString aStr1("Line must differ.");
- rtl::OUString aStr2("Line foo bar, ok, differ.");
+ OUString aStr1("Line must differ.");
+ OUString aStr2("Line foo bar, ok, differ.");
sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
aStr2.getStr(), aStr2.getLength(),
@@ -253,7 +253,7 @@ namespace rtl_ustr
//
// void hashCode_001()
// {
-// rtl::OString aStr1 = "Line for a hashCode.";
+// OString aStr1 = "Line for a hashCode.";
// sal_Int32 nHashCode = rtl_ustr_hashCode( aStr1.getStr() );
// printf("hashcode: %d\n", nHashCode);
// // CPPUNIT_ASSERT_MESSAGE("failed.", nValue == 0);
@@ -261,10 +261,10 @@ namespace rtl_ustr
//
// void hashCode_002()
// {
-// rtl::OString aStr1 = "Line for a hashCode.";
+// OString aStr1 = "Line for a hashCode.";
// sal_Int32 nHashCode1 = rtl_ustr_hashCode( aStr1.getStr() );
//
-// rtl::OString aStr2 = "Line for a hashCode.";
+// OString aStr2 = "Line for a hashCode.";
// sal_Int32 nHashCode2 = rtl_ustr_hashCode( aStr2.getStr() );
//
// CPPUNIT_ASSERT_MESSAGE("hashcodes must be equal.", nHashCode1 == nHashCode2 );
@@ -272,10 +272,10 @@ namespace rtl_ustr
//
// void hashCode_003()
// {
-// rtl::OString aStr1 = "Line for a hashCode.";
+// OString aStr1 = "Line for a hashCode.";
// sal_Int32 nHashCode1 = rtl_ustr_hashCode( aStr1.getStr() );
//
-// rtl::OString aStr2 = "Line for another hashcode.";
+// OString aStr2 = "Line for another hashcode.";
// sal_Int32 nHashCode2 = rtl_ustr_hashCode( aStr2.getStr() );
//
// CPPUNIT_ASSERT_MESSAGE("hashcodes must differ.", nHashCode1 != nHashCode2 );
@@ -304,7 +304,7 @@ namespace rtl_ustr
void indexOfChar_001()
{
- rtl::OUString aStr1("Line for a indexOfChar.");
+ OUString aStr1("Line for a indexOfChar.");
sal_Int32 nIndex = rtl_ustr_indexOfChar( aStr1.getStr(), 'L' );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
@@ -321,7 +321,7 @@ namespace rtl_ustr
void indexOfChar_002()
{
- rtl::OUString aStr1("Line for a indexOfChar.");
+ OUString aStr1("Line for a indexOfChar.");
sal_Int32 nIndex = rtl_ustr_indexOfChar( aStr1.getStr(), 'y' );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -349,7 +349,7 @@ namespace rtl_ustr
void lastIndexOfChar_001()
{
- rtl::OUString aStr1("Line for a lastIndexOfChar.");
+ OUString aStr1("Line for a lastIndexOfChar.");
sal_Int32 nIndex = rtl_ustr_lastIndexOfChar( aStr1.getStr(), 'C' );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 22);
@@ -366,7 +366,7 @@ namespace rtl_ustr
void lastIndexOfChar_002()
{
- rtl::OUString aStr1("Line for a lastIndexOfChar.");
+ OUString aStr1("Line for a lastIndexOfChar.");
sal_Int32 nIndex = rtl_ustr_lastIndexOfChar( aStr1.getStr(), 'y' );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -394,35 +394,35 @@ namespace rtl_ustr
void indexOfStr_000_1()
{
- rtl::OUString aStr1("Line for a indexOfStr.");
+ OUString aStr1("Line for a indexOfStr.");
rtl_ustr_indexOfStr( aStr1.getStr(), 0 );
}
void indexOfStr_001()
{
- rtl::OUString aStr1("Line for a indexOfStr.");
+ OUString aStr1("Line for a indexOfStr.");
- rtl::OUString suSearch("Line");
+ OUString suSearch("Line");
sal_Int32 nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
- /* rtl::OUString */ suSearch("for");
+ /* OUString */ suSearch("for");
/* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 5);
- /* rtl::OUString */ suSearch("a");
+ /* OUString */ suSearch("a");
/* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 9);
- /* rtl::OUString */ suSearch("a index");
+ /* OUString */ suSearch("a index");
/* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex ==9);
}
void indexOfStr_002()
{
- rtl::OUString aStr1("Line for a indexOfStr.");
- rtl::OUString suSearch("not exist");
+ OUString aStr1("Line for a indexOfStr.");
+ OUString suSearch("not exist");
sal_Int32 nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -450,31 +450,31 @@ namespace rtl_ustr
void lastIndexOfStr_000_1()
{
- rtl::OUString aStr1("Line for a lastIndexOfStr.");
+ OUString aStr1("Line for a lastIndexOfStr.");
rtl_ustr_lastIndexOfStr( aStr1.getStr(), NULL );
}
void lastIndexOfStr_001()
{
- rtl::OUString aStr1("Line for a lastIndexOfStr.");
- rtl::OUString aSearchStr("Index");
+ OUString aStr1("Line for a lastIndexOfStr.");
+ OUString aSearchStr("Index");
sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 15);
- /* rtl::OString */ aSearchStr = rtl::OUString("Line");
+ /* OString */ aSearchStr = OUString("Line");
/* sal_Int32 */ nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
- /* rtl::OString */ aSearchStr = rtl::OUString();
+ /* OString */ aSearchStr = OUString();
/* sal_Int32 */ nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1);
}
void lastIndexOfStr_002()
{
- rtl::OUString aStr1("Line for a lastIndexOfStr.");
- rtl::OUString aSearchStr("foo");
+ OUString aStr1("Line for a lastIndexOfStr.");
+ OUString aSearchStr("foo");
sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -482,8 +482,8 @@ namespace rtl_ustr
void lastIndexOfStr_003()
{
- rtl::OUString aStr1("Line for a lastIndexOfStr.");
- rtl::OUString aSearchStr("O");
+ OUString aStr1("Line for a lastIndexOfStr.");
+ OUString aSearchStr("O");
sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 20 );
@@ -512,8 +512,8 @@ namespace rtl_ustr
void replaceChar_001()
{
- rtl::OUString aStr1("replace char.");
- rtl::OUString aShouldStr1("ruplacu char.");
+ OUString aStr1("replace char.");
+ OUString aShouldStr1("ruplacu char.");
sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
sal_Unicode* pStr = (sal_Unicode*) malloc( nLength + sizeof(sal_Unicode)); // length + 1 (null terminator)
@@ -522,7 +522,7 @@ namespace rtl_ustr
pStr[aStr1.getLength()] = 0;
rtl_ustr_replaceChar( pStr, 'e', 'u' );
- rtl::OUString suStr(pStr, aStr1.getLength());
+ OUString suStr(pStr, aStr1.getLength());
CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(suStr) == sal_True);
free(pStr);
@@ -553,8 +553,8 @@ namespace rtl_ustr
}
void replaceChar_WithLength_001()
{
- rtl::OUString aStr1("replace char.");
- rtl::OUString aShouldStr1("ruplace char.");
+ OUString aStr1("replace char.");
+ OUString aShouldStr1("ruplace char.");
sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
sal_Unicode* pStr = (sal_Unicode*) malloc(nLength);
@@ -562,7 +562,7 @@ namespace rtl_ustr
memcpy(pStr, aStr1.getStr(), nLength);
rtl_ustr_replaceChar_WithLength( pStr, 6, 'e', 'u' );
- rtl::OUString suStr(pStr, aStr1.getLength());
+ OUString suStr(pStr, aStr1.getLength());
CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(suStr) == sal_True);
free(pStr);
@@ -570,8 +570,8 @@ namespace rtl_ustr
void replaceChar_WithLength_002()
{
- rtl::OUString aStr1 ("eeeeeeeeeeeee");
- rtl::OUString aShouldStr1("uuuuuueeeeeee");
+ OUString aStr1 ("eeeeeeeeeeeee");
+ OUString aShouldStr1("uuuuuueeeeeee");
sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
sal_Unicode* pStr = (sal_Unicode*) malloc(nLength); // no null terminator is need
@@ -579,7 +579,7 @@ namespace rtl_ustr
memcpy(pStr, aStr1.getStr(), nLength);
rtl_ustr_replaceChar_WithLength( pStr, 6, 'e', 'u' );
- rtl::OUString suStr(pStr, aStr1.getLength());
+ OUString suStr(pStr, aStr1.getLength());
CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(suStr) == sal_True);
free(pStr);
@@ -608,8 +608,8 @@ namespace rtl_ustr
void toAsciiLowerCase_001()
{
- rtl::OUString aStr1("CHANGE THIS TO ASCII LOWER CASE.");
- rtl::OUString aShouldStr1("change this to ascii lower case.");
+ OUString aStr1("CHANGE THIS TO ASCII LOWER CASE.");
+ OUString aShouldStr1("change this to ascii lower case.");
sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode) ); // we need to add '\0' so one more
@@ -618,7 +618,7 @@ namespace rtl_ustr
pStr[aStr1.getLength()] = 0;
rtl_ustr_toAsciiLowerCase( pStr );
- rtl::OUString suStr(pStr, aStr1.getLength());
+ OUString suStr(pStr, aStr1.getLength());
CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(suStr) == sal_True);
free(pStr);
@@ -645,8 +645,8 @@ namespace rtl_ustr
void toAsciiLowerCase_WithLength_001()
{
- rtl::OUString aStr1("CHANGE THIS TO ASCII LOWER CASE.");
- rtl::OUString aShouldStr1("change thiS TO ASCII LOWER CASE.");
+ OUString aStr1("CHANGE THIS TO ASCII LOWER CASE.");
+ OUString aShouldStr1("change thiS TO ASCII LOWER CASE.");
sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
sal_Unicode* pStr = (sal_Unicode*) malloc(nLength);
@@ -655,7 +655,7 @@ namespace rtl_ustr
rtl_ustr_toAsciiLowerCase_WithLength( pStr, 10 );
- rtl::OUString suStr(pStr, aStr1.getLength());
+ OUString suStr(pStr, aStr1.getLength());
sal_Bool bResult = aShouldStr1.equals(suStr);
printOUString(suStr);
@@ -687,8 +687,8 @@ namespace rtl_ustr
void toAsciiUpperCase_001()
{
- rtl::OUString aStr1("change this to ascii upper case.");
- rtl::OUString aShouldStr1("CHANGE THIS TO ASCII UPPER CASE.");
+ OUString aStr1("change this to ascii upper case.");
+ OUString aShouldStr1("CHANGE THIS TO ASCII UPPER CASE.");
sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator
@@ -697,7 +697,7 @@ namespace rtl_ustr
pStr[aStr1.getLength()] = 0;
rtl_ustr_toAsciiUpperCase( pStr );
- rtl::OUString suStr(pStr, aStr1.getLength());
+ OUString suStr(pStr, aStr1.getLength());
CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(suStr) == sal_True);
free(pStr);
@@ -724,8 +724,8 @@ namespace rtl_ustr
void toAsciiUpperCase_WithLength_001()
{
- rtl::OUString aStr1("change this to ascii lower case.");
- rtl::OUString aShouldStr1("CHANGE THIs to ascii lower case.");
+ OUString aStr1("change this to ascii lower case.");
+ OUString aShouldStr1("CHANGE THIs to ascii lower case.");
sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
sal_Unicode* pStr = (sal_Unicode*) malloc(nLength);
@@ -733,7 +733,7 @@ namespace rtl_ustr
memcpy(pStr, aStr1.getStr(), nLength);
rtl_ustr_toAsciiUpperCase_WithLength( pStr, 10 );
- rtl::OUString suStr(pStr, aStr1.getLength());
+ OUString suStr(pStr, aStr1.getLength());
// printf("Uppercase with length: '%s'\n", aStr1.getStr());
CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(suStr) == sal_True);
@@ -761,7 +761,7 @@ namespace rtl_ustr
void trim_WithLength_000_1()
{
- rtl::OUString suStr(" trim this");
+ OUString suStr(" trim this");
sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -773,20 +773,20 @@ namespace rtl_ustr
void trim_WithLength_001()
{
- rtl::OUString suStr(" trim this");
+ OUString suStr(" trim this");
sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
memcpy(pStr, suStr.getStr(), nLength);
rtl_ustr_trim_WithLength( pStr, 2 );
- CPPUNIT_ASSERT_MESSAGE("string should be empty", rtl::OUString(pStr).getLength() == 0);
+ CPPUNIT_ASSERT_MESSAGE("string should be empty", OUString(pStr).getLength() == 0);
free(pStr);
}
void trim_WithLength_002()
{
- rtl::OUString suStr("trim this");
+ OUString suStr("trim this");
sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -794,13 +794,13 @@ namespace rtl_ustr
rtl_ustr_trim_WithLength( pStr, 5 );
- CPPUNIT_ASSERT_MESSAGE("string should contain 'trim'", rtl::OUString(pStr).getLength() == 4);
+ CPPUNIT_ASSERT_MESSAGE("string should contain 'trim'", OUString(pStr).getLength() == 4);
free(pStr);
}
void trim_WithLength_003()
{
- rtl::OUString suStr(" trim this");
+ OUString suStr(" trim this");
sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -808,13 +808,13 @@ namespace rtl_ustr
rtl_ustr_trim_WithLength( pStr, 11 );
- CPPUNIT_ASSERT_MESSAGE("string should contain 'trim'", rtl::OUString(pStr).getLength() == 4);
+ CPPUNIT_ASSERT_MESSAGE("string should contain 'trim'", OUString(pStr).getLength() == 4);
free(pStr);
}
void trim_WithLength_004()
{
- rtl::OUString suStr("\r\n\t \n\r trim \n this");
+ OUString suStr("\r\n\t \n\r trim \n this");
sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -822,13 +822,13 @@ namespace rtl_ustr
rtl_ustr_trim_WithLength( pStr, 17 );
- CPPUNIT_ASSERT_MESSAGE("string should contain 'trim'", rtl::OUString(pStr).getLength() == 4);
+ CPPUNIT_ASSERT_MESSAGE("string should contain 'trim'", OUString(pStr).getLength() == 4);
free(pStr);
}
void trim_WithLength_005()
{
- rtl::OUString suStr("\r\n\t \n\r trim \t this \n\r\t\t ");
+ OUString suStr("\r\n\t \n\r trim \t this \n\r\t\t ");
sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -836,7 +836,7 @@ namespace rtl_ustr
rtl_ustr_trim_WithLength( pStr, suStr.getLength() );
- CPPUNIT_ASSERT_MESSAGE("string should contain 'trim \\t this'", rtl::OUString(pStr).getLength() == 11);
+ CPPUNIT_ASSERT_MESSAGE("string should contain 'trim \\t this'", OUString(pStr).getLength() == 11);
free(pStr);
}
@@ -899,7 +899,7 @@ namespace rtl_ustr
void equal_ascii_shorter()
{
- rtl::OUString refStr("referenceString");
+ OUString refStr("referenceString");
char const * pAscii = "reference";
sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, refStr.pData->length, pAscii);
@@ -908,7 +908,7 @@ namespace rtl_ustr
void equal_ascii_shorter_asciiLength()
{
- rtl::OUString refStr("referenceString");
+ OUString refStr("referenceString");
char const * pAscii = "reference";
sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, rtl_str_getLength(pAscii), pAscii);
@@ -917,7 +917,7 @@ namespace rtl_ustr
void equal_ref_shorter()
{
- rtl::OUString refStr("reference");
+ OUString refStr("reference");
char const * pAscii = "referenceString";
sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, refStr.pData->length, pAscii);
@@ -926,7 +926,7 @@ namespace rtl_ustr
void equal()
{
- rtl::OUString refStr("reference");
+ OUString refStr("reference");
char const * pAscii = "reference";
sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, refStr.pData->length, pAscii);
@@ -935,7 +935,7 @@ namespace rtl_ustr
void unequal_reference_bigger()
{
- rtl::OUString refStr("defghi");
+ OUString refStr("defghi");
char const * pAscii = "abc";
sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, refStr.pData->length, pAscii);
@@ -944,7 +944,7 @@ namespace rtl_ustr
void unequal_ascii_bigger()
{
- rtl::OUString refStr("abc");
+ OUString refStr("abc");
char const * pAscii = "defghi";
sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, refStr.pData->length, pAscii);
@@ -975,21 +975,21 @@ namespace rtl_ustr
void ascii_shortenedCompareIgnoreAsciiCase_WithLength_000_1()
{
- rtl::OUString aStr1("Line must be equal.");
+ OUString aStr1("Line must be equal.");
rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), NULL, 0);
// should not GPF
}
void ascii_shortenedCompareIgnoreAsciiCase_WithLength_000_2()
{
- rtl::OUString aStr1("Line must be equal.");
- rtl::OString sStr2 = "Line is shorter.";
+ OUString aStr1("Line must be equal.");
+ OString sStr2 = "Line is shorter.";
rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), sStr2.getLength(), sStr2.getStr(), 0);
// should not GPF
}
void ascii_shortenedCompareIgnoreAsciiCase_WithLength_001()
{
- rtl::OUString suStr1;
- rtl::OString sStr2;
+ OUString suStr1;
+ OString sStr2;
sal_Int32 nValue = rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( suStr1, 0, sStr2.getStr(), 0);
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -997,8 +997,8 @@ namespace rtl_ustr
void ascii_shortenedCompareIgnoreAsciiCase_WithLength_002()
{
- rtl::OUString suStr1("Line must be equal.");
- rtl::OString sStr2 = "Line must be equal.";
+ OUString suStr1("Line must be equal.");
+ OString sStr2 = "Line must be equal.";
sal_Int32 nValue = rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr(), sStr2.getLength());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -1006,8 +1006,8 @@ namespace rtl_ustr
void ascii_shortenedCompareIgnoreAsciiCase_WithLength_003()
{
- rtl::OUString suStr1("Line must differ.");
- rtl::OString sStr2 = "Line must be differ and longer.";
+ OUString suStr1("Line must differ.");
+ OString sStr2 = "Line must be differ and longer.";
sal_Int32 nValue = rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr(), sStr2.getLength());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -1039,21 +1039,21 @@ namespace rtl_ustr
void ascii_compareIgnoreAsciiCase_WithLength_000_1()
{
- rtl::OUString aStr1("Line must be equal.");
+ OUString aStr1("Line must be equal.");
rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( aStr1.getStr(), 0, NULL);
// should not GPF
}
void ascii_compareIgnoreAsciiCase_WithLength_000_2()
{
- rtl::OUString aStr1("Line must be equal.");
- rtl::OString sStr2 = "Line is shorter.";
+ OUString aStr1("Line must be equal.");
+ OString sStr2 = "Line is shorter.";
rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( aStr1.getStr(), sStr2.getLength(), sStr2.getStr());
// should not GPF
}
void ascii_compareIgnoreAsciiCase_WithLength_001()
{
- rtl::OUString suStr1;
- rtl::OString sStr2;
+ OUString suStr1;
+ OString sStr2;
sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( suStr1, 0, sStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compareIgnoreAsciiCase_WithLength failed, strings are equal.", nValue == 0);
@@ -1061,8 +1061,8 @@ namespace rtl_ustr
void ascii_compareIgnoreAsciiCase_WithLength_002()
{
- rtl::OUString suStr1("Line must be equal.");
- rtl::OString sStr2 = "Line must be equal.";
+ OUString suStr1("Line must be equal.");
+ OString sStr2 = "Line must be equal.";
sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -1070,8 +1070,8 @@ namespace rtl_ustr
void ascii_compareIgnoreAsciiCase_WithLength_003()
{
- rtl::OUString suStr1("Line must differ.");
- rtl::OString sStr2 = "Line must be differ and longer.";
+ OUString suStr1("Line must differ.");
+ OString sStr2 = "Line must be differ and longer.";
sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -1103,14 +1103,14 @@ namespace rtl_ustr
void ascii_compare_000_1()
{
- rtl::OUString aStr1("Line must be equal.");
+ OUString aStr1("Line must be equal.");
rtl_ustr_ascii_compare( aStr1.getStr(), NULL);
// should not GPF
}
void ascii_compare_001()
{
- rtl::OUString suStr1;
- rtl::OString sStr2;
+ OUString suStr1;
+ OString sStr2;
sal_Int32 nValue = rtl_ustr_ascii_compare( suStr1, sStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -1118,8 +1118,8 @@ namespace rtl_ustr
void ascii_compare_002()
{
- rtl::OUString suStr1("Line must be equal.");
- rtl::OString sStr2 = "Line must be equal.";
+ OUString suStr1("Line must be equal.");
+ OString sStr2 = "Line must be equal.";
sal_Int32 nValue = rtl_ustr_ascii_compare( suStr1.getStr(), sStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -1127,8 +1127,8 @@ namespace rtl_ustr
void ascii_compare_003()
{
- rtl::OUString suStr1("Line must differ.");
- rtl::OString sStr2 = "Line foo bar, ok, differ.";
+ OUString suStr1("Line must differ.");
+ OString sStr2 = "Line foo bar, ok, differ.";
sal_Int32 nValue = rtl_ustr_ascii_compare( suStr1.getStr(), sStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -1159,14 +1159,14 @@ namespace rtl_ustr
void ascii_compareIgnoreAsciiCase_000_1()
{
- rtl::OUString aStr1("Line must be equal.");
+ OUString aStr1("Line must be equal.");
rtl_ustr_ascii_compareIgnoreAsciiCase( aStr1.getStr(), NULL);
// should not GPF
}
void ascii_compareIgnoreAsciiCase_001()
{
- rtl::OUString suStr1;
- rtl::OString sStr2;
+ OUString suStr1;
+ OString sStr2;
sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1, sStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -1174,8 +1174,8 @@ namespace rtl_ustr
void ascii_compareIgnoreAsciiCase_002()
{
- rtl::OUString suStr1("Line must be equal.");
- rtl::OString sStr2 = "Line must be equal.";
+ OUString suStr1("Line must be equal.");
+ OString sStr2 = "Line must be equal.";
sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -1183,8 +1183,8 @@ namespace rtl_ustr
void ascii_compareIgnoreAsciiCase_002_1()
{
- rtl::OUString suStr1("Line must be equal, when ignore case.");
- rtl::OString sStr2 = "LINE MUST BE EQUAL, WHEN IGNORE CASE.";
+ OUString suStr1("Line must be equal, when ignore case.");
+ OString sStr2 = "LINE MUST BE EQUAL, WHEN IGNORE CASE.";
sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitive).", nValue == 0);
@@ -1192,8 +1192,8 @@ namespace rtl_ustr
void ascii_compareIgnoreAsciiCase_003()
{
- rtl::OUString suStr1("Line must differ.");
- rtl::OString sStr2 = "Line foo bar, ok, differ.";
+ OUString suStr1("Line must differ.");
+ OString sStr2 = "Line foo bar, ok, differ.";
sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -1203,8 +1203,8 @@ namespace rtl_ustr
// void ascii_compareIgnoreAsciiCase_001()
// {
- // rtl::OUString suStr1("change this to ascii upper case.");
- // rtl::OUString aShouldStr1("CHANGE THIS TO ASCII UPPER CASE.");
+ // OUString suStr1("change this to ascii upper case.");
+ // OUString aShouldStr1("CHANGE THIS TO ASCII UPPER CASE.");
//
// sal_uInt32 nLength = suStr1.getLength() * sizeof(sal_Unicode);
// sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator
@@ -1213,7 +1213,7 @@ namespace rtl_ustr
// memcpy(pStr, suStr1.getStr(), nLength);
//
// rtl_ustr_ascii_compareIgnoreAsciiCase( pStr );
- // rtl::OUString suStr(pStr, suStr1.getLength());
+ // OUString suStr(pStr, suStr1.getLength());
//
// CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(suStr) == sal_True);
// free(pStr);
@@ -1256,14 +1256,14 @@ namespace rtl_ustr
void ascii_compareIgnoreAsciiCase_000_1()
{
- rtl::OUString aStr1("Line must be equal.");
+ OUString aStr1("Line must be equal.");
rtl_ustr_ascii_compareIgnoreAsciiCase( aStr1.getStr(), NULL);
// should not GPF
}
void ascii_compareIgnoreAsciiCase_001()
{
- rtl::OUString suStr1;
- rtl::OString sStr2;
+ OUString suStr1;
+ OString sStr2;
sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1, sStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -1271,8 +1271,8 @@ namespace rtl_ustr
void ascii_compareIgnoreAsciiCase_002()
{
- rtl::OUString suStr1("Line must be equal.");
- rtl::OString sStr2 = "Line must be equal.";
+ OUString suStr1("Line must be equal.");
+ OString sStr2 = "Line must be equal.";
sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -1280,8 +1280,8 @@ namespace rtl_ustr
void ascii_compareIgnoreAsciiCase_002_1()
{
- rtl::OUString suStr1("Line must be equal, when ignore case.");
- rtl::OString sStr2 = "LINE MUST BE EQUAL, WHEN IGNORE CASE.";
+ OUString suStr1("Line must be equal, when ignore case.");
+ OString sStr2 = "LINE MUST BE EQUAL, WHEN IGNORE CASE.";
sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitive).", nValue == 0);
@@ -1289,8 +1289,8 @@ namespace rtl_ustr
void ascii_compareIgnoreAsciiCase_003()
{
- rtl::OUString suStr1("Line must differ.");
- rtl::OString sStr2 = "Line foo bar, ok, differ.";
+ OUString suStr1("Line must differ.");
+ OString sStr2 = "Line foo bar, ok, differ.";
sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -1300,8 +1300,8 @@ namespace rtl_ustr
// void ascii_compareIgnoreAsciiCase_001()
// {
- // rtl::OUString suStr1("change this to ascii upper case.");
- // rtl::OUString aShouldStr1("CHANGE THIS TO ASCII UPPER CASE.");
+ // OUString suStr1("change this to ascii upper case.");
+ // OUString aShouldStr1("CHANGE THIS TO ASCII UPPER CASE.");
//
// sal_uInt32 nLength = suStr1.getLength() * sizeof(sal_Unicode);
// sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator
@@ -1310,7 +1310,7 @@ namespace rtl_ustr
// memcpy(pStr, suStr1.getStr(), nLength);
//
// rtl_ustr_ascii_compareIgnoreAsciiCase( pStr );
- // rtl::OUString suStr(pStr, suStr1.getLength());
+ // OUString suStr(pStr, suStr1.getLength());
//
// CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(suStr) == sal_True);
// free(pStr);
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
index b51bfb9a1132..f1a151fdc836 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
@@ -27,7 +27,7 @@ private:
void AppendChar::testAppendChar() {
// Check that append('a') does not unexpectedly pick
// append(sal_Int32 i, sal_Int16 radix = 10):
- rtl::OUStringBuffer s;
+ OUStringBuffer s;
s.append('a');
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), s.getLength());
CPPUNIT_ASSERT_EQUAL(u'a', s[0]);
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
index 3601bd4c47ab..c50f9699ad49 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
@@ -40,14 +40,14 @@ private:
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::ToString);
void test::oustringbuffer::ToString::testToString() {
- rtl::OUStringBuffer sb(rtl::OUString("test string"));
- rtl::OUString str = sb.toString();
- CPPUNIT_ASSERT_EQUAL( rtl::OUString("test string"), str );
+ OUStringBuffer sb(OUString("test string"));
+ OUString str = sb.toString();
+ CPPUNIT_ASSERT_EQUAL( OUString("test string"), str );
// returned OUString must be independent from sb
sb.append( 'a' );
- CPPUNIT_ASSERT_EQUAL( rtl::OUString("test string"), str );
+ CPPUNIT_ASSERT_EQUAL( OUString("test string"), str );
sb.setLength(0);
- CPPUNIT_ASSERT_EQUAL( rtl::OUString("test string"), str );
+ CPPUNIT_ASSERT_EQUAL( OUString("test string"), str );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
index 9dfcf0de8332..53f738285761 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
@@ -46,7 +46,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::Utf32);
namespace {
-void appendString(rtl::OStringBuffer & buffer, rtl::OUString const & string) {
+void appendString(OStringBuffer & buffer, OUString const & string) {
buffer.append('"');
for (int i = 0; i < string.getLength(); ++i) {
buffer.append("\\u");
@@ -67,8 +67,8 @@ void appendString(rtl::OStringBuffer & buffer, rtl::OUString const & string) {
}
void createMessage(
- rtl::OStringBuffer & message, rtl::OUString const & string1,
- rtl::OUString const & string2)
+ OStringBuffer & message, OUString const & string1,
+ OUString const & string2)
{
message.setLength(0);
appendString(message, string1);
@@ -85,19 +85,19 @@ void test::oustringbuffer::Utf32::appendUtf32() {
sal_Unicode const str2[str2Len] = { 'a', 'b', 'c', 'd' };
int const str3Len = 6;
sal_Unicode const str3[str3Len] = { 'a', 'b', 'c', 'd', 0xD800, 0xDC00 };
- rtl::OStringBuffer message;
- rtl::OUStringBuffer buf1(rtl::OUString(str1, str1Len));
+ OStringBuffer message;
+ OUStringBuffer buf1(OUString(str1, str1Len));
buf1.appendUtf32('d');
- rtl::OUString res1(buf1.makeStringAndClear());
- createMessage(message, res1, rtl::OUString(str2, str2Len));
+ OUString res1(buf1.makeStringAndClear());
+ createMessage(message, res1, OUString(str2, str2Len));
CPPUNIT_ASSERT_EQUAL_MESSAGE(
- message.getStr(), rtl::OUString(str2, str2Len), res1);
- rtl::OUStringBuffer buf2(rtl::OUString(str2, str2Len));
+ message.getStr(), OUString(str2, str2Len), res1);
+ OUStringBuffer buf2(OUString(str2, str2Len));
buf2.appendUtf32(0x10000);
- rtl::OUString res2(buf2.makeStringAndClear());
- createMessage(message, res2, rtl::OUString(str3, str3Len));
+ OUString res2(buf2.makeStringAndClear());
+ createMessage(message, res2, OUString(str3, str3Len));
CPPUNIT_ASSERT_EQUAL_MESSAGE(
- message.getStr(), rtl::OUString(str3, str3Len), res2);
+ message.getStr(), OUString(str3, str3Len), res2);
}
void test::oustringbuffer::Utf32::insertUtf32() {
@@ -107,19 +107,19 @@ void test::oustringbuffer::Utf32::insertUtf32() {
sal_Unicode const str2[str2Len] = { 'a', 'b', 'd', 'c' };
int const str3Len = 6;
sal_Unicode const str3[str3Len] = { 'a', 'b', 0xDBFF, 0xDFFF, 'd', 'c' };
- rtl::OStringBuffer message;
- rtl::OUStringBuffer buf1(rtl::OUString(str1, str1Len));
+ OStringBuffer message;
+ OUStringBuffer buf1(OUString(str1, str1Len));
buf1.insertUtf32(2, 'd');
- rtl::OUString res1(buf1.makeStringAndClear());
- createMessage(message, res1, rtl::OUString(str2, str2Len));
+ OUString res1(buf1.makeStringAndClear());
+ createMessage(message, res1, OUString(str2, str2Len));
CPPUNIT_ASSERT_EQUAL_MESSAGE(
- message.getStr(), rtl::OUString(str2, str2Len), res1);
- rtl::OUStringBuffer buf2(rtl::OUString(str2, str2Len));
+ message.getStr(), OUString(str2, str2Len), res1);
+ OUStringBuffer buf2(OUString(str2, str2Len));
buf2.insertUtf32(2, 0x10FFFF);
- rtl::OUString res2(buf2.makeStringAndClear());
- createMessage(message, res2, rtl::OUString(str3, str3Len));
+ OUString res2(buf2.makeStringAndClear());
+ createMessage(message, res2, OUString(str3, str3Len));
CPPUNIT_ASSERT_EQUAL_MESSAGE(
- message.getStr(), rtl::OUString(str3, str3Len), res2);
+ message.getStr(), OUString(str3, str3Len), res2);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/process/child_process.cxx b/sal/qa/rtl/process/child_process.cxx
index a51cdde51631..d5039b059c96 100644
--- a/sal/qa/rtl/process/child_process.cxx
+++ b/sal/qa/rtl/process/child_process.cxx
@@ -40,8 +40,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(, argv)
for( sal_Int32 i = 0 ; i < nCount ; i ++ )
{
rtl_getAppCommandArg( i , &(suArg[i].pData) );
- rtl::OString aString;
- aString = ::rtl::OUStringToOString( suArg[i], RTL_TEXTENCODING_ASCII_US );
+ OString aString;
+ aString = OUStringToOString( suArg[i], RTL_TEXTENCODING_ASCII_US );
printf(
"# Parameter[%ld] is %s\n", sal::static_int_cast< long >(i),
aString.getStr());
diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx
index ab3b8433d4c3..37e79825c739 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -37,26 +37,22 @@
using namespace osl;
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringToOString;
-
/** print a UNI_CODE String. And also print some comments of the string.
*/
-static void printUString( const ::rtl::OUString & str, const sal_Char * msg )
+static void printUString( const OUString & str, const sal_Char * msg )
{
if ( msg != nullptr )
{
printf("#%s #printUString_u# ", msg );
}
- rtl::OString aString;
- aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
+ OString aString;
+ aString = OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
printf("%s\n", aString.getStr( ) );
}
-static ::rtl::OUString getModulePath()
+static OUString getModulePath()
{
- ::rtl::OUString suDirPath;
+ OUString suDirPath;
::osl::Module::getUrlFromAddress(
reinterpret_cast< oslGenericFunction >(getModulePath), suDirPath );
@@ -75,12 +71,12 @@ public:
void getAppCommandArg_001()
{
#if defined(_WIN32)
- const rtl::OUString EXECUTABLE_NAME("child_process.exe");
+ const OUString EXECUTABLE_NAME("child_process.exe");
#else
- const rtl::OUString EXECUTABLE_NAME("child_process");
+ const OUString EXECUTABLE_NAME("child_process");
#endif
- rtl::OUString suCWD = getModulePath();
- // rtl::OUString suCWD2 = getExecutableDirectory();
+ OUString suCWD = getModulePath();
+ // OUString suCWD2 = getExecutableDirectory();
printUString(suCWD, "path to the current module");
// printUString(suCWD2, "suCWD2");
@@ -95,7 +91,7 @@ public:
pParameters[2] = suParam2.pData;
pParameters[3] = suParam3.pData;
- rtl::OUString suFileURL = suCWD + "/" + EXECUTABLE_NAME;
+ OUString suFileURL = suCWD + "/" + EXECUTABLE_NAME;
oslProcessError osl_error = osl_executeProcess(
suFileURL.pData,
@@ -200,9 +196,9 @@ public:
void getGlobalProcessId_002()
{
#if defined(_WIN32)
- const rtl::OUString EXEC_NAME("child_process_id.exe");
+ const OUString EXEC_NAME("child_process_id.exe");
#else
- const rtl::OUString EXEC_NAME("child_process_id");
+ const OUString EXEC_NAME("child_process_id");
#endif
sal_uInt8 pTargetUUID1[16];
rtl_getGlobalProcessId( pTargetUUID1 );
@@ -211,9 +207,9 @@ public:
printUuidtoBuffer( pTargetUUID1, pUUID1 );
printf("# UUID to String is %s\n", pUUID1);
- rtl::OUString suCWD = getModulePath();
+ OUString suCWD = getModulePath();
oslProcess hProcess = nullptr;
- rtl::OUString suFileURL = suCWD + "/" + EXEC_NAME;
+ OUString suFileURL = suCWD + "/" + EXEC_NAME;
oslFileHandle* pChildOutputRead = new oslFileHandle();
oslProcessError osl_error = osl_executeProcess_WithRedirectedIO(
suFileURL.pData,
diff --git a/sal/qa/rtl/process/rtl_Process_Const.h b/sal/qa/rtl/process/rtl_Process_Const.h
index 8f5c7463c261..50c38eb97e6a 100644
--- a/sal/qa/rtl/process/rtl_Process_Const.h
+++ b/sal/qa/rtl/process/rtl_Process_Const.h
@@ -27,10 +27,10 @@ extern "C"
{
#endif
-::rtl::OUString suParam0("-join");
-::rtl::OUString suParam1("-with");
-::rtl::OUString suParam2("-child");
-::rtl::OUString suParam3("-process");
+OUString suParam0("-join");
+OUString suParam1("-with");
+OUString suParam2("-child");
+OUString suParam3("-process");
#ifdef __cplusplus
}
diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx b/sal/qa/rtl/strings/test_oustring_compare.cxx
index 5e9bc0f73a5d..2f4172e51493 100644
--- a/sal/qa/rtl/strings/test_oustring_compare.cxx
+++ b/sal/qa/rtl/strings/test_oustring_compare.cxx
@@ -48,18 +48,18 @@ void test::oustring::Compare::equalsIgnoreAsciiCaseAscii()
const char* const abc = "abc";
const char* const abcd = "abcd";
const char* const empty = "";
- CPPUNIT_ASSERT(!rtl::OUString().equalsIgnoreAsciiCaseAscii(abc));
- CPPUNIT_ASSERT(!rtl::OUString().equalsIgnoreAsciiCaseAsciiL(abc,3));
- CPPUNIT_ASSERT(!rtl::OUString("abc").
+ CPPUNIT_ASSERT(!OUString().equalsIgnoreAsciiCaseAscii(abc));
+ CPPUNIT_ASSERT(!OUString().equalsIgnoreAsciiCaseAsciiL(abc,3));
+ CPPUNIT_ASSERT(!OUString("abc").
equalsIgnoreAsciiCaseAscii(empty));
- CPPUNIT_ASSERT(!rtl::OUString("abc").
+ CPPUNIT_ASSERT(!OUString("abc").
equalsIgnoreAsciiCaseAsciiL(empty,0));
- CPPUNIT_ASSERT(rtl::OUString("abc").
+ CPPUNIT_ASSERT(OUString("abc").
equalsIgnoreAsciiCaseAscii(abc));
- CPPUNIT_ASSERT(!rtl::OUString("abcd").
+ CPPUNIT_ASSERT(!OUString("abcd").
equalsIgnoreAsciiCaseAscii(abc));
- CPPUNIT_ASSERT(!rtl::OUString("abc").
+ CPPUNIT_ASSERT(!OUString("abc").
equalsIgnoreAsciiCaseAscii(abcd));
}
@@ -67,12 +67,12 @@ void test::oustring::Compare::compareToIgnoreAsciiCase()
{
CPPUNIT_ASSERT_EQUAL(
sal_Int32(0),
- rtl::OUString("abc").compareToIgnoreAsciiCase("ABC"));
+ OUString("abc").compareToIgnoreAsciiCase("ABC"));
CPPUNIT_ASSERT(
- rtl::OUString("ABC").compareToIgnoreAsciiCase("abcdef")
+ OUString("ABC").compareToIgnoreAsciiCase("abcdef")
< 0);
CPPUNIT_ASSERT(
- rtl::OUString("A").compareToIgnoreAsciiCase("_") > 0);
+ OUString("A").compareToIgnoreAsciiCase("_") > 0);
}
void test::oustring::Compare::compareTo()
diff --git a/sal/qa/rtl/strings/test_oustring_convert.cxx b/sal/qa/rtl/strings/test_oustring_convert.cxx
index b80c446936dd..cbf32ec13d52 100644
--- a/sal/qa/rtl/strings/test_oustring_convert.cxx
+++ b/sal/qa/rtl/strings/test_oustring_convert.cxx
@@ -55,14 +55,14 @@ struct TestConvertToString
void testConvertToString(TestConvertToString const & rTest)
{
- const rtl::OUString aSource(rTest.aSource, rTest.nLength);
- rtl::OString aStrict(RTL_CONSTASCII_STRINGPARAM("12345"));
+ const OUString aSource(rTest.aSource, rTest.nLength);
+ OString aStrict(RTL_CONSTASCII_STRINGPARAM("12345"));
bool bSuccess = aSource.convertToString(&aStrict, rTest.nEncoding,
rTest.nFlags);
- rtl::OString aRelaxed(rtl::OUStringToOString(aSource, rTest.nEncoding,
+ OString aRelaxed(OUStringToOString(aSource, rTest.nEncoding,
rTest.nFlags));
- rtl::OStringBuffer aPrefix;
+ OStringBuffer aPrefix;
aPrefix.append("{");
for (sal_Int32 i = 0; i < rTest.nLength; ++i)
{
@@ -81,7 +81,7 @@ void testConvertToString(TestConvertToString const & rTest)
{
if (rTest.pStrict == nullptr || aStrict != rTest.pStrict)
{
- rtl::OStringBuffer aMessage(aPrefix);
+ OStringBuffer aMessage(aPrefix);
aMessage.append("strict = \"");
aMessage.append(aStrict);
aMessage.append("\"");
@@ -90,22 +90,22 @@ void testConvertToString(TestConvertToString const & rTest)
}
else
{
- if (aStrict != rtl::OString(RTL_CONSTASCII_STRINGPARAM("12345")))
+ if (aStrict != OString(RTL_CONSTASCII_STRINGPARAM("12345")))
{
- rtl::OStringBuffer aMessage(aPrefix);
+ OStringBuffer aMessage(aPrefix);
aMessage.append("modified output");
CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), false);
}
if (rTest.pStrict != nullptr)
{
- rtl::OStringBuffer aMessage(aPrefix);
+ OStringBuffer aMessage(aPrefix);
aMessage.append("failed");
CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), false);
}
}
if (aRelaxed != rTest.pRelaxed)
{
- rtl::OStringBuffer aMessage(aPrefix);
+ OStringBuffer aMessage(aPrefix);
aMessage.append("relaxed = \"");
aMessage.append(aRelaxed);
aMessage.append("\"");
diff --git a/sal/qa/rtl/strings/test_oustring_endswith.cxx b/sal/qa/rtl/strings/test_oustring_endswith.cxx
index 22c68abd1d2e..33858e12ae23 100644
--- a/sal/qa/rtl/strings/test_oustring_endswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_endswith.cxx
@@ -45,7 +45,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::EndsWith);
namespace {
-void appendString(rtl::OStringBuffer & buffer, rtl::OString const & string)
+void appendString(OStringBuffer & buffer, OString const & string)
{
buffer.append('"');
for (int i = 0; i < string.getLength(); ++i) {
@@ -94,16 +94,16 @@ void test::oustring::EndsWith::endsWith()
{ RTL_CONSTASCII_STRINGPARAM("a\0b\0c"),
RTL_CONSTASCII_STRINGPARAM("b"), false } };
for (size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
- rtl::OStringBuffer msg;
- appendString(msg, rtl::OString(data[i].str1, data[i].str1Len));
+ OStringBuffer msg;
+ appendString(msg, OString(data[i].str1, data[i].str1Len));
msg.append(".endsWithIgnoreAsciiCaseAsciiL(");
- appendString(msg, rtl::OString(data[i].str2, data[i].str2Len));
+ appendString(msg, OString(data[i].str2, data[i].str2Len));
msg.append(") == ");
msg.append(data[i].endsWith);
CPPUNIT_ASSERT_EQUAL_MESSAGE(
msg.getStr(),
data[i].endsWith,
- rtl::OUString(
+ OUString(
data[i].str1, data[i].str1Len,
RTL_TEXTENCODING_ASCII_US).endsWithIgnoreAsciiCaseAsciiL(
data[i].str2, data[i].str2Len));
diff --git a/sal/qa/rtl/strings/test_oustring_startswith.cxx b/sal/qa/rtl/strings/test_oustring_startswith.cxx
index 3a8a15a03377..43d4c9e921c4 100644
--- a/sal/qa/rtl/strings/test_oustring_startswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_startswith.cxx
@@ -30,9 +30,9 @@ CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::StartsWith);
void test::oustring::StartsWith::startsWith()
{
- CPPUNIT_ASSERT( rtl::OUString( "foobar" ).startsWith( "foo" ));
- CPPUNIT_ASSERT( !rtl::OUString( "foo" ).startsWith( "foobar" ));
- CPPUNIT_ASSERT( !rtl::OUString( "foobar" ).startsWith( "oo" ));
+ CPPUNIT_ASSERT( OUString( "foobar" ).startsWith( "foo" ));
+ CPPUNIT_ASSERT( !OUString( "foo" ).startsWith( "foobar" ));
+ CPPUNIT_ASSERT( !OUString( "foobar" ).startsWith( "oo" ));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/strings/test_strings_replace.cxx b/sal/qa/rtl/strings/test_strings_replace.cxx
index 40c0117e5c66..a27f5f14286b 100644
--- a/sal/qa/rtl/strings/test_strings_replace.cxx
+++ b/sal/qa/rtl/strings/test_strings_replace.cxx
@@ -66,175 +66,175 @@ private:
void Test::stringReplaceFirst() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OString("otherbarfoo"),
- rtl::OString("foobarfoo").replaceFirst("foo", "other"));
+ OString("otherbarfoo"),
+ OString("foobarfoo").replaceFirst("foo", "other"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OString("foobarfoo"),
- rtl::OString("foobarfoo").replaceFirst("bars", "other"));
+ OString("foobarfoo"),
+ OString("foobarfoo").replaceFirst("bars", "other"));
{
sal_Int32 n = 0;
CPPUNIT_ASSERT_EQUAL(
- rtl::OString("otherbarfoo"),
- rtl::OString("foobarfoo").replaceFirst("foo", "other", &n));
+ OString("otherbarfoo"),
+ OString("foobarfoo").replaceFirst("foo", "other", &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), n);
}
{
sal_Int32 n = 1;
CPPUNIT_ASSERT_EQUAL(
- rtl::OString("foobarother"),
- rtl::OString("foobarfoo").replaceFirst("foo", "other", &n));
+ OString("foobarother"),
+ OString("foobarfoo").replaceFirst("foo", "other", &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), n);
}
{
sal_Int32 n = 4;
CPPUNIT_ASSERT_EQUAL(
- rtl::OString("foobarfoo"),
- rtl::OString("foobarfoo").replaceFirst("bar", "other", &n));
+ OString("foobarfoo"),
+ OString("foobarfoo").replaceFirst("bar", "other", &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
}
}
void Test::stringReplaceAll() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OString("otherbarother"),
- rtl::OString("foobarfoo").replaceAll("foo", "other"));
+ OString("otherbarother"),
+ OString("foobarfoo").replaceAll("foo", "other"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OString("foobarfoo"),
- rtl::OString("foobarfoo").replaceAll("bars", "other"));
+ OString("foobarfoo"),
+ OString("foobarfoo").replaceAll("bars", "other"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OString("xxa"), rtl::OString("xaa").replaceAll("xa", "xx"));
+ OString("xxa"), OString("xaa").replaceAll("xa", "xx"));
}
void Test::ustringReplaceFirst() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarfoo"),
- rtl::OUString("foobarfoo").replaceFirst(s_foo, s_other));
+ OUString("otherbarfoo"),
+ OUString("foobarfoo").replaceFirst(s_foo, s_other));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceFirst(s_bars, s_other));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceFirst(s_bars, s_other));
{
sal_Int32 n = 0;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarfoo"),
- rtl::OUString("foobarfoo").replaceFirst(s_foo, s_other, &n));
+ OUString("otherbarfoo"),
+ OUString("foobarfoo").replaceFirst(s_foo, s_other, &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), n);
}
{
sal_Int32 n = 1;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarother"),
- rtl::OUString("foobarfoo").replaceFirst(s_foo, s_other, &n));
+ OUString("foobarother"),
+ OUString("foobarfoo").replaceFirst(s_foo, s_other, &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), n);
}
{
sal_Int32 n = 4;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceFirst(s_bar, s_other, &n));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceFirst(s_bar, s_other, &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
}
}
void Test::ustringReplaceFirstAsciiL() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarfoo"),
- rtl::OUString("foobarfoo").replaceFirst("foo", s_other));
+ OUString("otherbarfoo"),
+ OUString("foobarfoo").replaceFirst("foo", s_other));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceFirst("bars", s_other));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceFirst("bars", s_other));
{
sal_Int32 n = 0;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarfoo"),
- rtl::OUString("foobarfoo").replaceFirst("foo", s_other, &n));
+ OUString("otherbarfoo"),
+ OUString("foobarfoo").replaceFirst("foo", s_other, &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), n);
}
{
sal_Int32 n = 1;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarother"),
- rtl::OUString("foobarfoo").replaceFirst("foo", s_other, &n));
+ OUString("foobarother"),
+ OUString("foobarfoo").replaceFirst("foo", s_other, &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), n);
}
{
sal_Int32 n = 4;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceFirst("bar", s_other, &n));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceFirst("bar", s_other, &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
}
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(), rtl::OUString("xa").replaceFirst("xa", s_empty));
+ OUString(), OUString("xa").replaceFirst("xa", s_empty));
}
void Test::ustringReplaceFirstToAsciiL() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarfoo"),
- rtl::OUString("foobarfoo").replaceFirst(s_foo, "other"));
+ OUString("otherbarfoo"),
+ OUString("foobarfoo").replaceFirst(s_foo, "other"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceFirst(s_bars, "other"));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceFirst(s_bars, "other"));
{
sal_Int32 n = 0;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarfoo"),
- rtl::OUString("foobarfoo").replaceFirst(s_foo, "other", &n));
+ OUString("otherbarfoo"),
+ OUString("foobarfoo").replaceFirst(s_foo, "other", &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), n);
}
{
sal_Int32 n = 1;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarother"),
- rtl::OUString("foobarfoo").replaceFirst(s_foo, "other", &n));
+ OUString("foobarother"),
+ OUString("foobarfoo").replaceFirst(s_foo, "other", &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), n);
}
{
sal_Int32 n = 4;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceFirst(s_bar, "other", &n));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceFirst(s_bar, "other", &n));
CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
}
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(), rtl::OUString("xa").replaceFirst(s_xa, ""));
+ OUString(), OUString("xa").replaceFirst(s_xa, ""));
}
void Test::ustringReplaceFirstAsciiLAsciiL() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarfoo"),
- (rtl::OUString("foobarfoo").
+ OUString("otherbarfoo"),
+ (OUString("foobarfoo").
replaceFirst("foo", "other")));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- (rtl::OUString("foobarfoo").
+ OUString("foobarfoo"),
+ (OUString("foobarfoo").
replaceFirst("bars", "other")));
{
sal_Int32 n = 0;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarfoo"),
- (rtl::OUString("foobarfoo").
+ OUString("otherbarfoo"),
+ (OUString("foobarfoo").
replaceFirst("foo", "other", &n)));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), n);
}
@@ -242,8 +242,8 @@ void Test::ustringReplaceFirstAsciiLAsciiL() {
{
sal_Int32 n = 1;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarother"),
- (rtl::OUString("foobarfoo").
+ OUString("foobarother"),
+ (OUString("foobarfoo").
replaceFirst("foo", "other", &n)));
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), n);
}
@@ -251,82 +251,82 @@ void Test::ustringReplaceFirstAsciiLAsciiL() {
{
sal_Int32 n = 4;
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- (rtl::OUString("foobarfoo").
+ OUString("foobarfoo"),
+ (OUString("foobarfoo").
replaceFirst("bar", "other", &n)));
CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
}
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(), rtl::OUString("xa").replaceFirst("xa", ""));
+ OUString(), OUString("xa").replaceFirst("xa", ""));
}
void Test::ustringReplaceAll() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarother"),
- rtl::OUString("foobarfoo").replaceAll(s_foo, s_other));
+ OUString("otherbarother"),
+ OUString("foobarfoo").replaceAll(s_foo, s_other));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceAll(s_bars, s_other));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceAll(s_bars, s_other));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("xxa"),
- rtl::OUString("xaa").replaceAll(s_xa, s_xx));
+ OUString("xxa"),
+ OUString("xaa").replaceAll(s_xa, s_xx));
}
void Test::ustringReplaceAllAsciiL() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarother"),
- rtl::OUString("foobarfoo").replaceAll("foo", s_other));
+ OUString("otherbarother"),
+ OUString("foobarfoo").replaceAll("foo", s_other));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceAll("bars", s_other));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceAll("bars", s_other));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("xxa"),
- rtl::OUString("xaa").replaceAll("xa", s_xx));
+ OUString("xxa"),
+ OUString("xaa").replaceAll("xa", s_xx));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(), rtl::OUString("xa").replaceAll("xa", s_empty));
+ OUString(), OUString("xa").replaceAll("xa", s_empty));
}
void Test::ustringReplaceAllToAsciiL() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarother"),
- rtl::OUString("foobarfoo").replaceAll(s_foo, "other"));
+ OUString("otherbarother"),
+ OUString("foobarfoo").replaceAll(s_foo, "other"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- rtl::OUString("foobarfoo").replaceAll(s_bars, "other"));
+ OUString("foobarfoo"),
+ OUString("foobarfoo").replaceAll(s_bars, "other"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("xxa"),
- rtl::OUString("xaa").replaceAll(s_xa, "xx"));
+ OUString("xxa"),
+ OUString("xaa").replaceAll(s_xa, "xx"));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(), rtl::OUString("xa").replaceAll(s_xa, ""));
+ OUString(), OUString("xa").replaceAll(s_xa, ""));
}
void Test::ustringReplaceAllAsciiLAsciiL() {
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("otherbarother"),
- (rtl::OUString("foobarfoo").
+ OUString("otherbarother"),
+ (OUString("foobarfoo").
replaceAll("foo", "other")));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("foobarfoo"),
- (rtl::OUString("foobarfoo").
+ OUString("foobarfoo"),
+ (OUString("foobarfoo").
replaceAll("bars", "other")));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("xxa"),
- (rtl::OUString("xaa").
+ OUString("xxa"),
+ (OUString("xaa").
replaceAll("xa", "xx")));
CPPUNIT_ASSERT_EQUAL(
- rtl::OUString(), rtl::OUString("xa").replaceAll("xa", ""));
+ OUString(), OUString("xa").replaceAll("xa", ""));
}
}
diff --git a/sal/qa/rtl/strings/test_strings_toint.cxx b/sal/qa/rtl/strings/test_strings_toint.cxx
index 38b74bf651aa..d81525b94405 100644
--- a/sal/qa/rtl/strings/test_strings_toint.cxx
+++ b/sal/qa/rtl/strings/test_strings_toint.cxx
@@ -64,8 +64,8 @@ private:
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION(Test< rtl::OString >);
-CPPUNIT_TEST_SUITE_REGISTRATION(Test< rtl::OUString >);
+CPPUNIT_TEST_SUITE_REGISTRATION(Test< OString >);
+CPPUNIT_TEST_SUITE_REGISTRATION(Test< OUString >);
}
diff --git a/sal/qa/rtl/strings/test_strings_valuex.cxx b/sal/qa/rtl/strings/test_strings_valuex.cxx
index 5253a4b99ddb..b1102cce6fd1 100644
--- a/sal/qa/rtl/strings/test_strings_valuex.cxx
+++ b/sal/qa/rtl/strings/test_strings_valuex.cxx
@@ -49,11 +49,11 @@ void testBoolean() {
}
void test::strings::valueX::testOBoolean() {
- testBoolean<rtl::OString>();
+ testBoolean<OString>();
}
void test::strings::valueX::testOUBoolean() {
- testBoolean<rtl::OUString>();
+ testBoolean<OUString>();
}
template< typename T >
@@ -91,11 +91,11 @@ static void testInt() {
}
void test::strings::valueX::testOUInt() {
- testInt<rtl::OUString>();
+ testInt<OUString>();
}
void test::strings::valueX::testOInt() {
- testInt<rtl::OString>();
+ testInt<OString>();
}
template< typename T >
@@ -106,10 +106,10 @@ static void testFloat() {
}
void test::strings::valueX::testOUFloat() {
- testFloat<rtl::OUString>();
+ testFloat<OUString>();
}
void test::strings::valueX::testOFloat() {
- testFloat<rtl::OString>();
+ testFloat<OString>();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index 79d232f42355..81ec983450f5 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -33,35 +33,35 @@ namespace Stringtest
class Convert : public CppUnit::TestFixture
{
public:
- rtl::OString convertToOString(rtl::OUString const& _suStr)
+ OString convertToOString(OUString const& _suStr)
{
- return rtl::OUStringToOString(_suStr, osl_getThreadTextEncoding()/*RTL_TEXTENCODING_ASCII_US*/);
+ return OUStringToOString(_suStr, osl_getThreadTextEncoding()/*RTL_TEXTENCODING_ASCII_US*/);
}
- void showContent(rtl::OUString const& _suStr)
+ void showContent(OUString const& _suStr)
{
- rtl::OString sStr = convertToOString(_suStr);
+ OString sStr = convertToOString(_suStr);
printf("%s\n", sStr.getStr());
}
void test_FromUTF8_001()
{
// string --> ustring
- rtl::OString sStrUTF8("h%C3%A4llo");
- rtl::OUString suStrUTF8 = rtl::OStringToOUString(sStrUTF8, RTL_TEXTENCODING_ASCII_US);
+ OString sStrUTF8("h%C3%A4llo");
+ OUString suStrUTF8 = OStringToOUString(sStrUTF8, RTL_TEXTENCODING_ASCII_US);
// UTF8 --> real ustring
- rtl::OUString suStr_UriDecodeToIuri = rtl::Uri::decode(suStrUTF8, rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8);
+ OUString suStr_UriDecodeToIuri = rtl::Uri::decode(suStrUTF8, rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8);
showContent(suStr_UriDecodeToIuri);
// string --> ustring
- rtl::OString sStr("h\xE4llo", strlen("h\xE4llo"));
- rtl::OUString suString = rtl::OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15);
+ OString sStr("h\xE4llo", strlen("h\xE4llo"));
+ OUString suString = OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Strings must be equal", suString, suStr_UriDecodeToIuri);
// ustring --> ustring (UTF8)
- rtl::OUString suStr2 = rtl::Uri::encode(suStr_UriDecodeToIuri, rtl_UriCharClassUnoParamValue, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
+ OUString suStr2 = rtl::Uri::encode(suStr_UriDecodeToIuri, rtl_UriCharClassUnoParamValue, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
showContent(suStr2);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Strings must be equal", suStr2, suStrUTF8);
diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx
index 049640ef3982..3310ec25bba6 100644
--- a/sal/qa/rtl/uri/rtl_testuri.cxx
+++ b/sal/qa/rtl/uri/rtl_testuri.cxx
@@ -44,13 +44,13 @@ void Test::test_Uri() {
rtl_UriCharClass const eFirstCharClass = rtl_UriCharClassNone;
rtl_UriCharClass const eLastCharClass = rtl_UriCharClassUnoParamValue;
- rtl::OUStringBuffer aBuffer;
- rtl::OUString aText1;
- rtl::OUString aText2;
+ OUStringBuffer aBuffer;
+ OUString aText1;
+ OUString aText2;
// Check that all characters map back to themselves when encoded/decoded:
- aText1 = rtl::OUString(
+ aText1 = OUString(
RTL_CONSTASCII_USTRINGPARAM(
"\x00\x01\x02\x03\x04\x05\x06\x07"
"\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"
@@ -123,7 +123,7 @@ void Test::test_Uri() {
rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8));
}
- aText1 = rtl::OUString(
+ aText1 = OUString(
("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"
"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"
"\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2A\x2B\x2C\x2D\x2E\x2F"
@@ -338,12 +338,12 @@ void Test::test_Uri() {
for (std::size_t i = 0; i < SAL_N_ELEMENTS(aRelToAbsTest); ++i)
{
- rtl::OUString aAbs;
+ OUString aAbs;
bool bMalformed = false;
try {
aAbs = rtl::Uri::convertRelToAbs(
- rtl::OUString::createFromAscii(aRelToAbsTest[i].pBase),
- rtl::OUString::createFromAscii(aRelToAbsTest[i].pRel));
+ OUString::createFromAscii(aRelToAbsTest[i].pBase),
+ OUString::createFromAscii(aRelToAbsTest[i].pRel));
} catch (const rtl::MalformedUriException &) {
bMalformed = true;
}
@@ -357,7 +357,7 @@ void Test::test_Uri() {
aRelToAbsTest[i].pBase, aRelToAbsTest[i].pRel,
(bMalformed
? "<MALFORMED>"
- : rtl::OUStringToOString(
+ : OUStringToOString(
aAbs, RTL_TEXTENCODING_UTF8).getStr()),
(aRelToAbsTest[i].pAbs == nullptr
? "<MALFORMED>" : aRelToAbsTest[i].pAbs));
@@ -369,7 +369,7 @@ void Test::test_Uri() {
{
sal_Unicode const aText1U[] = { ' ', '!', 0x0401, 0x045F, 0 };
- aText1 = rtl::OUString(aText1U);
+ aText1 = OUString(aText1U);
aText2 = "%20!%A1%FF";
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"failure 20",
@@ -385,10 +385,10 @@ void Test::test_Uri() {
}
{
sal_Unicode const aText1U[] = { ' ', '!', 0x0401, 0x0700, 0x045F, 0 };
- aText1 = rtl::OUString(aText1U);
+ aText1 = OUString(aText1U);
sal_Unicode const aText2U[] = {
'%', '2', '0', '!', '%', 'A', '1', 0x0700, '%', 'F', 'F', 0 };
- aText2 = rtl::OUString(aText2U);
+ aText2 = OUString(aText2U);
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"failure 21",
aText2,
@@ -404,7 +404,7 @@ void Test::test_Uri() {
#if WITH_LOCALE_ALL || WITH_LOCALE_zh
{
sal_Unicode const aText1U[] = { ' ', '!', 0x028A, 0xD849, 0xDD13, 0 };
- aText1 = rtl::OUString(aText1U);
+ aText1 = OUString(aText1U);
aText2 = "%20!%81%30%B1%33%95%39%C5%37";
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"failure 22",
@@ -423,8 +423,8 @@ void Test::test_Uri() {
{
sal_Unicode const aText1U[] = { ' ', '!', 0x0401, 0x0700, 0x045F, 0 };
- aText1 = rtl::OUString(aText1U);
- aText2 = rtl::OUString();
+ aText1 = OUString(aText1U);
+ aText2 = OUString();
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"failure 23",
aText2,
@@ -434,7 +434,7 @@ void Test::test_Uri() {
}
{
aText1 = "%20%C4%80%FF";
- aText2 = rtl::OUString();
+ aText2 = OUString();
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"failure 24",
aText2,
@@ -444,7 +444,7 @@ void Test::test_Uri() {
#if WITH_LOCALE_ALL || WITH_LOCALE_zh
{
aText1 = "%81 ";
- aText2 = rtl::OUString();
+ aText2 = OUString();
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"failure 25",
aText2,
@@ -453,7 +453,7 @@ void Test::test_Uri() {
}
{
aText1 = "%81%20";
- aText2 = rtl::OUString();
+ aText2 = OUString();
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"failure 26",
aText2,
@@ -463,7 +463,7 @@ void Test::test_Uri() {
{
aText1 = "%81%30%B1%33";
sal_Unicode const aText2U[] = { 0x028A, 0 };
- aText2 = rtl::OUString(aText2U);
+ aText2 = OUString(aText2U);
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"failure 27",
aText2,
@@ -473,7 +473,7 @@ void Test::test_Uri() {
{
aText1 = "%810%B13";
sal_Unicode const aText2U[] = { 0x028A, 0 };
- aText2 = rtl::OUString(aText2U);
+ aText2 = OUString(aText2U);
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"failure 28",
aText2,
@@ -495,7 +495,7 @@ void Test::test_Uri() {
}
{
sal_Unicode const aText1U[] = { 0x00EA, 0 };
- aText1 = rtl::OUString(aText1U);
+ aText1 = OUString(aText1U);
aText2 = "%C3%AA";
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"failure 30",
@@ -506,8 +506,8 @@ void Test::test_Uri() {
}
{
sal_Unicode const aText1U[] = { ' ', '!', 0x0401, 0x0700, 0x045F, 0 };
- aText1 = rtl::OUString(aText1U);
- aText2 = rtl::OUString();
+ aText1 = OUString(aText1U);
+ aText2 = OUString();
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"failure 23",
aText2,
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index b63557375fe5..5e0769c99630 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -55,10 +55,6 @@
using osl::DirectoryItem;
using osl::FileStatus;
-using rtl::OString;
-using rtl::OUString;
-using rtl::OUStringToOString;
-
struct Bootstrap_Impl;
namespace
@@ -66,12 +62,12 @@ namespace
static char const VND_SUN_STAR_PATHNAME[] = "vnd.sun.star.pathname:";
-bool isPathnameUrl(rtl::OUString const & url)
+bool isPathnameUrl(OUString const & url)
{
return url.matchIgnoreAsciiCase(VND_SUN_STAR_PATHNAME);
}
-bool resolvePathnameUrl(rtl::OUString * url)
+bool resolvePathnameUrl(OUString * url)
{
OSL_ASSERT(url);
if (!isPathnameUrl(*url) ||
@@ -81,7 +77,7 @@ bool resolvePathnameUrl(rtl::OUString * url)
{
return true;
}
- *url = rtl::OUString();
+ *url = OUString();
return false;
}
@@ -92,23 +88,23 @@ enum LookupMode {
struct ExpandRequestLink {
ExpandRequestLink const * next;
Bootstrap_Impl const * file;
- rtl::OUString const key;
+ OUString const key;
};
-rtl::OUString expandMacros(
- Bootstrap_Impl const * file, rtl::OUString const & text, LookupMode mode,
+OUString expandMacros(
+ Bootstrap_Impl const * file, OUString const & text, LookupMode mode,
ExpandRequestLink const * requestStack);
-rtl::OUString recursivelyExpandMacros(
- Bootstrap_Impl const * file, rtl::OUString const & text, LookupMode mode,
- Bootstrap_Impl const * requestFile, rtl::OUString const & requestKey,
+OUString recursivelyExpandMacros(
+ Bootstrap_Impl const * file, OUString const & text, LookupMode mode,
+ Bootstrap_Impl const * requestFile, OUString const & requestKey,
ExpandRequestLink const * requestStack)
{
for (; requestStack; requestStack = requestStack->next) {
if (requestStack->file == requestFile &&
requestStack->key == requestKey)
{
- return rtl::OUString("***RECURSION DETECTED***");
+ return OUString("***RECURSION DETECTED***");
}
}
ExpandRequestLink link = { requestStack, requestFile, requestKey };
@@ -133,8 +129,8 @@ struct rtl_bootstrap_NameValue
typedef std::vector<rtl_bootstrap_NameValue> NameValueVector;
static bool find(
- NameValueVector const & vector, rtl::OUString const & key,
- rtl::OUString * value)
+ NameValueVector const & vector, OUString const & key,
+ OUString * value)
{
OSL_ASSERT(value);
for (NameValueVector::const_iterator i(vector.begin()); i != vector.end(); ++i)
@@ -155,7 +151,7 @@ namespace
}
static bool getFromCommandLineArgs(
- rtl::OUString const & key, rtl::OUString * value )
+ OUString const & key, OUString * value )
{
OSL_ASSERT(value);
@@ -243,13 +239,13 @@ static OUString & getIniFileName_Impl()
// possibility to have several "applications" in the same
// installation location with different inifiles.
const char *inifile = [[@"vnd.sun.star.pathname:" stringByAppendingString: [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent: @"rc"]] UTF8String];
- fileName = rtl::OUString(inifile, strlen(inifile), RTL_TEXTENCODING_UTF8);
+ fileName = OUString(inifile, strlen(inifile), RTL_TEXTENCODING_UTF8);
resolvePathnameUrl(&fileName);
#elif defined ANDROID
// Apps are self-contained on Android, too, can as well hardcode
// it as "rc" in the "/assets" directory, i.e. inside the app's
// .apk (zip) archive as the /assets/rc file.
- fileName = rtl::OUString("vnd.sun.star.pathname:/assets/rc");
+ fileName = OUString("vnd.sun.star.pathname:/assets/rc");
resolvePathnameUrl(&fileName);
#else
if (getFromCommandLineArgs("INIFILENAME", &fileName))
@@ -300,7 +296,7 @@ static OUString & getIniFileName_Impl()
// ensure the given file url has no final slash
-static void EnsureNoFinalSlash (rtl::OUString & url)
+static void EnsureNoFinalSlash (OUString & url)
{
sal_Int32 i = url.getLength();
@@ -325,18 +321,18 @@ struct Bootstrap_Impl
{ free (p); }
bool getValue(
- rtl::OUString const & key, rtl_uString ** value,
+ OUString const & key, rtl_uString ** value,
rtl_uString * defaultValue, LookupMode mode, bool override,
ExpandRequestLink const * requestStack) const;
bool getDirectValue(
- rtl::OUString const & key, rtl_uString ** value, LookupMode mode,
+ OUString const & key, rtl_uString ** value, LookupMode mode,
ExpandRequestLink const * requestStack) const;
bool getAmbienceValue(
- rtl::OUString const & key, rtl_uString ** value, LookupMode mode,
+ OUString const & key, rtl_uString ** value, LookupMode mode,
ExpandRequestLink const * requestStack) const;
void expandValue(
- rtl_uString ** value, rtl::OUString const & text, LookupMode mode,
- Bootstrap_Impl const * requestFile, rtl::OUString const & requestKey,
+ rtl_uString ** value, OUString const & text, LookupMode mode,
+ Bootstrap_Impl const * requestFile, OUString const & requestKey,
ExpandRequestLink const * requestStack) const;
};
@@ -443,7 +439,7 @@ struct FundamentalIni: public rtl::Static< FundamentalIniData, FundamentalIni >
}
bool Bootstrap_Impl::getValue(
- rtl::OUString const & key, rtl_uString ** value, rtl_uString * defaultValue,
+ OUString const & key, rtl_uString ** value, rtl_uString * defaultValue,
LookupMode mode, bool override, ExpandRequestLink const * requestStack)
const
{
@@ -456,14 +452,14 @@ bool Bootstrap_Impl::getValue(
if (key == "_OS")
{
rtl_uString_assign(
- value, rtl::OUString(RTL_OS).pData);
+ value, OUString(RTL_OS).pData);
return true;
}
if (key == "_ARCH")
{
rtl_uString_assign(
- value, rtl::OUString(RTL_ARCH).pData);
+ value, OUString(RTL_ARCH).pData);
return true;
}
@@ -471,7 +467,7 @@ bool Bootstrap_Impl::getValue(
{
rtl_uString_assign(
value,
- (rtl::OUString(
+ (OUString(
SAL_STRINGIFY(CPPU_ENV)).
pData));
return true;
@@ -482,7 +478,7 @@ bool Bootstrap_Impl::getValue(
{
const char *app_data_dir = lo_get_app_data_dir();
rtl_uString_assign(
- value, rtl::OUString(app_data_dir, strlen(app_data_dir), RTL_TEXTENCODING_UTF8).pData);
+ value, OUString(app_data_dir, strlen(app_data_dir), RTL_TEXTENCODING_UTF8).pData);
return true;
}
#endif
@@ -492,7 +488,7 @@ bool Bootstrap_Impl::getValue(
{
const char *app_data_dir = [[[[NSBundle mainBundle] bundlePath] stringByAddingPercentEncodingWithAllowedCharacters: [NSCharacterSet URLPathAllowedCharacterSet]] UTF8String];
rtl_uString_assign(
- value, rtl::OUString(app_data_dir, strlen(app_data_dir), RTL_TEXTENCODING_UTF8).pData);
+ value, OUString(app_data_dir, strlen(app_data_dir), RTL_TEXTENCODING_UTF8).pData);
return true;
}
#endif
@@ -511,7 +507,7 @@ bool Bootstrap_Impl::getValue(
if (key == "SYSUSERCONFIG")
{
- rtl::OUString v;
+ OUString v;
bool b = osl::Security().getConfigDir(v);
EnsureNoFinalSlash(v);
rtl_uString_assign(value, v.pData);
@@ -520,7 +516,7 @@ bool Bootstrap_Impl::getValue(
if (key == "SYSUSERHOME")
{
- rtl::OUString v;
+ OUString v;
bool b = osl::Security().getHomeDir(v);
EnsureNoFinalSlash(v);
rtl_uString_assign(value, v.pData);
@@ -558,10 +554,10 @@ bool Bootstrap_Impl::getValue(
}
bool Bootstrap_Impl::getDirectValue(
- rtl::OUString const & key, rtl_uString ** value, LookupMode mode,
+ OUString const & key, rtl_uString ** value, LookupMode mode,
ExpandRequestLink const * requestStack) const
{
- rtl::OUString v;
+ OUString v;
if (find(_nameValueVector, key, &v))
{
expandValue(value, v, mode, this, key, requestStack);
@@ -572,10 +568,10 @@ bool Bootstrap_Impl::getDirectValue(
}
bool Bootstrap_Impl::getAmbienceValue(
- rtl::OUString const & key, rtl_uString ** value, LookupMode mode,
+ OUString const & key, rtl_uString ** value, LookupMode mode,
ExpandRequestLink const * requestStack) const
{
- rtl::OUString v;
+ OUString v;
bool f;
{
@@ -594,8 +590,8 @@ bool Bootstrap_Impl::getAmbienceValue(
}
void Bootstrap_Impl::expandValue(
- rtl_uString ** value, rtl::OUString const & text, LookupMode mode,
- Bootstrap_Impl const * requestFile, rtl::OUString const & requestKey,
+ rtl_uString ** value, OUString const & text, LookupMode mode,
+ Bootstrap_Impl const * requestFile, OUString const & requestKey,
ExpandRequestLink const * requestStack) const
{
rtl_uString_assign(
@@ -613,7 +609,7 @@ namespace {
struct bootstrap_map {
typedef std::unordered_map<
- rtl::OUString, Bootstrap_Impl * > t;
+ OUString, Bootstrap_Impl * > t;
bootstrap_map(const bootstrap_map&) = delete;
bootstrap_map& operator=(const bootstrap_map&) = delete;
@@ -830,7 +826,7 @@ void SAL_CALL rtl_bootstrap_expandMacros(rtl_uString ** macro)
void rtl_bootstrap_encode(rtl_uString const * value, rtl_uString ** encoded)
{
OSL_ASSERT(value);
- rtl::OUStringBuffer b;
+ OUStringBuffer b;
for (sal_Int32 i = 0; i < value->length; ++i)
{
sal_Unicode c = value->buffer[i];
@@ -853,7 +849,7 @@ int hex(sal_Unicode c)
c >= 'a' && c <= 'f' ? c - 'a' + 10 : -1;
}
-sal_Unicode read(rtl::OUString const & text, sal_Int32 * pos, bool * escaped)
+sal_Unicode read(OUString const & text, sal_Int32 * pos, bool * escaped)
{
OSL_ASSERT(pos && *pos >= 0 && *pos < text.getLength() && escaped);
sal_Unicode c = text[(*pos)++];
@@ -883,22 +879,22 @@ sal_Unicode read(rtl::OUString const & text, sal_Int32 * pos, bool * escaped)
return c;
}
-rtl::OUString lookup(
+OUString lookup(
Bootstrap_Impl const * file, LookupMode mode, bool override,
- rtl::OUString const & key, ExpandRequestLink const * requestStack)
+ OUString const & key, ExpandRequestLink const * requestStack)
{
- rtl::OUString v;
+ OUString v;
(file == nullptr ? get_static_bootstrap_handle() : file)->getValue(
key, &v.pData, nullptr, mode, override, requestStack);
return v;
}
-rtl::OUString expandMacros(
- Bootstrap_Impl const * file, rtl::OUString const & text, LookupMode mode,
+OUString expandMacros(
+ Bootstrap_Impl const * file, OUString const & text, LookupMode mode,
ExpandRequestLink const * requestStack)
{
SAL_INFO("sal.bootstrap", "expandMacros called with: " << text);
- rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
for (sal_Int32 i = 0; i < text.getLength();)
{
@@ -915,7 +911,7 @@ rtl::OUString expandMacros(
++i;
sal_Int32 p = i;
sal_Int32 nesting = 0;
- rtl::OUString seg[3];
+ OUString seg[3];
int n = 0;
while (i < text.getLength())
@@ -992,20 +988,20 @@ rtl::OUString expandMacros(
// replacement text (and if it did, it would fail to
// detect cycles that pass through here):
buf.append(
- rtl::OStringToOUString(
+ OStringToOUString(
osl::Profile(seg[0]).readString(
- rtl::OUStringToOString(
+ OUStringToOString(
seg[1], RTL_TEXTENCODING_UTF8),
- rtl::OUStringToOString(
+ OUStringToOString(
seg[2], RTL_TEXTENCODING_UTF8),
- rtl::OString()),
+ OString()),
RTL_TEXTENCODING_UTF8));
}
}
}
else
{
- rtl::OUStringBuffer kbuf;
+ OUStringBuffer kbuf;
for (; i < text.getLength();)
{
sal_Int32 j = i;
diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx
index 70f1e2e82c20..3bf0e1d34c2f 100644
--- a/sal/rtl/uri.cxx
+++ b/sal/rtl/uri.cxx
@@ -145,7 +145,7 @@ sal_uInt32 readUcs4(sal_Unicode const ** pBegin, sal_Unicode const * pEnd,
}
else
{
- rtl::OStringBuffer aBuf;
+ OStringBuffer aBuf;
aBuf.append(static_cast< char >(nChar));
rtl_TextToUnicodeConverter aConverter
= rtl_createTextToUnicodeConverter(eCharset);
@@ -425,7 +425,7 @@ void parseUriRef(rtl_uString const * pUriRef, Components * pComponents)
}
void appendPath(
- rtl::OUStringBuffer & buffer, sal_Int32 bufferStart, bool precedingSlash,
+ OUStringBuffer & buffer, sal_Int32 bufferStart, bool precedingSlash,
sal_Unicode const * pathBegin, sal_Unicode const * pathEnd)
{
while (precedingSlash || pathBegin != pathEnd)
@@ -755,7 +755,7 @@ sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef,
{
// Use the strict parser algorithm from RFC 3986, section 5.2, to turn the
// relative URI into an absolute one:
- rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
Components aRelComponents;
parseUriRef(pRelUriRef, &aRelComponents);
@@ -788,8 +788,8 @@ sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef,
{
rtl_uString_assign(
pException,
- (rtl::OUString(
- "<" + rtl::OUString(pBaseUriRef)
+ (OUString(
+ "<" + OUString(pBaseUriRef)
+ "> does not start with a scheme component")
.pData));
return false;
diff --git a/salhelper/source/dynload.cxx b/salhelper/source/dynload.cxx
index 09f678e1cbc3..63e3201f3ae7 100644
--- a/salhelper/source/dynload.cxx
+++ b/salhelper/source/dynload.cxx
@@ -26,8 +26,8 @@ namespace salhelper
typedef void* (*ApiInitFunction) ();
ORealDynamicLoader::ORealDynamicLoader(ORealDynamicLoader ** ppSetToZeroInDestructor_,
- const rtl::OUString& moduleName,
- const rtl::OUString& initFunction,
+ const OUString& moduleName,
+ const OUString& initFunction,
void* pApi,
oslModule pModule)
: m_pApi(pApi)
@@ -40,8 +40,8 @@ ORealDynamicLoader::ORealDynamicLoader(ORealDynamicLoader ** ppSetToZeroInDestru
}
ORealDynamicLoader* ORealDynamicLoader::newInstance(ORealDynamicLoader ** ppSetToZeroInDestructor,
- const rtl::OUString& moduleName,
- const rtl::OUString& initFunction)
+ const OUString& moduleName,
+ const OUString& initFunction)
{
#ifdef DISABLE_DYNLOADING
(void) ppSetToZeroInDestructor;
diff --git a/salhelper/test/Symbols/loader.cxx b/salhelper/test/Symbols/loader.cxx
index f912863d46f8..a0bfc50fa253 100644
--- a/salhelper/test/Symbols/loader.cxx
+++ b/salhelper/test/Symbols/loader.cxx
@@ -23,7 +23,7 @@
using namespace salhelper;
-using ::rtl::OUString;
+using OUString;
class SampleLibLoader
@@ -32,8 +32,8 @@ class SampleLibLoader
public:
SampleLibLoader():
::salhelper::ODynamicLoader<SampleLib_Api>
- (::rtl::OUString( SAL_MODULENAME( "samplelib") ),
- ::rtl::OUString( SAMPLELIB_INIT_FUNCTION_NAME ))
+ (OUString( SAL_MODULENAME( "samplelib") ),
+ OUString( SAMPLELIB_INIT_FUNCTION_NAME ))
{}
};
diff --git a/salhelper/test/dynamicloader/loader.cxx b/salhelper/test/dynamicloader/loader.cxx
index c741d6e87950..7d7bed793341 100644
--- a/salhelper/test/dynamicloader/loader.cxx
+++ b/salhelper/test/dynamicloader/loader.cxx
@@ -24,7 +24,7 @@
using namespace salhelper;
-using ::rtl::OUString;
+using OUString;
class SampleLibLoader
@@ -33,8 +33,8 @@ class SampleLibLoader
public:
SampleLibLoader():
::salhelper::ODynamicLoader<SampleLib_Api>
- (::rtl::OUString( SAL_MODULENAME( "samplelib") ),
- ::rtl::OUString( SAMPLELIB_INIT_FUNCTION_NAME) )
+ (OUString( SAL_MODULENAME( "samplelib") ),
+ OUString( SAMPLELIB_INIT_FUNCTION_NAME) )
{}
};
diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx
index 4cf2142c9a60..e786be2f1cd5 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -78,7 +78,7 @@ void doTest(util::Duration const & rid, char const*const pis,
{
char const*const pos(i_pos ? i_pos : pis);
util::Duration od;
- OUString is(::rtl::OUString::createFromAscii(pis));
+ OUString is(OUString::createFromAscii(pis));
SAL_INFO("sax.cppunit","about to convert '" << is << "'");
bool bSuccess = Converter::convertDuration(od, is);
SAL_INFO("sax.cppunit","" << (od.Negative ? "-" : "+") << " " << od.Years << "Y " << od.Months << "M " << od.Days << "D " << od.Hours << "H " << od.Minutes << "M " << od.Seconds << "S " << od.NanoSeconds << "n");
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 741dcc8b086c..27ffbdde8c77 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -995,7 +995,7 @@ readUnsignedNumber(const OUString & rString,
static Result
readUnsignedNumberMaxDigits(int maxDigits,
- const ::rtl::OUString & rString, sal_Int32 & io_rnPos,
+ const OUString & rString, sal_Int32 & io_rnPos,
sal_Int32 & o_rNumber)
{
bool bOverflow(false);
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 5645600c2a45..c9d092cb54de 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -6796,8 +6796,8 @@ void Test::checkPrecisionAsShown( OUString& rCode, double fValue, double fExpect
CPPUNIT_ASSERT_EQUAL( sal_Int32(0), nCheckPos );
}
double fRoundValue = m_pDoc->RoundValueAsShown( fValue, nFormat );
- rtl::OString aMessage = "Format \"";
- aMessage += rtl::OUStringToOString( rCode, RTL_TEXTENCODING_ASCII_US );
+ OString aMessage = "Format \"";
+ aMessage += OUStringToOString( rCode, RTL_TEXTENCODING_ASCII_US );
aMessage += "\" is not correctly rounded";
CPPUNIT_ASSERT_EQUAL_MESSAGE( aMessage.getStr(), fExpectedRoundVal, fRoundValue );
}
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 48101b3849e4..af95ef99c288 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -587,7 +587,7 @@ void ScBroadcastAreaSlot::Dump() const
const SvtBroadcaster::ListenersType& rListeners = rBC.GetAllListeners();
size_t n = rListeners.size();
- cout << " * range: " << rtl::OUStringToOString(pArea->GetRange().Format(ScRefFlags::VALID|ScRefFlags::TAB_3D, pDoc), RTL_TEXTENCODING_UTF8).getStr()
+ cout << " * range: " << OUStringToOString(pArea->GetRange().Format(ScRefFlags::VALID|ScRefFlags::TAB_3D, pDoc), RTL_TEXTENCODING_UTF8).getStr()
<< ", group: " << pArea->IsGroupListening()
<< ", listener count: " << n << endl;
@@ -597,7 +597,7 @@ void ScBroadcastAreaSlot::Dump() const
if (pFC)
{
cout << " * listener: formula cell: "
- << rtl::OUStringToOString(pFC->aPos.Format(ScRefFlags::VALID|ScRefFlags::TAB_3D, pDoc), RTL_TEXTENCODING_UTF8).getStr()
+ << OUStringToOString(pFC->aPos.Format(ScRefFlags::VALID|ScRefFlags::TAB_3D, pDoc), RTL_TEXTENCODING_UTF8).getStr()
<< endl;
continue;
}
@@ -606,7 +606,7 @@ void ScBroadcastAreaSlot::Dump() const
if (pFGListener)
{
cout << " * listener: formula group: (pos: "
- << rtl::OUStringToOString(pFGListener->getTopCellPos().Format(ScRefFlags::VALID | ScRefFlags::TAB_3D, pDoc), RTL_TEXTENCODING_UTF8).getStr()
+ << OUStringToOString(pFGListener->getTopCellPos().Format(ScRefFlags::VALID | ScRefFlags::TAB_3D, pDoc), RTL_TEXTENCODING_UTF8).getStr()
<< ", length: " << pFGListener->getGroupLength()
<< ")" << endl;
continue;
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 512e6fda53e7..029e96c72f2f 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -388,7 +388,7 @@ namespace {
struct CaseInsensitiveNamePredicate : svl::StyleSheetPredicate
{
- CaseInsensitiveNamePredicate(const rtl::OUString& rName, SfxStyleFamily eFam)
+ CaseInsensitiveNamePredicate(const OUString& rName, SfxStyleFamily eFam)
: mFamily(eFam)
{
mUppercaseName = ScGlobal::pCharClass->uppercase(rName);
@@ -399,7 +399,7 @@ struct CaseInsensitiveNamePredicate : svl::StyleSheetPredicate
{
if (rStyleSheet.GetFamily() == mFamily)
{
- rtl::OUString aUpName = ScGlobal::pCharClass->uppercase(rStyleSheet.GetName());
+ OUString aUpName = ScGlobal::pCharClass->uppercase(rStyleSheet.GetName());
if (mUppercaseName == aUpName)
{
return true;
@@ -408,7 +408,7 @@ struct CaseInsensitiveNamePredicate : svl::StyleSheetPredicate
return false;
}
- rtl::OUString mUppercaseName;
+ OUString mUppercaseName;
SfxStyleFamily const mFamily;
};
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 0f0f5e57f134..7c9c6baa3e88 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -300,7 +300,7 @@ public:
throw Unhandled(__FILE__, __LINE__);
}
- const rtl::OUString s = ref->GetString().getString().toAsciiUpperCase();
+ const OUString s = ref->GetString().getString().toAsciiUpperCase();
hashCode = s.hashCode();
// Pass the scalar result back to the rest of the formula kernel
diff --git a/sc/source/core/tool/formulalogger.cxx b/sc/source/core/tool/formulalogger.cxx
index af6c873a1ae7..0f2c82041d7b 100644
--- a/sc/source/core/tool/formulalogger.cxx
+++ b/sc/source/core/tool/formulalogger.cxx
@@ -300,7 +300,7 @@ void FormulaLogger::writeAscii( const char* s, size_t n )
void FormulaLogger::write( const OUString& ou )
{
- OString s = rtl::OUStringToOString(ou, RTL_TEXTENCODING_UTF8).getStr();
+ OString s = OUStringToOString(ou, RTL_TEXTENCODING_UTF8).getStr();
writeAscii(s.getStr(), s.getLength());
}
diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index b69a96504dd6..0026f8f1377e 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -175,7 +175,7 @@ void ScInterpreter::ScFilterXML()
{
if( nSize > nNode )
{
- rtl::OUString aResult;
+ OUString aResult;
if(pNodeSet->nodeTab[nNode]->type == XML_NAMESPACE_DECL)
{
xmlNsPtr ns = reinterpret_cast<xmlNsPtr>(pNodeSet->nodeTab[nNode]);
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 43c9b98fe8cc..920de7431839 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -206,7 +206,7 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm )
"sharedStrings.xml",
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml",
- rtl::OUStringToOString(oox::getRelationship(Relationship::SHAREDSTRINGS), RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(oox::getRelationship(Relationship::SHAREDSTRINGS), RTL_TEXTENCODING_UTF8).getStr());
rStrm.PushStream( pSst );
pSst->startElement( XML_sst,
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 81aab4194e24..111820021319 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1434,7 +1434,7 @@ void XclExpComments::SaveXml( XclExpXmlStream& rStrm )
XclXmlUtils::GetStreamName( "../", "comments", mnTab + 1 ),
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml",
- rtl::OUStringToOString(oox::getRelationship(Relationship::COMMENTS), RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(oox::getRelationship(Relationship::COMMENTS), RTL_TEXTENCODING_UTF8).getStr());
rStrm.PushStream( rComments );
if( rStrm.getVersion() == oox::core::ISOIEC_29500_2008 )
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 2934439d69a6..b70086e9f364 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -1089,7 +1089,7 @@ bool XclExpXmlStream::exportDocument()
PushStream( CreateOutputStream( workbook, workbook,
uno::Reference <XOutputStream>(),
pWorkbookContentType,
- rtl::OUStringToOString(oox::getRelationship(Relationship::OFFICEDOCUMENT), RTL_TEXTENCODING_UTF8).getStr() ) );
+ OUStringToOString(oox::getRelationship(Relationship::OFFICEDOCUMENT), RTL_TEXTENCODING_UTF8).getStr() ) );
if (mbExportVBA)
{
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index d7a621c30150..177a15a46a5a 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -3162,7 +3162,7 @@ void XclExpXmlStyleSheet::SaveXml( XclExpXmlStream& rStrm )
"styles.xml",
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml",
- rtl::OUStringToOString(oox::getRelationship(Relationship::STYLES), RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(oox::getRelationship(Relationship::STYLES), RTL_TEXTENCODING_UTF8).getStr());
rStrm.PushStream( aStyleSheet );
aStyleSheet->startElement( XML_styleSheet,
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 09ff5e63b422..63387a275984 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -455,7 +455,7 @@ SdrObjectUniquePtr XclImpDrawObjBase::CreateSdrObject( XclImpDffConverter& rDffC
{
const Reference< XControlModel >& xCtrlModel = pSdrUnoObj->GetUnoControlModel();
Reference< XPropertySet > xPropSet(xCtrlModel,UNO_QUERY);
- const static rtl::OUString sPropertyName("ControlTypeinMSO");
+ const static OUString sPropertyName("ControlTypeinMSO");
enum { eCreateFromOffice = 0, eCreateFromMSTBXControl, eCreateFromMSOCXControl };
@@ -475,7 +475,7 @@ SdrObjectUniquePtr XclImpDrawObjBase::CreateSdrObject( XclImpDffConverter& rDffC
if( mnObjType == 8 )//OCX
{
//Need summary type for export
- const static rtl::OUString sObjIdPropertyName("ObjIDinMSO");
+ const static OUString sObjIdPropertyName("ObjIDinMSO");
const XclImpPictureObj* const pObj = dynamic_cast< const XclImpPictureObj* const >(this);
if( pObj != nullptr && pObj->IsOcxControl() )
{
diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx
index 133ed1013897..b4166d0d17dc 100644
--- a/sc/source/filter/inc/ooxformulaparser.hxx
+++ b/sc/source/filter/inc/ooxformulaparser.hxx
@@ -47,13 +47,13 @@ public:
// com.sun.star.lang.XServiceInfo interface -------------------------------
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName() override;
virtual sal_Bool SAL_CALL
- supportsService( const ::rtl::OUString& rService ) override;
+ supportsService( const OUString& rService ) override;
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
// com.sun.star.lang.XInitialization interface ----------------------------
@@ -63,17 +63,17 @@ public:
// com.sun.star.sheet.XFilterFormulaParser interface ----------------------
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getSupportedNamespace() override;
// com.sun.star.sheet.XFormulaParser interface ----------------------------
virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL
parseFormula(
- const ::rtl::OUString& rFormula,
+ const OUString& rFormula,
const css::table::CellAddress& rReferencePos ) override;
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
printFormula(
const css::uno::Sequence< css::sheet::FormulaToken >& rTokens,
const css::table::CellAddress& rReferencePos ) override;
diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx
index c563321a03c5..c3de7a4927bc 100644
--- a/sc/source/filter/oox/ooxformulaparser.cxx
+++ b/sc/source/filter/oox/ooxformulaparser.cxx
@@ -34,8 +34,6 @@ using namespace ::com::sun::star::sheet;
using namespace ::com::sun::star::table;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
-
class OOXMLFormulaParserImpl : private FormulaFinalizer
{
public:
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 22e1dfac26be..16216b02affd 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -256,7 +256,7 @@ void SaveDrawingMLObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, sal_Int
XclXmlUtils::GetStreamName( "../", "drawings/drawing", nDrawing ),
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.drawing+xml",
- rtl::OUStringToOString(oox::getRelationship(Relationship::DRAWING), RTL_TEXTENCODING_UTF8).getStr(),
+ OUStringToOString(oox::getRelationship(Relationship::DRAWING), RTL_TEXTENCODING_UTF8).getStr(),
&sId );
rStrm.GetCurrentStream()->singleElement( XML_drawing,
@@ -290,7 +290,7 @@ void SaveVmlObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, sal_Int32& nV
XclXmlUtils::GetStreamName( "../", "drawings/vmlDrawing", nDrawing ),
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.vmlDrawing",
- rtl::OUStringToOString(oox::getRelationship(Relationship::VMLDRAWING), RTL_TEXTENCODING_UTF8).getStr(),
+ OUStringToOString(oox::getRelationship(Relationship::VMLDRAWING), RTL_TEXTENCODING_UTF8).getStr(),
&sId );
rStrm.GetCurrentStream()->singleElement( XML_legacyDrawing,
@@ -1280,7 +1280,7 @@ void ExcBundlesheet8::SaveXml( XclExpXmlStream& rStrm )
XclXmlUtils::GetStreamName( nullptr, "worksheets/sheet", nTab+1),
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml",
- rtl::OUStringToOString(oox::getRelationship(Relationship::WORKSHEET), RTL_TEXTENCODING_UTF8).getStr(),
+ OUStringToOString(oox::getRelationship(Relationship::WORKSHEET), RTL_TEXTENCODING_UTF8).getStr(),
&sId );
rStrm.GetCurrentStream()->singleElement( XML_sheet,
diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx
index 9d5160da9c0f..9a029e8cabf6 100644
--- a/sc/source/ui/inc/AccessibleEditObject.hxx
+++ b/sc/source/ui/inc/AccessibleEditObject.hxx
@@ -179,7 +179,7 @@ private:
virtual sal_Int32 SAL_CALL getBackground( ) override;
- sal_Int32 GetFgBgColor( const rtl::OUString &strPropColor) ;
+ sal_Int32 GetFgBgColor( const OUString &strPropColor) ;
};
#endif
diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx
index 41777caf360c..ad5ed4234e99 100644
--- a/sc/source/ui/sidebar/ScPanelFactory.cxx
+++ b/sc/source/ui/sidebar/ScPanelFactory.cxx
@@ -39,7 +39,6 @@
using namespace css;
using namespace css::uno;
-using ::rtl::OUString;
namespace sc { namespace sidebar {
@@ -53,7 +52,7 @@ ScPanelFactory::~ScPanelFactory()
}
Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement (
- const ::rtl::OUString& rsResourceURL,
+ const OUString& rsResourceURL,
const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments)
{
Reference<ui::XUIElement> xElement;
diff --git a/sc/source/ui/sidebar/ScPanelFactory.hxx b/sc/source/ui/sidebar/ScPanelFactory.hxx
index 1e08c43281e9..817058588fe9 100644
--- a/sc/source/ui/sidebar/ScPanelFactory.hxx
+++ b/sc/source/ui/sidebar/ScPanelFactory.hxx
@@ -46,7 +46,7 @@ public:
// XUIElementFactory
css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement(
- const ::rtl::OUString& rsResourceURL,
+ const OUString& rsResourceURL,
const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
OUString SAL_CALL getImplementationName() override;
diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx
index 920cc22cb520..e89ba81d48b5 100644
--- a/sc/source/ui/vba/vbaname.cxx
+++ b/sc/source/ui/vba/vbaname.cxx
@@ -131,7 +131,7 @@ void ScVbaName::setContent( const OUString& rContent, const formula::FormulaGra
OUString
ScVbaName::getValue()
{
- rtl::OUString sResult = getContent( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );
+ OUString sResult = getContent( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );
return sResult;
}
@@ -169,7 +169,7 @@ ScVbaName::setRefersToLocal( const OUString & rRefersTo )
OUString
ScVbaName::getRefersToR1C1()
{
- rtl::OUString sResult = getContent( formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 );
+ OUString sResult = getContent( formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 );
return sResult;
}
diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx
index e1c6c4cfc50b..39ed7ff65d33 100644
--- a/sc/source/ui/vba/vbapagesetup.hxx
+++ b/sc/source/ui/vba/vbapagesetup.hxx
@@ -79,10 +79,10 @@ public:
virtual sal_Bool SAL_CALL getPrintGridlines() override;
virtual void SAL_CALL setPrintGridlines( sal_Bool _printgridlines ) override;
- virtual ::rtl::OUString SAL_CALL getPrintTitleRows() override;
- virtual void SAL_CALL setPrintTitleRows( const ::rtl::OUString& _printtitlerows ) override;
- virtual ::rtl::OUString SAL_CALL getPrintTitleColumns() override;
- virtual void SAL_CALL setPrintTitleColumns( const ::rtl::OUString& _printtitlecolumns ) override;
+ virtual OUString SAL_CALL getPrintTitleRows() override;
+ virtual void SAL_CALL setPrintTitleRows( const OUString& _printtitlerows ) override;
+ virtual OUString SAL_CALL getPrintTitleColumns() override;
+ virtual void SAL_CALL setPrintTitleColumns( const OUString& _printtitlecolumns ) override;
virtual sal_Int32 SAL_CALL getPaperSize() override;
virtual void SAL_CALL setPaperSize( sal_Int32 papersize ) override;
// XHelperInterface
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index fafee6815e70..5d90aec39f2a 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1961,7 +1961,7 @@ ScVbaRange::getFormulaArray()
uno::Any aSingleValueOrMatrix;
// When dealing with a single element ( embedded in the sequence of sequence ) unwrap and return
// that value
- uno::Sequence< uno::Sequence<rtl::OUString> > aTmpSeq = xCellRangeFormula->getFormulaArray();
+ uno::Sequence< uno::Sequence<OUString> > aTmpSeq = xCellRangeFormula->getFormulaArray();
if ( aTmpSeq.getLength() == 1 )
{
if ( aTmpSeq[ 0 ].getLength() == 1 )
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 7e7e40b95fd6..8f7f7e37c836 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2473,7 +2473,7 @@ OUString ScTabView::getRowColumnHeaders(const tools::Rectangle& rRectangle)
bool bRangeHeaderSupport = comphelper::LibreOfficeKit::isRangeHeaders();
- rtl::OUStringBuffer aBuffer(256);
+ OUStringBuffer aBuffer(256);
aBuffer.append("{ \"commandName\": \".uno:ViewRowColumnHeaders\",\n");
SCTAB nTab = aViewData.GetTabNo();
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index fae113555f12..3376b022de84 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -1144,10 +1144,10 @@ void SdDrawDocument::InitLayoutVector()
::comphelper::getProcessComponentContext() );
// get file list from configuration
- Sequence< rtl::OUString > aFiles(
+ Sequence< OUString > aFiles(
officecfg::Office::Impress::Misc::LayoutListFiles::get(xContext) );
- rtl::OUString sFilename;
+ OUString sFilename;
for( sal_Int32 i=0; i < aFiles.getLength(); ++i )
{
sFilename = comphelper::getExpandedUri(xContext, aFiles[i]);
@@ -1183,10 +1183,10 @@ void SdDrawDocument::InitObjectVector()
::comphelper::getProcessComponentContext() );
// get file list from configuration
- Sequence< rtl::OUString > aFiles(
+ Sequence< OUString > aFiles(
officecfg::Office::Impress::Misc::PresObjListFiles::get(xContext) );
- rtl::OUString sFilename;
+ OUString sFilename;
for( sal_Int32 i=0; i < aFiles.getLength(); ++i )
{
sFilename = comphelper::getExpandedUri(xContext, aFiles[i]);
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 7646a6063d8d..2415061add75 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -910,7 +910,7 @@ void getPresObjProp( const SdPage& rPage, const char* sObjKind, const char* sPag
Reference<XNode> objectNode = *aIter; //get i'th object element
Reference<XNamedNodeMap> objectattrlist = objectNode->getAttributes();
Reference<XNode> objectattr = objectattrlist->getNamedItem("type");
- rtl::OUString sObjType = objectattr->getNodeValue();
+ OUString sObjType = objectattr->getNodeValue();
if (sObjType.equalsAscii(sObjKind))
{
@@ -920,19 +920,19 @@ void getPresObjProp( const SdPage& rPage, const char* sObjKind, const char* sPag
for( int j=0; j< objSize; j++)
{
Reference<XNode> obj = objectChildren->item(j);
- rtl::OUString nodename = obj->getNodeName();
+ OUString nodename = obj->getNodeName();
//check whether children is blank 'text-node' or 'object-prop' node
if(nodename == "object-prop")
{
Reference<XNamedNodeMap> ObjAttributes = obj->getAttributes();
Reference<XNode> ObjPageKind = ObjAttributes->getNamedItem("pagekind");
- rtl::OUString sObjPageKind = ObjPageKind->getNodeValue();
+ OUString sObjPageKind = ObjPageKind->getNodeValue();
if (sObjPageKind.equalsAscii(sPageKind))
{
Reference<XNode> ObjSizeHeight = ObjAttributes->getNamedItem("relative-height");
- rtl::OUString sValue = ObjSizeHeight->getNodeValue();
+ OUString sValue = ObjSizeHeight->getNodeValue();
presObjPropValue[0] = sValue.toDouble();
Reference<XNode> ObjSizeWidth = ObjAttributes->getNamedItem("relative-width");
@@ -1273,9 +1273,9 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout )
return aLayouts[ eLayout - AUTOLAYOUT_START ];
}
-static rtl::OUString enumtoString(AutoLayout aut)
+static OUString enumtoString(AutoLayout aut)
{
- rtl::OUString retstr;
+ OUString retstr;
switch (aut)
{
case AUTOLAYOUT_TITLE_CONTENT:
@@ -1331,7 +1331,7 @@ static rtl::OUString enumtoString(AutoLayout aut)
return retstr;
}
-static void CalcAutoLayoutRectangles( SdPage const & rPage,::tools::Rectangle* rRectangle ,const rtl::OUString& sLayoutType )
+static void CalcAutoLayoutRectangles( SdPage const & rPage,::tools::Rectangle* rRectangle ,const OUString& sLayoutType )
{
::tools::Rectangle aTitleRect;
::tools::Rectangle aLayoutRect;
@@ -1373,7 +1373,7 @@ static void CalcAutoLayoutRectangles( SdPage const & rPage,::tools::Rectangle* r
Reference<XNamedNodeMap> layoutAttrList =layoutNode->getAttributes();
// get the attribute value of layout (i.e it's type)
- rtl::OUString sLayoutAttName =
+ OUString sLayoutAttName =
layoutAttrList->getNamedItem("type")->getNodeValue();
if(sLayoutAttName == sLayoutType)
{
@@ -1382,7 +1382,7 @@ static void CalcAutoLayoutRectangles( SdPage const & rPage,::tools::Rectangle* r
const int presobjsize = layoutChildren->getLength();
for( int j=0; j< presobjsize ; j++)
{
- rtl::OUString nodename;
+ OUString nodename;
Reference<XNode> presobj = layoutChildren->item(j);
nodename=presobj->getNodeName();
@@ -1395,7 +1395,7 @@ static void CalcAutoLayoutRectangles( SdPage const & rPage,::tools::Rectangle* r
Reference<XNamedNodeMap> presObjAttributes = presobj->getAttributes();
Reference<XNode> presObjSizeHeight = presObjAttributes->getNamedItem("relative-height");
- rtl::OUString sValue = presObjSizeHeight->getNodeValue();
+ OUString sValue = presObjSizeHeight->getNodeValue();
propvalue[0] = sValue.toDouble();
Reference<XNode> presObjSizeWidth = presObjAttributes->getNamedItem("relative-width");
@@ -1618,7 +1618,7 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, bool bInit, bool bCreate )
::tools::Rectangle aRectangle[MAX_PRESOBJS];
const LayoutDescriptor& aDescriptor = GetLayoutDescriptor( meAutoLayout );
- rtl::OUString sLayoutName( enumtoString(meAutoLayout) );
+ OUString sLayoutName( enumtoString(meAutoLayout) );
CalcAutoLayoutRectangles( *this, aRectangle, sLayoutName);
std::set< SdrObject* > aUsedPresentationObjects;
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 61f7c3414711..ff2a55a22f80 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -639,7 +639,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily
SfxStyleSheetBase* pSheet = rSourcePool.GetStyleSheetByPositionInIndex( *it );
if( !pSheet )
continue;
- rtl::OUString aName( pSheet->GetName() );
+ OUString aName( pSheet->GetName() );
// now check whether we already have a sheet with the same name
std::vector<unsigned> aSheetsWithName = GetIndexedStyleSheets().FindPositionsByName(aName);
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 9b002537a849..1e71a03cc8ae 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -138,7 +138,7 @@ OUString SAL_CALL
if ( pSdView )
{
SdDrawDocument& rDoc = pSdView->GetDoc();
- rtl::OUString sFileName = rDoc.getDocAccTitle();
+ OUString sFileName = rDoc.getDocAccTitle();
if (sFileName.isEmpty())
{
::sd::DrawDocShell* pDocSh = pSdView->GetDocSh();
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 1c6843de8241..7d34fd8cf1ef 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -165,7 +165,7 @@ OUString SdStartPresentationDlg::GetDisplayName( sal_Int32 nDisplay,
}
/// Store display index together with name in user data
-sal_Int32 SdStartPresentationDlg::InsertDisplayEntry(const rtl::OUString &aName,
+sal_Int32 SdStartPresentationDlg::InsertDisplayEntry(const OUString &aName,
sal_Int32 nDisplay)
{
m_xLBMonitor->append(OUString::number(nDisplay), aName);
diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx
index 990431646b7c..fc84f0e8cbb1 100644
--- a/sd/source/ui/inc/present.hxx
+++ b/sd/source/ui/inc/present.hxx
@@ -73,7 +73,7 @@ private:
MONITOR_NORMAL,
MONITOR_IS_EXTERNAL,
};
- sal_Int32 InsertDisplayEntry(const rtl::OUString &aName,
+ sal_Int32 InsertDisplayEntry(const OUString &aName,
sal_Int32 nDisplay);
OUString GetDisplayName( sal_Int32 nDisplay,
DisplayType eType );
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index 67cc62b1392e..4750ee9494d2 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -41,7 +41,6 @@
using namespace css;
using namespace css::uno;
using namespace ::sd::framework;
-using ::rtl::OUString;
namespace sd { namespace sidebar {
@@ -65,7 +64,7 @@ void SAL_CALL PanelFactory::disposing()
// XUIElementFactory
Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
- const ::rtl::OUString& rsUIElementResourceURL,
+ const OUString& rsUIElementResourceURL,
const css::uno::Sequence<css::beans::PropertyValue>& rArguments)
{
// Process arguments.
diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx
index ad34f1ba4a58..0eee16f580c9 100644
--- a/sd/source/ui/sidebar/PanelFactory.hxx
+++ b/sd/source/ui/sidebar/PanelFactory.hxx
@@ -56,7 +56,7 @@ public:
// XUIElementFactory
css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement (
- const ::rtl::OUString& rsResourceURL,
+ const OUString& rsResourceURL,
const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
};
diff --git a/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx b/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
index 457729720bdc..bf4d6d41847b 100644
--- a/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
+++ b/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
@@ -34,7 +34,7 @@ public:
ContextChangeBroadcaster();
~ContextChangeBroadcaster();
- void Initialize (const ::rtl::OUString& rsContextName);
+ void Initialize (const OUString& rsContextName);
void Activate (const css::uno::Reference<css::frame::XFrame>& rxFrame);
void Deactivate (const css::uno::Reference<css::frame::XFrame>& rxFrame);
@@ -48,14 +48,14 @@ public:
bool SetBroadcasterEnabled (const bool bIsEnabled);
private:
- rtl::OUString msContextName;
+ OUString msContextName;
bool mbIsBroadcasterEnabled;
void BroadcastContextChange (
const css::uno::Reference<css::frame::XFrame>& rxFrame,
- const ::rtl::OUString& rsModuleName,
- const ::rtl::OUString& rsContextName);
- static ::rtl::OUString GetModuleName (
+ const OUString& rsModuleName,
+ const OUString& rsContextName);
+ static OUString GetModuleName (
const css::uno::Reference<css::frame::XFrame>& rxFrame);
};
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index 582b403ebecb..189910f59864 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -116,17 +116,17 @@ static QSMenuExecute* pExecute = nil;
static std::set< OUString > aShortcuts;
-static NSString* getAutoreleasedString( const rtl::OUString& rStr )
+static NSString* getAutoreleasedString( const OUString& rStr )
{
return [[[NSString alloc] initWithCharacters: reinterpret_cast<unichar const *>(rStr.getStr()) length: rStr.getLength()] autorelease];
}
struct RecentMenuEntry
{
- rtl::OUString aURL;
- rtl::OUString aFilter;
- rtl::OUString aTitle;
- rtl::OUString aPassword;
+ OUString aURL;
+ OUString aFilter;
+ OUString aTitle;
+ OUString aPassword;
};
class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStringWidth >
@@ -135,7 +135,7 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin
RecentFilesStringLength() {}
// XStringWidth
- sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& aString ) override
+ sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) override
{
return aString.getLength();
}
@@ -208,15 +208,15 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin
// insert new recent items
for ( std::vector<RecentMenuEntry>::size_type i = 0; i < m_pRecentFilesItems->size(); i++ )
{
- rtl::OUString aMenuTitle;
+ OUString aMenuTitle;
INetURLObject aURL( (*m_pRecentFilesItems)[i].aURL );
if ( aURL.GetProtocol() == INetProtocol::File )
{
// Do handle file URL differently => convert it to a system
// path and abbreviate it with a special function:
- ::rtl::OUString aSystemPath( aURL.getFSysPath( FSysStyle::Detect ) );
- ::rtl::OUString aCompactedSystemPath;
+ OUString aSystemPath( aURL.getFSysPath( FSysStyle::Detect ) );
+ OUString aCompactedSystemPath;
oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, nullptr );
if ( !nError )
@@ -258,11 +258,11 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin
aArgsList[1].Name = "AsTemplate";
aArgsList[1].Value <<= false;
- ::rtl::OUString aFilter( rRecentFile.aFilter );
+ OUString aFilter( rRecentFile.aFilter );
sal_Int32 nPos = aFilter.indexOf( '|' );
if ( nPos >= 0 )
{
- rtl::OUString aFilterOptions;
+ OUString aFilterOptions;
if ( nPos < ( aFilter.getLength() - 1 ) )
aFilterOptions = aFilter.copy( nPos+1 );
@@ -284,13 +284,13 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin
static RecentMenuDelegate* pRecentDelegate = nil;
-static rtl::OUString getShortCut( const rtl::OUString& i_rTitle )
+static OUString getShortCut( const OUString& i_rTitle )
{
// create shortcut
- rtl::OUString aKeyEquiv;
+ OUString aKeyEquiv;
for( sal_Int32 nIndex = 0; nIndex < i_rTitle.getLength(); nIndex++ )
{
- rtl::OUString aShortcut( i_rTitle.copy( nIndex, 1 ).toAsciiLowerCase() );
+ OUString aShortcut( i_rTitle.copy( nIndex, 1 ).toAsciiLowerCase() );
if( aShortcuts.find( aShortcut ) == aShortcuts.end() )
{
aShortcuts.insert( aShortcut );
@@ -302,7 +302,7 @@ static rtl::OUString getShortCut( const rtl::OUString& i_rTitle )
return aKeyEquiv;
}
-static void appendMenuItem( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const rtl::OUString& i_rTitle, int i_nTag, const rtl::OUString& i_rKeyEquiv )
+static void appendMenuItem( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const OUString& i_rTitle, int i_nTag, const OUString& i_rKeyEquiv )
{
if( ! i_rTitle.getLength() )
return;
@@ -406,14 +406,14 @@ void aqua_init_systray()
// collect the URLs of the entries in the File/New menu
SvtModuleOptions aModuleOptions;
- std::set< rtl::OUString > aFileNewAppsAvailable;
+ std::set< OUString > aFileNewAppsAvailable;
SvtDynamicMenuOptions aOpt;
css::uno::Sequence < css::uno::Sequence < css::beans::PropertyValue > > aNewMenu = aOpt.GetMenu( EDynamicMenuType::NewMenu );
for ( auto const & newMenuProp : aNewMenu )
{
comphelper::SequenceAsHashMap aEntryItems( newMenuProp );
- rtl::OUString sURL( aEntryItems.getUnpackedValueOrDefault( "URL", rtl::OUString() ) );
+ OUString sURL( aEntryItems.getUnpackedValueOrDefault( "URL", OUString() ) );
if ( sURL.getLength() )
aFileNewAppsAvailable.insert( sURL );
}
@@ -452,14 +452,14 @@ void aqua_init_systray()
// the complete application is not even installed
continue;
- rtl::OUString sURL( ::rtl::OUString::createFromAscii( aMenuItems[i].pAsciiURLDescription ) );
+ OUString sURL( OUString::createFromAscii( aMenuItems[i].pAsciiURLDescription ) );
if ( aFileNewAppsAvailable.find( sURL ) == aFileNewAppsAvailable.end() )
// the application is installed, but the entry has been configured to *not* appear in the File/New
// menu => also let not appear it in the quickstarter
continue;
- rtl::OUString aKeyEquiv( getShortCut( ShutdownIcon::GetUrlDescription( sURL ) ) );
+ OUString aKeyEquiv( getShortCut( ShutdownIcon::GetUrlDescription( sURL ) ) );
appendMenuItem( pMenu, pDockMenu, ShutdownIcon::GetUrlDescription( sURL ), aMenuItems[i].nMenuTag, aKeyEquiv );
}
@@ -469,8 +469,8 @@ void aqua_init_systray()
// add recent menu
appendRecentMenu( pMenu, pDockMenu, SfxResId(STR_QUICKSTART_RECENTDOC) );
- rtl::OUString aTitle( SfxResId(STR_QUICKSTART_FROMTEMPLATE) );
- rtl::OUString aKeyEquiv( getShortCut( aTitle ) );
+ OUString aTitle( SfxResId(STR_QUICKSTART_FROMTEMPLATE) );
+ OUString aKeyEquiv( getShortCut( aTitle ) );
appendMenuItem( pMenu, pDockMenu, aTitle, MI_TEMPLATE, aKeyEquiv );
aTitle = SfxResId(STR_QUICKSTART_FILEOPEN);
aKeyEquiv = getShortCut( aTitle );
diff --git a/sfx2/source/control/emojiview.cxx b/sfx2/source/control/emojiview.cxx
index f0003cc1ebad..79bb1b0a000f 100644
--- a/sfx2/source/control/emojiview.cxx
+++ b/sfx2/source/control/emojiview.cxx
@@ -133,15 +133,15 @@ void EmojiView::Populate()
// get values of parameters in AppendItem() function
if(emojiParam == "unicode")
{
- sTitle = rtl::OStringToOUString(OString( prop.string_value().get(), prop.string_value().size() ), RTL_TEXTENCODING_UTF8);
+ sTitle = OStringToOUString(OString( prop.string_value().get(), prop.string_value().size() ), RTL_TEXTENCODING_UTF8);
}
else if(emojiParam == "category")
{
- sCategory = rtl::OStringToOUString(OString( prop.string_value().get(), prop.string_value().size() ), RTL_TEXTENCODING_UTF8);
+ sCategory = OStringToOUString(OString( prop.string_value().get(), prop.string_value().size() ), RTL_TEXTENCODING_UTF8);
}
else if(emojiParam == "name")
{
- sName = rtl::OStringToOUString(OString( prop.string_value().get(), prop.string_value().size() ), RTL_TEXTENCODING_UTF8);
+ sName = OStringToOUString(OString( prop.string_value().get(), prop.string_value().size() ), RTL_TEXTENCODING_UTF8);
}
else if(emojiParam == "duplicate")
{
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index c7a7731ba5c7..a5f942cbb935 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -694,7 +694,7 @@ void SfxShell::ApplyItemSet( sal_uInt16, const SfxItemSet& )
{
}
-void SfxShell::SetContextName (const ::rtl::OUString& rsContextName)
+void SfxShell::SetContextName (const OUString& rsContextName)
{
pImpl->maContextChangeBroadcaster.Initialize(rsContextName);
}
diff --git a/sfx2/source/sidebar/Context.cxx b/sfx2/source/sidebar/Context.cxx
index b263f3e0bfcf..2452dd63aeb0 100644
--- a/sfx2/source/sidebar/Context.cxx
+++ b/sfx2/source/sidebar/Context.cxx
@@ -36,8 +36,8 @@ Context::Context()
}
Context::Context (
- const ::rtl::OUString& rsApplication,
- const ::rtl::OUString& rsContext)
+ const OUString& rsApplication,
+ const OUString& rsContext)
: msApplication(rsApplication),
msContext(rsContext)
{
diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
index bdbf62defb36..716cb84fcfc4 100644
--- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
+++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
@@ -24,7 +24,6 @@
#include <osl/diagnose.h>
#include <comphelper/processfactory.hxx>
-using ::rtl::OUString;
using namespace css;
using namespace css::uno;
@@ -40,7 +39,7 @@ ContextChangeBroadcaster::~ContextChangeBroadcaster()
{
}
-void ContextChangeBroadcaster::Initialize (const ::rtl::OUString& rsContextName)
+void ContextChangeBroadcaster::Initialize (const OUString& rsContextName)
{
msContextName = rsContextName;
}
@@ -71,8 +70,8 @@ bool ContextChangeBroadcaster::SetBroadcasterEnabled (const bool bIsEnabled)
void ContextChangeBroadcaster::BroadcastContextChange (
const css::uno::Reference<css::frame::XFrame>& rxFrame,
- const ::rtl::OUString& rsModuleName,
- const ::rtl::OUString& rsContextName)
+ const OUString& rsModuleName,
+ const OUString& rsContextName)
{
if ( ! mbIsBroadcasterEnabled)
return;
diff --git a/sfx2/source/sidebar/ContextList.cxx b/sfx2/source/sidebar/ContextList.cxx
index 12a21ca43de9..d6148191431d 100644
--- a/sfx2/source/sidebar/ContextList.cxx
+++ b/sfx2/source/sidebar/ContextList.cxx
@@ -19,8 +19,6 @@
#include <sfx2/sidebar/ContextList.hxx>
#include <sfx2/sidebar/Context.hxx>
-using ::rtl::OUString;
-
namespace sfx2 { namespace sidebar {
ContextList::ContextList()
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx
index ce1910784fd7..e96d4cff6b2d 100644
--- a/sfx2/source/sidebar/ControllerFactory.cxx
+++ b/sfx2/source/sidebar/ControllerFactory.cxx
@@ -33,7 +33,6 @@
using namespace css;
using namespace css::uno;
-using ::rtl::OUString;
namespace sfx2 { namespace sidebar {
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 198f136922c4..f39ed4e7d945 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -94,7 +94,7 @@ SidebarController::SidebarController (
mpTabBar(VclPtr<TabBar>::Create(
mpParentWindow,
rxFrame,
- [this](const ::rtl::OUString& rsDeckId) { return this->OpenThenToggleDeck(rsDeckId); },
+ [this](const OUString& rsDeckId) { return this->OpenThenToggleDeck(rsDeckId); },
[this](const tools::Rectangle& rButtonBox,const ::std::vector<TabBar::DeckMenuData>& rMenuData) { return this->ShowPopupMenu(rButtonBox,rMenuData); },
this)),
mxFrame(rxFrame),
@@ -581,7 +581,7 @@ void SidebarController::SwitchToDefaultDeck()
}
void SidebarController::SwitchToDeck (
- const ::rtl::OUString& rsDeckId)
+ const OUString& rsDeckId)
{
if ( msCurrentDeckId != rsDeckId
|| ! mbIsDeckOpen
@@ -594,11 +594,11 @@ void SidebarController::SwitchToDeck (
}
}
-void SidebarController::CreateDeck(const ::rtl::OUString& rDeckId) {
+void SidebarController::CreateDeck(const OUString& rDeckId) {
CreateDeck(rDeckId, maCurrentContext);
}
-void SidebarController::CreateDeck(const ::rtl::OUString& rDeckId, const Context& rContext, bool bForceCreate)
+void SidebarController::CreateDeck(const OUString& rDeckId, const Context& rContext, bool bForceCreate)
{
std::shared_ptr<DeckDescriptor> xDeckDescriptor = mpResourceManager->GetDeckDescriptor(rDeckId);
@@ -620,7 +620,7 @@ void SidebarController::CreateDeck(const ::rtl::OUString& rDeckId, const Context
}
}
-void SidebarController::CreatePanels(const ::rtl::OUString& rDeckId, const Context& rContext)
+void SidebarController::CreatePanels(const OUString& rDeckId, const Context& rContext)
{
std::shared_ptr<DeckDescriptor> xDeckDescriptor = mpResourceManager->GetDeckDescriptor(rDeckId);
@@ -854,7 +854,7 @@ VclPtr<Panel> SidebarController::CreatePanel (
Reference<ui::XUIElement> SidebarController::CreateUIElement (
const Reference<awt::XWindowPeer>& rxWindow,
- const ::rtl::OUString& rsImplementationURL,
+ const OUString& rsImplementationURL,
const bool bWantsCanvas,
const Context& rContext)
{
@@ -1348,7 +1348,7 @@ ResourceManager::DeckContextDescriptorContainer SidebarController::GetMatchingDe
return aDecks;
}
-ResourceManager::PanelContextDescriptorContainer SidebarController::GetMatchingPanels(const ::rtl::OUString& rDeckId)
+ResourceManager::PanelContextDescriptorContainer SidebarController::GetMatchingPanels(const OUString& rDeckId)
{
ResourceManager::PanelContextDescriptorContainer aPanels;
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 7d0687462122..0906dc962d57 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -34,7 +34,7 @@ using namespace css::uno;
namespace sfx2 { namespace sidebar {
Reference<ui::XUIElement> SidebarPanelBase::Create (
- const ::rtl::OUString& rsResourceURL,
+ const OUString& rsResourceURL,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
vcl::Window* pWindow,
const css::ui::LayoutSize& rLayoutSize)
@@ -49,7 +49,7 @@ Reference<ui::XUIElement> SidebarPanelBase::Create (
}
SidebarPanelBase::SidebarPanelBase (
- const ::rtl::OUString& rsResourceURL,
+ const OUString& rsResourceURL,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
vcl::Window* pWindow,
const css::ui::LayoutSize& rLayoutSize)
@@ -118,7 +118,7 @@ css::uno::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame()
return mxFrame;
}
-::rtl::OUString SAL_CALL SidebarPanelBase::getResourceURL()
+OUString SAL_CALL SidebarPanelBase::getResourceURL()
{
return msResourceURL;
}
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index e793c4c77e00..a6587a493a50 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -384,7 +384,7 @@ Reference<beans::XPropertySetInfo> SAL_CALL Theme::getPropertySetInfo()
}
void SAL_CALL Theme::setPropertyValue (
- const ::rtl::OUString& rsPropertyName,
+ const OUString& rsPropertyName,
const css::uno::Any& rValue)
{
PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
@@ -427,7 +427,7 @@ void SAL_CALL Theme::setPropertyValue (
}
Any SAL_CALL Theme::getPropertyValue (
- const ::rtl::OUString& rsPropertyName)
+ const OUString& rsPropertyName)
{
PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
if (iId == maPropertyNameToIdMap.end())
@@ -443,7 +443,7 @@ Any SAL_CALL Theme::getPropertyValue (
}
void SAL_CALL Theme::addPropertyChangeListener(
- const ::rtl::OUString& rsPropertyName,
+ const OUString& rsPropertyName,
const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
{
ThemeItem eItem (AnyItem_);
@@ -465,7 +465,7 @@ void SAL_CALL Theme::addPropertyChangeListener(
}
void SAL_CALL Theme::removePropertyChangeListener(
- const ::rtl::OUString& rsPropertyName,
+ const OUString& rsPropertyName,
const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
{
ThemeItem eItem (AnyItem_);
@@ -497,7 +497,7 @@ void SAL_CALL Theme::removePropertyChangeListener(
}
void SAL_CALL Theme::addVetoableChangeListener(
- const ::rtl::OUString& rsPropertyName,
+ const OUString& rsPropertyName,
const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
{
ThemeItem eItem (AnyItem_);
@@ -519,7 +519,7 @@ void SAL_CALL Theme::addVetoableChangeListener(
}
void SAL_CALL Theme::removeVetoableChangeListener(
- const ::rtl::OUString& rsPropertyName,
+ const OUString& rsPropertyName,
const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
{
ThemeItem eItem (AnyItem_);
@@ -574,7 +574,7 @@ css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties()
aProperties.size());
}
-beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsPropertyName)
+beans::Property SAL_CALL Theme::getPropertyByName (const OUString& rsPropertyName)
{
PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
if (iId == maPropertyNameToIdMap.end())
@@ -593,7 +593,7 @@ beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsProp
0);
}
-sal_Bool SAL_CALL Theme::hasPropertyByName (const ::rtl::OUString& rsPropertyName)
+sal_Bool SAL_CALL Theme::hasPropertyByName (const OUString& rsPropertyName)
{
PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
if (iId == maPropertyNameToIdMap.end())
@@ -846,7 +846,7 @@ css::uno::Type const & Theme::GetCppuType (const PropertyType eType)
switch(eType)
{
case PT_Image:
- return cppu::UnoType<rtl::OUString>::get();
+ return cppu::UnoType<OUString>::get();
case PT_Color:
return cppu::UnoType<sal_uInt32>::get();
@@ -989,7 +989,7 @@ void Theme::ProcessNewValue (
{
case PT_Image:
{
- ::rtl::OUString sURL;
+ OUString sURL;
if (rValue >>= sURL)
{
maImages[nIndex] = Tools::GetImage(sURL, nullptr);
diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx
index a21b7414c61a..0f0f596f936d 100644
--- a/sfx2/source/sidebar/Tools.cxx
+++ b/sfx2/source/sidebar/Tools.cxx
@@ -37,8 +37,8 @@ using namespace css::uno;
namespace sfx2 { namespace sidebar {
Image Tools::GetImage (
- const ::rtl::OUString& rsImageURL,
- const ::rtl::OUString& rsHighContrastImageURL,
+ const OUString& rsImageURL,
+ const OUString& rsHighContrastImageURL,
const Reference<frame::XFrame>& rxFrame)
{
if (Theme::IsHighContrastMode())
@@ -48,7 +48,7 @@ Image Tools::GetImage (
}
Image Tools::GetImage (
- const ::rtl::OUString& rsURL,
+ const OUString& rsURL,
const Reference<frame::XFrame>& rxFrame)
{
if (rsURL.getLength() > 0)
@@ -98,7 +98,7 @@ Gradient Tools::AwtToVclGradient (const css::awt::Gradient& rAwtGradient)
return aVclGradient;
}
-util::URL Tools::GetURL (const ::rtl::OUString& rsCommand)
+util::URL Tools::GetURL (const OUString& rsCommand)
{
util::URL aURL;
aURL.Complete = rsCommand;
@@ -115,15 +115,15 @@ Reference<frame::XDispatch> Tools::GetDispatch (
const util::URL& rURL)
{
Reference<frame::XDispatchProvider> xProvider (rxFrame, UNO_QUERY_THROW);
- Reference<frame::XDispatch> xDispatch (xProvider->queryDispatch(rURL, ::rtl::OUString(), 0));
+ Reference<frame::XDispatch> xDispatch (xProvider->queryDispatch(rURL, OUString(), 0));
return xDispatch;
}
-::rtl::OUString Tools::GetModuleName (
+OUString Tools::GetModuleName (
const css::uno::Reference<css::frame::XController>& rxController)
{
if (!rxController.is())
- return ::rtl::OUString();
+ return OUString();
try
{
@@ -135,7 +135,7 @@ Reference<frame::XDispatch> Tools::GetDispatch (
{
// Ignored.
}
- return ::rtl::OUString();
+ return OUString();
}
} } // end of namespace sfx2::sidebar
diff --git a/shell/source/backends/macbe/macbackend.mm b/shell/source/backends/macbe/macbackend.mm
index 59c34daad271..d89aa0b6bc16 100644
--- a/shell/source/backends/macbe/macbackend.mm
+++ b/shell/source/backends/macbe/macbackend.mm
@@ -156,7 +156,7 @@ MacOSXBackend* MacOSXBackend::createInstance()
return new MacOSXBackend;
}
-static rtl::OUString CFStringToOUString(const CFStringRef sOrig) {
+static OUString CFStringToOUString(const CFStringRef sOrig) {
CFRetain(sOrig);
CFIndex nStringLen = CFStringGetLength(sOrig)+1;
@@ -168,18 +168,18 @@ static rtl::OUString CFStringToOUString(const CFStringRef sOrig) {
CFRelease(sOrig);
- return rtl::OUString::createFromAscii(sBuffer);
+ return OUString::createFromAscii(sBuffer);
}
-static rtl::OUString GetOUString( NSString* pStr )
+static OUString GetOUString( NSString* pStr )
{
if( ! pStr )
- return rtl::OUString();
+ return OUString();
int nLen = [pStr length];
if( nLen == 0 )
- return rtl::OUString();
+ return OUString();
- rtl::OUStringBuffer aBuf( nLen+1 );
+ OUStringBuffer aBuf( nLen+1 );
aBuf.setLength( nLen );
[pStr getCharacters:
reinterpret_cast<unichar *>(const_cast<sal_Unicode*>(aBuf.getStr()))];
@@ -187,7 +187,7 @@ static rtl::OUString GetOUString( NSString* pStr )
}
void MacOSXBackend::setPropertyValue(
- rtl::OUString const &, css::uno::Any const &)
+ OUString const &, css::uno::Any const &)
{
throw css::lang::IllegalArgumentException(
"setPropertyValue not supported",
@@ -195,17 +195,17 @@ void MacOSXBackend::setPropertyValue(
}
css::uno::Any MacOSXBackend::getPropertyValue(
- rtl::OUString const & PropertyName)
+ OUString const & PropertyName)
{
if ( PropertyName == "WorkPathVariable" )
{
- rtl::OUString aDocDir;
+ OUString aDocDir;
NSArray* pPaths = NSSearchPathForDirectoriesInDomains( NSDocumentDirectory, NSUserDomainMask, true );
if( pPaths && [pPaths count] > 0 )
{
aDocDir = GetOUString( [pPaths objectAtIndex: 0] );
- rtl::OUString aDocURL;
+ OUString aDocURL;
if( aDocDir.getLength() > 0 &&
osl_getFileURLFromSystemPath( aDocDir.pData, &aDocURL.pData ) == osl_File_E_None )
{
@@ -233,7 +233,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
if (retVal)
{
- auto const Server = rtl::OUString::createFromAscii( host );
+ auto const Server = OUString::createFromAscii( host );
if( Server.getLength() > 0 )
{
return css::uno::makeAny(
@@ -267,7 +267,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
if (retVal)
{
- auto const Server = rtl::OUString::createFromAscii( host );
+ auto const Server = OUString::createFromAscii( host );
if( Server.getLength() > 0 )
{
return css::uno::makeAny(
@@ -301,7 +301,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
if (retVal)
{
- auto const Server = rtl::OUString::createFromAscii( host );
+ auto const Server = OUString::createFromAscii( host );
if( Server.getLength() > 0 )
{
return css::uno::makeAny(
@@ -333,7 +333,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
true, uno::makeAny( sal_Int32(1) ) ) );
} else if ( PropertyName == "ooInetNoProxy" )
{
- rtl::OUString aProxyBypassList;
+ OUString aProxyBypassList;
CFArrayRef rExceptionsList;
CFDictionaryRef rProxyDict = SCDynamicStoreCopyProxies(nullptr);
@@ -374,29 +374,29 @@ css::uno::Any MacOSXBackend::getPropertyValue(
}
}
-rtl::OUString MacOSXBackend::getBackendName(void)
+OUString MacOSXBackend::getBackendName(void)
{
- return rtl::OUString("com.sun.star.comp.configuration.backend.MacOSXBackend");
+ return OUString("com.sun.star.comp.configuration.backend.MacOSXBackend");
}
-rtl::OUString SAL_CALL MacOSXBackend::getImplementationName(void)
+OUString SAL_CALL MacOSXBackend::getImplementationName(void)
{
return getBackendName();
}
-uno::Sequence<rtl::OUString> MacOSXBackend::getBackendServiceNames(void)
+uno::Sequence<OUString> MacOSXBackend::getBackendServiceNames(void)
{
uno::Sequence<OUString> aServiceNameList { "com.sun.star.configuration.backend.MacOSXBackend" };
return aServiceNameList;
}
-sal_Bool SAL_CALL MacOSXBackend::supportsService(const rtl::OUString& aServiceName)
+sal_Bool SAL_CALL MacOSXBackend::supportsService(const OUString& aServiceName)
{
return cppu::supportsService(this, aServiceName);
}
-uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getSupportedServiceNames(void)
+uno::Sequence<OUString> SAL_CALL MacOSXBackend::getSupportedServiceNames(void)
{
return getBackendServiceNames();
}
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index 7589cc014ee3..eb931f23b683 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -208,7 +208,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
Reference< XSimpleMailMessage2 > xMessage( xSimpleMailMessage, UNO_QUERY );
if ( xMessage.is() )
{
- rtl::OUString sBody = xMessage->getBody();
+ OUString sBody = xMessage->getBody();
if ( sBody.getLength() > 0 )
{
aBuffer.append(" --body ");
diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx
index 63b17216cf0f..7a622b3fe0db 100644
--- a/shell/source/win32/simplemail/smplmailmsg.cxx
+++ b/shell/source/win32/simplemail/smplmailmsg.cxx
@@ -31,12 +31,12 @@ CSmplMailMsg::CSmplMailMsg( )
{
}
-void SAL_CALL CSmplMailMsg::setBody( const ::rtl::OUString& aBody )
+void SAL_CALL CSmplMailMsg::setBody( const OUString& aBody )
{
m_aBody = aBody;
}
-::rtl::OUString SAL_CALL CSmplMailMsg::getBody( )
+OUString SAL_CALL CSmplMailMsg::getBody( )
{
return m_aBody;
}
diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx
index ef87341c03b5..4797f4e81e2e 100644
--- a/shell/source/win32/simplemail/smplmailmsg.hxx
+++ b/shell/source/win32/simplemail/smplmailmsg.hxx
@@ -34,9 +34,9 @@ class CSmplMailMsg : public cppu::WeakImplHelper< css::system::XSimpleMailMessag
public:
CSmplMailMsg( );
- virtual void SAL_CALL setBody( const ::rtl::OUString& aBody ) override;
+ virtual void SAL_CALL setBody( const OUString& aBody ) override;
- virtual ::rtl::OUString SAL_CALL getBody( ) override;
+ virtual OUString SAL_CALL getBody( ) override;
virtual void SAL_CALL setRecipient( const OUString& aRecipient ) override;
diff --git a/solenv/gdb/libreoffice/sal.py b/solenv/gdb/libreoffice/sal.py
index 8dcfaebe66e1..00923a7bfdb0 100644
--- a/solenv/gdb/libreoffice/sal.py
+++ b/solenv/gdb/libreoffice/sal.py
@@ -147,10 +147,10 @@ def build_pretty_printers():
printer.add('_rtl_String', RtlStringPrinter)
printer.add('_rtl_uString', lambda name, val: RtlStringPrinter(name,
val, 'utf-16le'))
- printer.add('rtl::OString', StringPrinter)
- printer.add('rtl::OUString', lambda name, val: StringPrinter(name, val, 'utf-16'))
- printer.add('rtl::OStringBuffer', StringPrinter)
- printer.add('rtl::OUStringBuffer', lambda name, val: StringPrinter(name, val, 'utf-16'))
+ printer.add('OString', StringPrinter)
+ printer.add('OUString', lambda name, val: StringPrinter(name, val, 'utf-16'))
+ printer.add('OStringBuffer', StringPrinter)
+ printer.add('OUStringBuffer', lambda name, val: StringPrinter(name, val, 'utf-16'))
printer.add('sal_Unicode', SalUnicodePrinter, SalUnicodePrinter.query)
# other stuff
diff --git a/solenv/gdb/libreoffice/util/uno.py b/solenv/gdb/libreoffice/util/uno.py
index 648ea408a6d5..3790f075f925 100644
--- a/solenv/gdb/libreoffice/util/uno.py
+++ b/solenv/gdb/libreoffice/util/uno.py
@@ -223,7 +223,7 @@ def make_uno_type(val):
elif type_class == TypeClass.DOUBLE:
uno_type = PrimitiveType(type_class, name, 'double')
elif type_class == TypeClass.STRING:
- uno_type = PrimitiveType(type_class, name, 'rtl::OUString')
+ uno_type = PrimitiveType(type_class, name, 'OUString')
elif type_class == TypeClass.TYPE:
uno_type = PrimitiveType(type_class, name, 'com::sun::star::uno::Type')
elif type_class == TypeClass.ANY:
diff --git a/solenv/lldb/libreoffice/LO.py b/solenv/lldb/libreoffice/LO.py
index 3c1134ccadc4..31088af2aa32 100644
--- a/solenv/lldb/libreoffice/LO.py
+++ b/solenv/lldb/libreoffice/LO.py
@@ -99,8 +99,8 @@ def sal_unicode_string(buffer_ptr, length):
# Automatically install the above summary functions when this is loaded
def __lldb_init_module(debugger, dict):
debugger.HandleCommand("type summary add --skip-references --python-function LO.rtl_String_summary rtl_String")
- debugger.HandleCommand("type summary add --skip-pointers --skip-references --python-function LO.rtl_OString_summary rtl::OString")
+ debugger.HandleCommand("type summary add --skip-pointers --skip-references --python-function LO.rtl_OString_summary OString")
debugger.HandleCommand("type summary add --skip-references --python-function LO.rtl_uString_summary rtl_uString")
- debugger.HandleCommand("type summary add --skip-pointers --skip-references --python-function LO.rtl_OUString_summary rtl::OUString")
+ debugger.HandleCommand("type summary add --skip-pointers --skip-references --python-function LO.rtl_OUString_summary OUString")
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/vs/LibreOffice.natvis b/solenv/vs/LibreOffice.natvis
index 409ccd5919c8..ad16550d0504 100644
--- a/solenv/vs/LibreOffice.natvis
+++ b/solenv/vs/LibreOffice.natvis
@@ -8,11 +8,11 @@
*
-->
<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
- <Type Name="rtl::OUString">
+ <Type Name="OUString">
<DisplayString>{*pData}</DisplayString>
<StringView>*pData,su</StringView>
</Type>
- <Type Name="rtl::OString">
+ <Type Name="OString">
<DisplayString>{*pData}</DisplayString>
<StringView>*pData,s</StringView>
</Type>
@@ -54,7 +54,7 @@
<DisplayString Condition="pType->eTypeClass == 9" >{*((unsigned __int64*)pData),d} (UNSIGNED_HYPER)</DisplayString><!-- typelib_TypeClass_UNSIGNED_HYPER -->
<DisplayString Condition="pType->eTypeClass == 10">{*((float*)pData)} (FLOAT)</DisplayString><!-- typelib_TypeClass_FLOAT -->
<DisplayString Condition="pType->eTypeClass == 11">{*((double*)pData)} (DOUBLE)</DisplayString><!-- typelib_TypeClass_DOUBLE -->
- <DisplayString Condition="pType->eTypeClass == 12">{*((rtl::OUString*)pData)} (STRING)</DisplayString><!-- typelib_TypeClass_STRING -->
+ <DisplayString Condition="pType->eTypeClass == 12">{*((OUString*)pData)} (STRING)</DisplayString><!-- typelib_TypeClass_STRING -->
<DisplayString Condition="pType->eTypeClass == 13">{*((com::sun::star::uno::Type*)pData)} (TYPE)</DisplayString><!-- typelib_TypeClass_TYPE -->
<DisplayString Condition="pType->eTypeClass == 14">{*((_uno_Any*)pData)} (ANY)</DisplayString><!-- typelib_TypeClass_ANY -->
<DisplayString Condition="pType->eTypeClass == 15">{*((sal_Int32*)pData),d} (ENUM)</DisplayString><!-- typelib_TypeClass_ENUM -->
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 60a74840a233..b6ddaae591b7 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1608,7 +1608,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
if (aDataHelper.HasFormat(nId = SotClipboardFormatId::STRING))
{
// In case of FORMAT_STRING no stream exists, need to generate one
- ::rtl::OUString aString;
+ OUString aString;
if (aDataHelper.GetString( nId, aString))
{
std::unique_ptr<SfxMedium> pClipboardMedium(new SfxMedium());
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index d0608528b909..02706a6258de 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -1885,7 +1885,7 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect(
// Catalogue methods
// Filter all (?) methods of XInterface so e.g. acquire and release
// can not be called from scripting
- rtl::OUString className(
+ OUString className(
rxMethod_i->getDeclaringClass()->getName());
if (className == "com.sun.star.uno.XInterface") {
bFoundXInterface = true;
diff --git a/svl/qa/unit/items/test_IndexedStyleSheets.cxx b/svl/qa/unit/items/test_IndexedStyleSheets.cxx
index 3e083892d43f..b00833f418cf 100644
--- a/svl/qa/unit/items/test_IndexedStyleSheets.cxx
+++ b/svl/qa/unit/items/test_IndexedStyleSheets.cxx
@@ -23,7 +23,7 @@ using namespace svl;
class MockedStyleSheet : public SfxStyleSheetBase
{
public:
- MockedStyleSheet(const rtl::OUString& name, SfxStyleFamily fam = SfxStyleFamily::Char)
+ MockedStyleSheet(const OUString& name, SfxStyleFamily fam = SfxStyleFamily::Char)
: SfxStyleSheetBase(name, nullptr, fam, SfxStyleSearchBits::Auto)
{}
@@ -117,8 +117,8 @@ void IndexedStyleSheetsTest::RemovingStyleSheetWhichIsNotAvailableHasNoEffect()
void IndexedStyleSheetsTest::StyleSheetsCanBeRetrievedByTheirName()
{
- rtl::OUString name1("name1");
- rtl::OUString name2("name2");
+ OUString name1("name1");
+ OUString name2("name2");
rtl::Reference<SfxStyleSheetBase> sheet1(new MockedStyleSheet(name1));
rtl::Reference<SfxStyleSheetBase> sheet2(new MockedStyleSheet(name2));
rtl::Reference<SfxStyleSheetBase> sheet3(new MockedStyleSheet(name1));
@@ -142,8 +142,8 @@ void IndexedStyleSheetsTest::StyleSheetsCanBeRetrievedByTheirName()
void IndexedStyleSheetsTest::KnowsThatItStoresAStyleSheet()
{
- rtl::OUString const name1("name1");
- rtl::OUString const name2("name2");
+ OUString const name1("name1");
+ OUString const name2("name2");
rtl::Reference<SfxStyleSheetBase> sheet1(new MockedStyleSheet(name1));
rtl::Reference<SfxStyleSheetBase> sheet2(new MockedStyleSheet(name1));
rtl::Reference<SfxStyleSheetBase> sheet3(new MockedStyleSheet(name2));
@@ -182,7 +182,7 @@ void IndexedStyleSheetsTest::PositionCanBeQueriedByFamily()
void IndexedStyleSheetsTest::OnlyOneStyleSheetIsReturnedWhenReturnFirstIsUsed()
{
- rtl::OUString name("name1");
+ OUString name("name1");
rtl::Reference<SfxStyleSheetBase> sheet1(new MockedStyleSheet(name, SfxStyleFamily::Char));
rtl::Reference<SfxStyleSheetBase> sheet2(new MockedStyleSheet(name, SfxStyleFamily::Para));
rtl::Reference<SfxStyleSheetBase> sheet3(new MockedStyleSheet(name, SfxStyleFamily::Char));
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index b41ed0a519a9..f2a91b3e2f1f 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -412,12 +412,12 @@ void Test::checkPreviewString(SvNumberFormatter& aFormatter,
Color** ppColor = &pColor;
if (!aFormatter.GetPreviewString(sCode, fPreviewNumber, sStr, ppColor, eLang))
{
- rtl::OString aMessage = "GetPreviewString( \"";
- aMessage += rtl::OUStringToOString( sCode, RTL_TEXTENCODING_ASCII_US );
+ OString aMessage = "GetPreviewString( \"";
+ aMessage += OUStringToOString( sCode, RTL_TEXTENCODING_ASCII_US );
aMessage += "\", ";
- aMessage += rtl::OString::number( fPreviewNumber );
+ aMessage += OString::number( fPreviewNumber );
aMessage += ", sStr, ppColor, ";
- aMessage += rtl::OString::number( static_cast<sal_uInt16>(eLang) );
+ aMessage += OString::number( static_cast<sal_uInt16>(eLang) );
aMessage += " ) failed";
CPPUNIT_FAIL( aMessage.getStr() );
}
diff --git a/svl/source/items/IndexedStyleSheets.cxx b/svl/source/items/IndexedStyleSheets.cxx
index 95d579a3231c..28a36587c4c8 100644
--- a/svl/source/items/IndexedStyleSheets.cxx
+++ b/svl/source/items/IndexedStyleSheets.cxx
@@ -15,8 +15,6 @@
#include <algorithm>
#include <utility>
-using rtl::OUString;
-
namespace {
const size_t NUMBER_OF_FAMILIES = 7;
@@ -100,7 +98,7 @@ IndexedStyleSheets::AddStyleSheet(const rtl::Reference< SfxStyleSheetBase >& sty
bool
IndexedStyleSheets::RemoveStyleSheet(const rtl::Reference< SfxStyleSheetBase >& style)
{
- rtl::OUString styleName = style->GetName();
+ OUString styleName = style->GetName();
std::vector<unsigned> positions = FindPositionsByName(styleName);
bool found = false;
unsigned stylePosition = 0;
@@ -121,7 +119,7 @@ IndexedStyleSheets::RemoveStyleSheet(const rtl::Reference< SfxStyleSheetBase >&
}
std::vector<unsigned>
-IndexedStyleSheets::FindPositionsByName(const rtl::OUString& name) const
+IndexedStyleSheets::FindPositionsByName(const OUString& name) const
{
std::vector<unsigned> r;
std::pair<MapType::const_iterator, MapType::const_iterator> range = mPositionsByName.equal_range(name);
@@ -132,7 +130,7 @@ IndexedStyleSheets::FindPositionsByName(const rtl::OUString& name) const
}
std::vector<unsigned>
-IndexedStyleSheets::FindPositionsByNameAndPredicate(const rtl::OUString& name,
+IndexedStyleSheets::FindPositionsByNameAndPredicate(const OUString& name,
StyleSheetPredicate& predicate, SearchBehavior behavior) const
{
std::vector<unsigned> r;
@@ -212,7 +210,7 @@ IndexedStyleSheets::~IndexedStyleSheets()
bool
IndexedStyleSheets::HasStyleSheet(const rtl::Reference< SfxStyleSheetBase >& style) const
{
- rtl::OUString styleName = style->GetName();
+ OUString styleName = style->GetName();
std::vector<unsigned> positions = FindPositionsByName(styleName);
for (std::vector<unsigned>::const_iterator it = positions.begin();
it != positions.end(); ++it) {
diff --git a/svtools/inc/vclxaccessibleheaderbar.hxx b/svtools/inc/vclxaccessibleheaderbar.hxx
index 919cba36bd1d..e13ef9fb317d 100644
--- a/svtools/inc/vclxaccessibleheaderbar.hxx
+++ b/svtools/inc/vclxaccessibleheaderbar.hxx
@@ -48,8 +48,8 @@ public:
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName() override;
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
public:
virtual void SAL_CALL disposing() override;
diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx
index 528c1c0ad689..1c79039eddeb 100644
--- a/svtools/source/control/vclxaccessibleheaderbar.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbar.cxx
@@ -68,13 +68,13 @@ VCLXAccessibleHeaderBar::~VCLXAccessibleHeaderBar()
// XServiceInfo
-::rtl::OUString VCLXAccessibleHeaderBar::getImplementationName()
+OUString VCLXAccessibleHeaderBar::getImplementationName()
{
return OUString( "com.sun.star.comp.toolkit.AccessibleHeaderBar" );
}
-Sequence< ::rtl::OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames()
+Sequence< OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames()
{
Sequence<OUString> aNames { "com.sun.star.awt.AccessibleHeaderBar" };
return aNames;
diff --git a/svx/inc/AccessibleSvxFindReplaceDialog.hxx b/svx/inc/AccessibleSvxFindReplaceDialog.hxx
index 5b46c3b7f6db..a460dcc80b4e 100644
--- a/svx/inc/AccessibleSvxFindReplaceDialog.hxx
+++ b/svx/inc/AccessibleSvxFindReplaceDialog.hxx
@@ -31,8 +31,8 @@ public:
virtual ~VCLXAccessibleSvxFindReplaceDialog() override;
virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName() override;
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
};
diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx
index 59df1c3e30fb..fc2df2c76a9f 100644
--- a/svx/source/accessibility/AccessibleOLEShape.cxx
+++ b/svx/source/accessibility/AccessibleOLEShape.cxx
@@ -138,7 +138,7 @@ uno::Sequence<uno::Type> SAL_CALL
uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes()
{
uno::Any strRet;
- ::rtl::OUString style;
+ OUString style;
if( m_pShape )
{
style = "style:" + static_cast<SdrOle2Obj*>(m_pShape)->GetStyleString();
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index c417c94eab56..daeaa702732c 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -53,7 +53,7 @@
using namespace ::com::sun::star;
-static bool FileExists( const INetURLObject &rURL, const rtl::OUString &rExt )
+static bool FileExists( const INetURLObject &rURL, const OUString &rExt )
{
INetURLObject aURL( rURL );
aURL.setExtension( rExt );
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 73c6f649ddef..f9e324160d0a 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -183,7 +183,7 @@ void GalApp::Init()
css::ucb::UniversalContentBroker::create(xComponentContext);
} catch (const uno::Exception &e) {
fprintf( stderr, "Bootstrap exception '%s'\n",
- rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
exit( 1 );
}
}
@@ -192,7 +192,7 @@ static std::vector<OUString> ReadResponseFile_Impl(OUString const& rInput)
{
osl::File file(rInput);
osl::FileBase::RC rc = file.open(osl_File_OpenFlag_Read);
- OString const uInput(rtl::OUStringToOString(rInput, RTL_TEXTENCODING_UTF8));
+ OString const uInput(OUStringToOString(rInput, RTL_TEXTENCODING_UTF8));
if (osl::FileBase::E_None != rc)
{
fprintf(stderr, "error while opening response file: %s (%d)\n",
diff --git a/svx/source/inc/DefaultShapesPanel.hxx b/svx/source/inc/DefaultShapesPanel.hxx
index d2e94258b965..6c7f7c99735e 100644
--- a/svx/source/inc/DefaultShapesPanel.hxx
+++ b/svx/source/inc/DefaultShapesPanel.hxx
@@ -61,7 +61,7 @@ private:
VclPtr<ValueSet> mpStarSet;
VclPtr<ValueSet> mp3DObjectSet;
Reference< XFrame > mxFrame;
- std::map<VclPtr<ValueSet>, std::map<sal_uInt16, rtl::OUString>> mpShapesSetMap;
+ std::map<VclPtr<ValueSet>, std::map<sal_uInt16, OUString>> mpShapesSetMap;
void populateShapes();
void Initialize();
diff --git a/svx/source/inc/ShapesUtil.hxx b/svx/source/inc/ShapesUtil.hxx
index e6385c9a69d0..45b246cc1881 100644
--- a/svx/source/inc/ShapesUtil.hxx
+++ b/svx/source/inc/ShapesUtil.hxx
@@ -27,7 +27,7 @@ class SvxShapeCommandsMap
{
public:
SvxShapeCommandsMap();
- std::map<sal_uInt16, rtl::OUString> mpLineShapes, mpCurveShapes,
+ std::map<sal_uInt16, OUString> mpLineShapes, mpCurveShapes,
mpConnectorShapes, mpBasicShapes, mpSymbolShapes,
mpBlockArrowShapes, mpFlowchartShapes,
mpCalloutShapes, mpStarShapes, mp3DShapes;
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 5c0e5fd18735..cdc225da1288 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -201,7 +201,7 @@ namespace svx
// XAccessibleAction
virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override;
virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override;
- virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
+ virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 36ce4e7f6d43..7dbbd48327e7 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -202,7 +202,7 @@ public:
// XAccessibleAction
virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override;
virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override;
- virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
+ virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
// internal
diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx
index c64d1e1a310a..f5cf28f06906 100644
--- a/svx/source/items/galleryitem.cxx
+++ b/svx/source/items/galleryitem.cxx
@@ -74,7 +74,7 @@ bool SvxGalleryItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /* nMemberId
bool bAllConverted( true );
sal_Int8 nType(0);
- rtl::OUString aURL, aFilterName;
+ OUString aURL, aFilterName;
css::uno::Reference< css::lang::XComponent > xDrawing;
css::uno::Reference< css::graphic::XGraphic > xGraphic;
diff --git a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx
index 5591ee389200..230ced107676 100644
--- a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx
+++ b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx
@@ -60,7 +60,7 @@ void ContextChangeEventMultiplexer::NotifyContextChange (
}
-::rtl::OUString ContextChangeEventMultiplexer::GetModuleName (
+OUString ContextChangeEventMultiplexer::GetModuleName (
const css::uno::Reference<css::frame::XFrame>& rxFrame)
{
try
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx
index f180d4b3d927..4eb6270dab2f 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -70,7 +70,7 @@ public:
// XUIElementFactory
css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement (
- const ::rtl::OUString& rsResourceURL,
+ const OUString& rsResourceURL,
const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
OUString SAL_CALL getImplementationName() override
@@ -89,7 +89,7 @@ PanelFactory::PanelFactory()
}
Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
- const ::rtl::OUString& rsResourceURL,
+ const OUString& rsResourceURL,
const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments)
{
const ::comphelper::NamedValueCollection aArguments (rArguments);
diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx
index 6ec2baed0d86..9858820d6a36 100644
--- a/svx/source/sidebar/SelectionChangeHandler.cxx
+++ b/svx/source/sidebar/SelectionChangeHandler.cxx
@@ -31,7 +31,7 @@ using namespace css::uno;
namespace svx { namespace sidebar {
SelectionChangeHandler::SelectionChangeHandler (
- const std::function<rtl::OUString()>& rSelectionChangeCallback,
+ const std::function<OUString()>& rSelectionChangeCallback,
const Reference<css::frame::XController>& rxController,
const vcl::EnumContext::Context eDefaultContext)
: SelectionChangeHandlerInterfaceBase(m_aMutex),
diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.cxx b/svx/source/sidebar/media/MediaPlaybackPanel.cxx
index 33f4646645d4..a0a2b899375b 100644
--- a/svx/source/sidebar/media/MediaPlaybackPanel.cxx
+++ b/svx/source/sidebar/media/MediaPlaybackPanel.cxx
@@ -26,7 +26,6 @@
#include <sfx2/dispatch.hxx>
#include <avmedia/MediaControlBase.hxx>
-using ::rtl::OUString;
using namespace avmedia;
namespace svx { namespace sidebar {
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 4d21ea94fd9e..ca1f29938304 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -448,8 +448,8 @@ sal_uInt16 NumberingTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 m
return sal_uInt16(0xFFFF);
const SvxNumberFormat& aFmt(aNum.GetLevel(nActLv));
- //sal_Unicode cPrefix = rtl::OUString(aFmt.GetPrefix())[0];
- //sal_Unicode cSuffix = rtl::OUString(aFmt.GetSuffix())[0];
+ //sal_Unicode cPrefix = OUString(aFmt.GetPrefix())[0];
+ //sal_Unicode cSuffix = :OUString(aFmt.GetSuffix())[0];
const OUString& sPrefix = aFmt.GetPrefix();
const OUString& sLclSuffix = aFmt.GetSuffix();
sal_Int16 eNumType = aFmt.GetNumberingType();
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 4e4eaffbb125..084fb7d1c718 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -408,7 +408,7 @@ IMPL_LINK_NOARG( PosSizePropertyPanel, ClickAutoHdl, Button*, void )
// mpCbxScale must synchronized with that on Position and Size tabpage on Shape Properties dialog
SvtViewOptions aPageOpt(EViewType::TabPage, "cui/ui/possizetabpage/PositionAndSize");
- aPageOpt.SetUserItem( USERITEM_NAME, css::uno::makeAny( ::rtl::OUString::number( int(mpCbxScale->IsChecked()) ) ) );
+ aPageOpt.SetUserItem( USERITEM_NAME, css::uno::makeAny( OUString::number( int(mpCbxScale->IsChecked()) ) ) );
}
@@ -803,7 +803,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
SvtViewOptions aPageOpt(EViewType::TabPage, "cui/ui/possizetabpage/PositionAndSize");
OUString sUserData;
css::uno::Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME );
- ::rtl::OUString aTemp;
+ OUString aTemp;
if ( aUserItem >>= aTemp )
sUserData = aTemp;
mpCbxScale->Check( static_cast<bool>(sUserData.toInt32()) );
diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
index 1f8c2d10b58c..74079228f65e 100644
--- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
+++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
@@ -23,8 +23,6 @@
#include <vcl/outdev.hxx>
#include <vcl/commandinfoprovider.hxx>
-using ::rtl::OUString;
-
namespace svx { namespace sidebar {
DefaultShapesPanel::DefaultShapesPanel (
@@ -125,7 +123,7 @@ void DefaultShapesPanel::populateShapes()
for(auto& aSet : mpShapesSetMap)
{
aSet.first->SetColCount(6);
- for(std::map<sal_uInt16, rtl::OUString>::size_type i = 0; i < aSet.second.size(); i++)
+ for(std::map<sal_uInt16, OUString>::size_type i = 0; i < aSet.second.size(); i++)
{
sSlotStr = aSet.second[i];
aSlotImage = vcl::CommandInfoProvider::GetImageForCommand(sSlotStr, mxFrame);
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 9846b9898ee2..acbbac52f21e 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -108,7 +108,7 @@ void TextCharacterSpacingControl::Initialize()
if(aWinOpt.Exists())
{
css::uno::Sequence<css::beans::NamedValue> aSeq = aWinOpt.GetUserData();
- ::rtl::OUString aTmp;
+ OUString aTmp;
if(aSeq.getLength())
aSeq[0].Value >>= aTmp;
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index 7d2ae7ea4365..b6c1d7f90c2d 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -126,7 +126,7 @@ void SmartTagMgr::RecognizeTextRange(const Reference< text::XTextRange>& xRange,
const sal_uInt32 nSmartTagCount = xRecognizer->getSmartTagCount();
for ( sal_uInt32 j = 0; j < nSmartTagCount && !bCallRecognizer; ++j )
{
- const rtl::OUString aSmartTagName = xRecognizer->getSmartTagName(j);
+ const OUString aSmartTagName = xRecognizer->getSmartTagName(j);
if ( IsSmartTagTypeEnabled( aSmartTagName ) )
bCallRecognizer = true;
}
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index 4eff1c5bb569..ad2029bd7c53 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -35,7 +35,7 @@ namespace svx
#define TOOLBAR_RESNAME "private:resource/toolbar/"
#define PROPNAME_LAYOUTMANAGER "LayoutManager"
- ToolboxAccess::ToolboxAccess( const ::rtl::OUString& rToolboxName ) :
+ ToolboxAccess::ToolboxAccess( const OUString& rToolboxName ) :
m_sToolboxResName ( TOOLBAR_RESNAME )
{
m_sToolboxResName += rToolboxName;
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 492c92a5eeb3..73e24198df1b 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -724,7 +724,7 @@ static SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap()
{ OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
{ OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
{ OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
- { OUString(UNO_NAME_MISC_OBJ_NAME), SDRATTR_OBJECTNAME, cppu::UnoType<rtl::OUString>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_NAME), SDRATTR_OBJECTNAME, cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0},
{ OUString("Model"), OWN_ATTR_OLEMODEL , cppu::UnoType<css::table::XTable>::get(), css::beans::PropertyAttribute::READONLY, 0},
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index c9b538920c68..a640d9a61055 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -65,7 +65,7 @@ uno::Reference< container::XNameContainer > XGradientList::createInstance()
bool XGradientList::Create()
{
- rtl::OUStringBuffer aStr(SvxResId(RID_SVXSTR_GRADIENT));
+ OUStringBuffer aStr(SvxResId(RID_SVXSTR_GRADIENT));
aStr.append(" 1");
sal_Int32 nLen = aStr.getLength() - 1;
Insert(o3tl::make_unique<XGradientEntry>(XGradient(COL_BLACK, COL_WHITE, css::awt::GradientStyle_LINEAR , 0,10,10, 0,100,100),aStr.toString()));
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 794a76245525..b3494c754f16 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -1023,7 +1023,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf90810, "tdf90810short.docx")
uno::Reference<container::XIndexAccess> xFootnoteIdxAcc(xFootnoteSupp->getFootnotes(), uno::UNO_QUERY);
uno::Reference<text::XFootnote> xFootnote(xFootnoteIdxAcc->getByIndex(0), uno::UNO_QUERY);
uno::Reference<text::XText> xFootnoteText(xFootnote, uno::UNO_QUERY);
- rtl::OUString sFootnoteText = xFootnoteText->getString();
+ OUString sFootnoteText = xFootnoteText->getString();
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(89), sFootnoteText.getLength());
}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index d26a0f886e8c..233d987e5db0 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -775,8 +775,7 @@ public:
void Import()
{
- struct DefaultLocale
- : public comphelper::ConfigurationProperty<DefaultLocale, rtl::OUString>
+ struct DefaultLocale : public comphelper::ConfigurationProperty<DefaultLocale, OUString>
{
static OUString path()
{
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 48a0477cd67b..76cc659805dd 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -4069,7 +4069,7 @@ void SwUiWriterTest::testTdf94804()
IDocumentMarkAccess::MarkType::CROSSREF_HEADING_BOOKMARK,
::sw::mark::InsertMode::New));
//get the new(autogenerated) bookmark name
- rtl::OUString bookmark1name = pMark1->GetName();
+ OUString bookmark1name = pMark1->GetName();
//match the bookmark name, it should be like "__RefHeading__**"
CPPUNIT_ASSERT(bookmark1name.match("__RefHeading__"));
//make second bookmark, CROSSREF_NUMITEM, with *empty* name
@@ -4077,7 +4077,7 @@ void SwUiWriterTest::testTdf94804()
IDocumentMarkAccess::MarkType::CROSSREF_NUMITEM_BOOKMARK,
::sw::mark::InsertMode::New));
//get the new(autogenerated) bookmark name
- rtl::OUString bookmark2name = pMark2->GetName();
+ OUString bookmark2name = pMark2->GetName();
//match the bookmark name, it should be like "__RefNumPara__**"
CPPUNIT_ASSERT(bookmark2name.match("__RefNumPara__"));
}
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index b803a43a1329..8ff9fd384af8 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -677,7 +677,7 @@ namespace sw
static bool
CanEncode(OUString const& rString, rtl_TextEncoding const eEncoding)
{
- rtl::OString tmp;
+ OString tmp;
return rString.convertToString(&tmp, eEncoding,
RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR |
RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR);
diff --git a/test/source/drawing/captionshape.cxx b/test/source/drawing/captionshape.cxx
index fc3d8ea6755d..70d0b8007a37 100644
--- a/test/source/drawing/captionshape.cxx
+++ b/test/source/drawing/captionshape.cxx
@@ -25,7 +25,7 @@ namespace apitest
void CaptionShape::testCaptionShapeProperties()
{
uno::Reference<beans::XPropertySet> xCaptionShape(init(), UNO_QUERY_THROW);
- rtl::OUString propName;
+ OUString propName;
uno::Any aNewValue;
propName = "CornerRadius";
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 682d4365e217..a22f9308095b 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -815,7 +815,7 @@ static const MessageBoxTypeInfo aMessageBoxTypeInfo[] =
};
bool lcl_convertMessageBoxType(
- rtl::OUString &sType,
+ OUString &sType,
css::awt::MessageBoxType eType )
{
const MessageBoxTypeInfo *pMap = aMessageBoxTypeInfo;
@@ -826,7 +826,7 @@ bool lcl_convertMessageBoxType(
if ( pMap->eType == eType )
{
eVal = eType;
- sType = rtl::OUString( pMap->pName, pMap->nLen, RTL_TEXTENCODING_ASCII_US );
+ sType = OUString( pMap->pName, pMap->nLen, RTL_TEXTENCODING_ASCII_US );
break;
}
pMap++;
@@ -1759,7 +1759,7 @@ css::uno::Reference< css::awt::XMessageBox > SAL_CALL VCLXToolkit::createMessage
if ( sal_Int32( aButtons & 0xffff0000L ) == css::awt::MessageBoxButtons::DEFAULT_BUTTON_IGNORE )
nAddWinBits |= MessBoxStyle::DefaultIgnore;
- rtl::OUString aType;
+ OUString aType;
lcl_convertMessageBoxType( aType, eType );
aDescriptor.Type = css::awt::WindowClass_MODALTOP;
diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx
index 61a16a5400e7..16b81b6ee56f 100644
--- a/tools/source/generic/gen.cxx
+++ b/tools/source/generic/gen.cxx
@@ -41,7 +41,7 @@ SvStream& WritePair( SvStream& rOStream, const Pair& rPair )
return rOStream;
}
-rtl::OString Pair::toString() const
+OString Pair::toString() const
{
std::stringstream ss;
// Note that this is not just used for debugging output but the
diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx
index d1345552b92f..49e86bfeec2e 100644
--- a/ucb/source/inc/regexpmap.hxx
+++ b/ucb/source/inc/regexpmap.hxx
@@ -107,7 +107,7 @@ private:
template< typename Val >
RegexpMapConstIter< Val >::RegexpMapConstIter():
- m_aEntry(rtl::OUString(), 0),
+ m_aEntry(OUString(), 0),
m_pMap(nullptr),
m_nList(-1),
m_bEntrySet(false)
@@ -116,7 +116,7 @@ RegexpMapConstIter< Val >::RegexpMapConstIter():
template< typename Val >
RegexpMapConstIter< Val >::RegexpMapConstIter(RegexpMap< Val > * pTheMap,
bool bBegin):
- m_aEntry(rtl::OUString(), 0),
+ m_aEntry(OUString(), 0),
m_pMap(pTheMap),
m_bEntrySet(false)
{
@@ -137,7 +137,7 @@ template< typename Val >
inline RegexpMapConstIter< Val >::RegexpMapConstIter(RegexpMap< Val > * pTheMap,
int nTheList,
ListIterator aTheIndex):
- m_aEntry(rtl::OUString(), 0),
+ m_aEntry(OUString(), 0),
m_aIndex(aTheIndex),
m_pMap(pTheMap),
m_nList(nTheList),
@@ -299,7 +299,7 @@ private:
};
template< typename Val >
-void RegexpMap< Val >::add(rtl::OUString const & rKey, Val const & rValue)
+void RegexpMap< Val >::add(OUString const & rKey, Val const & rValue)
{
Regexp aRegexp(Regexp::parse(rKey));
@@ -328,7 +328,7 @@ void RegexpMap< Val >::add(rtl::OUString const & rKey, Val const & rValue)
}
template< typename Val >
-typename RegexpMap< Val >::iterator RegexpMap< Val >::find(rtl::OUString const & rKey)
+typename RegexpMap< Val >::iterator RegexpMap< Val >::find(OUString const & rKey)
{
Regexp aRegexp(Regexp::parse(rKey));
@@ -399,7 +399,7 @@ typename RegexpMap< Val >::size_type RegexpMap< Val >::size() const
}
template< typename Val >
-Val const * RegexpMap< Val >::map(rtl::OUString const & rString) const
+Val const * RegexpMap< Val >::map(OUString const & rString) const
{
for (int n = Regexp::KIND_DOMAIN; n >= Regexp::KIND_PREFIX; --n)
{
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
index 09d0a88b7be0..30ec5256f965 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
@@ -138,7 +138,7 @@ public:
/// @throws DAVException
void
GET0( DAVRequestHeaders & rRequestHeaders,
- const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all'
+ const std::vector< OUString > & rHeaderNames, // empty == 'all'
DAVResource & rResource,
const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 86cac8850bce..4616957b0725 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -104,8 +104,8 @@ namespace
// implement a GET to substitute HEAD, when HEAD not available
void lcl_sendPartialGETRequest( bool &bError,
DAVException &aLastException,
- const std::vector< rtl::OUString >& rProps,
- std::vector< rtl::OUString > &aHeaderNames,
+ const std::vector< OUString >& rProps,
+ std::vector< OUString > &aHeaderNames,
const std::unique_ptr< DAVResourceAccess > &xResAccess,
std::unique_ptr< ContentProperties > &xProps,
const uno::Reference< ucb::XCommandEnvironment >& xEnv )
@@ -116,7 +116,7 @@ namespace
OUString( "bytes=0-0" ) );
bool bIsRequestSize = std::any_of(aHeaderNames.begin(), aHeaderNames.end(),
- [](const rtl::OUString& rHeaderName) { return rHeaderName == "Content-Length"; });
+ [](const OUString& rHeaderName) { return rHeaderName == "Content-Length"; });
if ( bIsRequestSize )
{
@@ -135,7 +135,7 @@ namespace
// the ContentProperties maps "Content-Length" to the UCB "Size" property
// This would have an unrealistic value of 1 byte because we did only a partial GET
// Solution: if "Content-Range" is present, map it with UCB "Size" property
- rtl::OUString aAcceptRanges, aContentRange, aContentLength;
+ OUString aAcceptRanges, aContentRange, aContentLength;
std::vector< DAVPropertyValue > &aResponseProps = aResource.properties;
for ( const auto& rResponseProp : aResponseProps )
{
@@ -169,7 +169,7 @@ namespace
sal_Int32 nSlash = aContentRange.lastIndexOf( '/' );
if ( nSlash != -1 )
{
- rtl::OUString aSize = aContentRange.copy( nSlash + 1 );
+ OUString aSize = aContentRange.copy( nSlash + 1 );
// "*" means that the instance-length is unknown at the time when the response was generated
if ( aSize != "*" )
{
@@ -4165,7 +4165,7 @@ bool Content::isResourceAvailable( const css::uno::Reference< css::ucb::XCommand
const std::unique_ptr< DAVResourceAccess > & rResAccess,
DAVOptions& rDAVOptions )
{
- std::vector< rtl::OUString > aHeaderNames;
+ std::vector< OUString > aHeaderNames;
DAVResource aResource;
try
diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
index 4d52efcf5e6b..d86371d17bc8 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
@@ -592,7 +592,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
"removeProperty",
-1,
- cppu::UnoType<rtl::OUString>::get() );
+ cppu::UnoType<OUString>::get() );
bool bFolder = false;
diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx
index 34537d29e663..a08a8488da15 100644
--- a/ucb/source/ucp/webdav/DAVProperties.cxx
+++ b/ucb/source/ucp/webdav/DAVProperties.cxx
@@ -180,7 +180,7 @@ bool DAVProperties::isUCBDeadProperty( const SerfPropName & rName )
== 0 ) );
}
-bool DAVProperties::isUCBSpecialProperty(const rtl::OUString& rFullName, rtl::OUString& rParsedName)
+bool DAVProperties::isUCBSpecialProperty(const OUString& rFullName, OUString& rParsedName)
{
sal_Int32 nLen = rFullName.getLength();
if ( nLen <= 0 ||
@@ -193,7 +193,7 @@ bool DAVProperties::isUCBSpecialProperty(const rtl::OUString& rFullName, rtl::OU
if ( nEnd == -1 )
return false;
- rtl::OUString sPropName = rFullName.copy( nStart, nEnd - nStart );
+ OUString sPropName = rFullName.copy( nStart, nEnd - nStart );
if ( !sPropName.getLength() )
return false;
@@ -206,11 +206,11 @@ bool DAVProperties::isUCBSpecialProperty(const rtl::OUString& rFullName, rtl::OU
if ( nEnd != nLen - RTL_CONSTASCII_LENGTH( "\">" ) )
return false;
- rtl::OUString sNamesp = rFullName.copy( nStart, nEnd - nStart );
+ OUString sNamesp = rFullName.copy( nStart, nEnd - nStart );
if ( !( nLen = sNamesp.getLength() ) )
return false;
- rtl::OUStringBuffer aBuff( sNamesp );
+ OUStringBuffer aBuff( sNamesp );
if ( sNamesp[nLen - 1] != '/' )
aBuff.append( '/' );
aBuff.append( sPropName );
diff --git a/ucb/source/ucp/webdav/DAVProperties.hxx b/ucb/source/ucp/webdav/DAVProperties.hxx
index e8103fbe45af..926afd6a765f 100644
--- a/ucb/source/ucp/webdav/DAVProperties.hxx
+++ b/ucb/source/ucp/webdav/DAVProperties.hxx
@@ -49,8 +49,8 @@ struct DAVProperties
OUString & rFullName );
static bool isUCBDeadProperty( const SerfPropName & rName );
- static bool isUCBSpecialProperty( const rtl::OUString & rFullName,
- rtl::OUString & rParsedName );
+ static bool isUCBSpecialProperty( const OUString & rFullName,
+ OUString & rParsedName );
};
} // namespace http_dav_ucp
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 2132cb095390..6ff0458dd2fa 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -1027,7 +1027,7 @@ const OUString & DAVResourceAccess::getRequestURI() const
// static
void DAVResourceAccess::getUserRequestHeaders(
const uno::Reference< ucb::XCommandEnvironment > & xEnv,
- const rtl::OUString & rURI,
+ const OUString & rURI,
ucb::WebDAVHTTPMethod eMethod,
DAVRequestHeaders & rRequestHeaders )
{
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
index f6c0ce9322ed..37d76d83f42e 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
@@ -118,7 +118,7 @@ public:
/// @throws DAVException
css::uno::Reference< css::io::XInputStream >
GET( DAVRequestHeaders & rRequestHeaders,
- const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all'
+ const std::vector< OUString > & rHeaderNames, // empty == 'all'
DAVResource & rResource,
const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
@@ -189,7 +189,7 @@ public:
static void
getUserRequestHeaders(
const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv,
- const rtl::OUString & rURI,
+ const OUString & rURI,
css::ucb::WebDAVHTTPMethod eMethod,
DAVRequestHeaders & rRequestHeaders );
diff --git a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
index 57502dc3ccbd..4540ccbd0124 100644
--- a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
@@ -65,7 +65,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
: 0;
if ( nPropCount > 0 )
{
- rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
// add PropPatch xml header in front
aBuffer.append( PROPPATCH_HEADER );
@@ -137,7 +137,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
// add PropPatch xml trailer at end
aBuffer.append( PROPPATCH_TRAILER );
- aBodyText = rtl::OUStringToOString( aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
+ aBodyText = OUStringToOString( aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
body_bkt = serf_bucket_simple_copy_create( aBodyText.getStr(),
aBodyText.getLength(),
pSerfBucketAlloc );
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index 51a29a7445bf..6bcdc0b1ec11 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -462,7 +462,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
{
uno::Reference< security::XCertificateExtension >element = extensions[i];
- const rtl::OString aId ( reinterpret_cast<const sal_Char *>(const_cast<const signed char *>(element->getExtensionId().getArray())), element->getExtensionId().getLength());
+ const OString aId ( reinterpret_cast<const sal_Char *>(const_cast<const signed char *>(element->getExtensionId().getArray())), element->getExtensionId().getLength());
if ( aId.equals( OID_SUBJECT_ALTERNATIVE_NAME ) )
{
uno::Reference< security::XSanExtension > sanExtension ( element, uno::UNO_QUERY );
@@ -471,7 +471,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
}
}
- uno::Sequence< ::rtl::OUString > certHostNames(altNames.getLength() + 1);
+ uno::Sequence< OUString > certHostNames(altNames.getLength() + 1);
certHostNames[0] = sServerCertificateSubject;
for( int n = 0; n < altNames.getLength(); ++n )
{
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index a6e7087c26a2..72913059c5e3 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -90,8 +90,8 @@ namespace
{
void lcl_sendPartialGETRequest( bool &bError,
DAVException &aLastException,
- const std::vector< rtl::OUString >& rProps,
- std::vector< rtl::OUString > &aHeaderNames,
+ const std::vector< OUString >& rProps,
+ std::vector< OUString > &aHeaderNames,
const std::unique_ptr< DAVResourceAccess > &xResAccess,
std::unique_ptr< ContentProperties > &xProps,
const uno::Reference< ucb::XCommandEnvironment >& xEnv )
@@ -104,7 +104,7 @@ void lcl_sendPartialGETRequest( bool &bError,
OUString( "bytes=0-0" )));
bool bIsRequestSize = std::any_of(aHeaderNames.begin(), aHeaderNames.end(),
- [](const rtl::OUString& rHeaderName) { return rHeaderName == "Content-Length"; });
+ [](const OUString& rHeaderName) { return rHeaderName == "Content-Length"; });
if ( bIsRequestSize )
{
@@ -126,7 +126,7 @@ void lcl_sendPartialGETRequest( bool &bError,
// the ContentProperties maps "Content-Length" to the UCB "Size" property
// This would have an unrealistic value of 1 byte because we did only a partial GET
// Solution: if "Content-Range" is present, map it with UCB "Size" property
- rtl::OUString aAcceptRanges, aContentRange, aContentLength;
+ OUString aAcceptRanges, aContentRange, aContentLength;
std::vector< DAVPropertyValue > &aResponseProps = aResource.properties;
for ( const auto& rResponseProp : aResponseProps )
{
@@ -157,7 +157,7 @@ void lcl_sendPartialGETRequest( bool &bError,
sal_Int32 nSlash = aContentRange.lastIndexOf( '/' );
if ( nSlash != -1 )
{
- rtl::OUString aSize = aContentRange.copy( nSlash + 1 );
+ OUString aSize = aContentRange.copy( nSlash + 1 );
// "*" means that the instance-length is unknown at the time when the response was generated
if ( aSize != "*" )
{
@@ -710,7 +710,7 @@ uno::Any SAL_CALL Content::execute(
}
else if ( aCommand.Name == "removeProperty" )
{
- rtl::OUString sPropName;
+ OUString sPropName;
if ( !( aCommand.Argument >>= sPropName ) )
{
ucbhelper::cancelCommandExecution(
@@ -815,7 +815,7 @@ void Content::addProperty( const css::ucb::PropertyCommandArgument &aCmdArg,
// Take into account special properties with custom namespace
// using <prop:the_propname xmlns:prop="the_namespace">
- rtl::OUString aSpecialName;
+ OUString aSpecialName;
bool bIsSpecial = DAVProperties::isUCBSpecialProperty( aProperty.Name, aSpecialName );
// Note: This requires network access!
@@ -912,7 +912,7 @@ void Content::addProperty( const css::ucb::PropertyCommandArgument &aCmdArg,
}
}
-void Content::removeProperty( const rtl::OUString& Name,
+void Content::removeProperty( const OUString& Name,
const uno::Reference< ucb::XCommandEnvironment >& xEnv )
{
#if 0
@@ -1016,7 +1016,7 @@ void Content::removeProperty( const rtl::OUString& Name,
}
// virtual
-void SAL_CALL Content::addProperty( const rtl::OUString& Name,
+void SAL_CALL Content::addProperty( const OUString& Name,
sal_Int16 Attributes,
const uno::Any& DefaultValue )
{
@@ -1031,7 +1031,7 @@ void SAL_CALL Content::addProperty( const rtl::OUString& Name,
}
// virtual
-void SAL_CALL Content::removeProperty( const rtl::OUString& Name )
+void SAL_CALL Content::removeProperty( const OUString& Name )
{
removeProperty( Name,
uno::Reference< ucb::XCommandEnvironment >() );
@@ -1709,7 +1709,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
// Optional props.
- rtl::OUString aSpecialName;
+ OUString aSpecialName;
bool bIsSpecial = DAVProperties::isUCBSpecialProperty( rName, aSpecialName );
if ( !xInfo.is() )
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx
index 5c0b47bda8ce..68cf8e5d24fc 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -182,7 +182,7 @@ private:
/// @throws css::beans::PropertyExistException
/// @throws css::beans::NotRemoveableException
/// @throws css::uno::RuntimeException
- void removeProperty( const rtl::OUString& Name,
+ void removeProperty( const OUString& Name,
const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
public:
/// @throws css::ucb::ContentCreationException
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index 485be38470cf..2259929f523b 100644
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
@@ -543,7 +543,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
"removeProperty",
-1,
- cppu::UnoType<rtl::OUString>::get() );
+ cppu::UnoType<OUString>::get() );
bool bFolder = false;
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index 2bf20dc2b613..3cf2a236f08b 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -120,8 +120,8 @@ static OString generateCompHelperDeclaration(std::ostream & o,
// generate component/service helper functions
o << "// component and service helper functions:\n"
- "::rtl::OUString SAL_CALL _getImplementationName();\n"
- "css::uno::Sequence< ::rtl::OUString > SAL_CALL "
+ "OUString SAL_CALL _getImplementationName();\n"
+ "css::uno::Sequence< OUString > SAL_CALL "
"_getSupportedServiceNames();\n"
"css::uno::Reference< css::uno::XInterface > SAL_CALL _create("
" css::uno::Reference< css::uno::XComponentContext > const & "
@@ -143,18 +143,18 @@ static void generateCompHelperDefinition(std::ostream & o,
OString nm;
short nbrackets = generateNamespace(o, implname, true, nm);
- o << "::rtl::OUString SAL_CALL _getImplementationName() {\n"
- " return ::rtl::OUString(\n"
+ o << "OUString SAL_CALL _getImplementationName() {\n"
+ " return OUString(\n"
" \"" << implname << "\");\n}\n\n";
- o << "css::uno::Sequence< ::rtl::OUString > SAL_CALL "
+ o << "css::uno::Sequence< OUString > SAL_CALL "
"_getSupportedServiceNames()\n{\n css::uno::Sequence< "
- "::rtl::OUString > s(" << services.size() << ");\n";
+ "OUString > s(" << services.size() << ");\n";
short i=0;
for (const auto& rService : services)
{
- o << " s[" << i++ << "] = ::rtl::OUString(\""
+ o << " s[" << i++ << "] = OUString(\""
<< rService << "\");\n";
}
o << " return s;\n}\n\n";
@@ -204,7 +204,7 @@ void generateXPropertySetBodies(std::ostream& o,
<< propertyhelper
<< " >::getPropertySetInfo();\n}\n\n";
- o << "void SAL_CALL " << classname << "setPropertyValue(const ::rtl::OUString"
+ o << "void SAL_CALL " << classname << "setPropertyValue(const OUString"
" & aPropertyName, const css::uno::Any & aValue) throw ("
"css::uno::RuntimeException, css::beans::UnknownPropertyException, "
"css::beans::PropertyVetoException, css::lang::IllegalArgumentException, "
@@ -213,13 +213,13 @@ void generateXPropertySetBodies(std::ostream& o,
o << "css::uno::Any SAL_CALL " << classname << "getPropertyValue(const "
- "::rtl::OUString & aPropertyName) throw (css::uno::RuntimeException, "
+ "OUString & aPropertyName) throw (css::uno::RuntimeException, "
"css::beans::UnknownPropertyException, css::lang::WrappedTargetException)"
"\n{\n return ::cppu::PropertySetMixin< "
<< propertyhelper << " >::getPropertyValue(aPropertyName);\n}\n\n";
o << "void SAL_CALL " << classname << "addPropertyChangeListener(const "
- "::rtl::OUString & aPropertyName, const css::uno::Reference< "
+ "OUString & aPropertyName, const css::uno::Reference< "
"css::beans::XPropertyChangeListener > & xListener) throw ("
"css::uno::RuntimeException, css::beans::UnknownPropertyException, "
"css::lang::WrappedTargetException)\n{\n ::cppu::PropertySetMixin< "
@@ -227,7 +227,7 @@ void generateXPropertySetBodies(std::ostream& o,
<< " >::addPropertyChangeListener(aPropertyName, xListener);\n}\n\n";
o << "void SAL_CALL " << classname << "removePropertyChangeListener(const "
- "::rtl::OUString & aPropertyName, const css::uno::Reference< "
+ "OUString & aPropertyName, const css::uno::Reference< "
"css::beans::XPropertyChangeListener > & xListener) throw ("
"css::uno::RuntimeException, css::beans::UnknownPropertyException, "
"css::lang::WrappedTargetException)\n{\n ::cppu::PropertySetMixin< "
@@ -235,7 +235,7 @@ void generateXPropertySetBodies(std::ostream& o,
<< " >::removePropertyChangeListener(aPropertyName, xListener);\n}\n\n";
o << "void SAL_CALL " << classname << "addVetoableChangeListener(const "
- "::rtl::OUString & aPropertyName, const css::uno::Reference< "
+ "OUString & aPropertyName, const css::uno::Reference< "
"css::beans::XVetoableChangeListener > & xListener) throw ("
"css::uno::RuntimeException, css::beans::UnknownPropertyException, "
"css::lang::WrappedTargetException)\n{\n ::cppu::PropertySetMixin< "
@@ -243,7 +243,7 @@ void generateXPropertySetBodies(std::ostream& o,
<< " >::addVetoableChangeListener(aPropertyName, xListener);\n}\n\n";
o << "void SAL_CALL " << classname << "removeVetoableChangeListener(const "
- "::rtl::OUString & aPropertyName, const css::uno::Reference< "
+ "OUString & aPropertyName, const css::uno::Reference< "
"css::beans::XVetoableChangeListener > & xListener) throw ("
"css::uno::RuntimeException, css::beans::UnknownPropertyException, "
"css::lang::WrappedTargetException)\n{\n ::cppu::PropertySetMixin< "
@@ -307,54 +307,54 @@ void generateXAddInBodies(std::ostream& o, const OString & classname)
{
o << "// css::sheet::XAddIn:\n";
- o << "::rtl::OUString SAL_CALL " << classname << "getProgrammaticFuntionName("
- "const ::rtl::OUString & aDisplayName) throw (css::uno::RuntimeException)"
- "\n{\n ::rtl::OUString ret;\n try {\n css::uno::Reference< "
+ o << "OUString SAL_CALL " << classname << "getProgrammaticFuntionName("
+ "const OUString & aDisplayName) throw (css::uno::RuntimeException)"
+ "\n{\n OUString ret;\n try {\n css::uno::Reference< "
"css::container::XNameAccess > xNAccess(m_xHAccess, css::uno::UNO_QUERY);\n"
- " css::uno::Sequence< ::rtl::OUString > functions = "
+ " css::uno::Sequence< OUString > functions = "
"xNAccess->getElementNames();\n sal_Int32 len = functions."
- "getLength();\n ::rtl::OUString sDisplayName;\n"
+ "getLength();\n OUString sDisplayName;\n"
" for (sal_Int32 i=0; i < len; ++i) {\n"
" sDisplayName = getAddinProperty(functions[i], "
- "::rtl::OUString(),\n "
+ "OUString(),\n "
"sDISPLAYNAME);\n if (sDisplayName.equals(aDisplayName))\n"
" return functions[i];\n }\n }\n"
" catch ( const css::uno::RuntimeException & e ) {\n throw e;\n }\n"
" catch ( css::uno::Exception & ) {\n }\n return ret;\n}\n\n";
- o << "::rtl::OUString SAL_CALL " << classname << "getDisplayFunctionName(const "
- "::rtl::OUString & aProgrammaticName) throw (css::uno::RuntimeException)\n"
- "{\n return getAddinProperty(aProgrammaticName, ::rtl::OUString(), "
+ o << "OUString SAL_CALL " << classname << "getDisplayFunctionName(const "
+ "OUString & aProgrammaticName) throw (css::uno::RuntimeException)\n"
+ "{\n return getAddinProperty(aProgrammaticName, OUString(), "
"sDISPLAYNAME);\n}\n\n";
- o << "::rtl::OUString SAL_CALL " << classname << "getFunctionDescription(const "
- "::rtl::OUString & aProgrammaticName) throw (css::uno::RuntimeException)\n"
- "{\n return getAddinProperty(aProgrammaticName, ::rtl::OUString(), "
+ o << "OUString SAL_CALL " << classname << "getFunctionDescription(const "
+ "OUString & aProgrammaticName) throw (css::uno::RuntimeException)\n"
+ "{\n return getAddinProperty(aProgrammaticName, OUString(), "
"sDESCRIPTION);\n}\n\n";
- o << "::rtl::OUString SAL_CALL " << classname << "getDisplayArgumentName(const "
- "::rtl::OUString & aProgrammaticFunctionName, ::sal_Int32 nArgument) throw "
+ o << "OUString SAL_CALL " << classname << "getDisplayArgumentName(const "
+ "OUString & aProgrammaticFunctionName, ::sal_Int32 nArgument) throw "
"(css::uno::RuntimeException)\n{\n return getAddinProperty("
"aProgrammaticFunctionName,\n m_functionMap["
"aProgrammaticFunctionName][nArgument],\n"
" sDISPLAYNAME);\n}\n\n";
- o << "::rtl::OUString SAL_CALL " << classname << "getArgumentDescription(const "
- "::rtl::OUString & aProgrammaticFunctionName, ::sal_Int32 nArgument) throw "
+ o << "OUString SAL_CALL " << classname << "getArgumentDescription(const "
+ "OUString & aProgrammaticFunctionName, ::sal_Int32 nArgument) throw "
"(css::uno::RuntimeException)\n{\n return getAddinProperty("
"aProgrammaticFunctionName,\n "
"m_functionMap[aProgrammaticFunctionName][nArgument],\n"
" sDESCRIPTION);\n}\n\n";
- o << "::rtl::OUString SAL_CALL " << classname << "getProgrammaticCategoryName("
- "const ::rtl::OUString & aProgrammaticFunctionName) throw ("
+ o << "OUString SAL_CALL " << classname << "getProgrammaticCategoryName("
+ "const OUString & aProgrammaticFunctionName) throw ("
"css::uno::RuntimeException)\n{\n return getAddinProperty("
- "aProgrammaticFunctionName, ::rtl::OUString(), sCATEGORY);\n}\n\n";
+ "aProgrammaticFunctionName, OUString(), sCATEGORY);\n}\n\n";
- o << "::rtl::OUString SAL_CALL " << classname << "getDisplayCategoryName(const "
- "::rtl::OUString & aProgrammaticFunctionName) throw ("
+ o << "OUString SAL_CALL " << classname << "getDisplayCategoryName(const "
+ "OUString & aProgrammaticFunctionName) throw ("
"css::uno::RuntimeException)\n{\n return getAddinProperty("
- "aProgrammaticFunctionName, ::rtl::OUString(), "
+ "aProgrammaticFunctionName, OUString(), "
"sCATEGORYDISPLAYNAME);\n}\n\n";
}
@@ -362,27 +362,27 @@ void generateXCompatibilityNamesBodies(std::ostream& o, const OString & classnam
{
o << "// css::sheet::XCompatibilityNames:\n"
"css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL " << classname
- << "getCompatibilityNames(const ::rtl::OUString & aProgrammaticName) throw "
+ << "getCompatibilityNames(const OUString & aProgrammaticName) throw "
"(css::uno::RuntimeException)\n{\n css::uno::Sequence< "
"css::sheet::LocalizedName > seqLocalizedNames;\n try {\n "
- "::rtl::OUStringBuffer buf("
+ "OUStringBuffer buf("
"aProgrammaticName);\n buf.appendAscii(\"/CompatibilityName\");\n"
- " ::rtl::OUString hname(buf.makeStringAndClear());\n\n "
+ " OUString hname(buf.makeStringAndClear());\n\n "
"if ( m_xCompAccess->hasByHierarchicalName(hname) ) {\n"
" css::uno::Reference< css::container::XNameAccess > "
"xNameAccess(\n"
" m_xCompAccess->getByHierarchicalName(hname), "
- "css::uno::UNO_QUERY);\n\n css::uno::Sequence< ::rtl::OUString"
+ "css::uno::UNO_QUERY);\n\n css::uno::Sequence< OUString"
" > elems = \n xNameAccess->getElementNames();"
"\n ::sal_Int32 len = elems.getLength();\n\n "
- "seqLocalizedNames.realloc(len);\n\n ::rtl::OUString "
+ "seqLocalizedNames.realloc(len);\n\n OUString "
"sCompatibilityName;\n for (::sal_Int32 i=0; i < len; ++i) {\n"
- " ::rtl::OUString sLocale(elems[i]);\n "
+ " OUString sLocale(elems[i]);\n "
"xNameAccess->getByName(sLocale) >>= sCompatibilityName;\n\n"
" css::lang::Locale aLocale;\n "
"::sal_Int32 nIndex = 0, nToken = 0;\n "
/* FIXME-BCP47: this will break. */
- "do {\n ::rtl::OUString aToken = sLocale.getToken(0, '-', "
+ "do {\n OUString aToken = sLocale.getToken(0, '-', "
"nIndex);\n switch (nToken++) {\n "
"case 0:\n aLocale.Language = aToken;\n"
" break;\n case 1:\n"
@@ -457,7 +457,7 @@ void generateXDispatchProvider(std::ostream& o,
o << "// css::frame::XDispatchProvider:\n"
"css::uno::Reference< css::frame::XDispatch > SAL_CALL " << classname
<< "queryDispatch( const css::util::URL& aURL,"
- " const ::rtl::OUString& sTargetFrameName, sal_Int32 nSearchFlags ) "
+ " const OUString& sTargetFrameName, sal_Int32 nSearchFlags ) "
"throw(css::uno::RuntimeException)\n{\n css::uno::Reference< "
"css::frame::XDispatch > xRet;\n"
" if ( !m_xFrame.is() )\n return 0;\n\n";
@@ -506,20 +506,20 @@ static void generateAddinConstructorAndHelper(std::ostream& o,
o << " css::uno::Reference< css::lang::XMultiServiceFactory > xProvider"
"(\n m_xContext->getServiceManager()->createInstanceWithContext"
- "(\n ::rtl::OUString(\n "
+ "(\n OUString(\n "
" \"com.sun.star.configuration.ConfigurationProvider\"),"
"\n m_xContext ), css::uno::UNO_QUERY );\n\n";
- o << " ::rtl::OUString sReadOnlyView(\n"
+ o << " OUString sReadOnlyView(\n"
" \"com.sun.star.configuration.ConfigurationAccess\");\n\n";
- o << " ::rtl::OUStringBuffer sPath(::rtl::OUString(\n"
+ o << " OUStringBuffer sPath(OUString(\n"
" \"/org.openoffice.Office.CalcAddIns/AddInInfo/\"));\n"
" sPath.appendAscii(sADDIN_SERVICENAME);\n"
" sPath.appendAscii(\"/AddInFunctions\");\n\n"
" // create arguments: nodepath\n"
" css::beans::PropertyValue aArgument;\n"
- " aArgument.Name = ::rtl::OUString(\"nodepath\");\n"
+ " aArgument.Name = OUString(\"nodepath\");\n"
" aArgument.Value <<= sPath.makeStringAndClear();\n\n"
" css::uno::Sequence< css::uno::Any > aArguments(1);\n"
" aArguments[0] <<= aArgument;\n\n";
@@ -533,8 +533,8 @@ static void generateAddinConstructorAndHelper(std::ostream& o,
o << " // extend arguments to create a view for all locales to get "
"simple\n // access to the compatibilityname property\n"
- " aArgument.Name = ::rtl::OUString(\"locale\");\n"
- " aArgument.Value <<= ::rtl::OUString(\"*\");\n"
+ " aArgument.Name = OUString(\"locale\");\n"
+ " aArgument.Value <<= OUString(\"*\");\n"
" aArguments.realloc(2);\n"
" aArguments[1] <<= aArgument;\n\n"
" // create view for all locales\n"
@@ -544,12 +544,12 @@ static void generateAddinConstructorAndHelper(std::ostream& o,
o << " }\n catch ( css::uno::Exception & ) {\n }\n}\n\n";
- o << "// addin configuration property helper function:\n::rtl::OUString "
- "SAL_CALL " << classname << "::getAddinProperty(const ::rtl::OUString &"
- " funcName, const ::rtl::OUString & paramName, const char * propName) "
+ o << "// addin configuration property helper function:\nOUString "
+ "SAL_CALL " << classname << "::getAddinProperty(const OUString &"
+ " funcName, const OUString & paramName, const char * propName) "
"throw (css::uno::RuntimeException)\n{\n"
- " ::rtl::OUString ret;\n try {\n "
- "::rtl::OUStringBuffer buf(funcName);\n"
+ " OUString ret;\n try {\n "
+ "OUStringBuffer buf(funcName);\n"
" if (!paramName.isEmpty()) {\n"
" buf.appendAscii(\"/Parameters/\");\n"
" buf.append(paramName);\n }\n\n"
@@ -557,7 +557,7 @@ static void generateAddinConstructorAndHelper(std::ostream& o,
" m_xHAccess->getByHierarchicalName(\n"
" buf.makeStringAndClear()), css::uno::UNO_QUERY);\n"
" xPropSet->getPropertyValue(\n "
- "::rtl::OUString(propName)) >>= ret;\n }\n"
+ "OUString(propName)) >>= ret;\n }\n"
" catch ( const css::uno::RuntimeException & e ) {\n throw e;\n }\n"
" catch ( css::uno::Exception & ) {\n }\n return ret;\n";
}
@@ -647,8 +647,8 @@ static OString generateClassDefinition(std::ostream& o,
// generate component/service helper functions
// o << " // component and service helper functions:\n"
-// << " static ::rtl::OUString SAL_CALL _getImplementationName();\n"
-// << " static css::uno::Sequence< ::rtl::OUString > SAL_CALL "
+// << " static OUString SAL_CALL _getImplementationName();\n"
+// << " static css::uno::Sequence< OUString > SAL_CALL "
// << "_getSupportedServiceNames();\n"
// << " static css::uno::Reference< css::uno::XInterface > SAL_CALL _create("
// << "\n css::uno::Reference< css::uno::XComponentContext > const & "
@@ -694,12 +694,12 @@ static OString generateClassDefinition(std::ostream& o,
" virtual ~" << classname << "() {}\n\n";
if (options.componenttype == 2) {
- o << " typedef boost::unordered_map< ::sal_Int32, rtl::OUString, "
+ o << " typedef boost::unordered_map< ::sal_Int32, OUString, "
"boost::hash<::sal_Int32> > ParamMap;\n"
- " typedef boost::unordered_map< rtl::OUString, ParamMap, "
- "rtl::OUStringHash > FunctionMap;\n\n"
- " ::rtl::OUString SAL_CALL getAddinProperty(const ::rtl::OUString & "
- "funcName, const ::rtl::OUString & paramName, const char * propName) "
+ " typedef boost::unordered_map< OUString, ParamMap, "
+ "OUStringHash > FunctionMap;\n\n"
+ " OUString SAL_CALL getAddinProperty(const OUString & "
+ "funcName, const OUString & paramName, const char * propName) "
"throw (css::uno::RuntimeException);\n\n";
}
@@ -805,7 +805,7 @@ static OString generateClassDefinition(std::ostream& o,
buffer.append("IMPLEMENTS_PROPERTY_ACCESS");
}
o << buffer.makeStringAndClear()
- << "), css::uno::Sequence< ::rtl::OUString >()),\n";
+ << "), css::uno::Sequence< OUString >()),\n";
}
o << " m_xContext(context)";
@@ -834,20 +834,20 @@ static void generateXServiceInfoBodies(std::ostream& o,
OString const & comphelpernamespace)
{
o << "// com.sun.star.uno.XServiceInfo:\n"
- "::rtl::OUString SAL_CALL " << classname << "getImplementationName() "
+ "OUString SAL_CALL " << classname << "getImplementationName() "
"throw (css::uno::RuntimeException)\n{\n "
"return " << comphelpernamespace << "::_getImplementationName();\n}\n\n";
o << "sal_Bool SAL_CALL " << classname
- << "supportsService(::rtl::OUString const & "
+ << "supportsService(OUString const & "
"serviceName) throw (css::uno::RuntimeException)\n{\n "
- "css::uno::Sequence< ::rtl::OUString > serviceNames = "
+ "css::uno::Sequence< OUString > serviceNames = "
<< comphelpernamespace << "::_getSupportedServiceNames();\n "
"for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) {\n "
" if (serviceNames[i] == serviceName)\n return sal_True;\n"
" }\n return sal_False;\n}\n\n";
- o << "css::uno::Sequence< ::rtl::OUString > SAL_CALL " << classname
+ o << "css::uno::Sequence< OUString > SAL_CALL " << classname
<< "getSupportedServiceNames() throw (css::uno::RuntimeException)\n{\n "
"return " << comphelpernamespace
<< "::_getSupportedServiceNames();\n}\n\n";
diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
index 5fbd2e37ce33..21c336ba02ad 100644
--- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
@@ -376,10 +376,10 @@ static void printSetPropertyMixinBody(
o << " v <<= " << buffer2.makeStringAndClear() << ";\n\n";
}
- o << " prepareSet(\n rtl::OUString(\""
+ o << " prepareSet(\n OUString(\""
<< attribute.name << "\"),\n css::uno::Any(), v, ";
} else {
- o << " prepareSet(\n rtl::OUString(\""
+ o << " prepareSet(\n OUString(\""
<< attribute.name << "\"),\n css::uno::Any(), css::uno::Any(), ";
}
@@ -439,9 +439,9 @@ void printMethods(std::ostream & o,
if (body && options.componenttype == 2) {
if (name == "com.sun.star.lang.XServiceName") {
o << "// ::com::sun::star::lang::XServiceName:\n"
- "::rtl::OUString SAL_CALL " << classname << "getServiceName() "
+ "OUString SAL_CALL " << classname << "getServiceName() "
"throw (css::uno::RuntimeException)\n{\n "
- "return ::rtl::OUString("
+ "return OUString("
"sADDIN_SERVICENAME);\n}\n";
generated.add(u2b(name));
return;
diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
index 330bb2470177..f57afcdab7ce 100644
--- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx
+++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
@@ -35,7 +35,7 @@ using namespace ::codemaker::cpp;
namespace skeletonmaker {
-void printLicenseHeader(std::ostream& o, rtl::OString const & filename)
+void printLicenseHeader(std::ostream& o, OString const & filename)
{
sal_Int32 index;
#ifdef SAL_UNX
@@ -570,7 +570,7 @@ static void generateFunctionParameterMap(std::ostream& o,
{
if ( options.language == 2 ) {
o << " fpm[" << n
- << "] = ::rtl::OUString(\""
+ << "] = OUString(\""
<< rParam.name
<< "\");\n";
}
@@ -583,7 +583,7 @@ static void generateFunctionParameterMap(std::ostream& o,
}
if ( options.language == 2 ) {
- o << " m_functionMap[::rtl::OUString(\""
+ o << " m_functionMap[OUString(\""
<< rMethod.name << "\")] = fpm;\n\n";
}
else {
diff --git a/unoidl/source/sourcefileprovider.cxx b/unoidl/source/sourcefileprovider.cxx
index 5845dbbc0115..c538f8553b90 100644
--- a/unoidl/source/sourcefileprovider.cxx
+++ b/unoidl/source/sourcefileprovider.cxx
@@ -55,14 +55,14 @@ public:
private:
virtual ~Module() throw () override {}
- virtual std::vector<rtl::OUString> getMemberNames() const override;
+ virtual std::vector<OUString> getMemberNames() const override;
virtual rtl::Reference<MapCursor> createCursor() const override
{ return new Cursor(map); }
};
-std::vector<rtl::OUString> Module::getMemberNames() const {
- std::vector<rtl::OUString> names;
+std::vector<OUString> Module::getMemberNames() const {
+ std::vector<OUString> names;
for (auto & i: map) {
names.push_back(i.first);
}
diff --git a/unoidl/source/sourceprovider-scanner.hxx b/unoidl/source/sourceprovider-scanner.hxx
index 551a21c6843a..ad499ce7c5bb 100644
--- a/unoidl/source/sourceprovider-scanner.hxx
+++ b/unoidl/source/sourceprovider-scanner.hxx
@@ -197,12 +197,12 @@ public:
struct Constructor {
struct Parameter {
Parameter(
- rtl::OUString const & theName,
+ OUString const & theName,
SourceProviderType const & theType, bool theRest):
name(theName), type(theType), rest(theRest)
{}
- rtl::OUString name;
+ OUString name;
SourceProviderType const type;
@@ -210,18 +210,18 @@ public:
};
Constructor(
- rtl::OUString const & theName,
- std::vector< rtl::OUString > const & theAnnotations):
+ OUString const & theName,
+ std::vector< OUString > const & theAnnotations):
name(theName), annotations(theAnnotations)
{}
- rtl::OUString const name;
+ OUString const name;
std::vector< Parameter > parameters;
- std::vector< rtl::OUString > exceptions;
+ std::vector< OUString > exceptions;
- std::vector< rtl::OUString > const annotations;
+ std::vector< OUString > const annotations;
};
explicit SourceProviderSingleInterfaceBasedServiceEntityPad(
diff --git a/unoidl/source/unoidl.cxx b/unoidl/source/unoidl.cxx
index 7ab7562292bd..cabf575efd3d 100644
--- a/unoidl/source/unoidl.cxx
+++ b/unoidl/source/unoidl.cxx
@@ -174,7 +174,7 @@ rtl::Reference< Provider > Manager::addProvider(OUString const & uri) {
return p;
}
-rtl::Reference< Entity > Manager::findEntity(rtl::OUString const & name) const {
+rtl::Reference< Entity > Manager::findEntity(OUString const & name) const {
//TODO: caching? (here or in cppuhelper::TypeManager?)
osl::MutexGuard g(mutex_);
for (auto & i: providers_) {
@@ -186,7 +186,7 @@ rtl::Reference< Entity > Manager::findEntity(rtl::OUString const & name) const {
return rtl::Reference< Entity >();
}
-rtl::Reference< MapCursor > Manager::createCursor(rtl::OUString const & name)
+rtl::Reference< MapCursor > Manager::createCursor(OUString const & name)
const
{
return new AggregatingCursor(providers_, name);
diff --git a/unotools/source/misc/ServiceDocumenter.hxx b/unotools/source/misc/ServiceDocumenter.hxx
index bc25ddd23c70..acb64e78614c 100644
--- a/unotools/source/misc/ServiceDocumenter.hxx
+++ b/unotools/source/misc/ServiceDocumenter.hxx
@@ -25,13 +25,13 @@ class ServiceDocumenter : public ::cppu::WeakImplHelper<
, m_sServiceBaseUrl("https://api.libreoffice.org/docs/idl/ref")
{};
// XServiceDocumenter
- virtual ::rtl::OUString SAL_CALL getCoreBaseUrl() override
+ virtual OUString SAL_CALL getCoreBaseUrl() override
{ return m_sCoreBaseUrl; };
- virtual void SAL_CALL setCoreBaseUrl( const ::rtl::OUString& sCoreBaseUrl ) override
+ virtual void SAL_CALL setCoreBaseUrl( const OUString& sCoreBaseUrl ) override
{ m_sCoreBaseUrl = sCoreBaseUrl; };
- virtual ::rtl::OUString SAL_CALL getServiceBaseUrl() override
+ virtual OUString SAL_CALL getServiceBaseUrl() override
{ return m_sServiceBaseUrl; };
- virtual void SAL_CALL setServiceBaseUrl( const ::rtl::OUString& sServiceBaseUrl ) override
+ virtual void SAL_CALL setServiceBaseUrl( const OUString& sServiceBaseUrl ) override
{ m_sServiceBaseUrl = sServiceBaseUrl; };
virtual void SAL_CALL showServiceDocs( const ::css::uno::Reference< ::css::lang::XServiceInfo >& xService) override;
virtual void SAL_CALL showInterfaceDocs( const ::css::uno::Reference< ::css::lang::XTypeProvider >& xTypeProvider ) override;
diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx
index 3a56465fbae3..55c61988c8c8 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.cxx
@@ -280,7 +280,7 @@ bool ISO8601parseDateTime(const OUString &rString, css::util::DateTime& rDateTim
{
bool bSuccess = true;
- rtl::OUString aDateStr, aTimeStr;
+ OUString aDateStr, aTimeStr;
css::util::Date aDate;
css::util::Time aTime;
sal_Int32 nPos = rString.indexOf( 'T' );
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index c600a59f5be8..a659428f8623 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -238,7 +238,7 @@ namespace
class TempDirCreatedObserver : public DirectoryCreationObserver
{
public:
- virtual void DirectoryCreated(const rtl::OUString& aDirectoryUrl) override
+ virtual void DirectoryCreated(const OUString& aDirectoryUrl) override
{
File::setAttributes( aDirectoryUrl, osl_File_Attribute_OwnRead |
osl_File_Attribute_OwnWrite | osl_File_Attribute_OwnExe );
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index fb957d9f221a..1434947030b0 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -83,7 +83,7 @@ public:
context_(context) {}
virtual ::sal_Int32 SAL_CALL run(
- css::uno::Sequence< ::rtl::OUString > const &);
+ css::uno::Sequence< OUString > const &);
private:
Service(Service &); // not defined
@@ -93,17 +93,17 @@ private:
void test(
css::uno::Reference< test::types::XTest > const & test,
- ::rtl::OUString const & name);
+ OUString const & name);
css::uno::Reference< css::uno::XComponentContext > context_;
};
-::sal_Int32 Service::run(css::uno::Sequence< ::rtl::OUString > const &) {
+::sal_Int32 Service::run(css::uno::Sequence< OUString > const &) {
osl_getThreadIdentifier(0); // check for sal
(new salhelper::SimpleReferenceObject)->release(); // check for salhelper
css::uno::getCurrentContext(); // check for cppu
try { // check for cppuhelper
- std::auto_ptr< cppu::UnoUrl > dummy(new cppu::UnoUrl(rtl::OUString()));
+ std::auto_ptr< cppu::UnoUrl > dummy(new cppu::UnoUrl(OUString()));
} catch (rtl::MalformedUriException &) {}
static char const * const services[] = {
"com.sun.star.io.DataInputStream",
@@ -121,7 +121,7 @@ private:
"com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"
};
for (::std::size_t i = 0; i < SAL_N_ELEMENTS(services); ++i) {
- ::rtl::OUString name(::rtl::OUString::createFromAscii(services[i]));
+ OUString name(OUString::createFromAscii(services[i]));
css::uno::Reference< css::uno::XInterface > instance;
try {
instance = context_->getServiceManager()->createInstanceWithContext(
@@ -130,7 +130,7 @@ private:
throw;
} catch (css::uno::Exception &) {
throw css::uno::RuntimeException(
- ::rtl::OUString("error creating instance"),
+ OUString("error creating instance"),
static_cast< ::cppu::OWeakObject * >(this));
}
if (!instance.is()) {
@@ -168,22 +168,22 @@ private:
for (std::size_t i = 0; i != SAL_N_ELEMENTS(singletons); ++i) {
css::uno::Reference< css::uno::XInterface > instance(
context_->getValueByName(
- "/singletons/" + rtl::OUString::createFromAscii(singletons[i])),
+ "/singletons/" + OUString::createFromAscii(singletons[i])),
css::uno::UNO_QUERY_THROW);
}
css::util::theMacroExpander::get(context_);
test(
::test::types::CppTest::create(context_),
- ::rtl::OUString("test.types.CppTest"));
+ OUString("test.types.CppTest"));
test(
::test::types::JavaTest::create(context_),
- ::rtl::OUString("test.types.JavaTest"));
+ OUString("test.types.JavaTest"));
return 0;
}
void Service::test(
css::uno::Reference< test::types::XTest > const & test,
- ::rtl::OUString const & name)
+ OUString const & name)
{
bool ok = false;
try {
@@ -194,7 +194,7 @@ void Service::test(
if (!ok) {
throw css::uno::RuntimeException(
(name
- + ::rtl::OUString(".throwException failed")),
+ + OUString(".throwException failed")),
static_cast< ::cppu::OWeakObject * >(this));
}
}
@@ -207,12 +207,12 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< ::cppu::OWeakObject * >(new Service(context));
}
-rtl::OUString getImplementationName() {
- return rtl::OUString("test.cpp.cppmain.Component");
+OUString getImplementationName() {
+ return OUString("test.cpp.cppmain.Component");
}
-css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() {
- return css::uno::Sequence< ::rtl::OUString >();
+css::uno::Sequence< OUString > getSupportedServiceNames() {
+ return css::uno::Sequence< OUString >();
}
}
diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc
index db42c9fb3f9f..48f63e0b9284 100644
--- a/ure/source/uretest/cppserver.cc
+++ b/ure/source/uretest/cppserver.cc
@@ -42,7 +42,7 @@ public:
Service() {}
virtual ::test::types::Data SAL_CALL getData() {
- return ::test::types::Data(rtl::OUString("Hello"), 42);
+ return ::test::types::Data(OUString("Hello"), 42);
}
private:
@@ -60,12 +60,12 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< ::cppu::OWeakObject * >(new Service);
}
-rtl::OUString getImplementationName() {
- return rtl::OUString("test.cpp.cppserver.Component");
+OUString getImplementationName() {
+ return OUString("test.cpp.cppserver.Component");
}
-css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
- return css::uno::Sequence< rtl::OUString >();
+css::uno::Sequence< OUString > getSupportedServiceNames() {
+ return css::uno::Sequence< OUString >();
}
}
diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc
index b037fdceebfb..3545a88b5f07 100644
--- a/ure/source/uretest/cpptest.cc
+++ b/ure/source/uretest/cpptest.cc
@@ -43,7 +43,7 @@ public:
virtual void SAL_CALL throwException() {
throw test::types::TestException(
- rtl::OUString("test"),
+ OUString("test"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -62,13 +62,13 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< cppu::OWeakObject * >(new Service);
}
-rtl::OUString getImplementationName() {
- return rtl::OUString("test.cpp.cpptest.Component");
+OUString getImplementationName() {
+ return OUString("test.cpp.cpptest.Component");
}
-css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
- rtl::OUString s("test.types.CppTest");
- return css::uno::Sequence< rtl::OUString >(&s, 1);
+css::uno::Sequence< OUString > getSupportedServiceNames() {
+ OUString s("test.types.CppTest");
+ return css::uno::Sequence< OUString >(&s, 1);
}
}
diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx
index ec51c18d9469..6aadbed9fdde 100644
--- a/vcl/inc/opengl/program.hxx
+++ b/vcl/inc/opengl/program.hxx
@@ -69,7 +69,7 @@ public:
GLuint Id() { return mnId; }
bool Load( const OUString& rVertexShader, const OUString& rFragmentShader,
- const rtl::OString& preamble, const rtl::OString& rDigest );
+ const OString& preamble, const OString& rDigest );
void Use();
void Reuse();
void Clean();
diff --git a/vcl/inc/unx/screensaverinhibitor.hxx b/vcl/inc/unx/screensaverinhibitor.hxx
index 76c57722c338..a1042da33a54 100644
--- a/vcl/inc/unx/screensaverinhibitor.hxx
+++ b/vcl/inc/unx/screensaverinhibitor.hxx
@@ -24,7 +24,7 @@
class VCL_PLUGIN_PUBLIC ScreenSaverInhibitor
{
public:
- void inhibit( bool bInhibit, const rtl::OUString& sReason,
+ void inhibit( bool bInhibit, const OUString& sReason,
bool bIsX11, const boost::optional<unsigned int>& xid, boost::optional<Display*> pDisplay );
private:
diff --git a/vcl/opengl/program.cxx b/vcl/opengl/program.cxx
index 5f677f1a5655..4de2c5decac0 100644
--- a/vcl/opengl/program.cxx
+++ b/vcl/opengl/program.cxx
@@ -45,8 +45,8 @@ OpenGLProgram::~OpenGLProgram()
bool OpenGLProgram::Load( const OUString& rVertexShader,
const OUString& rFragmentShader,
- const rtl::OString& preamble,
- const rtl::OString& rDigest )
+ const OString& preamble,
+ const OString& rDigest )
{
mnId = OpenGLHelper::LoadShaders( rVertexShader, rFragmentShader, preamble, rDigest );
return ( mnId != 0 );
diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx
index ae0ef85e2a34..577e2c2ad3b2 100644
--- a/vcl/opengl/x11/X11DeviceInfo.cxx
+++ b/vcl/opengl/x11/X11DeviceInfo.cxx
@@ -283,8 +283,8 @@ bool X11OpenGLDeviceInfo::isDeviceBlocked()
if (mnGLMajorVersion == 1)
return true;
- CrashReporter::AddKeyValue("AdapterVendorId", rtl::OStringToOUString(maVendor, RTL_TEXTENCODING_UTF8));
- CrashReporter::AddKeyValue("AdapterDeviceId", rtl::OStringToOUString(maRenderer, RTL_TEXTENCODING_UTF8));
+ CrashReporter::AddKeyValue("AdapterVendorId", OStringToOUString(maVendor, RTL_TEXTENCODING_UTF8));
+ CrashReporter::AddKeyValue("AdapterDeviceId", OStringToOUString(maRenderer, RTL_TEXTENCODING_UTF8));
SAL_INFO("vcl.opengl", "Vendor: " << maVendor);
SAL_INFO("vcl.opengl", "Renderer: " << maRenderer);
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 3c3e3f675fbd..37fb6b3e11c6 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -150,7 +150,7 @@ class ControllerProperties;
class ControllerProperties
{
- std::map< int, rtl::OUString > maTagToPropertyName;
+ std::map< int, OUString > maTagToPropertyName;
std::map< int, sal_Int32 > maTagToValueInt;
std::map< NSView*, NSView* > maViewPairMap;
std::vector< NSObject* > maViews;
@@ -167,24 +167,24 @@ public:
static_assert( SAL_N_ELEMENTS(SV_PRINT_NATIVE_STRINGS) == 5, "resources not found" );
}
- static rtl::OUString getMoreString()
+ static OUString getMoreString()
{
return VclResId(SV_PRINT_NATIVE_STRINGS[3]);
}
- static rtl::OUString getPrintSelectionString()
+ static OUString getPrintSelectionString()
{
return VclResId(SV_PRINT_NATIVE_STRINGS[4]);
}
- int addNameTag( const rtl::OUString& i_rPropertyName )
+ int addNameTag( const OUString& i_rPropertyName )
{
int nNewTag = mnNextTag++;
maTagToPropertyName[ nNewTag ] = i_rPropertyName;
return nNewTag;
}
- int addNameAndValueTag( const rtl::OUString& i_rPropertyName, sal_Int32 i_nValue )
+ int addNameAndValueTag( const OUString& i_rPropertyName, sal_Int32 i_nValue )
{
int nNewTag = mnNextTag++;
maTagToPropertyName[ nNewTag ] = i_rPropertyName;
@@ -214,7 +214,7 @@ public:
void changePropertyWithIntValue( int i_nTag )
{
- std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
+ std::map< int, OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
std::map< int, sal_Int32 >::const_iterator value_it = maTagToValueInt.find( i_nTag );
if( name_it != maTagToPropertyName.end() && value_it != maTagToValueInt.end() )
{
@@ -230,7 +230,7 @@ public:
void changePropertyWithIntValue( int i_nTag, sal_Int64 i_nValue )
{
- std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
+ std::map< int, OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
if( name_it != maTagToPropertyName.end() )
{
vcl::PrinterController * mpController = [mpAccessoryController printerController];
@@ -245,7 +245,7 @@ public:
void changePropertyWithBoolValue( int i_nTag, bool i_bValue )
{
- std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
+ std::map< int, OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
if( name_it != maTagToPropertyName.end() )
{
vcl::PrinterController * mpController = [mpAccessoryController printerController];
@@ -263,9 +263,9 @@ public:
}
}
- void changePropertyWithStringValue( int i_nTag, const rtl::OUString& i_rValue )
+ void changePropertyWithStringValue( int i_nTag, const OUString& i_rValue )
{
- std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
+ std::map< int, OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
if( name_it != maTagToPropertyName.end() )
{
vcl::PrinterController * mpController = [mpAccessoryController printerController];
@@ -294,7 +294,7 @@ public:
pCell ? [pCell tag] :
-1;
- std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( nTag );
+ std::map< int, OUString >::const_iterator name_it = maTagToPropertyName.find( nTag );
if( name_it != maTagToPropertyName.end() && name_it->second != "PrintContent" )
{
vcl::PrinterController * mpController = [mpAccessoryController printerController];
@@ -314,9 +314,9 @@ public:
};
-static OUString filterAccelerator( rtl::OUString const & rText )
+static OUString filterAccelerator( OUString const & rText )
{
- rtl::OUStringBuffer aBuf( rText.getLength() );
+ OUStringBuffer aBuf( rText.getLength() );
for( sal_Int32 nIndex = 0; nIndex != -1; )
aBuf.append( rText.getToken( 0, '~', nIndex ) );
return aBuf.makeStringAndClear();
@@ -365,7 +365,7 @@ static OUString filterAccelerator( rtl::OUString const & rText )
{
NSTextField* pField = static_cast<NSTextField*>(pSender);
int nTag = [pField tag];
- rtl::OUString aValue = GetOUString( [pSender stringValue] );
+ OUString aValue = GetOUString( [pSender stringValue] );
mpController->changePropertyWithStringValue( nTag, aValue );
}
else
@@ -577,7 +577,7 @@ static void adjustTabViews( NSTabView* pTabView, NSSize aTabSize )
}
}
-static NSControl* createLabel( const rtl::OUString& i_rText )
+static NSControl* createLabel( const OUString& i_rText )
{
NSString* pText = CreateNSString( i_rText );
NSRect aTextRect = { NSZeroPoint, {20, 15} };
@@ -593,7 +593,7 @@ static NSControl* createLabel( const rtl::OUString& i_rText )
return pTextView;
}
-static sal_Int32 findBreak( const rtl::OUString& i_rText, sal_Int32 i_nPos )
+static sal_Int32 findBreak( const OUString& i_rText, sal_Int32 i_nPos )
{
sal_Int32 nRet = i_rText.getLength();
Reference< i18n::XBreakIterator > xBI( vcl::unohelper::CreateBreakIterator() );
@@ -609,7 +609,7 @@ static sal_Int32 findBreak( const rtl::OUString& i_rText, sal_Int32 i_nPos )
return nRet;
}
-static void linebreakCell( NSCell* pBtn, const rtl::OUString& i_rText )
+static void linebreakCell( NSCell* pBtn, const OUString& i_rText )
{
NSString* pText = CreateNSString( i_rText );
[pBtn setTitle: pText];
@@ -623,7 +623,7 @@ static void linebreakCell( NSCell* pBtn, const rtl::OUString& i_rText )
nIndex = findBreak( i_rText, nIndex );
if( nIndex < nLen )
{
- rtl::OUStringBuffer aBuf( i_rText );
+ OUStringBuffer aBuf( i_rText );
aBuf[nIndex] = '\n';
pText = CreateNSString( aBuf.makeStringAndClear() );
[pBtn setTitle: pText];
@@ -632,7 +632,7 @@ static void linebreakCell( NSCell* pBtn, const rtl::OUString& i_rText )
}
}
-static void addSubgroup( NSView* pCurParent, long& rCurY, const rtl::OUString& rText )
+static void addSubgroup( NSView* pCurParent, long& rCurY, const OUString& rText )
{
NSControl* pTextView = createLabel( rText );
[pCurParent addSubview: [pTextView autorelease]];
@@ -651,8 +651,8 @@ static void addSubgroup( NSView* pCurParent, long& rCurY, const rtl::OUString& r
}
static void addBool( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOffset,
- const rtl::OUString& rText, bool bEnabled,
- const rtl::OUString& rProperty, bool bValue,
+ const OUString& rText, bool bEnabled,
+ const OUString& rProperty, bool bValue,
std::vector<ColumnItem >& rRightColumn,
ControllerProperties* pControllerProperties,
ControlTarget* pCtrlTarget
@@ -694,8 +694,8 @@ static void addBool( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOf
}
static void addRadio( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOffset,
- const rtl::OUString& rText,
- const rtl::OUString& rProperty, Sequence<rtl::OUString> const & rChoices, sal_Int32 nSelectValue,
+ const OUString& rText,
+ const OUString& rProperty, Sequence<OUString> const & rChoices, sal_Int32 nSelectValue,
std::vector<ColumnItem >& rLeftColumn,
std::vector<ColumnItem >& rRightColumn,
ControllerProperties* pControllerProperties,
@@ -770,8 +770,8 @@ static void addRadio( NSView* pCurParent, long rCurX, long& rCurY, long nAttachO
}
static void addList( NSView* pCurParent, long& rCurX, long& rCurY, long /*nAttachOffset*/,
- const rtl::OUString& rText,
- const rtl::OUString& rProperty, Sequence<rtl::OUString> const & rChoices, sal_Int32 nSelectValue,
+ const OUString& rText,
+ const OUString& rProperty, Sequence<OUString> const & rChoices, sal_Int32 nSelectValue,
std::vector<ColumnItem >& rLeftColumn,
std::vector<ColumnItem >& rRightColumn,
ControllerProperties* pControllerProperties,
@@ -830,9 +830,9 @@ static void addList( NSView* pCurParent, long& rCurX, long& rCurY, long /*nAttac
}
static void addEdit( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOffset,
- const rtl::OUString& rCtrlType,
- const rtl::OUString& rText,
- const rtl::OUString& rProperty, const PropertyValue* pValue,
+ const OUString& rCtrlType,
+ const OUString& rText,
+ const OUString& rProperty, const PropertyValue* pValue,
sal_Int64 nMinValue, sal_Int64 nMaxValue,
std::vector<ColumnItem >& rLeftColumn,
std::vector<ColumnItem >& rRightColumn,
@@ -938,7 +938,7 @@ static void addEdit( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOf
if( pValue && pValue->Value.hasValue() )
{
- rtl::OUString aValue;
+ OUString aValue;
pValue->Value >>= aValue;
if( aValue.getLength() )
{
@@ -997,9 +997,9 @@ static void addEdit( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOf
Sequence< beans::PropertyValue > aOptProp;
rOptions[i].Value >>= aOptProp;
- rtl::OUString aCtrlType;
- rtl::OUString aPropertyName;
- Sequence< rtl::OUString > aChoices;
+ OUString aCtrlType;
+ OUString aPropertyName;
+ Sequence< OUString > aChoices;
Sequence< sal_Bool > aChoicesDisabled;
sal_Int32 aSelectionChecked = 0;
for( int n = 0; n < aOptProp.getLength(); n++ )
@@ -1043,11 +1043,11 @@ static void addEdit( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOf
rOptions[i].Value >>= aOptProp;
// extract ui element
- rtl::OUString aCtrlType;
- rtl::OUString aText;
- rtl::OUString aPropertyName;
- rtl::OUString aGroupHint;
- Sequence< rtl::OUString > aChoices;
+ OUString aCtrlType;
+ OUString aText;
+ OUString aPropertyName;
+ OUString aGroupHint;
+ Sequence< OUString > aChoices;
bool bEnabled = true;
sal_Int64 nMinValue = 0, nMaxValue = 0;
long nAttachOffset = 0;
@@ -1122,7 +1122,7 @@ static void addEdit( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOf
|| ( aCtrlType == "Subgroup" && nCurY < -250 && ! bIgnore )
)
{
- rtl::OUString aGroupTitle( aText );
+ OUString aGroupTitle( aText );
if( aCtrlType == "Subgroup" )
aGroupTitle = ControllerProperties::getMoreString();
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index 7bbdc9d8843f..321fa2d6a68c 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -233,7 +233,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
while( (pFile = [it nextObject]) != nil )
{
- const rtl::OUString aFile( GetOUString( pFile ) );
+ const OUString aFile( GetOUString( pFile ) );
if( ! AquaSalInstance::isOnCommandLine( aFile ) )
{
aFileList.push_back( aFile );
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index e23c29a5e379..51fcdf709bc4 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -185,7 +185,7 @@ void Qt5Menu::EnableItem(unsigned nPos, bool bEnable)
}
}
-void Qt5Menu::SetItemText(unsigned, SalMenuItem* pItem, const rtl::OUString& rText)
+void Qt5Menu::SetItemText(unsigned, SalMenuItem* pItem, const OUString& rText)
{
Qt5MenuItem* pSalMenuItem = static_cast<Qt5MenuItem*>(pItem);
if (pSalMenuItem->mpAction)
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 8da8c0355e7d..454c88e23a16 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -183,7 +183,7 @@ struct ImplStyleData
std::shared_ptr<vcl::IconThemeSelector>
mIconThemeSelector;
- rtl::OUString mIconTheme;
+ OUString mIconTheme;
bool mbSkipDisabledInMenus;
bool mbHideDisabledMenuItems;
bool mbPreferredContextMenuShortcuts;
diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx
index 76ebd74c3ad5..94740fadbcbf 100644
--- a/vcl/source/control/notebookbar.cxx
+++ b/vcl/source/control/notebookbar.cxx
@@ -49,7 +49,7 @@ NotebookBar::NotebookBar(Window* pParent, const OString& rID, const OUString& rU
if (i)
aName += OUString::number(i);
- pContextContainer = dynamic_cast<NotebookbarContextControl*>(m_pUIBuilder->get<Window>(rtl::OUStringToOString(aName, RTL_TEXTENCODING_UTF8)));
+ pContextContainer = dynamic_cast<NotebookbarContextControl*>(m_pUIBuilder->get<Window>(OUStringToOString(aName, RTL_TEXTENCODING_UTF8)));
if (pContextContainer)
m_pContextContainers.push_back(pContextContainer);
i++;
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 07f5491a11c9..f7fee1a9b21b 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -756,7 +756,7 @@ void OpenGLContext::ReleaseFramebuffers()
BindFramebuffer( nullptr );
}
-OpenGLProgram* OpenGLContext::GetProgram( const OUString& rVertexShader, const OUString& rFragmentShader, const rtl::OString& preamble )
+OpenGLProgram* OpenGLContext::GetProgram( const OUString& rVertexShader, const OUString& rFragmentShader, const OString& preamble )
{
OpenGLZone aZone;
@@ -764,7 +764,7 @@ OpenGLProgram* OpenGLContext::GetProgram( const OUString& rVertexShader, const O
// based on only the names and the preamble. We don't expect
// shader source files to change during the lifetime of a
// LibreOffice process.
- rtl::OString aNameBasedKey = OUStringToOString(rVertexShader + "+" + rFragmentShader, RTL_TEXTENCODING_UTF8) + "+" + preamble;
+ OString aNameBasedKey = OUStringToOString(rVertexShader + "+" + rFragmentShader, RTL_TEXTENCODING_UTF8) + "+" + preamble;
if( !aNameBasedKey.isEmpty() )
{
ProgramCollection::iterator it = maPrograms.find( aNameBasedKey );
@@ -776,7 +776,7 @@ OpenGLProgram* OpenGLContext::GetProgram( const OUString& rVertexShader, const O
// LibreOffice process instances) based on a hash of their source
// code, as the source code can and will change between
// LibreOffice versions even if the shader names don't change.
- rtl::OString aPersistentKey = OpenGLHelper::GetDigest( rVertexShader, rFragmentShader, preamble );
+ OString aPersistentKey = OpenGLHelper::GetDigest( rVertexShader, rFragmentShader, preamble );
std::shared_ptr<OpenGLProgram> pProgram = std::make_shared<OpenGLProgram>();
if( !pProgram->Load( rVertexShader, rFragmentShader, preamble, aPersistentKey ) )
return nullptr;
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 0ae68ec86c13..6ae47184ae2e 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -104,8 +104,8 @@ OString& getShaderSource(const OUString& rFilename)
}
namespace {
- int LogCompilerError(GLuint nId, const rtl::OUString &rDetail,
- const rtl::OUString &rName, bool bShaderNotProgram)
+ int LogCompilerError(GLuint nId, const OUString &rDetail,
+ const OUString &rName, bool bShaderNotProgram)
{
OpenGLZone aZone;
@@ -248,14 +248,14 @@ namespace
osl::Directory::create(url);
- return rtl::OUStringToOString(url, RTL_TEXTENCODING_UTF8);
+ return OUStringToOString(url, RTL_TEXTENCODING_UTF8);
}
bool writeProgramBinary( const OString& rBinaryFileName,
const std::vector<sal_uInt8>& rBinary )
{
- osl::File aFile(rtl::OStringToOUString(rBinaryFileName, RTL_TEXTENCODING_UTF8));
+ osl::File aFile(OStringToOUString(rBinaryFileName, RTL_TEXTENCODING_UTF8));
osl::FileBase::RC eStatus = aFile.open(
osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
@@ -284,7 +284,7 @@ namespace
bool readProgramBinary( const OString& rBinaryFileName,
std::vector<sal_uInt8>& rBinary )
{
- osl::File aFile( rtl::OStringToOUString( rBinaryFileName, RTL_TEXTENCODING_UTF8 ) );
+ osl::File aFile( OStringToOUString( rBinaryFileName, RTL_TEXTENCODING_UTF8 ) );
if(aFile.open( osl_File_OpenFlag_Read ) == osl::FileBase::E_None)
{
sal_uInt64 nSize = 0;
@@ -311,10 +311,10 @@ namespace
{
OString aFileName;
aFileName += getCacheFolder();
- aFileName += rtl::OUStringToOString( rVertexShaderName, RTL_TEXTENCODING_UTF8 ) + "-";
- aFileName += rtl::OUStringToOString( rFragmentShaderName, RTL_TEXTENCODING_UTF8 ) + "-";
+ aFileName += OUStringToOString( rVertexShaderName, RTL_TEXTENCODING_UTF8 ) + "-";
+ aFileName += OUStringToOString( rFragmentShaderName, RTL_TEXTENCODING_UTF8 ) + "-";
if (!rGeometryShaderName.isEmpty())
- aFileName += rtl::OUStringToOString( rGeometryShaderName, RTL_TEXTENCODING_UTF8 ) + "-";
+ aFileName += OUStringToOString( rGeometryShaderName, RTL_TEXTENCODING_UTF8 ) + "-";
aFileName += rDigest + ".bin";
return aFileName;
}
@@ -374,7 +374,7 @@ namespace
}
}
-rtl::OString OpenGLHelper::GetDigest( const OUString& rVertexShaderName,
+OString OpenGLHelper::GetDigest( const OUString& rVertexShaderName,
const OUString& rFragmentShaderName,
const OString& rPreamble )
{
diff --git a/vcl/source/window/EnumContext.cxx b/vcl/source/window/EnumContext.cxx
index ec8249d67f1c..9c6d149255da 100644
--- a/vcl/source/window/EnumContext.cxx
+++ b/vcl/source/window/EnumContext.cxx
@@ -27,15 +27,15 @@ namespace vcl {
namespace {
-typedef ::std::map<rtl::OUString,EnumContext::Application> ApplicationMap;
+typedef ::std::map<OUString,EnumContext::Application> ApplicationMap;
static ApplicationMap maApplicationMap;
-static o3tl::enumarray<EnumContext::Application, rtl::OUString> maApplicationVector;
+static o3tl::enumarray<EnumContext::Application, OUString> maApplicationVector;
-typedef ::std::map<rtl::OUString,EnumContext::Context> ContextMap;
+typedef ::std::map<OUString,EnumContext::Context> ContextMap;
static ContextMap maContextMap;
-static o3tl::enumarray<EnumContext::Context, rtl::OUString> maContextVector;
+static o3tl::enumarray<EnumContext::Context, OUString> maContextVector;
}
@@ -57,8 +57,8 @@ EnumContext::EnumContext (
}
EnumContext::EnumContext (
- const ::rtl::OUString& rsApplicationName,
- const ::rtl::OUString& rsContextName)
+ const OUString& rsApplicationName,
+ const OUString& rsContextName)
: meApplication(GetApplicationEnum(rsApplicationName)),
meContext(GetContextEnum(rsContextName))
{
@@ -102,7 +102,7 @@ bool EnumContext::operator!= (const EnumContext& rOther)
|| meContext!=rOther.meContext;
}
-void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Application eApplication)
+void EnumContext::AddEntry (const OUString& rsName, const Application eApplication)
{
maApplicationMap[rsName] = eApplication;
OSL_ASSERT(eApplication<=Application::LAST);
@@ -131,7 +131,7 @@ void EnumContext::ProvideApplicationContainers()
}
-EnumContext::Application EnumContext::GetApplicationEnum (const ::rtl::OUString& rsApplicationName)
+EnumContext::Application EnumContext::GetApplicationEnum (const OUString& rsApplicationName)
{
ProvideApplicationContainers();
@@ -143,13 +143,13 @@ EnumContext::Application EnumContext::GetApplicationEnum (const ::rtl::OUString&
return EnumContext::Application::NONE;
}
-const ::rtl::OUString& EnumContext::GetApplicationName (const Application eApplication)
+const OUString& EnumContext::GetApplicationName (const Application eApplication)
{
ProvideApplicationContainers();
return maApplicationVector[eApplication];
}
-void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Context eContext)
+void EnumContext::AddEntry (const OUString& rsName, const Context eContext)
{
maContextMap[rsName] = eContext;
maContextVector[eContext] = rsName;
@@ -199,7 +199,7 @@ void EnumContext::ProvideContextContainers()
AddEntry("empty", Context::Empty);
}
-EnumContext::Context EnumContext::GetContextEnum (const ::rtl::OUString& rsContextName)
+EnumContext::Context EnumContext::GetContextEnum (const OUString& rsContextName)
{
ProvideContextContainers();
@@ -210,7 +210,7 @@ EnumContext::Context EnumContext::GetContextEnum (const ::rtl::OUString& rsConte
return EnumContext::Context::Unknown;
}
-const ::rtl::OUString& EnumContext::GetContextName (const Context eContext)
+const OUString& EnumContext::GetContextName (const Context eContext)
{
ProvideContextContainers();
return maContextVector[eContext];
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 9ae62256a512..d5fd865747ba 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -702,7 +702,7 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getFiles()
namespace
{
-bool lcl_matchFilter( const rtl::OUString& rFilter, const rtl::OUString& rExt )
+bool lcl_matchFilter( const OUString& rFilter, const OUString& rExt )
{
const sal_Unicode cSep {';'};
sal_Int32 nIdx {0};
diff --git a/vcl/unx/gtk3_kde5/filepicker_ipc_commands.hxx b/vcl/unx/gtk3_kde5/filepicker_ipc_commands.hxx
index 1acef8caf48e..1d0925257b9e 100644
--- a/vcl/unx/gtk3_kde5/filepicker_ipc_commands.hxx
+++ b/vcl/unx/gtk3_kde5/filepicker_ipc_commands.hxx
@@ -68,9 +68,9 @@ inline std::vector<char> readIpcStringArg(std::istream& stream)
return buffer;
}
-void readIpcArg(std::istream& stream, rtl::OUString& string);
+void readIpcArg(std::istream& stream, OUString& string);
void readIpcArg(std::istream& stream, QString& string);
-void readIpcArg(std::istream& stream, css::uno::Sequence<rtl::OUString>& seq);
+void readIpcArg(std::istream& stream, css::uno::Sequence<OUString>& seq);
inline void readIpcArg(std::istream& stream, Commands& value)
{
@@ -120,7 +120,7 @@ inline void readIpcArgs(std::istream& stream, T& arg, Args&... args)
readIpcArgs(stream, args...);
}
-void sendIpcArg(std::ostream& stream, const rtl::OUString& string);
+void sendIpcArg(std::ostream& stream, const OUString& string);
void sendIpcArg(std::ostream& stream, const QString& string);
inline void sendIpcStringArg(std::ostream& stream, uint32_t length, const char* string)
diff --git a/vcl/workben/commonfuzzer.hxx b/vcl/workben/commonfuzzer.hxx
index 108bdb49da90..85e772e19468 100644
--- a/vcl/workben/commonfuzzer.hxx
+++ b/vcl/workben/commonfuzzer.hxx
@@ -66,10 +66,10 @@ namespace
OUString sExecDir;
osl::FileBase::getSystemPathFromFileURL(execdir, sExecDir);
- rtl::OStringBuffer aBuffer("<?xml version=\"1.0\"?>\n<fontconfig><dir>");
+ OStringBuffer aBuffer("<?xml version=\"1.0\"?>\n<fontconfig><dir>");
aBuffer.append(OUStringToOString(sExecDir + getExecutableName() + ".fonts", osl_getThreadTextEncoding()));
aBuffer.append("</dir><cachedir>/tmp/cache/fontconfig</cachedir></fontconfig>");
- rtl::OString aConf = aBuffer.makeStringAndClear();
+ OString aConf = aBuffer.makeStringAndClear();
sal_uInt64 aBytesWritten;
aFontConfig.write(aConf.getStr(), aConf.getLength(), aBytesWritten);
assert(aBytesWritten == aConf.getLength());
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 39743415594d..59d121b70c28 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1653,7 +1653,7 @@ double DemoRenderer::getAndResetBenchmark(const RenderStyle style)
double avgtime = maRenderers[i]->sumTime / maRenderers[i]->countTime;
geomean *= avgtime;
fprintf(stderr, "%s: %f (iteration: %d*%d*%d)\n",
- rtl::OUStringToOString(maRenderers[i]->getName(),
+ OUStringToOString(maRenderers[i]->getName(),
RTL_TEXTENCODING_UTF8).getStr(), avgtime,
maRenderers[i]->countTime, maRenderers[i]->getTestRepeatCount(),
(style == RENDER_THUMB) ? THUMB_REPEAT_FACTOR : 1);
@@ -2170,7 +2170,7 @@ class DemoApp : public Application
fprintf(stderr," --show <renderer> - start with a given renderer, options are:\n");
OUString aRenderers(rRenderer.getRendererList());
fprintf(stderr," %s\n",
- rtl::OUStringToOString(aRenderers, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(aRenderers, RTL_TEXTENCODING_UTF8).getStr());
fprintf(stderr," --test <iterCount> - create benchmark data\n");
fprintf(stderr," --widgets - launch the widget test.\n");
fprintf(stderr," --threads - render from multiple threads.\n");
@@ -2224,7 +2224,7 @@ public:
else if (aArg.startsWith("--"))
{
fprintf(stderr,"Unknown argument '%s'\n",
- rtl::OUStringToOString(aArg, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(aArg, RTL_TEXTENCODING_UTF8).getStr());
return showHelp(aRenderer);
}
}
diff --git a/winaccessibility/inc/AccObject.hxx b/winaccessibility/inc/AccObject.hxx
index ef83f343eaf3..2a024642d8ac 100644
--- a/winaccessibility/inc/AccObject.hxx
+++ b/winaccessibility/inc/AccObject.hxx
@@ -79,7 +79,7 @@ private:
DWORD GetMSAAStateFromUNO(short xState);//translate state from UNO to MSAA value
css::accessibility::XAccessibleSelection* GetXAccessibleSelection();
void GetExpandedState(sal_Bool* isExpandable, sal_Bool* isExpanded);
- ::rtl::OUString GetMAccessibleValueFromAny(css::uno::Any pAny);
+ OUString GetMAccessibleValueFromAny(css::uno::Any pAny);
public:
diff --git a/winaccessibility/source/UAccCOM/AccActionBase.cxx b/winaccessibility/source/UAccCOM/AccActionBase.cxx
index 514824cd4bdc..a10dd877eae4 100644
--- a/winaccessibility/source/UAccCOM/AccActionBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccActionBase.cxx
@@ -115,7 +115,7 @@ STDMETHODIMP CAccActionBase::get_description(long actionIndex,BSTR __RPC_FAR *de
if(!pRXAct.is())
return E_FAIL;
- ::rtl::OUString ouStr = GetXInterface()->getAccessibleActionDescription(actionIndex);
+ OUString ouStr = GetXInterface()->getAccessibleActionDescription(actionIndex);
// #CHECK#
SAFE_SYSFREESTRING(*description);
diff --git a/winaccessibility/source/UAccCOM/AccEditableText.cxx b/winaccessibility/source/UAccCOM/AccEditableText.cxx
index a53d99b0a935..87addcaa5a8f 100644
--- a/winaccessibility/source/UAccCOM/AccEditableText.cxx
+++ b/winaccessibility/source/UAccCOM/AccEditableText.cxx
@@ -120,7 +120,7 @@ STDMETHODIMP CAccEditableText::insertText(long offset, BSTR * text)
if( !pRXEdtTxt.is() )
return E_FAIL;
- ::rtl::OUString ouStr(o3tl::toU(*text));
+ OUString ouStr(o3tl::toU(*text));
if( GetXInterface()->insertText( ouStr, offset ) )
return S_OK;
@@ -197,7 +197,7 @@ STDMETHODIMP CAccEditableText::replaceText(long startOffset, long endOffset, BST
if( !pRXEdtTxt.is() )
return E_FAIL;
- ::rtl::OUString ouStr(o3tl::toU(*text));
+ OUString ouStr(o3tl::toU(*text));
if( GetXInterface()->replaceText( startOffset,endOffset, ouStr) )
return S_OK;
@@ -226,13 +226,13 @@ STDMETHODIMP CAccEditableText::setAttributes(long startOffset, long endOffset, B
if( !pRXEdtTxt.is() )
return E_FAIL;
- ::rtl::OUString ouStr(o3tl::toU(*attributes));
+ OUString ouStr(o3tl::toU(*attributes));
sal_Int32 nIndex = 0;
- vector< ::rtl::OUString > vecAttr;
+ vector< OUString > vecAttr;
do
{
- ::rtl::OUString ouToken = ouStr.getToken(0, ';', nIndex);
+ OUString ouToken = ouStr.getToken(0, ';', nIndex);
vecAttr.push_back(ouToken);
}
while(nIndex >= 0);
@@ -240,12 +240,12 @@ STDMETHODIMP CAccEditableText::setAttributes(long startOffset, long endOffset, B
Sequence< PropertyValue > beanSeq(vecAttr.size());
for(std::vector<OUString>::size_type i = 0; i < vecAttr.size(); i ++)
{
- ::rtl::OUString attr = vecAttr[i];
+ OUString attr = vecAttr[i];
sal_Int32 nPos = attr.indexOf(':');
if(nPos > -1)
{
- ::rtl::OUString attrName = attr.copy(0, nPos);
- ::rtl::OUString attrValue = attr.copy(nPos + 1);
+ OUString attrName = attr.copy(0, nPos);
+ OUString attrValue = attr.copy(nPos + 1);
beanSeq[i].Name = attrName;
get_AnyFromOLECHAR(attrName, attrValue, beanSeq[i].Value);
}
@@ -266,7 +266,7 @@ STDMETHODIMP CAccEditableText::setAttributes(long startOffset, long endOffset, B
* @param ouValue the string of attribute value.
* @param rAny the Any object to be returned.
*/
-void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const ::rtl::OUString &ouValue, Any &rAny)
+void CAccEditableText::get_AnyFromOLECHAR(const OUString &ouName, const OUString &ouValue, Any &rAny)
{
if(ouName == "CharBackColor" ||
ouName == "CharColor" ||
@@ -308,7 +308,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const :
else if(ouName == "CharFontName" )
{
// Convert to string.
- rAny.setValue(&ouValue, cppu::UnoType<rtl::OUString>::get());
+ rAny.setValue(&ouValue, cppu::UnoType<OUString>::get());
}
else if(ouName == "CharPosture" )
{
@@ -322,7 +322,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const :
// Convert to the Sequence with TabStop element.
vector< css::style::TabStop > vecTabStop;
css::style::TabStop tabStop;
- ::rtl::OUString ouSubValue;
+ OUString ouSubValue;
sal_Int32 pos = 0, posComma = 0;
do
@@ -429,7 +429,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const :
{
// Parse value string.
css::style::LineSpacing lineSpacing;
- ::rtl::OUString ouSubValue;
+ OUString ouSubValue;
sal_Int32 pos = 0, posComma = 0;
pos = ouValue.indexOf("Mode=", pos);
diff --git a/winaccessibility/source/UAccCOM/AccEditableText.h b/winaccessibility/source/UAccCOM/AccEditableText.h
index c0e002ced15a..62bfc662d3b4 100644
--- a/winaccessibility/source/UAccCOM/AccEditableText.h
+++ b/winaccessibility/source/UAccCOM/AccEditableText.h
@@ -104,7 +104,7 @@ private:
css::uno::Reference<css::accessibility::XAccessibleEditableText> pRXEdtTxt;
- static void get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const ::rtl::OUString &ouValue, css::uno::Any &rAny);
+ static void get_AnyFromOLECHAR(const OUString &ouName, const OUString &ouValue, css::uno::Any &rAny);
css::accessibility::XAccessibleEditableText* GetXInterface()
{
diff --git a/winaccessibility/source/UAccCOM/AccImage.cxx b/winaccessibility/source/UAccCOM/AccImage.cxx
index 1bf9449aea5b..4094f5d59314 100644
--- a/winaccessibility/source/UAccCOM/AccImage.cxx
+++ b/winaccessibility/source/UAccCOM/AccImage.cxx
@@ -55,7 +55,7 @@ STDMETHODIMP CAccImage::get_description(BSTR * description)
if( !pRXImg.is() )
return E_FAIL;
- ::rtl::OUString ouStr = GetXInterface()->getAccessibleImageDescription();
+ OUString ouStr = GetXInterface()->getAccessibleImageDescription();
SAFE_SYSFREESTRING(*description);
*description = SysAllocString(o3tl::toW(ouStr.getStr()));
diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx
index 6a872b277dc0..429258fee0d5 100644
--- a/winaccessibility/source/UAccCOM/AccTable.cxx
+++ b/winaccessibility/source/UAccCOM/AccTable.cxx
@@ -129,7 +129,7 @@ STDMETHODIMP CAccTable::get_columnDescription(long column, BSTR * description)
if(!pRXTable.is())
return E_FAIL;
- const ::rtl::OUString& ouStr = GetXInterface()->getAccessibleColumnDescription(column);
+ const OUString& ouStr = GetXInterface()->getAccessibleColumnDescription(column);
// #CHECK#
SAFE_SYSFREESTRING(*description);
@@ -348,7 +348,7 @@ STDMETHODIMP CAccTable::get_rowDescription(long row, BSTR * description)
if(!pRXTable.is())
return E_FAIL;
- const ::rtl::OUString& ouStr = GetXInterface()->getAccessibleRowDescription(row);
+ const OUString& ouStr = GetXInterface()->getAccessibleRowDescription(row);
// #CHECK#
SAFE_SYSFREESTRING(*description);
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx b/winaccessibility/source/UAccCOM/AccTextBase.cxx
index 4b78d75a4b54..d68c18e89e49 100644
--- a/winaccessibility/source/UAccCOM/AccTextBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx
@@ -112,7 +112,7 @@ STDMETHODIMP CAccTextBase::get_attributes(long offset, long * startOffset, long
OUStringBuffer strAttrs("Version:1;");
- Sequence< css::beans::PropertyValue > pValues = GetXInterface()->getCharacterAttributes(offset, Sequence< rtl::OUString >());
+ Sequence< css::beans::PropertyValue > pValues = GetXInterface()->getCharacterAttributes(offset, Sequence< OUString >());
int nCount = pValues.getLength();
sal_Int16 numberingLevel = 0;
@@ -477,7 +477,7 @@ STDMETHODIMP CAccTextBase::get_text(long startOffset, long endOffset, BSTR * tex
return E_FAIL;
}
- ::rtl::OUString ouStr;
+ OUString ouStr;
if (endOffset == -1 )
{
long nLen=0;
@@ -575,7 +575,7 @@ STDMETHODIMP CAccTextBase::get_textBeforeOffset(long offset, IA2TextBoundaryType
}
TextSegment segment = GetXInterface()->getTextBeforeIndex( offset, sal_Int16(lUnoBoundaryType));
- ::rtl::OUString ouStr = segment.SegmentText;
+ OUString ouStr = segment.SegmentText;
SysFreeString(*text);
*text = SysAllocString(o3tl::toW(ouStr.getStr()));
*startOffset = segment.SegmentStart;
@@ -661,7 +661,7 @@ STDMETHODIMP CAccTextBase::get_textAfterOffset(long offset, IA2TextBoundaryType
}
TextSegment segment = GetXInterface()->getTextBehindIndex( offset, sal_Int16(lUnoBoundaryType));
- ::rtl::OUString ouStr = segment.SegmentText;
+ OUString ouStr = segment.SegmentText;
SysFreeString(*text);
*text = SysAllocString(o3tl::toW(ouStr.getStr()));
*startOffset = segment.SegmentStart;
@@ -748,7 +748,7 @@ STDMETHODIMP CAccTextBase::get_textAtOffset(long offset, IA2TextBoundaryType bou
}
TextSegment segment = GetXInterface()->getTextAtIndex( offset, sal_Int16(lUnoBoundaryType));
- ::rtl::OUString ouStr = segment.SegmentText;
+ OUString ouStr = segment.SegmentText;
SysFreeString(*text);
*text = SysAllocString(o3tl::toW(ouStr.getStr()));
*startOffset = segment.SegmentStart;
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 8c7f4fa6aec1..01a90065dde0 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -589,7 +589,7 @@ STDMETHODIMP CMAccessible::get_accHelpTopic(BSTR *, VARIANT, long *)
return E_NOTIMPL;
}
-static bool GetMnemonicChar( const ::rtl::OUString& aStr, sal_Unicode* wStr)
+static bool GetMnemonicChar( const OUString& aStr, sal_Unicode* wStr)
{
for (sal_Int32 i = 0;; i += 2) {
i = aStr.indexOf('~', i);
@@ -724,7 +724,7 @@ STDMETHODIMP CMAccessible::get_accKeyboardShortcut(VARIANT varChild, BSTR *pszKe
if(!pRXIE.is())
return S_FALSE;
- ::rtl::OUString ouStr = pRXIE->getTitledBorderText();
+ OUString ouStr = pRXIE->getTitledBorderText();
sal_Unicode key;
if(GetMnemonicChar(ouStr, &key))
{
@@ -2725,18 +2725,18 @@ OUString CMAccessible::get_StringFromAny(Any const & pAny)
}
case TypeClass_STRING:
{
- ::rtl::OUString val;
+ OUString val;
pAny >>= val;
return val;
}
case TypeClass_SEQUENCE:
{
- if(pAny.getValueType() == cppu::UnoType<Sequence< ::rtl::OUString >>::get())
+ if(pAny.getValueType() == cppu::UnoType<Sequence< OUString >>::get())
{
- Sequence < ::rtl::OUString > val;
+ Sequence < OUString > val;
pAny >>= val;
- ::rtl::OUStringBuffer pString;
+ OUStringBuffer pString;
int count = val.getLength();
@@ -2947,7 +2947,7 @@ void CMAccessible::ConvertAnyToVariant(const css::uno::Any &rAnyVal, VARIANT *pv
case TypeClass_STRING:
{
pvData->vt = VT_BSTR;
- ::rtl::OUString val;
+ OUString val;
rAnyVal >>= val;
pvData->bstrVal = SysAllocString(o3tl::toW(val.getStr()));
break;
@@ -3200,7 +3200,7 @@ STDMETHODIMP CMAccessible::get_attributes(/*[out]*/ BSTR *pAttr)
pRXAttr = pRXI.get();
css::uno::Any anyVal = pRXAttr->getExtendedAttributes();
- ::rtl::OUString val;
+ OUString val;
anyVal >>= val;
if(*pAttr)
diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx
index 608a1978409c..96016251a1b0 100644
--- a/winaccessibility/source/service/AccObject.cxx
+++ b/winaccessibility/source/service/AccObject.cxx
@@ -386,7 +386,7 @@ void AccObject::SetValue( Any pAny )
return ;
}
Reference< XAccessibleText > pRText(m_xAccContextRef,UNO_QUERY);
- ::rtl::OUString val;
+ OUString val;
switch(m_accRole)
{
case SPIN_BOX:
@@ -422,9 +422,9 @@ void AccObject::SetValue( Any pAny )
return;
}
-::rtl::OUString AccObject::GetMAccessibleValueFromAny(Any pAny)
+OUString AccObject::GetMAccessibleValueFromAny(Any pAny)
{
- ::rtl::OUString strValue;
+ OUString strValue;
if(nullptr == m_pIMAcc)
return strValue;
@@ -434,19 +434,19 @@ void AccObject::SetValue( Any pAny )
sal_uInt16 val;
if (pAny >>= val)
{
- strValue=::rtl::OUString::number(val);
+ strValue=OUString::number(val);
}
}
- else if(pAny.getValueType() == cppu::UnoType<rtl::OUString>::get())
+ else if(pAny.getValueType() == cppu::UnoType<OUString>::get())
{
pAny >>= strValue ;
}
- else if(pAny.getValueType() == cppu::UnoType<Sequence< ::rtl::OUString >>::get())
+ else if(pAny.getValueType() == cppu::UnoType<Sequence< OUString >>::get())
{
- Sequence< ::rtl::OUString > val;
+ Sequence< OUString > val;
if (pAny >>= val)
{
@@ -464,7 +464,7 @@ void AccObject::SetValue( Any pAny )
double val;
if (pAny >>= val)
{
- strValue=::rtl::OUString::number(val);
+ strValue=OUString::number(val);
}
}
else if(pAny.getValueType() == cppu::UnoType<sal_Int32>::get())
@@ -472,7 +472,7 @@ void AccObject::SetValue( Any pAny )
sal_Int32 val;
if (pAny >>= val)
{
- strValue=::rtl::OUString::number(val);
+ strValue=OUString::number(val);
}
}
else if (pAny.getValueType() == cppu::UnoType<css::accessibility::TextSegment>::get())
@@ -480,7 +480,7 @@ void AccObject::SetValue( Any pAny )
css::accessibility::TextSegment val;
if (pAny >>= val)
{
- ::rtl::OUString realVal(val.SegmentText);
+ OUString realVal(val.SegmentText);
strValue = realVal;
}
@@ -752,7 +752,7 @@ void AccObject::UpdateActionDesc()
return;
}
- ::rtl::OUString pXString = m_xAccContextRef->getAccessibleDescription();
+ OUString pXString = m_xAccContextRef->getAccessibleDescription();
m_pIMAcc->Put_XAccDescription(o3tl::toW(pXString.getStr()));
long Role = m_accRole;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index de36dbcf9755..835e6ff53920 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4493,8 +4493,8 @@ void DomainMapper_Impl::CloseFieldCommand()
uno::Reference< text::XDependentTextField > xDependentField( xFieldInterface, uno::UNO_QUERY_THROW );
xDependentField->attachTextFieldMaster( xMaster );
- rtl::OUString sFormula = sSeqName + "+1";
- rtl::OUString sValue;
+ OUString sFormula = sSeqName + "+1";
+ OUString sValue;
if( lcl_FindInCommand( pContext->GetCommand(), 'c', sValue ))
{
sFormula = sSeqName;
@@ -4890,7 +4890,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
uno::Reference<lang::XServiceInfo> xServiceInfo(xTextField, uno::UNO_QUERY);
bool bIsSetExpression = xServiceInfo->supportsService("com.sun.star.text.TextField.SetExpression");
// If we already have content set, then use the current presentation
- rtl::OUString sValue;
+ OUString sValue;
if (bIsSetExpression)
{ // this will throw for field types without Content
uno::Any aValue(xFieldProperties->getPropertyValue(
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index 4912414cad88..f8e67f0fd638 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -129,7 +129,7 @@ private:
ListLevel::Pointer m_pCurrentLevel;
// The style name linked to.
- ::rtl::OUString m_sNumStyleLink;
+ OUString m_sNumStyleLink;
public:
typedef tools::SvRef< AbstractListDef > Pointer;
diff --git a/writerperfect/inc/DocumentHandlerFor.hxx b/writerperfect/inc/DocumentHandlerFor.hxx
index dabd4ffcc5ef..0f31b85fd176 100644
--- a/writerperfect/inc/DocumentHandlerFor.hxx
+++ b/writerperfect/inc/DocumentHandlerFor.hxx
@@ -16,7 +16,7 @@ namespace writerperfect
*/
template <class Generator> struct DocumentHandlerFor
{
- // static const rtl::OUString name();
+ // static const OUString name();
};
}
diff --git a/writerperfect/inc/DocumentHandlerForOdg.hxx b/writerperfect/inc/DocumentHandlerForOdg.hxx
index 96cb288f6ba7..1fba93194948 100644
--- a/writerperfect/inc/DocumentHandlerForOdg.hxx
+++ b/writerperfect/inc/DocumentHandlerForOdg.hxx
@@ -16,10 +16,7 @@ namespace writerperfect
{
template <> struct DocumentHandlerFor<OdgGenerator>
{
- static const rtl::OUString name()
- {
- return rtl::OUString("com.sun.star.comp.Draw.XMLOasisImporter");
- }
+ static const OUString name() { return OUString("com.sun.star.comp.Draw.XMLOasisImporter"); }
};
}
diff --git a/writerperfect/inc/DocumentHandlerForOdp.hxx b/writerperfect/inc/DocumentHandlerForOdp.hxx
index 0ca91c65bd06..d7a3aaf9f28b 100644
--- a/writerperfect/inc/DocumentHandlerForOdp.hxx
+++ b/writerperfect/inc/DocumentHandlerForOdp.hxx
@@ -16,10 +16,7 @@ namespace writerperfect
{
template <> struct DocumentHandlerFor<OdpGenerator>
{
- static const rtl::OUString name()
- {
- return rtl::OUString("com.sun.star.comp.Impress.XMLOasisImporter");
- }
+ static const OUString name() { return OUString("com.sun.star.comp.Impress.XMLOasisImporter"); }
};
}
diff --git a/writerperfect/inc/DocumentHandlerForOds.hxx b/writerperfect/inc/DocumentHandlerForOds.hxx
index 60f96d2332cd..9b789d628e11 100644
--- a/writerperfect/inc/DocumentHandlerForOds.hxx
+++ b/writerperfect/inc/DocumentHandlerForOds.hxx
@@ -16,10 +16,7 @@ namespace writerperfect
{
template <> struct DocumentHandlerFor<OdsGenerator>
{
- static const rtl::OUString name()
- {
- return rtl::OUString("com.sun.star.comp.Calc.XMLOasisImporter");
- }
+ static const OUString name() { return OUString("com.sun.star.comp.Calc.XMLOasisImporter"); }
};
}
diff --git a/writerperfect/inc/DocumentHandlerForOdt.hxx b/writerperfect/inc/DocumentHandlerForOdt.hxx
index e933644b534d..d1abe81d9bb6 100644
--- a/writerperfect/inc/DocumentHandlerForOdt.hxx
+++ b/writerperfect/inc/DocumentHandlerForOdt.hxx
@@ -16,10 +16,7 @@ namespace writerperfect
{
template <> struct DocumentHandlerFor<OdtGenerator>
{
- static const rtl::OUString name()
- {
- return rtl::OUString("com.sun.star.comp.Writer.XMLOasisImporter");
- }
+ static const OUString name() { return OUString("com.sun.star.comp.Writer.XMLOasisImporter"); }
};
}
diff --git a/writerperfect/qa/unit/DrawingImportTest.cxx b/writerperfect/qa/unit/DrawingImportTest.cxx
index 5e71bf3e9b4f..4e1300d496c3 100644
--- a/writerperfect/qa/unit/DrawingImportTest.cxx
+++ b/writerperfect/qa/unit/DrawingImportTest.cxx
@@ -38,13 +38,12 @@ public:
}
// XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) override;
- virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
private:
- virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput,
- rtl::OUString& rTypeName) override;
+ virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, OUString& rTypeName) override;
virtual bool doImportDocument(weld::Window* pWindow, librevenge::RVNGInputStream& rInput,
OdgGenerator& rGenerator,
utl::MediaDescriptor& rDescriptor) override;
@@ -59,24 +58,24 @@ bool DrawingImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputS
return true;
}
-bool DrawingImportFilter::doDetectFormat(librevenge::RVNGInputStream&, rtl::OUString& rTypeName)
+bool DrawingImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUString& rTypeName)
{
rTypeName = "WpftDummyDrawing";
return true;
}
// XServiceInfo
-rtl::OUString SAL_CALL DrawingImportFilter::getImplementationName()
+OUString SAL_CALL DrawingImportFilter::getImplementationName()
{
return OUString("org.libreoffice.comp.Wpft.QA.DrawingImportFilter");
}
-sal_Bool SAL_CALL DrawingImportFilter::supportsService(const rtl::OUString& rServiceName)
+sal_Bool SAL_CALL DrawingImportFilter::supportsService(const OUString& rServiceName)
{
return cppu::supportsService(this, rServiceName);
}
-uno::Sequence<rtl::OUString> SAL_CALL DrawingImportFilter::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL DrawingImportFilter::getSupportedServiceNames()
{
return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" };
}
@@ -146,10 +145,9 @@ void DrawingImportTest::test()
uno::Reference<drawing::XShapeDescriptor> xShapeDesc;
CPPUNIT_ASSERT(aShape >>= xShapeDesc);
CPPUNIT_ASSERT(xShapeDesc.is());
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("com.sun.star.drawing.TextShape"),
- xShapeDesc->getShapeType());
+ CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.TextShape"), xShapeDesc->getShapeType());
uno::Reference<text::XText> xText(xShapeDesc, uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("My hovercraft is full of eels."), xText->getString());
+ CPPUNIT_ASSERT_EQUAL(OUString("My hovercraft is full of eels."), xText->getString());
}
CPPUNIT_TEST_SUITE_REGISTRATION(DrawingImportTest);
diff --git a/writerperfect/qa/unit/ImportTest.cxx b/writerperfect/qa/unit/ImportTest.cxx
index 3168ac6aade3..3a7b9c2293f0 100644
--- a/writerperfect/qa/unit/ImportTest.cxx
+++ b/writerperfect/qa/unit/ImportTest.cxx
@@ -47,11 +47,11 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
- WpftLoader createCalcLoader(const rtl::OUString& rFile) const;
+ WpftLoader createCalcLoader(const OUString& rFile) const;
- WpftLoader createLoader(const rtl::OUString& rUrl, const rtl::OUString& rFactoryUrl) const;
+ WpftLoader createLoader(const OUString& rUrl, const OUString& rFactoryUrl) const;
- rtl::OUString makeUrl(const rtl::OUString& rFile) const;
+ OUString makeUrl(const OUString& rFile) const;
private:
uno::Reference<lang::XMultiServiceFactory> m_xFilterFactory;
@@ -83,13 +83,12 @@ void ImportTest::testWK3WithFM3()
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x0000ff), nCharColor); // blue text
}
-WpftLoader ImportTest::createCalcLoader(const rtl::OUString& rFile) const
+WpftLoader ImportTest::createCalcLoader(const OUString& rFile) const
{
return createLoader(makeUrl(rFile), "private:factory/scalc");
}
-WpftLoader ImportTest::createLoader(const rtl::OUString& rUrl,
- const rtl::OUString& rFactoryUrl) const
+WpftLoader ImportTest::createLoader(const OUString& rUrl, const OUString& rFactoryUrl) const
{
utl::MediaDescriptor aDesc;
aDesc[utl::MediaDescriptor::PROP_URL()] <<= rUrl;
@@ -97,7 +96,7 @@ WpftLoader ImportTest::createLoader(const rtl::OUString& rUrl,
uno::Sequence<beans::PropertyValue> lDesc(aDesc.getAsConstPropertyValueList());
m_xTypeDetection->queryTypeByDescriptor(lDesc, true);
aDesc = lDesc;
- rtl::OUString sFilter;
+ OUString sFilter;
aDesc[utl::MediaDescriptor::PROP_FILTERNAME()] >>= sFilter;
CPPUNIT_ASSERT(!sFilter.isEmpty());
const uno::Reference<document::XFilter> xFilter(m_xFilterFactory->createInstance(sFilter),
@@ -106,7 +105,7 @@ WpftLoader ImportTest::createLoader(const rtl::OUString& rUrl,
return WpftLoader(rUrl, xFilter, rFactoryUrl, m_xDesktop, m_xTypeMap, m_xContext);
}
-rtl::OUString ImportTest::makeUrl(const rtl::OUString& rFile) const
+OUString ImportTest::makeUrl(const OUString& rFile) const
{
return const_cast<ImportTest*>(this)->m_directories.getURLFromSrc("/" TEST_DIR "/" + rFile);
}
diff --git a/writerperfect/qa/unit/PresentationImportTest.cxx b/writerperfect/qa/unit/PresentationImportTest.cxx
index 8fc5a65d3141..4b2a65296545 100644
--- a/writerperfect/qa/unit/PresentationImportTest.cxx
+++ b/writerperfect/qa/unit/PresentationImportTest.cxx
@@ -38,13 +38,12 @@ public:
}
// XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) override;
- virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
private:
- virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput,
- rtl::OUString& rTypeName) override;
+ virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, OUString& rTypeName) override;
virtual bool doImportDocument(weld::Window* pWindow, librevenge::RVNGInputStream& rInput,
OdpGenerator& rGenerator,
utl::MediaDescriptor& rDescriptor) override;
@@ -59,25 +58,24 @@ bool PresentationImportFilter::doImportDocument(weld::Window*, librevenge::RVNGI
return true;
}
-bool PresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream&,
- rtl::OUString& rTypeName)
+bool PresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUString& rTypeName)
{
rTypeName = "WpftDummyPresentation";
return true;
}
// XServiceInfo
-rtl::OUString SAL_CALL PresentationImportFilter::getImplementationName()
+OUString SAL_CALL PresentationImportFilter::getImplementationName()
{
return OUString("org.libreoffice.comp.Wpft.QA.PresentationImportFilter");
}
-sal_Bool SAL_CALL PresentationImportFilter::supportsService(const rtl::OUString& rServiceName)
+sal_Bool SAL_CALL PresentationImportFilter::supportsService(const OUString& rServiceName)
{
return cppu::supportsService(this, rServiceName);
}
-uno::Sequence<rtl::OUString> SAL_CALL PresentationImportFilter::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL PresentationImportFilter::getSupportedServiceNames()
{
return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" };
}
@@ -147,10 +145,9 @@ void PresentationImportTest::test()
uno::Reference<drawing::XShapeDescriptor> xShapeDesc;
CPPUNIT_ASSERT(aShape >>= xShapeDesc);
CPPUNIT_ASSERT(xShapeDesc.is());
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("com.sun.star.drawing.TextShape"),
- xShapeDesc->getShapeType());
+ CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.TextShape"), xShapeDesc->getShapeType());
uno::Reference<text::XText> xText(xShapeDesc, uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("My hovercraft is full of eels."), xText->getString());
+ CPPUNIT_ASSERT_EQUAL(OUString("My hovercraft is full of eels."), xText->getString());
}
CPPUNIT_TEST_SUITE_REGISTRATION(PresentationImportTest);
diff --git a/writerperfect/qa/unit/SpreadsheetImportTest.cxx b/writerperfect/qa/unit/SpreadsheetImportTest.cxx
index 66b1623b39f4..e5ad7a3fcc1e 100644
--- a/writerperfect/qa/unit/SpreadsheetImportTest.cxx
+++ b/writerperfect/qa/unit/SpreadsheetImportTest.cxx
@@ -37,13 +37,12 @@ public:
}
// XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) override;
- virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
private:
- virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput,
- rtl::OUString& rTypeName) override;
+ virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, OUString& rTypeName) override;
virtual bool doImportDocument(weld::Window* pWindow, librevenge::RVNGInputStream& rInput,
OdsGenerator& rGenerator,
utl::MediaDescriptor& rDescriptor) override;
@@ -58,24 +57,24 @@ bool SpreadsheetImportFilter::doImportDocument(weld::Window*, librevenge::RVNGIn
return true;
}
-bool SpreadsheetImportFilter::doDetectFormat(librevenge::RVNGInputStream&, rtl::OUString& rTypeName)
+bool SpreadsheetImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUString& rTypeName)
{
rTypeName = "WpftDummySpreadsheet";
return true;
}
// XServiceInfo
-rtl::OUString SAL_CALL SpreadsheetImportFilter::getImplementationName()
+OUString SAL_CALL SpreadsheetImportFilter::getImplementationName()
{
return OUString("org.libreoffice.comp.Wpft.QA.SpreadsheetImportFilter");
}
-sal_Bool SAL_CALL SpreadsheetImportFilter::supportsService(const rtl::OUString& rServiceName)
+sal_Bool SAL_CALL SpreadsheetImportFilter::supportsService(const OUString& rServiceName)
{
return cppu::supportsService(this, rServiceName);
}
-uno::Sequence<rtl::OUString> SAL_CALL SpreadsheetImportFilter::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL SpreadsheetImportFilter::getSupportedServiceNames()
{
return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" };
}
@@ -131,7 +130,7 @@ void SpreadsheetImportTest::test()
uno::Reference<table::XCell> xCell = xSheet->getCellByPosition(0, 0);
CPPUNIT_ASSERT(xCell.is());
CPPUNIT_ASSERT_EQUAL(table::CellContentType_TEXT, xCell->getType());
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("My hovercraft is full of eels."), xCell->getFormula());
+ CPPUNIT_ASSERT_EQUAL(OUString("My hovercraft is full of eels."), xCell->getFormula());
}
CPPUNIT_TEST_SUITE_REGISTRATION(SpreadsheetImportTest);
diff --git a/writerperfect/qa/unit/TextImportTest.cxx b/writerperfect/qa/unit/TextImportTest.cxx
index de085a2f33b0..b9a3953fc8d2 100644
--- a/writerperfect/qa/unit/TextImportTest.cxx
+++ b/writerperfect/qa/unit/TextImportTest.cxx
@@ -36,13 +36,12 @@ public:
}
// XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) override;
- virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
private:
- virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput,
- rtl::OUString& rTypeName) override;
+ virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, OUString& rTypeName) override;
virtual bool doImportDocument(weld::Window* pWindow, librevenge::RVNGInputStream& rInput,
OdtGenerator& rGenerator,
utl::MediaDescriptor& rDescriptor) override;
@@ -57,24 +56,24 @@ bool TextImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputStre
return true;
}
-bool TextImportFilter::doDetectFormat(librevenge::RVNGInputStream&, rtl::OUString& rTypeName)
+bool TextImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUString& rTypeName)
{
rTypeName = "WpftDummyText";
return true;
}
// XServiceInfo
-rtl::OUString SAL_CALL TextImportFilter::getImplementationName()
+OUString SAL_CALL TextImportFilter::getImplementationName()
{
return OUString("org.libreoffice.comp.Wpft.QA.TextImportFilter");
}
-sal_Bool SAL_CALL TextImportFilter::supportsService(const rtl::OUString& rServiceName)
+sal_Bool SAL_CALL TextImportFilter::supportsService(const OUString& rServiceName)
{
return cppu::supportsService(this, rServiceName);
}
-uno::Sequence<rtl::OUString> SAL_CALL TextImportFilter::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL TextImportFilter::getSupportedServiceNames()
{
return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" };
}
@@ -130,12 +129,12 @@ void TextImportTest::test()
CPPUNIT_ASSERT(xPortions->hasMoreElements());
uno::Reference<beans::XPropertySet> xPortionProps(xPortions->nextElement(), uno::UNO_QUERY);
CPPUNIT_ASSERT(xPortionProps.is());
- rtl::OUString aPortionType;
+ OUString aPortionType;
CPPUNIT_ASSERT(xPortionProps->getPropertyValue("TextPortionType") >>= aPortionType);
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("Text"), aPortionType);
+ CPPUNIT_ASSERT_EQUAL(OUString("Text"), aPortionType);
uno::Reference<text::XTextRange> xPortion(xPortionProps, uno::UNO_QUERY);
CPPUNIT_ASSERT(xPortion.is());
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("My hovercraft is full of eels."), xPortion->getString());
+ CPPUNIT_ASSERT_EQUAL(OUString("My hovercraft is full of eels."), xPortion->getString());
CPPUNIT_ASSERT(!xPortions->hasMoreElements());
CPPUNIT_ASSERT(!xParas->hasMoreElements());
}
diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx b/writerperfect/qa/unit/WPXSvStreamTest.cxx
index 773458179145..d7c42ee7d3b0 100644
--- a/writerperfect/qa/unit/WPXSvStreamTest.cxx
+++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx
@@ -83,7 +83,7 @@ shared_ptr<RVNGInputStream> lcl_createStream()
return pInputStream;
}
-const shared_ptr<RVNGInputStream> lcl_createStreamForURL(const rtl::OUString& rURL)
+const shared_ptr<RVNGInputStream> lcl_createStreamForURL(const OUString& rURL)
{
using uno::Reference;
using uno::UNO_QUERY_THROW;
diff --git a/writerperfect/qa/unit/WpftFilterTestBase.cxx b/writerperfect/qa/unit/WpftFilterTestBase.cxx
index 301d9a1348ab..ea6ad5a89612 100644
--- a/writerperfect/qa/unit/WpftFilterTestBase.cxx
+++ b/writerperfect/qa/unit/WpftFilterTestBase.cxx
@@ -21,7 +21,7 @@ namespace writerperfect
{
namespace test
{
-WpftFilterTestBase::WpftFilterTestBase(const rtl::OUString& rFactoryURL)
+WpftFilterTestBase::WpftFilterTestBase(const OUString& rFactoryURL)
: ::test::FiltersTest()
, WpftFilterFixture()
, m_aFactoryURL(rFactoryURL)
@@ -45,13 +45,13 @@ bool WpftFilterTestBase::load(const OUString&, const OUString& rURL, const OUStr
return aLoader.getDocument().is();
}
-void WpftFilterTestBase::doTest(const rtl::OUString& rFilter, const rtl::OUString& rPath)
+void WpftFilterTestBase::doTest(const OUString& rFilter, const OUString& rPath)
{
m_xFilter.set(m_xFactory->createInstanceWithContext(rFilter, m_xContext), uno::UNO_QUERY_THROW);
testDir(OUString(), m_directories.getURLFromSrc(rPath));
}
-void WpftFilterTestBase::doTest(const rtl::OUString& rFilter, const rtl::OUString& rPath,
+void WpftFilterTestBase::doTest(const OUString& rFilter, const OUString& rPath,
const WpftOptionalMap_t& rOptionalMap)
{
m_xFilter.set(m_xFactory->createInstanceWithContext(rFilter, m_xContext), uno::UNO_QUERY_THROW);
diff --git a/writerperfect/qa/unit/WpftFilterTestBase.hxx b/writerperfect/qa/unit/WpftFilterTestBase.hxx
index 481d169d1663..509ebcb6d9f1 100644
--- a/writerperfect/qa/unit/WpftFilterTestBase.hxx
+++ b/writerperfect/qa/unit/WpftFilterTestBase.hxx
@@ -40,17 +40,17 @@ namespace writerperfect
{
namespace test
{
-typedef std::unordered_map<rtl::OUString, bool> WpftOptionalMap_t;
+typedef std::unordered_map<OUString, bool> WpftOptionalMap_t;
class WPFTQAHELPER_DLLPUBLIC WpftFilterTestBase : public ::test::FiltersTest,
public WpftFilterFixture
{
public:
- explicit WpftFilterTestBase(const rtl::OUString& rFactoryURL);
+ explicit WpftFilterTestBase(const OUString& rFactoryURL);
protected:
- void doTest(const rtl::OUString& rFilter, const rtl::OUString& rPath);
- void doTest(const rtl::OUString& rFilter, const rtl::OUString& rPath,
+ void doTest(const OUString& rFilter, const OUString& rPath);
+ void doTest(const OUString& rFilter, const OUString& rPath,
const WpftOptionalMap_t& rOptionalMap);
private:
@@ -58,7 +58,7 @@ private:
SotClipboardFormatId, unsigned int) override;
private:
- const rtl::OUString m_aFactoryURL;
+ const OUString m_aFactoryURL;
css::uno::Reference<css::document::XFilter> m_xFilter;
const WpftOptionalMap_t* m_pOptionalMap;
};
diff --git a/writerperfect/qa/unit/WpftLoader.cxx b/writerperfect/qa/unit/WpftLoader.cxx
index b89353d5c568..bae64e0aa651 100644
--- a/writerperfect/qa/unit/WpftLoader.cxx
+++ b/writerperfect/qa/unit/WpftLoader.cxx
@@ -42,9 +42,9 @@ namespace writerperfect
{
namespace test
{
-WpftLoader::WpftLoader(const rtl::OUString& rURL,
+WpftLoader::WpftLoader(const OUString& rURL,
const css::uno::Reference<css::document::XFilter>& rxFilter,
- const rtl::OUString& rFactoryURL,
+ const OUString& rFactoryURL,
const css::uno::Reference<css::frame::XDesktop2>& rxDesktop,
const css::uno::Reference<css::container::XNameAccess>& rxTypeMap,
const css::uno::Reference<css::uno::XComponentContext>& rxContext)
@@ -61,7 +61,7 @@ WpftLoader::WpftLoader(const rtl::OUString& rURL,
WpftLoader::WpftLoader(const css::uno::Reference<css::io::XInputStream>& rxInputStream,
const css::uno::Reference<css::document::XFilter>& rxFilter,
- const rtl::OUString& rFactoryURL,
+ const OUString& rFactoryURL,
const css::uno::Reference<css::frame::XDesktop2>& rxDesktop,
const css::uno::Reference<css::uno::XComponentContext>& rxContext)
: m_xInputStream(rxInputStream)
@@ -146,7 +146,7 @@ bool WpftLoader::impl_load()
const uno::Reference<document::XExtendedFilterDetection> xDetector(m_xFilter,
uno::UNO_QUERY_THROW);
- const rtl::OUString aTypeName(xDetector->detect(aDescriptor));
+ const OUString aTypeName(xDetector->detect(aDescriptor));
if (aTypeName.isEmpty())
throw lang::IllegalArgumentException();
@@ -179,7 +179,7 @@ void WpftLoader::impl_dispose()
}
void WpftLoader::impl_detectFilterName(uno::Sequence<beans::PropertyValue>& rDescriptor,
- const rtl::OUString& rTypeName)
+ const OUString& rTypeName)
{
const sal_Int32 nDescriptorLen = rDescriptor.getLength();
@@ -194,7 +194,7 @@ void WpftLoader::impl_detectFilterName(uno::Sequence<beans::PropertyValue>& rDes
{
for (sal_Int32 n = 0; aTypes.getLength() != n; ++n)
{
- rtl::OUString aFilterName;
+ OUString aFilterName;
if (("PreferredFilter" == aTypes[n].Name) && (aTypes[n].Value >>= aFilterName))
{
rDescriptor.realloc(nDescriptorLen + 1);
diff --git a/writerperfect/qa/unit/WpftLoader.hxx b/writerperfect/qa/unit/WpftLoader.hxx
index d76fb76ea52f..ccd8f9294175 100644
--- a/writerperfect/qa/unit/WpftLoader.hxx
+++ b/writerperfect/qa/unit/WpftLoader.hxx
@@ -63,15 +63,14 @@ namespace test
class WPFTQAHELPER_DLLPUBLIC WpftLoader
{
public:
- WpftLoader(const rtl::OUString& rURL,
- const css::uno::Reference<css::document::XFilter>& rxFilter,
- const rtl::OUString& rFactoryURL,
+ WpftLoader(const OUString& rURL, const css::uno::Reference<css::document::XFilter>& rxFilter,
+ const OUString& rFactoryURL,
const css::uno::Reference<css::frame::XDesktop2>& rxDesktop,
const css::uno::Reference<css::container::XNameAccess>& rxTypeMap,
const css::uno::Reference<css::uno::XComponentContext>& rxContext);
WpftLoader(const css::uno::Reference<css::io::XInputStream>& rxInputStream,
const css::uno::Reference<css::document::XFilter>& rxFilter,
- const rtl::OUString& rFactoryURL,
+ const OUString& rFactoryURL,
const css::uno::Reference<css::frame::XDesktop2>& rxDesktop,
const css::uno::Reference<css::uno::XComponentContext>& rxContext);
~WpftLoader();
@@ -83,12 +82,12 @@ private:
void impl_dispose();
void impl_detectFilterName(css::uno::Sequence<css::beans::PropertyValue>& rDescriptor,
- const rtl::OUString& rTypeName);
+ const OUString& rTypeName);
private:
- const rtl::OUString m_aURL;
+ const OUString m_aURL;
const css::uno::Reference<css::io::XInputStream> m_xInputStream;
- const rtl::OUString m_aFactoryURL;
+ const OUString m_aFactoryURL;
const css::uno::Reference<css::document::XFilter> m_xFilter;
const css::uno::Reference<css::frame::XDesktop2> m_xDesktop;
const css::uno::Reference<css::container::XNameAccess> m_xTypeMap;
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index ef8ff59ea013..86d21ec8a6e2 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -76,7 +76,7 @@ public:
}
//! add a file
- void addFile(rtl::OUString const& path, std::string const& shortName)
+ void addFile(OUString const& path, std::string const& shortName)
{
m_nameToPathMap[shortName] = path;
}
@@ -108,7 +108,7 @@ public:
if (m_nameToPathMap.size() < id)
return nullptr;
- std::map<std::string, rtl::OUString>::const_iterator it = m_nameToPathMap.begin();
+ std::map<std::string, OUString>::const_iterator it = m_nameToPathMap.begin();
std::advance(it, id);
return it->first.c_str();
}
@@ -134,7 +134,7 @@ public:
OUString lPath = m_nameToPathMap.find(name)->second;
do
{
- const rtl::OUString aTitle(xRow->getString(1));
+ const OUString aTitle(xRow->getString(1));
if (aTitle != lPath)
continue;
@@ -169,7 +169,7 @@ private:
/// the main container
uno::Reference<ucb::XContent> m_xContent;
/// the map short name to path
- std::map<std::string, rtl::OUString> m_nameToPathMap;
+ std::map<std::string, OUString> m_nameToPathMap;
FolderStream(const FolderStream&) = delete;
FolderStream& operator=(const FolderStream&) = delete;
};
@@ -336,8 +336,8 @@ MSWorksCalcImportFilter::filter(const css::uno::Sequence<css::beans::PropertyVal
const css::uno::Reference<container::XChild> xChild(xContent, uno::UNO_QUERY);
if (xChild.is())
{
- rtl::OUString sWM3Name;
- rtl::OUString sFM3Name;
+ OUString sWM3Name;
+ OUString sFM3Name;
const css::uno::Reference<ucb::XContent> xPackageContent(xChild->getParent(),
uno::UNO_QUERY);
uno::Reference<sdbc::XResultSet> xResultSet
@@ -351,12 +351,12 @@ MSWorksCalcImportFilter::filter(const css::uno::Sequence<css::beans::PropertyVal
sWM3Name = aTmpUrl.getName(INetURLObject::LAST_SEGMENT, true,
INetURLObject::DecodeMechanism::WithCharset);
aTmpUrl.setExtension("FM3");
- const rtl::OUString& sTestFM3Name
+ const OUString& sTestFM3Name
= aTmpUrl.getName(INetURLObject::LAST_SEGMENT, true,
INetURLObject::DecodeMechanism::WithCharset);
do
{
- const rtl::OUString& aTitle(xRow->getString(1));
+ const OUString& aTitle(xRow->getString(1));
if (aTitle.equalsIgnoreAsciiCase(sTestFM3Name))
sFM3Name = aTitle;
} while (xResultSet->next() && sFM3Name.isEmpty());
diff --git a/writerperfect/source/common/DirectoryStream.cxx b/writerperfect/source/common/DirectoryStream.cxx
index eeb449db0e9a..7f3e1b165da6 100644
--- a/writerperfect/source/common/DirectoryStream.cxx
+++ b/writerperfect/source/common/DirectoryStream.cxx
@@ -51,8 +51,7 @@ namespace writerperfect
{
namespace
{
-uno::Reference<io::XInputStream> findStream(ucbhelper::Content& rContent,
- const rtl::OUString& rName)
+uno::Reference<io::XInputStream> findStream(ucbhelper::Content& rContent, const OUString& rName)
{
uno::Reference<io::XInputStream> xInputStream;
@@ -68,7 +67,7 @@ uno::Reference<io::XInputStream> findStream(ucbhelper::Content& rContent,
const uno::Reference<sdbc::XRow> xRow(xResultSet, uno::UNO_QUERY_THROW);
do
{
- const rtl::OUString aTitle(xRow->getString(1));
+ const OUString aTitle(xRow->getString(1));
if (aTitle == rName)
{
const uno::Reference<ucb::XContent> xSubContent(xContentAccess->queryContent());
@@ -195,7 +194,7 @@ librevenge::RVNGInputStream* DirectoryStream::getSubStreamByName(const char* con
ucbhelper::Content aContent(m_pImpl->xContent, uno::Reference<ucb::XCommandEnvironment>(),
comphelper::getProcessComponentContext());
const uno::Reference<io::XInputStream> xInputStream(
- findStream(aContent, rtl::OUString::createFromAscii(pName)));
+ findStream(aContent, OUString::createFromAscii(pName)));
if (xInputStream.is())
return new WPXSvInputStream(xInputStream);
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index c0ac94ae3e18..771345a8c925 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -83,7 +83,7 @@ typedef struct
namespace
{
-rtl::OUString lcl_normalizeSubStreamPath(const rtl::OUString& rPath)
+OUString lcl_normalizeSubStreamPath(const OUString& rPath)
{
// accept paths which begin by '/'
// TODO: maybe this should to a full normalization
@@ -95,7 +95,7 @@ rtl::OUString lcl_normalizeSubStreamPath(const rtl::OUString& rPath)
namespace
{
-const rtl::OUString concatPath(const rtl::OUString& lhs, const rtl::OUString& rhs)
+const OUString concatPath(const OUString& lhs, const OUString& rhs)
{
if (lhs.isEmpty())
return rhs;
@@ -104,26 +104,26 @@ const rtl::OUString concatPath(const rtl::OUString& lhs, const rtl::OUString& rh
struct OLEStreamData
{
- OLEStreamData(const rtl::OString& rName, const rtl::OString& rvngName);
+ OLEStreamData(const OString& rName, const OString& rvngName);
SotStorageStreamRefWrapper stream;
/** Name of the stream.
*
- * This is not @c rtl::OUString, because we need to be able to
+ * This is not @c OUString, because we need to be able to
* produce const char* from it.
*/
- rtl::OString const name;
+ OString const name;
/** librevenge name of the stream.
*
- * This is not @c rtl::OUString, because we need to be able to
+ * This is not @c OUString, because we need to be able to
* produce const char* from it.
*/
- rtl::OString const RVNGname;
+ OString const RVNGname;
};
-typedef std::unordered_map<rtl::OUString, std::size_t> NameMap_t;
-typedef std::unordered_map<rtl::OUString, SotStorageRefWrapper> OLEStorageMap_t;
+typedef std::unordered_map<OUString, std::size_t> NameMap_t;
+typedef std::unordered_map<OUString, SotStorageRefWrapper> OLEStorageMap_t;
/** Representation of an OLE2 storage.
*
@@ -147,13 +147,13 @@ struct OLEStorageImpl
void initialize(std::unique_ptr<SvStream> pStream);
- tools::SvRef<SotStorageStream> getStream(const rtl::OUString& rPath);
+ tools::SvRef<SotStorageStream> getStream(const OUString& rPath);
tools::SvRef<SotStorageStream> const& getStream(std::size_t nId);
private:
- void traverse(const tools::SvRef<SotStorage>& rStorage, const rtl::OUString& rPath);
+ void traverse(const tools::SvRef<SotStorage>& rStorage, const OUString& rPath);
- tools::SvRef<SotStorageStream> createStream(const rtl::OUString& rPath);
+ tools::SvRef<SotStorageStream> createStream(const OUString& rPath);
public:
SotStorageRefWrapper mxRootStorage; //< root storage of the OLE2
@@ -163,7 +163,7 @@ public:
bool mbInitialized;
};
-OLEStreamData::OLEStreamData(const rtl::OString& rName, const rtl::OString& rvngName)
+OLEStreamData::OLEStreamData(const OString& rName, const OString& rvngName)
: stream()
, name(rName)
, RVNGname(rvngName)
@@ -191,9 +191,9 @@ void OLEStorageImpl::initialize(std::unique_ptr<SvStream> pStream)
mbInitialized = true;
}
-tools::SvRef<SotStorageStream> OLEStorageImpl::getStream(const rtl::OUString& rPath)
+tools::SvRef<SotStorageStream> OLEStorageImpl::getStream(const OUString& rPath)
{
- const rtl::OUString aPath(lcl_normalizeSubStreamPath(rPath));
+ const OUString aPath(lcl_normalizeSubStreamPath(rPath));
NameMap_t::iterator aIt = maNameMap.find(aPath);
// For the while don't return stream in this situation.
@@ -203,8 +203,8 @@ tools::SvRef<SotStorageStream> OLEStorageImpl::getStream(const rtl::OUString& rP
return tools::SvRef<SotStorageStream>();
if (!maStreams[aIt->second].stream.ref.is())
- maStreams[aIt->second].stream.ref = createStream(
- rtl::OStringToOUString(maStreams[aIt->second].name, RTL_TEXTENCODING_UTF8));
+ maStreams[aIt->second].stream.ref
+ = createStream(OStringToOUString(maStreams[aIt->second].name, RTL_TEXTENCODING_UTF8));
return maStreams[aIt->second].stream.ref;
}
@@ -213,12 +213,12 @@ tools::SvRef<SotStorageStream> const& OLEStorageImpl::getStream(const std::size_
{
if (!maStreams[nId].stream.ref.is())
maStreams[nId].stream.ref
- = createStream(rtl::OStringToOUString(maStreams[nId].name, RTL_TEXTENCODING_UTF8));
+ = createStream(OStringToOUString(maStreams[nId].name, RTL_TEXTENCODING_UTF8));
return maStreams[nId].stream.ref;
}
-void OLEStorageImpl::traverse(const tools::SvRef<SotStorage>& rStorage, const rtl::OUString& rPath)
+void OLEStorageImpl::traverse(const tools::SvRef<SotStorage>& rStorage, const OUString& rPath)
{
SvStorageInfoList infos;
@@ -228,18 +228,18 @@ void OLEStorageImpl::traverse(const tools::SvRef<SotStorage>& rStorage, const rt
{
if (info.IsStream())
{
- rtl::OUString baseName = info.GetName(), rvngName = baseName;
+ OUString baseName = info.GetName(), rvngName = baseName;
// librevenge::RVNGOLEStream ignores the first character when is a control code, so ...
if (!rvngName.isEmpty() && rvngName.toChar() < 32)
rvngName = rvngName.copy(1);
maStreams.emplace_back(
- rtl::OUStringToOString(concatPath(rPath, baseName), RTL_TEXTENCODING_UTF8),
- rtl::OUStringToOString(concatPath(rPath, rvngName), RTL_TEXTENCODING_UTF8));
+ OUStringToOString(concatPath(rPath, baseName), RTL_TEXTENCODING_UTF8),
+ OUStringToOString(concatPath(rPath, rvngName), RTL_TEXTENCODING_UTF8));
maNameMap[concatPath(rPath, rvngName)] = maStreams.size() - 1;
}
else if (info.IsStorage())
{
- const rtl::OUString aPath = concatPath(rPath, info.GetName());
+ const OUString aPath = concatPath(rPath, info.GetName());
SotStorageRefWrapper aStorage;
aStorage.ref = rStorage->OpenSotStorage(info.GetName(), StreamMode::STD_READ);
maStorageMap[aPath] = aStorage;
@@ -255,15 +255,15 @@ void OLEStorageImpl::traverse(const tools::SvRef<SotStorage>& rStorage, const rt
}
}
-tools::SvRef<SotStorageStream> OLEStorageImpl::createStream(const rtl::OUString& rPath)
+tools::SvRef<SotStorageStream> OLEStorageImpl::createStream(const OUString& rPath)
{
const sal_Int32 nDelim = rPath.lastIndexOf(u'/');
if (-1 == nDelim)
return mxRootStorage.ref->OpenSotStream(rPath, StreamMode::STD_READ);
- const rtl::OUString aDir = rPath.copy(0, nDelim);
- const rtl::OUString aName = rPath.copy(nDelim + 1);
+ const OUString aDir = rPath.copy(0, nDelim);
+ const OUString aName = rPath.copy(nDelim + 1);
const OLEStorageMap_t::const_iterator aIt = maStorageMap.find(aDir);
@@ -278,16 +278,16 @@ namespace
{
struct ZipStreamData
{
- explicit ZipStreamData(const rtl::OString& rName);
+ explicit ZipStreamData(const OString& rName);
Reference<XInputStream> xStream;
/** Name of the stream.
*
- * This is not @c rtl::OUString, because we need to be able to
+ * This is not @c OUString, because we need to be able to
* produce const char* from it.
*/
- rtl::OString const aName;
+ OString const aName;
};
/** Representation of a Zip storage.
@@ -307,13 +307,13 @@ struct ZipStorageImpl
*/
void initialize();
- Reference<XInputStream> getStream(const rtl::OUString& rPath);
+ Reference<XInputStream> getStream(const OUString& rPath);
Reference<XInputStream> const& getStream(std::size_t nId);
private:
void traverse(const Reference<container::XNameAccess>& rxEnum);
- Reference<XInputStream> createStream(const rtl::OUString& rPath);
+ Reference<XInputStream> createStream(const OUString& rPath);
public:
Reference<container::XNameAccess> mxContainer; //< root of the Zip
@@ -322,7 +322,7 @@ public:
bool mbInitialized;
};
-ZipStreamData::ZipStreamData(const rtl::OString& rName)
+ZipStreamData::ZipStreamData(const OString& rName)
: xStream()
, aName(rName)
{
@@ -344,9 +344,9 @@ void ZipStorageImpl::initialize()
mbInitialized = true;
}
-Reference<XInputStream> ZipStorageImpl::getStream(const rtl::OUString& rPath)
+Reference<XInputStream> ZipStorageImpl::getStream(const OUString& rPath)
{
- const rtl::OUString aPath(lcl_normalizeSubStreamPath(rPath));
+ const OUString aPath(lcl_normalizeSubStreamPath(rPath));
NameMap_t::iterator aIt = maNameMap.find(aPath);
// For the while don't return stream in this situation.
@@ -365,14 +365,14 @@ Reference<XInputStream> const& ZipStorageImpl::getStream(const std::size_t nId)
{
if (!maStreams[nId].xStream.is())
maStreams[nId].xStream
- = createStream(rtl::OStringToOUString(maStreams[nId].aName, RTL_TEXTENCODING_UTF8));
+ = createStream(OStringToOUString(maStreams[nId].aName, RTL_TEXTENCODING_UTF8));
return maStreams[nId].xStream;
}
void ZipStorageImpl::traverse(const Reference<container::XNameAccess>& rxContainer)
{
- const Sequence<rtl::OUString> lNames = rxContainer->getElementNames();
+ const Sequence<OUString> lNames = rxContainer->getElementNames();
maStreams.reserve(lNames.getLength());
@@ -380,13 +380,13 @@ void ZipStorageImpl::traverse(const Reference<container::XNameAccess>& rxContain
{
if (!lNames[n].endsWith("/")) // skip dirs
{
- maStreams.emplace_back(rtl::OUStringToOString(lNames[n], RTL_TEXTENCODING_UTF8));
+ maStreams.emplace_back(OUStringToOString(lNames[n], RTL_TEXTENCODING_UTF8));
maNameMap[lNames[n]] = maStreams.size() - 1;
}
}
}
-Reference<XInputStream> ZipStorageImpl::createStream(const rtl::OUString& rPath)
+Reference<XInputStream> ZipStorageImpl::createStream(const OUString& rPath)
{
Reference<XInputStream> xStream;
@@ -632,7 +632,7 @@ bool WPXSvInputStreamImpl::existsSubStream(const char* const name)
PositionHolder pos(mxSeekable);
mxSeekable->seek(0);
- const rtl::OUString aName(rtl::OStringToOUString(rtl::OString(name), RTL_TEXTENCODING_UTF8));
+ const OUString aName(OStringToOUString(OString(name), RTL_TEXTENCODING_UTF8));
if (isOLE())
{
@@ -662,7 +662,7 @@ librevenge::RVNGInputStream* WPXSvInputStreamImpl::getSubStreamByName(const char
PositionHolder pos(mxSeekable);
mxSeekable->seek(0);
- const rtl::OUString aName(rtl::OStringToOUString(rtl::OString(name), RTL_TEXTENCODING_UTF8));
+ const OUString aName(OStringToOUString(OString(name), RTL_TEXTENCODING_UTF8));
if (isOLE())
{
diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx
index 4c80c6cf075e..852c71aebdf1 100644
--- a/writerperfect/source/writer/EBookImportFilter.cxx
+++ b/writerperfect/source/writer/EBookImportFilter.cxx
@@ -27,7 +27,7 @@ bool EBookImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputStr
OdtGenerator& rGenerator,
utl::MediaDescriptor& rDescriptor)
{
- rtl::OUString aFilterName;
+ OUString aFilterName;
rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] >>= aFilterName;
assert(!aFilterName.isEmpty());
diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx
index 60132380d04c..9bdd251b93f5 100644
--- a/xmloff/source/core/RDFaExportHelper.cxx
+++ b/xmloff/source/core/RDFaExportHelper.cxx
@@ -155,7 +155,7 @@ RDFaExportHelper::AddRDFa(
xContent->getValue());
}
- ::std::vector<::rtl::OUString> curies;
+ ::std::vector<OUString> curies;
for (rdf::Statement const& rStatement : rStatements)
{
curies.push_back(makeCURIE(&m_rExport, rStatement.Predicate));
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 297ed54a1f6c..059e0fddab70 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -478,12 +478,12 @@ AnimationsExporterImpl::AnimationsExporterImpl( SvXMLExport& rExport, const Refe
/** split a uri hierarchy into first segment and rest */
-static bool splitPath(::rtl::OUString const & i_rPath,
- ::rtl::OUString & o_rDir, ::rtl::OUString& o_rRest)
+static bool splitPath(OUString const & i_rPath,
+ OUString & o_rDir, OUString& o_rRest)
{
const sal_Int32 idx(i_rPath.indexOf(u'/'));
if (idx < 0 || idx >= i_rPath.getLength()) {
- o_rDir = ::rtl::OUString();
+ o_rDir = OUString();
o_rRest = i_rPath;
return true;
} else if (idx == 0 || idx == i_rPath.getLength() - 1) {
@@ -499,10 +499,10 @@ static bool splitPath(::rtl::OUString const & i_rPath,
static void lcl_CopyStream(
uno::Reference<embed::XStorage> const& xSource,
uno::Reference<embed::XStorage> const& xTarget,
- ::rtl::OUString const& rPath)
+ OUString const& rPath)
{
- ::rtl::OUString dir;
- ::rtl::OUString rest;
+ OUString dir;
+ OUString rest;
if (!splitPath(rPath, dir, rest))
throw uno::RuntimeException();
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index ae6556b99b0c..3f7337dd5030 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -99,8 +99,8 @@ OUString AnimationsImport_getImplementationName() throw()
return OUString( "xmloff::AnimationsImport" );
}
-static ::rtl::OUString
-lcl_GetMediaReference(SvXMLImport const& rImport, ::rtl::OUString const& rURL)
+static OUString
+lcl_GetMediaReference(SvXMLImport const& rImport, OUString const& rURL)
{
if (rImport.IsPackageURL(rURL))
return "vnd.sun.star.Package:" + rURL;
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 7673c9d48756..7e0b4c8edd20 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -418,7 +418,7 @@ void XMLPageMasterExportPropMapper::ContextFilter(
case CTF_PM_FOOTERFILLBITMAPNAME:
case CTF_PM_FOOTERFILLTRANSNAME:
{
- rtl::OUString aStr;
+ OUString aStr;
if( (pProp->maValue >>= aStr) && 0 == aStr.getLength() )
{
diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx
index 3ccac9f8bc47..ea7556e2c28c 100644
--- a/xmloff/source/style/PageMasterImportContext.cxx
+++ b/xmloff/source/style/PageMasterImportContext.cxx
@@ -163,9 +163,9 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet
// ones are used when a FillStyle is defined
if(!m_bIsFillStyleAlreadyConverted && !GetProperties().empty())
{
- static ::rtl::OUString s_FillStyle("FillStyle");
- static ::rtl::OUString s_HeaderFillStyle("HeaderFillStyle");
- static ::rtl::OUString s_FooterFillStyle("FooterFillStyle");
+ static OUString s_FillStyle("FillStyle");
+ static OUString s_HeaderFillStyle("HeaderFillStyle");
+ static OUString s_FooterFillStyle("FooterFillStyle");
if(doNewDrawingLayerFillStyleDefinitionsExist(s_FillStyle))
{
@@ -256,7 +256,7 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet
case CTF_PM_FOOTERFILLBITMAPNAME:
{
struct XMLPropertyState& rState = GetProperties()[nIndex];
- rtl::OUString sStyleName;
+ OUString sStyleName;
rState.maValue >>= sStyleName;
// translate the used name from ODF intern to the name used in the Model
@@ -265,7 +265,7 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet
try
{
// set property
- const rtl::OUString& rPropertyName = rMapper->GetEntryAPIName(rState.mnIndex);
+ const OUString& rPropertyName = rMapper->GetEntryAPIName(rState.mnIndex);
if(!xInfo.is())
{
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index e9497349546a..3040b7417d9c 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -277,7 +277,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite )
if(bTakeCareOfDrawingLayerFillStyle)
{
// check if new FillStyles are used and if so mark old ones with -1
- static ::rtl::OUString s_FillStyle("FillStyle");
+ static OUString s_FillStyle("FillStyle");
if(doNewDrawingLayerFillStyleDefinitionsExist(s_FillStyle))
{
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index c2bc93fc401d..d9394b0347af 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -530,7 +530,7 @@ void XMLTextStyleContext::FillPropertySet(
case CTF_FILLBITMAPNAME:
{
// DrawingLayer FillStyle name needs to be mapped to DisplayName
- rtl::OUString sStyleName;
+ OUString sStyleName;
rState.maValue >>= sStyleName;
// translate the used name from ODF intern to the name used in the Model
@@ -561,7 +561,7 @@ void XMLTextStyleContext::FillPropertySet(
}
// set property
- const rtl::OUString& rPropertyName = rPropMapper->GetEntryAPIName(rState.mnIndex);
+ const OUString& rPropertyName = rPropMapper->GetEntryAPIName(rState.mnIndex);
if(!xInfo.is())
{
diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index 89ec490d46d5..2108c340cfbe 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -456,7 +456,7 @@ public:
OUString const & rPropName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importImageScaleModeProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
};