[Libreoffice-commits] core.git: accessibility/inc accessibility/source avmedia/source basegfx/source basic/source canvas/source chart2/source codemaker/source comphelper/source configmgr/source connectivity/source cppuhelper/qa cppuhelper/source cppu/qa cppu/source dbaccess/source desktop/source desktop/test embedserv/source extensions/source filter/qa filter/source forms/source fpicker/source framework/inc framework/source idlc/source include/comphelper include/drawinglayer include/framework include/o3tl include/oox include/registry include/sfx2 include/store include/svl include/svtools include/svx include/toolkit include/unoidl include/unotools include/vcl include/xmloff io/qa lingucomponent/source officecfg/registry oox/source opencl/source registry/source sal/cppunittester salhelper/source salhelper/test sal/osl sal/qa sal/rtl sax/qa sax/source sc/qa sc/source sd/source sfx2/inc sfx2/source shell/source solenv/gdb solenv/lldb solenv/vs starmath/source stoc/source svl/qa svl/source svtools/inc svtools/source svx/inc svx/source sw/qa sw/source test/source toolkit/source tools/source ucb/source unodevtools/source unoidl/source unotools/source ure/source vcl/inc vcl/opengl vcl/osx vcl/qt5 vcl/source vcl/unx vcl/workben winaccessibility/inc winaccessibility/source writerfilter/source writerperfect/inc writerperfect/qa writerperfect/source xmloff/source xmlscript/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Oct 24 12:44:16 UTC 2018
accessibility/inc/standard/vclxaccessiblelist.hxx | 2
accessibility/inc/standard/vclxaccessiblemenu.hxx | 2
accessibility/inc/standard/vclxaccessiblescrollbar.hxx | 2
accessibility/source/standard/vclxaccessiblelist.cxx | 2
avmedia/source/macavf/framegrabber.hxx | 6
avmedia/source/macavf/framegrabber.mm | 8
avmedia/source/macavf/macavfuno.mm | 4
avmedia/source/macavf/manager.hxx | 8
avmedia/source/macavf/manager.mm | 10
avmedia/source/macavf/player.hxx | 8
avmedia/source/macavf/player.mm | 10
avmedia/source/macavf/window.hxx | 6
avmedia/source/macavf/window.mm | 8
avmedia/source/vlc/vlcframegrabber.cxx | 16
avmedia/source/vlc/vlcframegrabber.hxx | 8
avmedia/source/vlc/vlcmanager.cxx | 12
avmedia/source/vlc/vlcmanager.hxx | 10
avmedia/source/vlc/vlcplayer.cxx | 12
avmedia/source/vlc/vlcplayer.hxx | 10
avmedia/source/vlc/vlcwindow.cxx | 10
avmedia/source/vlc/vlcwindow.hxx | 6
avmedia/source/vlc/wrapper/Media.cxx | 6
avmedia/source/vlc/wrapper/Player.cxx | 4
basegfx/source/tools/numbertools.cxx | 2
basic/source/runtime/methods.cxx | 2
canvas/source/opengl/ogl_spritecanvas.cxx | 4
canvas/source/opengl/ogl_spritecanvas.hxx | 2
chart2/source/controller/sidebar/Chart2PanelFactory.cxx | 3
chart2/source/controller/sidebar/Chart2PanelFactory.hxx | 2
chart2/source/view/main/PropertyMapper.cxx | 4
codemaker/source/codemaker/exceptiontree.cxx | 10
codemaker/source/codemaker/global.cxx | 10
codemaker/source/codemaker/options.cxx | 2
codemaker/source/cppumaker/cppuoptions.cxx | 2
codemaker/source/cppumaker/cpputype.hxx | 2
codemaker/source/cppumaker/dependencies.hxx | 6
codemaker/source/cppumaker/dumputils.cxx | 8
codemaker/source/javamaker/javatype.cxx | 2
codemaker/source/javamaker/javatype.hxx | 2
comphelper/source/container/embeddedobjectcontainer.cxx | 2
comphelper/source/misc/backupfilehelper.cxx | 4
comphelper/source/misc/docpasswordhelper.cxx | 16
comphelper/source/property/opropertybag.hxx | 12
configmgr/source/writemodfile.cxx | 2
connectivity/source/drivers/firebird/Clob.hxx | 4
connectivity/source/drivers/firebird/Connection.cxx | 2
connectivity/source/drivers/firebird/Connection.hxx | 18
connectivity/source/drivers/firebird/DatabaseMetaData.hxx | 64
connectivity/source/drivers/firebird/Driver.cxx | 4
connectivity/source/drivers/firebird/Driver.hxx | 16
connectivity/source/drivers/firebird/Indexes.hxx | 4
connectivity/source/drivers/firebird/Keys.hxx | 2
connectivity/source/drivers/firebird/PreparedStatement.cxx | 2
connectivity/source/drivers/firebird/PreparedStatement.hxx | 8
connectivity/source/drivers/firebird/ResultSet.hxx | 6
connectivity/source/drivers/firebird/ResultSetMetaData.hxx | 14
connectivity/source/drivers/firebird/Services.cxx | 1
connectivity/source/drivers/firebird/Statement.hxx | 8
connectivity/source/drivers/firebird/Table.hxx | 12
connectivity/source/drivers/firebird/Tables.hxx | 4
connectivity/source/drivers/firebird/User.hxx | 2
connectivity/source/drivers/firebird/Users.hxx | 4
connectivity/source/drivers/firebird/Util.hxx | 4
connectivity/source/drivers/mysqlc/mysqlc_connection.cxx | 66
connectivity/source/drivers/mysqlc/mysqlc_connection.hxx | 29
connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx | 337 +-
connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx | 112
connectivity/source/drivers/mysqlc/mysqlc_driver.hxx | 1
connectivity/source/drivers/mysqlc/mysqlc_general.cxx | 22
connectivity/source/drivers/mysqlc/mysqlc_general.hxx | 6
connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx | 24
connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx | 12
connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx | 24
connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx | 10
connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx | 38
connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx | 12
connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx | 36
connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx | 14
connectivity/source/drivers/mysqlc/mysqlc_services.cxx | 10
connectivity/source/drivers/mysqlc/mysqlc_statement.cxx | 34
connectivity/source/drivers/mysqlc/mysqlc_statement.hxx | 15
connectivity/source/parse/sqlflex.l | 50
cppu/qa/cppumaker/test_cppumaker.cxx | 2
cppu/qa/test_any.cxx | 218 -
cppu/source/AffineBridge/AffineBridge.cxx | 4
cppu/source/LogBridge/LogBridge.cxx | 10
cppu/source/UnsafeBridge/UnsafeBridge.cxx | 4
cppu/source/helper/purpenv/Proxy.hxx | 4
cppu/source/helper/purpenv/helper_purpenv_Environment.cxx | 28
cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx | 2
cppu/source/threadpool/current.cxx | 4
cppu/source/typelib/static_types.cxx | 3
cppu/source/typelib/typelib.cxx | 20
cppu/source/uno/EnvStack.cxx | 32
cppu/source/uno/IdentityMapping.cxx | 2
cppu/source/uno/cascade_mapping.cxx | 48
cppu/source/uno/eq.hxx | 2
cppu/source/uno/lbenv.cxx | 14
cppu/source/uno/lbmap.cxx | 2
cppu/source/uno/loadmodule.cxx | 4
cppu/source/uno/loadmodule.hxx | 2
cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx | 2
cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx | 28
cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx | 152
cppuhelper/qa/unourl/cppu_unourl.cxx | 34
cppuhelper/source/access_control.cxx | 2
cppuhelper/source/bootstrap.cxx | 9
cppuhelper/source/compat.cxx | 24
cppuhelper/source/component.cxx | 3
cppuhelper/source/component_context.cxx | 3
cppuhelper/source/defaultbootstrap.cxx | 14
cppuhelper/source/factory.cxx | 2
cppuhelper/source/gcc3.map | 4
cppuhelper/source/implbase_ex.cxx | 2
cppuhelper/source/implementationentry.cxx | 2
cppuhelper/source/loadsharedlibcomponentfactory.hxx | 8
cppuhelper/source/macro_expander.cxx | 5
cppuhelper/source/macro_expander.hxx | 2
cppuhelper/source/paths.cxx | 18
cppuhelper/source/paths.hxx | 6
cppuhelper/source/propertysetmixin.cxx | 88
cppuhelper/source/propshlp.cxx | 2
cppuhelper/source/servicemanager.cxx | 172 -
cppuhelper/source/servicemanager.hxx | 108
cppuhelper/source/shlib.cxx | 42
cppuhelper/source/supportsservice.cxx | 4
cppuhelper/source/tdmgr.cxx | 2
cppuhelper/source/typemanager.cxx | 260 -
cppuhelper/source/typemanager.hxx | 38
cppuhelper/source/unourl.cxx | 44
dbaccess/source/filter/hsqldb/rowinputbinary.cxx | 2
desktop/source/app/cmdlineargs.cxx | 2
desktop/source/app/crashreport.cxx | 4
desktop/source/app/dispatchwatcher.cxx | 12
desktop/test/deployment/active/active_native.cxx | 40
desktop/test/deployment/passive/passive_native.cxx | 40
embedserv/source/embed/docholder.cxx | 6
extensions/source/bibliography/bibprop.hxx | 20
extensions/source/logging/loggerconfig.cxx | 10
filter/qa/cppunit/priority-test.cxx | 4
filter/source/config/cache/contenthandlerfactory.hxx | 8
filter/source/config/cache/frameloaderfactory.hxx | 8
filter/source/msfilter/escherex.cxx | 2
filter/source/svg/svgexport.cxx | 2
forms/source/component/FormsCollection.hxx | 14
forms/source/inc/property.hxx | 36
fpicker/source/aqua/CFStringUtilities.mm | 16
fpicker/source/aqua/ControlHelper.mm | 2
fpicker/source/aqua/FilterHelper.mm | 56
fpicker/source/aqua/NSString_OOoAdditions.mm | 6
fpicker/source/aqua/NSURL_OOoAdditions.mm | 4
fpicker/source/aqua/SalAquaFilePicker.mm | 44
fpicker/source/aqua/SalAquaFolderPicker.mm | 22
fpicker/source/aqua/SalAquaPicker.mm | 6
fpicker/source/aqua/resourceprovider.mm | 1
framework/inc/uielement/statusbaritem.hxx | 22
framework/inc/uielement/statusbarmerger.hxx | 20
framework/source/fwe/classes/addonmenu.cxx | 6
framework/source/fwe/classes/addonsoptions.cxx | 58
framework/source/services/ContextChangeEventMultiplexer.cxx | 12
framework/source/uielement/genericstatusbarcontroller.cxx | 4
framework/source/uielement/menubarmanager.cxx | 2
framework/source/uielement/newmenucontroller.cxx | 2
framework/source/uielement/statusbaritem.cxx | 4
framework/source/uielement/statusbarmerger.cxx | 13
framework/source/uifactory/uicontrollerfactory.cxx | 4
idlc/source/parser.y | 37
idlc/source/scanner.l | 36
include/comphelper/DisableInteractionHelper.hxx | 2
include/comphelper/backupfilehelper.hxx | 2
include/comphelper/docpasswordhelper.hxx | 18
include/drawinglayer/primitive2d/textlayoutdevice.hxx | 10
include/framework/addonmenu.hxx | 2
include/framework/addonsoptions.hxx | 8
include/o3tl/string_view.hxx | 12
include/oox/drawingml/clrscheme.hxx | 2
include/oox/ole/axcontrol.hxx | 4
include/oox/ole/vbaproject.hxx | 2
include/oox/vml/vmlshape.hxx | 4
include/registry/reader.hxx | 64
include/registry/registry.hxx | 108
include/registry/writer.hxx | 30
include/sfx2/linksrc.hxx | 6
include/sfx2/progress.hxx | 4
include/sfx2/sfxdlg.hxx | 10
include/sfx2/shell.hxx | 2
include/sfx2/sidebar/Context.hxx | 8
include/sfx2/sidebar/ContextList.hxx | 4
include/sfx2/sidebar/ControllerFactory.hxx | 4
include/sfx2/sidebar/ResourceManager.hxx | 2
include/sfx2/sidebar/Theme.hxx | 20
include/sfx2/sidebar/Tools.hxx | 10
include/store/store.hxx | 12
include/svl/IndexedStyleSheets.hxx | 6
include/svtools/accessibleruler.hxx | 14
include/svtools/imagemgr.hxx | 8
include/svtools/rtfout.hxx | 2
include/svtools/rtftoken.h | 2
include/svx/galleryitem.hxx | 6
include/svx/nbdtmg.hxx | 10
include/svx/sidebar/ContextChangeEventMultiplexer.hxx | 2
include/svx/sidebar/SelectionChangeHandler.hxx | 4
include/svx/textchain.hxx | 2
include/toolkit/controls/dialogcontrol.hxx | 6
include/unoidl/unoidl.hxx | 220 -
include/unotools/datetime.hxx | 8
include/vcl/EnumContext.hxx | 16
include/vcl/opengl/OpenGLContext.hxx | 4
include/vcl/vclstatuslistener.hxx | 4
include/xmloff/prstylei.hxx | 2
include/xmloff/unointerfacetouniqueidentifiermapper.hxx | 2
io/qa/textinputstream.cxx | 4
lingucomponent/source/spellcheck/macosxspell/macspellimp.mm | 3
officecfg/registry/cppheader.xsl | 10
oox/source/drawingml/colorchoicecontext.cxx | 2
oox/source/export/chartexport.cxx | 2
opencl/source/openclwrapper.cxx | 8
registry/source/reflread.cxx | 24
registry/source/reflread.hxx | 12
registry/source/reflwrit.cxx | 12
registry/source/reflwrit.hxx | 12
sal/cppunittester/cppunittester.cxx | 18
sal/osl/all/debugbase.cxx | 10
sal/osl/all/loadmodulerelative.cxx | 4
sal/osl/unx/file_misc.cxx | 8
sal/osl/unx/file_path_helper.cxx | 40
sal/osl/unx/file_path_helper.hxx | 20
sal/osl/unx/file_stat.cxx | 20
sal/osl/unx/file_url.cxx | 36
sal/osl/unx/nlsupport.cxx | 4
sal/osl/unx/nlsupport.hxx | 2
sal/osl/unx/osxlocale.cxx | 6
sal/osl/unx/process.cxx | 14
sal/osl/unx/process_impl.cxx | 2
sal/osl/unx/uunxapi.cxx | 22
sal/osl/unx/uunxapi.hxx | 10
sal/osl/w32/file_dirvol.cxx | 38
sal/osl/w32/file_url.cxx | 8
sal/osl/w32/path_helper.cxx | 10
sal/osl/w32/path_helper.hxx | 6
sal/osl/w32/procimpl.cxx | 58
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 1648 ++++------
sal/qa/inc/stringhelper.hxx | 4
sal/qa/osl/condition/osl_Condition_Const.h | 2
sal/qa/osl/file/osl_File_Const.h | 2
sal/qa/osl/file/osl_old_test_file.cxx | 2
sal/qa/osl/file/test_cpy_wrt_file.cxx | 6
sal/qa/osl/module/osl_Module.cxx | 24
sal/qa/osl/pipe/osl_Pipe.cxx | 21
sal/qa/osl/process/osl_Thread.cxx | 8
sal/qa/osl/process/osl_process.cxx | 12
sal/qa/osl/profile/osl_old_testprofile.cxx | 6
sal/qa/osl/security/osl_Security.cxx | 50
sal/qa/osl/security/osl_Security_Const.h | 6
sal/qa/rtl/bootstrap/expand.cxx | 8
sal/qa/rtl/cipher/rtl_cipher.cxx | 4
sal/qa/rtl/digest/rtl_digest.cxx | 2
sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 12
sal/qa/rtl/locale/rtl_locale.cxx | 24
sal/qa/rtl/math/test-rtl-math.cxx | 28
sal/qa/rtl/ostring/rtl_OString2.cxx | 102
sal/qa/rtl/ostring/rtl_str.cxx | 132
sal/qa/rtl/ostring/rtl_string.cxx | 36
sal/qa/rtl/oustring/rtl_OUString2.cxx | 272 -
sal/qa/rtl/oustring/rtl_ustr.cxx | 286 -
sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx | 2
sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx | 10
sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx | 42
sal/qa/rtl/process/child_process.cxx | 4
sal/qa/rtl/process/rtl_Process.cxx | 32
sal/qa/rtl/process/rtl_Process_Const.h | 8
sal/qa/rtl/strings/test_oustring_compare.cxx | 20
sal/qa/rtl/strings/test_oustring_convert.cxx | 18
sal/qa/rtl/strings/test_oustring_endswith.cxx | 10
sal/qa/rtl/strings/test_oustring_startswith.cxx | 6
sal/qa/rtl/strings/test_strings_replace.cxx | 170 -
sal/qa/rtl/strings/test_strings_toint.cxx | 4
sal/qa/rtl/strings/test_strings_valuex.cxx | 12
sal/qa/rtl/uri/rtl_Uri.cxx | 20
sal/qa/rtl/uri/rtl_testuri.cxx | 46
sal/rtl/bootstrap.cxx | 104
sal/rtl/uri.cxx | 10
salhelper/source/dynload.cxx | 8
salhelper/test/Symbols/loader.cxx | 6
salhelper/test/dynamicloader/loader.cxx | 6
sax/qa/cppunit/test_converter.cxx | 2
sax/source/tools/converter.cxx | 2
sc/qa/unit/ucalc.cxx | 4
sc/source/core/data/bcaslot.cxx | 6
sc/source/core/data/stlpool.cxx | 6
sc/source/core/opencl/formulagroupcl.cxx | 2
sc/source/core/tool/formulalogger.cxx | 2
sc/source/core/tool/interpr7.cxx | 2
sc/source/filter/excel/xecontent.cxx | 2
sc/source/filter/excel/xeescher.cxx | 2
sc/source/filter/excel/xestream.cxx | 2
sc/source/filter/excel/xestyle.cxx | 2
sc/source/filter/excel/xiescher.cxx | 4
sc/source/filter/inc/ooxformulaparser.hxx | 12
sc/source/filter/oox/ooxformulaparser.cxx | 2
sc/source/filter/xcl97/xcl97rec.cxx | 6
sc/source/ui/inc/AccessibleEditObject.hxx | 2
sc/source/ui/sidebar/ScPanelFactory.cxx | 3
sc/source/ui/sidebar/ScPanelFactory.hxx | 2
sc/source/ui/vba/vbaname.cxx | 4
sc/source/ui/vba/vbapagesetup.hxx | 8
sc/source/ui/vba/vbarange.cxx | 2
sc/source/ui/view/tabview.cxx | 2
sd/source/core/drawdoc.cxx | 8
sd/source/core/sdpage.cxx | 22
sd/source/core/stlpool.cxx | 2
sd/source/ui/accessibility/AccessibleOutlineView.cxx | 2
sd/source/ui/dlg/present.cxx | 2
sd/source/ui/inc/present.hxx | 2
sd/source/ui/sidebar/PanelFactory.cxx | 3
sd/source/ui/sidebar/PanelFactory.hxx | 2
sfx2/inc/sidebar/ContextChangeBroadcaster.hxx | 10
sfx2/source/appl/shutdowniconaqua.mm | 42
sfx2/source/control/emojiview.cxx | 6
sfx2/source/control/shell.cxx | 2
sfx2/source/sidebar/Context.cxx | 4
sfx2/source/sidebar/ContextChangeBroadcaster.cxx | 7
sfx2/source/sidebar/ContextList.cxx | 2
sfx2/source/sidebar/ControllerFactory.cxx | 1
sfx2/source/sidebar/SidebarController.cxx | 14
sfx2/source/sidebar/SidebarPanelBase.cxx | 6
sfx2/source/sidebar/Theme.cxx | 20
sfx2/source/sidebar/Tools.cxx | 16
shell/source/backends/macbe/macbackend.mm | 40
shell/source/cmdmail/cmdmailsuppl.cxx | 2
shell/source/win32/simplemail/smplmailmsg.cxx | 4
shell/source/win32/simplemail/smplmailmsg.hxx | 4
solenv/gdb/libreoffice/sal.py | 8
solenv/gdb/libreoffice/util/uno.py | 2
solenv/lldb/libreoffice/LO.py | 4
solenv/vs/LibreOffice.natvis | 6
starmath/source/view.cxx | 2
stoc/source/inspect/introspection.cxx | 2
svl/qa/unit/items/test_IndexedStyleSheets.cxx | 12
svl/qa/unit/svl.cxx | 8
svl/source/items/IndexedStyleSheets.cxx | 10
svtools/inc/vclxaccessibleheaderbar.hxx | 4
svtools/source/control/vclxaccessibleheaderbar.cxx | 4
svx/inc/AccessibleSvxFindReplaceDialog.hxx | 4
svx/source/accessibility/AccessibleOLEShape.cxx | 2
svx/source/gallery2/gallery1.cxx | 2
svx/source/gengal/gengal.cxx | 4
svx/source/inc/DefaultShapesPanel.hxx | 2
svx/source/inc/ShapesUtil.hxx | 2
svx/source/inc/charmapacc.hxx | 2
svx/source/inc/svxrectctaccessiblecontext.hxx | 2
svx/source/items/galleryitem.cxx | 2
svx/source/sidebar/ContextChangeEventMultiplexer.cxx | 2
svx/source/sidebar/PanelFactory.cxx | 4
svx/source/sidebar/SelectionChangeHandler.cxx | 2
svx/source/sidebar/media/MediaPlaybackPanel.cxx | 1
svx/source/sidebar/nbdtmg.cxx | 4
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 4
svx/source/sidebar/shapes/DefaultShapesPanel.cxx | 4
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 2
svx/source/smarttags/SmartTagMgr.cxx | 2
svx/source/tbxctrls/tbxcolor.cxx | 2
svx/source/unodraw/unoprov.cxx | 2
svx/source/xoutdev/xtabgrdt.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 2
sw/qa/extras/rtfimport/rtfimport.cxx | 3
sw/qa/extras/uiwriter/uiwriter.cxx | 4
sw/source/filter/ww8/writerwordglue.cxx | 2
test/source/drawing/captionshape.cxx | 2
toolkit/source/awt/vclxtoolkit.cxx | 6
tools/source/generic/gen.cxx | 2
ucb/source/inc/regexpmap.hxx | 12
ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx | 2
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 12
ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx | 2
ucb/source/ucp/webdav/DAVProperties.cxx | 8
ucb/source/ucp/webdav/DAVProperties.hxx | 4
ucb/source/ucp/webdav/DAVResourceAccess.cxx | 2
ucb/source/ucp/webdav/DAVResourceAccess.hxx | 4
ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx | 4
ucb/source/ucp/webdav/SerfSession.cxx | 4
ucb/source/ucp/webdav/webdavcontent.cxx | 22
ucb/source/ucp/webdav/webdavcontent.hxx | 2
ucb/source/ucp/webdav/webdavcontentcaps.cxx | 2
unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 134
unodevtools/source/skeletonmaker/cpptypemaker.cxx | 8
unodevtools/source/skeletonmaker/skeletoncommon.cxx | 6
unoidl/source/sourcefileprovider.cxx | 6
unoidl/source/sourceprovider-scanner.hxx | 14
unoidl/source/unoidl.cxx | 4
unotools/source/misc/ServiceDocumenter.hxx | 8
unotools/source/misc/datetime.cxx | 2
unotools/source/ucbhelper/tempfile.cxx | 2
ure/source/uretest/cppmain.cc | 30
ure/source/uretest/cppserver.cc | 10
ure/source/uretest/cpptest.cc | 12
vcl/inc/opengl/program.hxx | 2
vcl/inc/unx/screensaverinhibitor.hxx | 2
vcl/opengl/program.cxx | 4
vcl/opengl/x11/X11DeviceInfo.cxx | 4
vcl/osx/printaccessoryview.mm | 76
vcl/osx/vclnsapp.mm | 2
vcl/qt5/Qt5Menu.cxx | 2
vcl/source/app/settings.cxx | 2
vcl/source/control/notebookbar.cxx | 2
vcl/source/opengl/OpenGLContext.cxx | 6
vcl/source/opengl/OpenGLHelper.cxx | 18
vcl/source/window/EnumContext.cxx | 24
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2
vcl/unx/gtk3_kde5/filepicker_ipc_commands.hxx | 6
vcl/workben/commonfuzzer.hxx | 4
vcl/workben/vcldemo.cxx | 6
winaccessibility/inc/AccObject.hxx | 2
winaccessibility/source/UAccCOM/AccActionBase.cxx | 2
winaccessibility/source/UAccCOM/AccEditableText.cxx | 24
winaccessibility/source/UAccCOM/AccEditableText.h | 2
winaccessibility/source/UAccCOM/AccImage.cxx | 2
winaccessibility/source/UAccCOM/AccTable.cxx | 4
winaccessibility/source/UAccCOM/AccTextBase.cxx | 10
winaccessibility/source/UAccCOM/MAccessible.cxx | 16
winaccessibility/source/service/AccObject.cxx | 22
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 6
writerfilter/source/dmapper/NumberingManager.hxx | 2
writerperfect/inc/DocumentHandlerFor.hxx | 2
writerperfect/inc/DocumentHandlerForOdg.hxx | 5
writerperfect/inc/DocumentHandlerForOdp.hxx | 5
writerperfect/inc/DocumentHandlerForOds.hxx | 5
writerperfect/inc/DocumentHandlerForOdt.hxx | 5
writerperfect/qa/unit/DrawingImportTest.cxx | 22
writerperfect/qa/unit/ImportTest.cxx | 15
writerperfect/qa/unit/PresentationImportTest.cxx | 23
writerperfect/qa/unit/SpreadsheetImportTest.cxx | 19
writerperfect/qa/unit/TextImportTest.cxx | 23
writerperfect/qa/unit/WPXSvStreamTest.cxx | 2
writerperfect/qa/unit/WpftFilterTestBase.cxx | 6
writerperfect/qa/unit/WpftFilterTestBase.hxx | 10
writerperfect/qa/unit/WpftLoader.cxx | 12
writerperfect/qa/unit/WpftLoader.hxx | 13
writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 16
writerperfect/source/common/DirectoryStream.cxx | 7
writerperfect/source/common/WPXSvInputStream.cxx | 80
writerperfect/source/writer/EBookImportFilter.cxx | 2
xmloff/source/core/RDFaExportHelper.cxx | 2
xmloff/source/draw/animationexport.cxx | 12
xmloff/source/draw/animationimport.cxx | 4
xmloff/source/style/PageMasterExportPropMapper.cxx | 2
xmloff/source/style/PageMasterImportContext.cxx | 10
xmloff/source/style/prstylei.cxx | 2
xmloff/source/text/txtstyli.cxx | 4
xmlscript/source/xmldlg_imexp/imp_share.hxx | 2
450 files changed, 4445 insertions(+), 4575 deletions(-)
New commits:
commit 6f50961e69406a17d6ec998956a6b33208b1001b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Oct 23 12:06:00 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Oct 24 14:43:34 2018 +0200
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 at collabora.co.uk>
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,"
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list