[Libreoffice-commits] core.git: dbaccess/source desktop/qa desktop/source drawinglayer/source dtrans/source editeng/source embeddedobj/source embedserv/source extensions/source
Tor Lillqvist
tml at collabora.com
Fri Feb 17 18:41:44 UTC 2017
dbaccess/source/core/api/CIndexes.hxx | 2
dbaccess/source/core/api/CRowSetDataColumn.cxx | 4
dbaccess/source/core/api/CRowSetDataColumn.hxx | 4
dbaccess/source/core/api/CacheSet.cxx | 18 +-
dbaccess/source/core/api/CacheSet.hxx | 6
dbaccess/source/core/api/FilteredContainer.cxx | 18 +-
dbaccess/source/core/api/HelperCollections.cxx | 4
dbaccess/source/core/api/HelperCollections.hxx | 4
dbaccess/source/core/api/KeySet.cxx | 54 ++++----
dbaccess/source/core/api/KeySet.hxx | 28 ++--
dbaccess/source/core/api/OptimisticSet.cxx | 34 ++---
dbaccess/source/core/api/OptimisticSet.hxx | 12 -
dbaccess/source/core/api/RowSet.cxx | 20 +--
dbaccess/source/core/api/RowSet.hxx | 4
dbaccess/source/core/api/RowSetBase.cxx | 20 +--
dbaccess/source/core/api/RowSetBase.hxx | 10 -
dbaccess/source/core/api/RowSetCache.cxx | 34 ++---
dbaccess/source/core/api/RowSetCache.hxx | 22 +--
dbaccess/source/core/api/RowSetRow.hxx | 2
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 62 +++++-----
dbaccess/source/core/api/TableDeco.cxx | 2
dbaccess/source/core/api/View.cxx | 2
dbaccess/source/core/api/column.cxx | 4
dbaccess/source/core/api/definitioncolumn.cxx | 2
dbaccess/source/core/api/preparedstatement.cxx | 2
dbaccess/source/core/api/query.hxx | 2
dbaccess/source/core/api/querycomposer.cxx | 4
dbaccess/source/core/api/querycontainer.cxx | 2
dbaccess/source/core/api/querydescriptor.cxx | 4
dbaccess/source/core/api/resultset.cxx | 2
dbaccess/source/core/api/table.cxx | 2
dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 2
dbaccess/source/core/dataaccess/ComponentDefinition.hxx | 2
dbaccess/source/core/dataaccess/ContentHelper.cxx | 2
dbaccess/source/core/dataaccess/ModelImpl.cxx | 10 -
dbaccess/source/core/dataaccess/ModelImpl.hxx | 2
dbaccess/source/core/dataaccess/connection.cxx | 10 -
dbaccess/source/core/dataaccess/databasecontext.cxx | 4
dbaccess/source/core/dataaccess/databasedocument.cxx | 16 +-
dbaccess/source/core/dataaccess/databasedocument.hxx | 2
dbaccess/source/core/dataaccess/datasource.cxx | 24 +--
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 6
dbaccess/source/core/dataaccess/documenteventexecutor.hxx | 2
dbaccess/source/core/dataaccess/documenteventnotifier.cxx | 2
dbaccess/source/core/dataaccess/documentevents.hxx | 4
dbaccess/source/core/dataaccess/myucp_datasupplier.hxx | 2
dbaccess/source/core/inc/ContainerMediator.hxx | 2
dbaccess/source/core/inc/DatabaseDataProvider.hxx | 2
dbaccess/source/core/inc/PropertyForward.hxx | 2
dbaccess/source/core/inc/SingleSelectQueryComposer.hxx | 20 +--
dbaccess/source/core/inc/column.hxx | 4
dbaccess/source/core/inc/composertools.hxx | 2
dbaccess/source/core/inc/definitioncontainer.hxx | 2
dbaccess/source/core/inc/objectnameapproval.hxx | 2
dbaccess/source/core/inc/querycomposer.hxx | 4
dbaccess/source/core/inc/recovery/dbdocrecovery.hxx | 4
dbaccess/source/core/misc/ContainerMediator.cxx | 2
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 22 +--
dbaccess/source/core/misc/PropertyForward.cxx | 6
dbaccess/source/core/misc/dsntypes.cxx | 2
dbaccess/source/core/recovery/dbdocrecovery.cxx | 4
dbaccess/source/core/recovery/storagetextstream.hxx | 2
dbaccess/source/core/recovery/storagexmlstream.cxx | 2
dbaccess/source/core/recovery/storagexmlstream.hxx | 2
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 2
dbaccess/source/ext/macromigration/docinteraction.hxx | 2
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 12 -
dbaccess/source/ext/macromigration/macromigrationdialog.hxx | 2
dbaccess/source/ext/macromigration/migrationengine.cxx | 14 +-
dbaccess/source/ext/macromigration/migrationengine.hxx | 2
dbaccess/source/ext/macromigration/migrationerror.hxx | 2
dbaccess/source/ext/macromigration/migrationlog.cxx | 14 +-
dbaccess/source/ext/macromigration/migrationlog.hxx | 2
dbaccess/source/ext/macromigration/progresscapture.hxx | 2
dbaccess/source/ext/macromigration/progressmixer.cxx | 2
dbaccess/source/ext/macromigration/progressmixer.hxx | 2
dbaccess/source/filter/xml/xmlAutoStyle.cxx | 6
dbaccess/source/filter/xml/xmlAutoStyle.hxx | 2
dbaccess/source/filter/xml/xmlDataSourceInfo.cxx | 2
dbaccess/source/filter/xml/xmlExport.cxx | 22 +--
dbaccess/source/filter/xml/xmlExport.hxx | 18 +-
dbaccess/source/filter/xml/xmlHelper.hxx | 2
dbaccess/source/filter/xml/xmlTableFilterList.hxx | 4
dbaccess/source/filter/xml/xmlfilter.hxx | 22 +--
dbaccess/source/inc/dsntypes.hxx | 2
dbaccess/source/sdbtools/connection/tablename.hxx | 2
dbaccess/source/ui/app/AppController.cxx | 42 +++---
dbaccess/source/ui/app/AppController.hxx | 18 +-
dbaccess/source/ui/app/AppControllerDnD.cxx | 42 +++---
dbaccess/source/ui/app/AppControllerGen.cxx | 16 +-
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 4
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2
dbaccess/source/ui/app/AppDetailView.cxx | 6
dbaccess/source/ui/app/AppDetailView.hxx | 6
dbaccess/source/ui/app/AppView.cxx | 4
dbaccess/source/ui/app/AppView.hxx | 2
dbaccess/source/ui/app/subcomponentmanager.cxx | 12 -
dbaccess/source/ui/app/subcomponentmanager.hxx | 2
dbaccess/source/ui/browser/brwctrlr.cxx | 2
dbaccess/source/ui/browser/dsbrowserDnD.cxx | 2
dbaccess/source/ui/browser/formadapter.cxx | 14 +-
dbaccess/source/ui/browser/genericcontroller.cxx | 30 ++--
dbaccess/source/ui/browser/sbagrid.cxx | 8 -
dbaccess/source/ui/browser/unodatbr.cxx | 28 ++--
dbaccess/source/ui/control/FieldDescControl.cxx | 10 -
dbaccess/source/ui/control/tabletree.cxx | 18 +-
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 8 -
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 4
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 36 ++---
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 36 ++---
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 22 +--
dbaccess/source/ui/dlg/DbAdminImpl.hxx | 4
dbaccess/source/ui/dlg/DriverSettings.cxx | 4
dbaccess/source/ui/dlg/DriverSettings.hxx | 2
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 4
dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 4
dbaccess/source/ui/dlg/UserAdmin.cxx | 4
dbaccess/source/ui/dlg/UserAdmin.hxx | 4
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 4
dbaccess/source/ui/dlg/admincontrols.cxx | 4
dbaccess/source/ui/dlg/admincontrols.hxx | 4
dbaccess/source/ui/dlg/adminpages.cxx | 4
dbaccess/source/ui/dlg/adminpages.hxx | 4
dbaccess/source/ui/dlg/adtabdlg.cxx | 4
dbaccess/source/ui/dlg/advancedsettings.cxx | 10 -
dbaccess/source/ui/dlg/advancedsettings.hxx | 10 -
dbaccess/source/ui/dlg/dbadmin.cxx | 2
dbaccess/source/ui/dlg/dbfindex.cxx | 4
dbaccess/source/ui/dlg/dbfindex.hxx | 4
dbaccess/source/ui/dlg/dbwiz.cxx | 2
dbaccess/source/ui/dlg/dbwizsetup.cxx | 2
dbaccess/source/ui/dlg/detailpages.cxx | 16 +-
dbaccess/source/ui/dlg/detailpages.hxx | 16 +-
dbaccess/source/ui/dlg/dsselect.hxx | 2
dbaccess/source/ui/dlg/generalpage.cxx | 12 -
dbaccess/source/ui/dlg/generalpage.hxx | 8 -
dbaccess/source/ui/dlg/odbcconfig.hxx | 2
dbaccess/source/ui/dlg/sqlmessage.cxx | 2
dbaccess/source/ui/dlg/tablespage.cxx | 4
dbaccess/source/ui/dlg/tablespage.hxx | 4
dbaccess/source/ui/inc/ColumnControlWindow.hxx | 2
dbaccess/source/ui/inc/ConnectionLineData.hxx | 2
dbaccess/source/ui/inc/DExport.hxx | 10 -
dbaccess/source/ui/inc/IItemSetHelper.hxx | 2
dbaccess/source/ui/inc/JoinController.hxx | 2
dbaccess/source/ui/inc/JoinTableView.hxx | 6
dbaccess/source/ui/inc/RelationController.hxx | 2
dbaccess/source/ui/inc/RtfReader.hxx | 2
dbaccess/source/ui/inc/TableConnection.hxx | 4
dbaccess/source/ui/inc/TableConnectionData.hxx | 2
dbaccess/source/ui/inc/TableController.hxx | 6
dbaccess/source/ui/inc/TableCopyHelper.hxx | 2
dbaccess/source/ui/inc/TableFieldDescription.hxx | 10 -
dbaccess/source/ui/inc/TableRowExchange.hxx | 4
dbaccess/source/ui/inc/TableWindow.hxx | 2
dbaccess/source/ui/inc/TableWindowData.hxx | 2
dbaccess/source/ui/inc/TablesSingleDlg.hxx | 2
dbaccess/source/ui/inc/TokenWriter.hxx | 4
dbaccess/source/ui/inc/TypeInfo.hxx | 2
dbaccess/source/ui/inc/UITools.hxx | 2
dbaccess/source/ui/inc/UserAdminDlg.hxx | 4
dbaccess/source/ui/inc/WColumnSelect.hxx | 6
dbaccess/source/ui/inc/WCopyTable.hxx | 20 +--
dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 4
dbaccess/source/ui/inc/dbadmin.hxx | 6
dbaccess/source/ui/inc/dbwiz.hxx | 4
dbaccess/source/ui/inc/dbwizsetup.hxx | 4
dbaccess/source/ui/inc/directsql.hxx | 2
dbaccess/source/ui/inc/dsmeta.hxx | 4
dbaccess/source/ui/inc/formadapter.hxx | 4
dbaccess/source/ui/inc/opendoccontrols.hxx | 4
dbaccess/source/ui/inc/propertystorage.hxx | 2
dbaccess/source/ui/inc/sbagrid.hxx | 4
dbaccess/source/ui/inc/singledoccontroller.hxx | 2
dbaccess/source/ui/inc/sqlmessage.hxx | 2
dbaccess/source/ui/inc/tabletree.hxx | 4
dbaccess/source/ui/inc/unodatbr.hxx | 4
dbaccess/source/ui/misc/DExport.cxx | 24 +--
dbaccess/source/ui/misc/RowSetDrop.cxx | 8 -
dbaccess/source/ui/misc/UITools.cxx | 16 +-
dbaccess/source/ui/misc/WColumnSelect.cxx | 18 +-
dbaccess/source/ui/misc/WCopyTable.cxx | 18 +-
dbaccess/source/ui/misc/WNameMatch.cxx | 4
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 4
dbaccess/source/ui/misc/dsmeta.cxx | 2
dbaccess/source/ui/querydesign/ConnectionLine.cxx | 4
dbaccess/source/ui/querydesign/JoinController.cxx | 2
dbaccess/source/ui/querydesign/JoinTableView.cxx | 22 +--
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 30 ++--
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx | 4
dbaccess/source/ui/querydesign/QueryTableView.cxx | 14 +-
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 2
dbaccess/source/ui/querydesign/TableConnection.cxx | 16 +-
dbaccess/source/ui/querydesign/TableFieldDescription.cxx | 6
dbaccess/source/ui/querydesign/TableWindow.cxx | 2
dbaccess/source/ui/querydesign/TableWindowAccess.cxx | 2
dbaccess/source/ui/querydesign/querycontroller.cxx | 14 +-
dbaccess/source/ui/relationdesign/RTableConnection.cxx | 2
dbaccess/source/ui/relationdesign/RelationController.cxx | 8 -
dbaccess/source/ui/relationdesign/RelationTableView.cxx | 10 -
dbaccess/source/ui/tabledesign/FieldDescriptions.cxx | 8 -
dbaccess/source/ui/tabledesign/TEditControl.cxx | 18 +-
dbaccess/source/ui/tabledesign/TEditControl.hxx | 8 -
dbaccess/source/ui/tabledesign/TableController.cxx | 44 +++----
dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 8 -
dbaccess/source/ui/tabledesign/TableUndo.cxx | 32 ++---
dbaccess/source/ui/tabledesign/TableUndo.hxx | 6
dbaccess/source/ui/uno/copytablewizard.cxx | 16 +-
desktop/qa/deployment_misc/test_dp_version.cxx | 2
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 6
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 2
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 4
desktop/source/deployment/gui/dp_gui_service.cxx | 2
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 2
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 6
desktop/source/deployment/inc/dp_descriptioninfoset.hxx | 2
desktop/source/deployment/inc/dp_ucb.h | 2
desktop/source/deployment/inc/dp_update.hxx | 2
desktop/source/deployment/manager/dp_activepackages.cxx | 4
desktop/source/deployment/manager/dp_activepackages.hxx | 2
desktop/source/deployment/manager/dp_extensionmanager.cxx | 32 ++---
desktop/source/deployment/manager/dp_extensionmanager.hxx | 4
desktop/source/deployment/manager/dp_manager.cxx | 14 +-
desktop/source/deployment/manager/dp_manager.h | 2
desktop/source/deployment/manager/dp_managerfac.cxx | 2
desktop/source/deployment/manager/dp_properties.cxx | 4
desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 10 -
desktop/source/deployment/misc/dp_ucb.cxx | 4
desktop/source/deployment/registry/component/dp_compbackenddb.hxx | 4
desktop/source/deployment/registry/component/dp_component.cxx | 18 +-
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 10 -
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx | 4
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx | 2
desktop/source/deployment/registry/dp_backend.cxx | 8 -
desktop/source/deployment/registry/dp_backenddb.cxx | 22 +--
desktop/source/deployment/registry/dp_registry.cxx | 8 -
desktop/source/deployment/registry/help/dp_help.cxx | 2
desktop/source/deployment/registry/help/dp_helpbackenddb.cxx | 2
desktop/source/deployment/registry/help/dp_helpbackenddb.hxx | 2
desktop/source/deployment/registry/inc/dp_backend.h | 2
desktop/source/deployment/registry/inc/dp_backenddb.hxx | 10 -
desktop/source/deployment/registry/package/dp_extbackenddb.hxx | 6
desktop/source/deployment/registry/package/dp_package.cxx | 22 +--
desktop/source/migration/migration.cxx | 22 +--
desktop/source/migration/migration_impl.hxx | 6
desktop/source/migration/services/jvmfwk.cxx | 4
desktop/source/migration/services/misc.hxx | 4
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 26 ++--
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 10 -
desktop/source/pkgchk/unopkg/unopkg_shared.h | 4
drawinglayer/source/attribute/sdrlightingattribute3d.cxx | 10 -
drawinglayer/source/attribute/sdrlineattribute.cxx | 10 -
drawinglayer/source/attribute/strokeattribute.cxx | 12 -
drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx | 2
drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx | 2
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 8 -
drawinglayer/source/primitive2d/patternfillprimitive2d.cxx | 2
drawinglayer/source/primitive2d/polygonprimitive2d.cxx | 2
drawinglayer/source/primitive2d/svggradientprimitive2d.cxx | 16 +-
drawinglayer/source/primitive2d/textbreakuphelper.cxx | 4
drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx | 4
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 8 -
drawinglayer/source/primitive2d/textlineprimitive2d.cxx | 2
drawinglayer/source/primitive2d/textprimitive2d.cxx | 4
drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx | 2
drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx | 2
drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx | 14 +-
drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx | 18 +-
drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx | 2
drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx | 2
drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx | 2
drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx | 2
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx | 4
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 2
drawinglayer/source/processor2d/vclprocessor2d.cxx | 4
drawinglayer/source/processor3d/defaultprocessor3d.cxx | 2
drawinglayer/source/processor3d/zbufferprocessor3d.cxx | 8 -
drawinglayer/source/texture/texture.cxx | 8 -
dtrans/source/generic/clipboardmanager.hxx | 2
dtrans/source/win32/clipb/WinClipboard.hxx | 2
editeng/source/accessibility/AccessibleParaManager.cxx | 26 ++--
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 20 +--
editeng/source/accessibility/AccessibleStringWrap.cxx | 2
editeng/source/editeng/editdoc.hxx | 2
editeng/source/editeng/impedit3.cxx | 10 -
editeng/source/editeng/impedit4.cxx | 2
editeng/source/items/borderline.cxx | 2
editeng/source/misc/svxacorr.cxx | 2
editeng/source/outliner/outliner.cxx | 2
editeng/source/rtf/svxrtf.cxx | 4
editeng/source/uno/unoedhlp.cxx | 26 ++--
editeng/source/uno/unoedprx.cxx | 14 +-
editeng/source/uno/unofored.cxx | 4
editeng/source/uno/unoforou.cxx | 4
embeddedobj/source/msole/olecomponent.cxx | 2
embedserv/source/embed/ed_ioleobject.cxx | 2
extensions/source/abpilot/typeselectionpage.cxx | 10 -
extensions/source/abpilot/typeselectionpage.hxx | 2
extensions/source/bibliography/formcontrolcontainer.cxx | 4
extensions/source/logging/filehandler.cxx | 2
extensions/source/propctrlr/browserlistbox.cxx | 6
extensions/source/propctrlr/browserlistbox.hxx | 4
extensions/source/propctrlr/buttonnavigationhandler.cxx | 2
extensions/source/propctrlr/cellbindinghandler.cxx | 6
extensions/source/propctrlr/cellbindinghandler.hxx | 2
extensions/source/propctrlr/cellbindinghelper.cxx | 4
extensions/source/propctrlr/composeduiupdate.cxx | 28 ++--
extensions/source/propctrlr/composeduiupdate.hxx | 2
extensions/source/propctrlr/defaultforminspection.hxx | 2
extensions/source/propctrlr/editpropertyhandler.cxx | 6
extensions/source/propctrlr/eformshelper.cxx | 30 ++--
extensions/source/propctrlr/eformshelper.hxx | 10 -
extensions/source/propctrlr/eformspropertyhandler.cxx | 6
extensions/source/propctrlr/eformspropertyhandler.hxx | 2
extensions/source/propctrlr/enumrepresentation.hxx | 2
extensions/source/propctrlr/eventhandler.cxx | 14 +-
extensions/source/propctrlr/formbrowsertools.hxx | 10 -
extensions/source/propctrlr/formcomponenthandler.cxx | 38 +++---
extensions/source/propctrlr/formcomponenthandler.hxx | 12 -
extensions/source/propctrlr/formgeometryhandler.cxx | 6
extensions/source/propctrlr/formlinkdialog.cxx | 4
extensions/source/propctrlr/formmetadata.cxx | 16 +-
extensions/source/propctrlr/formmetadata.hxx | 4
extensions/source/propctrlr/genericpropertyhandler.cxx | 14 +-
extensions/source/propctrlr/genericpropertyhandler.hxx | 4
extensions/source/propctrlr/handlerhelper.cxx | 12 -
extensions/source/propctrlr/handlerhelper.hxx | 4
extensions/source/propctrlr/inspectorhelpwindow.cxx | 2
extensions/source/propctrlr/inspectormodelbase.cxx | 2
extensions/source/propctrlr/inspectormodelbase.hxx | 2
extensions/source/propctrlr/newdatatype.cxx | 2
extensions/source/propctrlr/newdatatype.hxx | 4
extensions/source/propctrlr/propcontroller.cxx | 30 ++--
extensions/source/propctrlr/propcontroller.hxx | 8 -
extensions/source/propctrlr/propertycomposer.cxx | 18 +-
extensions/source/propctrlr/propertycomposer.hxx | 6
extensions/source/propctrlr/propertycontrolextender.hxx | 2
extensions/source/propctrlr/propertyeditor.cxx | 8 -
extensions/source/propctrlr/propertyeditor.hxx | 6
extensions/source/propctrlr/propertyhandler.cxx | 10 -
extensions/source/propctrlr/propertyhandler.hxx | 32 ++---
extensions/source/propctrlr/propertyinfo.hxx | 2
extensions/source/propctrlr/standardcontrol.cxx | 12 -
extensions/source/propctrlr/submissionhandler.cxx | 4
extensions/source/propctrlr/submissionhandler.hxx | 2
extensions/source/propctrlr/xsdvalidationhelper.cxx | 4
extensions/source/propctrlr/xsdvalidationhelper.hxx | 2
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 18 +-
extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx | 4
extensions/source/resource/ResourceIndexAccess.cxx | 4
extensions/source/resource/oooresourceloader.cxx | 2
extensions/source/resource/oooresourceloader.hxx | 6
353 files changed, 1403 insertions(+), 1403 deletions(-)
New commits:
commit b57d51e32fb85e9cde64f85719725253162c42e4
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Feb 17 19:06:24 2017 +0200
Drop :: prefix from std in [de]*/
Change-Id: I3247894fe022dce7f0aa351bd85fefcd7c545dd4
Reviewed-on: https://gerrit.libreoffice.org/34377
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Tor Lillqvist <tml at collabora.com>
diff --git a/dbaccess/source/core/api/CIndexes.hxx b/dbaccess/source/core/api/CIndexes.hxx
index e77ff65..6f8e5c6 100644
--- a/dbaccess/source/core/api/CIndexes.hxx
+++ b/dbaccess/source/core/api/CIndexes.hxx
@@ -35,7 +35,7 @@ namespace dbaccess
public:
OIndexes(connectivity::OTableHelper* _pTable,
::osl::Mutex& _rMutex,
- const ::std::vector< OUString> &_rVector,
+ const std::vector< OUString> &_rVector,
const css::uno::Reference< css::container::XNameAccess >& _rxIndexes
) : connectivity::OIndexesHelper(_pTable,_rMutex,_rVector)
,m_xIndexes(_rxIndexes)
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index 243dc54..99b15f7 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -198,7 +198,7 @@ ORowSetDataColumns::ORowSetDataColumns(
const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,
::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
- const ::std::vector< OUString> &_rVector
+ const std::vector< OUString> &_rVector
) : connectivity::sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector)
,m_aColumns(_rColumns)
{
@@ -226,7 +226,7 @@ void SAL_CALL ORowSetDataColumns::disposing()
m_aColumns = nullptr;
}
-void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< OUString> &_rVector)
+void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const std::vector< OUString> &_rVector)
{
m_aColumns = _rColumns;
reFill(_rVector);
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx
index a09bc21..2ae7789 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx
@@ -88,12 +88,12 @@ namespace dbaccess
const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,
::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
- const ::std::vector< OUString> &_rVector
+ const std::vector< OUString> &_rVector
);
virtual ~ORowSetDataColumns() override;
// only the name is identical to ::cppu::OComponentHelper
virtual void SAL_CALL disposing() override;
- void assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< OUString> &_rVector);
+ void assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const std::vector< OUString> &_rVector);
};
}
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index ed1a12a..f15c752 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -194,7 +194,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
,const connectivity::OSQLTable& _xTable
,OUStringBuffer& _sCondition
,OUStringBuffer& _sParameter
- ,::std::vector< sal_Int32>& _rOrgValues)
+ ,std::vector< sal_Int32>& _rOrgValues)
{
// use keys and indexes for exact positioning
// first the keys
@@ -209,7 +209,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
// Reference<XColumnsSupplier>
Reference<XPropertySet> xIndexColsSup;
Reference<XNameAccess> xIndexColumns;
- ::std::vector< Reference<XNameAccess> > aAllIndexColumns;
+ std::vector< Reference<XNameAccess> > aAllIndexColumns;
if(xIndexes.is())
{
for(sal_Int32 j=0;j<xIndexes->getCount();++j)
@@ -250,8 +250,8 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
_rOrgValues.push_back(nCheckCount);
}
- ::std::vector< Reference<XNameAccess> >::const_iterator aIndexEnd = aAllIndexColumns.end();
- for( ::std::vector< Reference<XNameAccess> >::const_iterator aIndexIter = aAllIndexColumns.begin();
+ std::vector< Reference<XNameAccess> >::const_iterator aIndexEnd = aAllIndexColumns.end();
+ for( std::vector< Reference<XNameAccess> >::const_iterator aIndexIter = aAllIndexColumns.begin();
aIndexIter != aIndexEnd;++aIndexIter)
{
if((*aIndexIter)->hasByName(aColumnName))
@@ -282,7 +282,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR
// list all columns that should be set
OUStringBuffer aCondition;
- ::std::vector< sal_Int32> aOrgValues;
+ std::vector< sal_Int32> aOrgValues;
fillParameters(_rInsertRow,_xTable,aCondition,aSql,aOrgValues);
aSql[aSql.getLength() - 1] = ' ';
if ( !aCondition.isEmpty() )
@@ -336,7 +336,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti
// Reference<XColumnsSupplier>
Reference<XPropertySet> xIndexColsSup;
Reference<XNameAccess> xIndexColumns;
- ::std::vector< Reference<XNameAccess> > aAllIndexColumns;
+ std::vector< Reference<XNameAccess> > aAllIndexColumns;
if(xIndexes.is())
{
for(sal_Int32 j=0;j<xIndexes->getCount();++j)
@@ -351,7 +351,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti
}
OUStringBuffer aColumnName;
- ::std::vector< sal_Int32> aOrgValues;
+ std::vector< sal_Int32> aOrgValues;
fillParameters(_rDeleteRow,_xTable,aSql,aColumnName,aOrgValues);
aSql.setLength(aSql.getLength()-5);
@@ -594,7 +594,7 @@ bool OCacheSet::isResultSetChanged() const
return false;
}
-void OCacheSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& /*io_aInsertRow*/,ORowSetValueVector::Vector& /*io_aRow*/,::std::vector<sal_Int32>& o_aChangedColumns)
+void OCacheSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& /*io_aInsertRow*/,ORowSetValueVector::Vector& /*io_aRow*/,std::vector<sal_Int32>& o_aChangedColumns)
{
o_aChangedColumns.push_back(i_nColumnIndex);
}
@@ -604,7 +604,7 @@ bool OCacheSet::columnValuesUpdated(ORowSetValueVector::Vector& /*io_aCachedRow*
return false;
}
-bool OCacheSet::updateColumnValues(const ORowSetValueVector::Vector& /*io_aCachedRow*/,ORowSetValueVector::Vector& /*io_aRow*/,const ::std::vector<sal_Int32>& /*i_aChangedColumns*/)
+bool OCacheSet::updateColumnValues(const ORowSetValueVector::Vector& /*io_aCachedRow*/,ORowSetValueVector::Vector& /*io_aRow*/,const std::vector<sal_Int32>& /*i_aChangedColumns*/)
{
return true;
}
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index 214f509..5f2c50d 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -68,7 +68,7 @@ namespace dbaccess
,const connectivity::OSQLTable& _xTable
,OUStringBuffer& _sCondition
,OUStringBuffer& _sParameter
- ,::std::vector< sal_Int32>& _rOrgValues);
+ ,std::vector< sal_Int32>& _rOrgValues);
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
void fillTableName(const css::uno::Reference< css::beans::XPropertySet>& _xTable);
@@ -173,9 +173,9 @@ namespace dbaccess
virtual bool isResultSetChanged() const;
virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) = 0;
- virtual void mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& io_aInsertRow,ORowSetValueVector::Vector& io_aRow,::std::vector<sal_Int32>& o_aChangedColumns);
+ virtual void mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& io_aInsertRow,ORowSetValueVector::Vector& io_aRow,std::vector<sal_Int32>& o_aChangedColumns);
virtual bool columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow,const ORowSetValueVector::Vector& i_aRow);
- virtual bool updateColumnValues(const ORowSetValueVector::Vector& io_aCachedRow,ORowSetValueVector::Vector& io_aRow,const ::std::vector<sal_Int32>& i_aChangedColumns);
+ virtual bool updateColumnValues(const ORowSetValueVector::Vector& io_aCachedRow,ORowSetValueVector::Vector& io_aRow,const std::vector<sal_Int32>& i_aChangedColumns);
virtual void fillMissingValues(ORowSetValueVector::Vector& io_aRow) const;
virtual bool previous_checked( bool i_bFetchRow );
virtual bool absolute_checked( sal_Int32 row,bool i_bFetchRow );
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index e0d61ef..7a599e9 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -45,7 +45,7 @@ namespace dbaccess
/** creates a vector of WildCards and reduce the _rTableFilter of the length of WildsCards
*/
-sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vector< WildCard >& _rOut)
+sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std::vector< WildCard >& _rOut)
{
// for wildcard search : remove all table filters which are a wildcard expression and build a WildCard
// for them
@@ -74,17 +74,17 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
bool lcl_isElementAllowed( const OUString& _rName,
const Sequence< OUString >& _rTableFilter,
- const ::std::vector< WildCard >& _rWCSearch )
+ const std::vector< WildCard >& _rWCSearch )
{
sal_Int32 nTableFilterLen = _rTableFilter.getLength();
const OUString* tableFilter = _rTableFilter.getConstArray();
const OUString* tableFilterEnd = _rTableFilter.getConstArray() + nTableFilterLen;
- bool bFilterMatch = ::std::find( tableFilter, tableFilterEnd, _rName ) != tableFilterEnd;
+ bool bFilterMatch = std::find( tableFilter, tableFilterEnd, _rName ) != tableFilterEnd;
// the table is allowed to "pass" if we had no filters at all or any of the non-wildcard filters matches
if (!bFilterMatch && !_rWCSearch.empty())
{ // or if one of the wildcard expression matches
- for ( ::std::vector< WildCard >::const_iterator aLoop = _rWCSearch.begin();
+ for ( std::vector< WildCard >::const_iterator aLoop = _rWCSearch.begin();
aLoop != _rWCSearch.end() && !bFilterMatch;
++aLoop
)
@@ -118,7 +118,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
{
}
};
- typedef ::std::vector< TableInfo > TableInfos;
+ typedef std::vector< TableInfo > TableInfos;
void lcl_ensureComposedName( TableInfo& _io_tableInfo, const Reference< XDatabaseMetaData >& _metaData )
{
@@ -176,7 +176,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
{
// for wildcard search : remove all table filters which are a wildcard expression and build a WildCard
// for them
- ::std::vector< WildCard > aWildCardTableFilter;
+ std::vector< WildCard > aWildCardTableFilter;
Sequence< OUString > aNonWildCardTableFilter = _tableFilter;
nTableFilterCount = createWildCardVector( aNonWildCardTableFilter, aWildCardTableFilter );
@@ -216,7 +216,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
// ensure that we know the table type
lcl_ensureType( *table, _metaData, _masterContainer );
- if ( ::std::find( pTableTypeFilterBegin, pTableTypeFilterEnd, *table->sType ) != pTableTypeFilterEnd )
+ if ( std::find( pTableTypeFilterBegin, pTableTypeFilterEnd, *table->sType ) != pTableTypeFilterEnd )
aFilteredTables.push_back( *table );
}
}
@@ -241,7 +241,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
IRefreshListener* _pRefreshListener,
::dbtools::WarningsContainer* _pWarningsContainer
,oslInterlockedCount& _nInAppend)
- :OCollection(_rParent,_bCase,_rMutex,::std::vector< OUString>())
+ :OCollection(_rParent,_bCase,_rMutex,std::vector< OUString>())
,m_bConstructed(false)
,m_pWarningsContainer(_pWarningsContainer)
,m_pRefreshListener(_pRefreshListener)
@@ -297,7 +297,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
// for wildcard search : remove all table filters which are a wildcard expression and build a WildCard
// for them
- ::std::vector< WildCard > aWCSearch;
+ std::vector< WildCard > aWCSearch;
createWildCardVector(aTableFilter,aWCSearch);
try
diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx
index ce1662e..6042d16 100644
--- a/dbaccess/source/core/api/HelperCollections.cxx
+++ b/dbaccess/source/core/api/HelperCollections.cxx
@@ -41,7 +41,7 @@ namespace dbaccess
bool _bCase,
::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
- const ::std::vector< OUString> &_rVector,
+ const std::vector< OUString> &_rVector,
bool _bUseAsIndex
) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector,_bUseAsIndex)
,m_aColumns(_rColumns)
@@ -51,7 +51,7 @@ namespace dbaccess
OPrivateColumns* OPrivateColumns::createWithIntrinsicNames( const ::rtl::Reference< ::connectivity::OSQLColumns >& _rColumns,
bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex )
{
- ::std::vector< OUString > aNames; aNames.reserve( _rColumns->get().size() );
+ std::vector< OUString > aNames; aNames.reserve( _rColumns->get().size() );
OUString sColumName;
for ( ::connectivity::OSQLColumns::Vector::const_iterator column = _rColumns->get().begin();
diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx
index 1f9bbb4..b645012 100644
--- a/dbaccess/source/core/api/HelperCollections.hxx
+++ b/dbaccess/source/core/api/HelperCollections.hxx
@@ -57,7 +57,7 @@ namespace dbaccess
bool _bCase,
::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
- const ::std::vector< OUString> &_rVector,
+ const std::vector< OUString> &_rVector,
bool _bUseAsIndex = false
);
@@ -90,7 +90,7 @@ namespace dbaccess
bool _bCase,
::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
- const ::std::vector< OUString> &_rVector
+ const std::vector< OUString> &_rVector
) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector)
,m_aTables(_rTables)
{
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 1a9dcff..1ca72b3 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -67,7 +67,7 @@ using std::vector;
namespace
{
- void lcl_fillIndexColumns(const Reference<XIndexAccess>& _xIndexes, ::std::vector< Reference<XNameAccess> >& _rAllIndexColumns)
+ void lcl_fillIndexColumns(const Reference<XIndexAccess>& _xIndexes, std::vector< Reference<XNameAccess> >& _rAllIndexColumns)
{
if ( _xIndexes.is() )
{
@@ -151,7 +151,7 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable,
const OUString& i_rUpdateTableName,
const Reference<XDatabaseMetaData>& i_xMeta,
const Reference<XNameAccess>& i_xQueryColumns,
- ::std::unique_ptr<SelectColumnsMetaData>& o_pKeyColumnNames)
+ std::unique_ptr<SelectColumnsMetaData>& o_pKeyColumnNames)
{
// first ask the database itself for the best columns which can be used
Sequence< OUString> aBestColumnNames;
@@ -322,7 +322,7 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet, const OUStrin
// the first row is empty because it's now easier for us to distinguish when we are beforefirst or first
// without extra variable to be set
- OKeySetValue keySetValue(nullptr,::std::pair<sal_Int32,Reference<XRow> >(0,Reference<XRow>()));
+ OKeySetValue keySetValue(nullptr,std::pair<sal_Int32,Reference<XRow> >(0,Reference<XRow>()));
m_aKeyMap.insert(OKeySetMatrix::value_type(0, keySetValue));
m_aKeyIter = m_aKeyMap.begin();
}
@@ -332,7 +332,7 @@ void OKeySet::reset(const Reference< XResultSet>& _xDriverSet)
OCacheSet::construct(_xDriverSet, m_sRowSetFilter);
m_bRowCountFinal = false;
m_aKeyMap.clear();
- OKeySetValue keySetValue(nullptr,::std::pair<sal_Int32,Reference<XRow> >(0,Reference<XRow>()));
+ OKeySetValue keySetValue(nullptr,std::pair<sal_Int32,Reference<XRow> >(0,Reference<XRow>()));
m_aKeyMap.insert(OKeySetMatrix::value_type(0,keySetValue));
m_aKeyIter = m_aKeyMap.begin();
}
@@ -471,11 +471,11 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
if ( xIndexSup.is() )
xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY);
- ::std::vector< Reference<XNameAccess> > aAllIndexColumns;
+ std::vector< Reference<XNameAccess> > aAllIndexColumns;
lcl_fillIndexColumns(xIndexes,aAllIndexColumns);
OUStringBuffer sKeyCondition,sIndexCondition;
- ::std::vector<sal_Int32> aIndexColumnPositions;
+ std::vector<sal_Int32> aIndexColumnPositions;
const sal_Int32 nOldLength = aSql.getLength();
sal_Int32 i = 1;
@@ -495,8 +495,8 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
}
else
{
- ::std::vector< Reference<XNameAccess> >::const_iterator aIndexEnd = aAllIndexColumns.end();
- for( ::std::vector< Reference<XNameAccess> >::const_iterator aIndexIter = aAllIndexColumns.begin();
+ std::vector< Reference<XNameAccess> >::const_iterator aIndexEnd = aAllIndexColumns.end();
+ for( std::vector< Reference<XNameAccess> >::const_iterator aIndexIter = aAllIndexColumns.begin();
aIndexIter != aIndexEnd;++aIndexIter)
{
if((*aIndexIter)->hasByName(aIter->first))
@@ -551,7 +551,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
executeUpdate(_rInsertRow ,_rOriginalRow,aSql.makeStringAndClear(),"",aIndexColumnPositions);
}
-void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const OUString& i_sSQL,const OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions)
+void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const OUString& i_sSQL,const OUString& i_sTableName,const std::vector<sal_Int32>& _aIndexColumnPositions)
{
// now create end execute the prepared statement
Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(i_sSQL));
@@ -573,7 +573,7 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO
{
if ( bRefetch )
{
- bRefetch = ::std::find(m_aFilterColumns.begin(),m_aFilterColumns.end(),aIter->second.sRealName) == m_aFilterColumns.end();
+ bRefetch = std::find(m_aFilterColumns.begin(),m_aFilterColumns.end(),aIter->second.sRealName) == m_aFilterColumns.end();
}
impl_convertValue_throw(_rInsertRow,aIter->second);
(_rInsertRow->get())[nPos].setSigned((_rOriginalRow->get())[nPos].isSigned());
@@ -595,8 +595,8 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO
if ( !_aIndexColumnPositions.empty() )
{
// now we have to set the index values
- ::std::vector<sal_Int32>::const_iterator aIdxColIter = _aIndexColumnPositions.begin();
- ::std::vector<sal_Int32>::const_iterator aIdxColEnd = _aIndexColumnPositions.end();
+ std::vector<sal_Int32>::const_iterator aIdxColIter = _aIndexColumnPositions.begin();
+ std::vector<sal_Int32>::const_iterator aIdxColEnd = _aIndexColumnPositions.end();
j = 0;
aIter = m_pColumnNames->begin();
for(;aIdxColIter != aIdxColEnd;++aIdxColIter,++i,++j,++aIter)
@@ -639,7 +639,7 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi
{
if ( bRefetch )
{
- bRefetch = ::std::find(m_aFilterColumns.begin(),m_aFilterColumns.end(),aIter->second.sRealName) == m_aFilterColumns.end();
+ bRefetch = std::find(m_aFilterColumns.begin(),m_aFilterColumns.end(),aIter->second.sRealName) == m_aFilterColumns.end();
}
aSql.append(::dbtools::quoteName( aQuote,aIter->second.sRealName) + ",");
aValues.append("?,");
@@ -717,8 +717,8 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
Reference< XResultSetMetaDataSupplier > xMdSup(xRes,UNO_QUERY);
Reference< XResultSetMetaData > xMd = xMdSup->getMetaData();
sal_Int32 nColumnCount = xMd->getColumnCount();
- ::std::vector< OUString >::const_iterator aAutoIter = m_aAutoColumns.begin();
- ::std::vector< OUString >::const_iterator aAutoEnd = m_aAutoColumns.end();
+ std::vector< OUString >::const_iterator aAutoIter = m_aAutoColumns.begin();
+ std::vector< OUString >::const_iterator aAutoEnd = m_aAutoColumns.end();
for (sal_Int32 i = 1;aAutoIter != aAutoEnd && i <= nColumnCount; ++aAutoIter,++i)
{
SelectColumnsMetaData::const_iterator aFind = m_pKeyColumnNames->find(*aAutoIter);
@@ -745,8 +745,8 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
const OUString sQuote = getIdentifierQuoteString();
OUString sMaxStmt;
aEnd = m_pKeyColumnNames->end();
- ::std::vector< OUString >::const_iterator aAutoIter = m_aAutoColumns.begin();
- ::std::vector< OUString >::const_iterator aAutoEnd = m_aAutoColumns.end();
+ std::vector< OUString >::const_iterator aAutoIter = m_aAutoColumns.begin();
+ std::vector< OUString >::const_iterator aAutoEnd = m_aAutoColumns.end();
for (;aAutoIter != aAutoEnd; ++aAutoIter)
{
// we will only fetch values which are keycolumns
@@ -796,7 +796,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
ORowSetRow aKeyRow = new connectivity::ORowVector< ORowSetValue >(m_pKeyColumnNames->size());
copyRowValue(_rInsertRow,aKeyRow,aKeyIter->first + 1);
- m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(aKeyIter->first + 1,OKeySetValue(aKeyRow,::std::pair<sal_Int32,Reference<XRow> >(1,Reference<XRow>())))).first;
+ m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(aKeyIter->first + 1,OKeySetValue(aKeyRow,std::pair<sal_Int32,Reference<XRow> >(1,Reference<XRow>())))).first;
// now we set the bookmark for this row
(_rInsertRow->get())[0] = makeAny((sal_Int32)m_aKeyIter->first);
tryRefetch(_rInsertRow,bRefetch);
@@ -881,11 +881,11 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit
xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY);
// Reference<XColumnsSupplier>
- ::std::vector< Reference<XNameAccess> > aAllIndexColumns;
+ std::vector< Reference<XNameAccess> > aAllIndexColumns;
lcl_fillIndexColumns(xIndexes,aAllIndexColumns);
OUStringBuffer sIndexCondition;
- ::std::vector<sal_Int32> aIndexColumnPositions;
+ std::vector<sal_Int32> aIndexColumnPositions;
SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin();
SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end();
@@ -906,8 +906,8 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit
}
else
{
- ::std::vector< Reference<XNameAccess> >::const_iterator aIndexEnd = aAllIndexColumns.end();
- for( ::std::vector< Reference<XNameAccess> >::const_iterator aIndexIter = aAllIndexColumns.begin();
+ std::vector< Reference<XNameAccess> >::const_iterator aIndexEnd = aAllIndexColumns.end();
+ for( std::vector< Reference<XNameAccess> >::const_iterator aIndexIter = aAllIndexColumns.begin();
aIndexIter != aIndexEnd;++aIndexIter)
{
if((*aIndexIter)->hasByName(aIter->first))
@@ -943,8 +943,8 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit
}
// now we have to set the index values
- ::std::vector<sal_Int32>::const_iterator aIdxColIter = aIndexColumnPositions.begin();
- ::std::vector<sal_Int32>::const_iterator aIdxColEnd = aIndexColumnPositions.end();
+ std::vector<sal_Int32>::const_iterator aIdxColIter = aIndexColumnPositions.begin();
+ std::vector<sal_Int32>::const_iterator aIdxColEnd = aIndexColumnPositions.end();
aIter = m_pColumnNames->begin();
for(;aIdxColIter != aIdxColEnd;++aIdxColIter,++i,++aIter)
{
@@ -1098,7 +1098,7 @@ sal_Int32 SAL_CALL OKeySet::getRow( )
OSL_ENSURE(!isAfterLast(),"getRow is not allowed when afterlast record!");
OSL_ENSURE(!isBeforeFirst(),"getRow is not allowed when beforefirst record!");
- return ::std::distance(m_aKeyMap.begin(),m_aKeyIter);
+ return std::distance(m_aKeyMap.begin(),m_aKeyIter);
}
bool SAL_CALL OKeySet::absolute( sal_Int32 row )
@@ -1311,7 +1311,7 @@ bool OKeySet::fetchRow()
const SelectColumnDescription& rColDesc = aPosIter->second;
aIter->fill(rColDesc.nPosition, rColDesc.nType, m_xRow);
}
- m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(m_aKeyMap.rbegin()->first+1,OKeySetValue(aKeyRow,::std::pair<sal_Int32,Reference<XRow> >(0,Reference<XRow>())))).first;
+ m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(m_aKeyMap.rbegin()->first+1,OKeySetValue(aKeyRow,std::pair<sal_Int32,Reference<XRow> >(0,Reference<XRow>())))).first;
}
else
m_bRowCountFinal = true;
@@ -1560,7 +1560,7 @@ void OKeySet::impl_convertValue_throw(const ORowSetRow& _rInsertRow,const Select
sal_Int32 nIndex = sValue.indexOf('.');
if ( nIndex != -1 )
{
- aValue = sValue.copy(0,::std::min(sValue.getLength(),nIndex + (i_aMetaData.nScale > 0 ? i_aMetaData.nScale + 1 : 0)));
+ aValue = sValue.copy(0,std::min(sValue.getLength(),nIndex + (i_aMetaData.nScale > 0 ? i_aMetaData.nScale + 1 : 0)));
}
}
break;
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index f8c65d7..266b51c 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -60,7 +60,7 @@ namespace dbaccess
{
}
};
- typedef ::std::map< OUString, SelectColumnDescription, ::comphelper::UStringMixLess > SelectColumnsMetaData;
+ typedef std::map< OUString, SelectColumnDescription, ::comphelper::UStringMixLess > SelectColumnsMetaData;
// the elements of _rxQueryColumns must have the properties PROPERTY_REALNAME and PROPERTY_TABLENAME
void getColumnPositions(const css::uno::Reference< css::container::XNameAccess >& _rxQueryColumns,
@@ -69,9 +69,9 @@ namespace dbaccess
SelectColumnsMetaData& o_rColumnNames /* out */,
bool i_bAppendTableName = false);
- typedef ::std::pair<ORowSetRow,::std::pair<sal_Int32,css::uno::Reference< css::sdbc::XRow> > > OKeySetValue;
- typedef ::std::map<sal_Int32,OKeySetValue > OKeySetMatrix;
- typedef ::std::map<sal_Int32, rtl::Reference<ORowSetValueVector> > OUpdatedParameter;
+ typedef std::pair<ORowSetRow,std::pair<sal_Int32,css::uno::Reference< css::sdbc::XRow> > > OKeySetValue;
+ typedef std::map<sal_Int32,OKeySetValue > OKeySetMatrix;
+ typedef std::map<sal_Int32, rtl::Reference<ORowSetValueVector> > OUpdatedParameter;
// is used when the source supports keys
class OKeySet : public OCacheSet
{
@@ -79,22 +79,22 @@ namespace dbaccess
OKeySetMatrix m_aKeyMap;
OKeySetMatrix::iterator m_aKeyIter;
- ::std::vector< OUString > m_aAutoColumns; // contains all columns which are autoincrement ones
+ std::vector< OUString > m_aAutoColumns; // contains all columns which are autoincrement ones
OUpdatedParameter m_aUpdatedParameter; // contains all parameter which have been updated and are needed for refetching
rtl::Reference<ORowSetValueVector> m_aParameterValueForCache;
- ::std::unique_ptr<SelectColumnsMetaData> m_pKeyColumnNames; // contains all key column names
- ::std::unique_ptr<SelectColumnsMetaData> m_pColumnNames; // contains all column names
- ::std::unique_ptr<SelectColumnsMetaData> m_pParameterNames; // contains all parameter names
- ::std::unique_ptr<SelectColumnsMetaData> m_pForeignColumnNames; // contains all column names of the rest
+ std::unique_ptr<SelectColumnsMetaData> m_pKeyColumnNames; // contains all key column names
+ std::unique_ptr<SelectColumnsMetaData> m_pColumnNames; // contains all column names
+ std::unique_ptr<SelectColumnsMetaData> m_pParameterNames; // contains all parameter names
+ std::unique_ptr<SelectColumnsMetaData> m_pForeignColumnNames; // contains all column names of the rest
connectivity::OSQLTable m_xTable; // reference to our table
css::uno::Reference< css::container::XIndexAccess> m_xTableKeys;
// we need a different SQL (statement) for each different combination
// of NULLness of key & foreign columns;
// each subclause is either "colName = ?" or "colName IS NULL"
// (we avoid the standard "colName IS NOT DISTINCT FROM ?" because it is not widely supported)
- typedef ::std::vector< bool > FilterColumnsNULL_t;
- typedef ::std::map< FilterColumnsNULL_t,
+ typedef std::vector< bool > FilterColumnsNULL_t;
+ typedef std::map< FilterColumnsNULL_t,
css::uno::Reference< css::sdbc::XPreparedStatement > >
vStatements_t;
vStatements_t m_vStatements;
@@ -103,7 +103,7 @@ namespace dbaccess
css::uno::Reference< css::sdbc::XRow> m_xRow;
css::uno::Reference< css::sdb::XSingleSelectQueryAnalyzer > m_xComposer;
const OUString m_sUpdateTableName;
- ::std::vector< OUString > m_aFilterColumns;
+ std::vector< OUString > m_aFilterColumns;
sal_Int32& m_rRowCount;
bool m_bRowCountFinal;
@@ -128,7 +128,7 @@ namespace dbaccess
const OUString& i_rUpdateTableName,
const css::uno::Reference< css::sdbc::XDatabaseMetaData>& i_xMeta,
const css::uno::Reference< css::container::XNameAccess>& i_xQueryColumns,
- ::std::unique_ptr<SelectColumnsMetaData>& o_pKeyColumnNames);
+ std::unique_ptr<SelectColumnsMetaData>& o_pKeyColumnNames);
void ensureStatement( );
virtual void makeNewStatement( );
static void setOneKeyColumnParameter( sal_Int32 &nPos,
@@ -141,7 +141,7 @@ namespace dbaccess
/// @throws css::uno::RuntimeException
bool doTryRefetch_throw();
void tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch);
- void executeUpdate(const ORowSetRow& _rInsertRow, const ORowSetRow& _rOriginalRow, const OUString& i_sSQL, const OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions = ::std::vector<sal_Int32>());
+ void executeUpdate(const ORowSetRow& _rInsertRow, const ORowSetRow& _rOriginalRow, const OUString& i_sSQL, const OUString& i_sTableName,const std::vector<sal_Int32>& _aIndexColumnPositions = std::vector<sal_Int32>());
void executeInsert( const ORowSetRow& _rInsertRow, const OUString& i_sSQL, const OUString& i_sTableName, bool bRefetch = false);
void executeStatement(OUStringBuffer& io_aFilter, css::uno::Reference< css::sdb::XSingleSelectQueryComposer>& io_xAnalyzer);
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 88eb6a1..84c3e6f 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -118,14 +118,14 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const OU
const OUString* pTableNameEnd = pTableNameIter + aTableNames.getLength();
for( ; pTableNameIter != pTableNameEnd ; ++pTableNameIter)
{
- ::std::unique_ptr<SelectColumnsMetaData> pKeyColumNames(new SelectColumnsMetaData(bCase));
+ std::unique_ptr<SelectColumnsMetaData> pKeyColumNames(new SelectColumnsMetaData(bCase));
findTableColumnsMatching_throw(xTables->getByName(*pTableNameIter),*pTableNameIter,xMeta,xQueryColumns,pKeyColumNames);
m_pKeyColumnNames->insert(pKeyColumNames->begin(),pKeyColumNames->end());
}
// the first row is empty because it's now easier for us to distinguish when we are beforefirst or first
// without extra variable to be set
- OKeySetValue keySetValue(nullptr,::std::pair<sal_Int32,Reference<XRow> >(0,Reference<XRow>()));
+ OKeySetValue keySetValue(nullptr,std::pair<sal_Int32,Reference<XRow> >(0,Reference<XRow>()));
m_aKeyMap.insert(OKeySetMatrix::value_type(0,keySetValue));
m_aKeyIter = m_aKeyMap.begin();
@@ -136,7 +136,7 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const OU
xAnalyzer->setElementaryQuery(xSourceComposer->getElementaryQuery());
// check for joins
OUString aErrorMsg;
- ::std::unique_ptr<OSQLParseNode> pStatementNode( m_aSqlParser.parseTree( aErrorMsg, sQuery ) );
+ std::unique_ptr<OSQLParseNode> pStatementNode( m_aSqlParser.parseTree( aErrorMsg, sQuery ) );
m_aSqlIterator.setParseTree( pStatementNode.get() );
m_aSqlIterator.traverseAll();
fillJoinedColumns_throw(m_aSqlIterator.getJoinConditions());
@@ -174,7 +174,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow
// list all columns that should be set
OUString aQuote = getIdentifierQuoteString();
- ::std::map< OUString,bool > aResultSetChanged;
+ std::map< OUString,bool > aResultSetChanged;
TSQLStatements aKeyConditions;
TSQLStatements aSql;
@@ -196,7 +196,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow
if ( m_aJoinedKeyColumns.find(aIter->second.nPosition) != m_aJoinedKeyColumns.end() )
throw SQLException();
- ::std::map<sal_Int32,sal_Int32>::const_iterator aJoinIter = m_aJoinedColumns.find(aIter->second.nPosition);
+ std::map<sal_Int32,sal_Int32>::const_iterator aJoinIter = m_aJoinedColumns.find(aIter->second.nPosition);
if ( aJoinIter != m_aJoinedColumns.end() )
{
(_rInsertRow->get())[aJoinIter->second] = (_rInsertRow->get())[aIter->second.nPosition];
@@ -241,7 +241,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
TSQLStatements aSql;
TSQLStatements aParameter;
TSQLStatements aKeyConditions;
- ::std::map< OUString,bool > aResultSetChanged;
+ std::map< OUString,bool > aResultSetChanged;
OUString aQuote = getIdentifierQuoteString();
// here we build the condition part for the update statement
@@ -260,7 +260,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
lcl_fillKeyCondition(aIter->second.sTableName,sQuotedColumnName,(_rInsertRow->get())[aIter->second.nPosition],aKeyConditions);
aResultSetChanged[aIter->second.sTableName] = true;
}
- ::std::map<sal_Int32,sal_Int32>::const_iterator aJoinIter = m_aJoinedColumns.find(aIter->second.nPosition);
+ std::map<sal_Int32,sal_Int32>::const_iterator aJoinIter = m_aJoinedColumns.find(aIter->second.nPosition);
if ( aJoinIter != m_aJoinedColumns.end() )
{
(_rInsertRow->get())[aJoinIter->second] = (_rInsertRow->get())[aIter->second.nPosition];
@@ -391,9 +391,9 @@ void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const OUString&
}
}
-void OptimisticSet::fillJoinedColumns_throw(const ::std::vector< TNodePair >& i_aJoinColumns)
+void OptimisticSet::fillJoinedColumns_throw(const std::vector< TNodePair >& i_aJoinColumns)
{
- ::std::vector< TNodePair >::const_iterator aIter = i_aJoinColumns.begin();
+ std::vector< TNodePair >::const_iterator aIter = i_aJoinColumns.begin();
for(;aIter != i_aJoinColumns.end();++aIter)
{
OUString sColumnName,sTableName;
@@ -452,10 +452,10 @@ bool OptimisticSet::isResultSetChanged() const
return bOld;
}
-void OptimisticSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& io_aInsertRow,ORowSetValueVector::Vector& io_aRow,::std::vector<sal_Int32>& o_aChangedColumns)
+void OptimisticSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& io_aInsertRow,ORowSetValueVector::Vector& io_aRow,std::vector<sal_Int32>& o_aChangedColumns)
{
o_aChangedColumns.push_back(i_nColumnIndex);
- ::std::map<sal_Int32,sal_Int32>::const_iterator aJoinIter = m_aJoinedColumns.find(i_nColumnIndex);
+ std::map<sal_Int32,sal_Int32>::const_iterator aJoinIter = m_aJoinedColumns.find(i_nColumnIndex);
if ( aJoinIter != m_aJoinedColumns.end() )
{
io_aRow[aJoinIter->second] = io_aRow[i_nColumnIndex];
@@ -465,19 +465,19 @@ void OptimisticSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVecto
}
}
-bool OptimisticSet::updateColumnValues(const ORowSetValueVector::Vector& io_aCachedRow,ORowSetValueVector::Vector& io_aRow,const ::std::vector<sal_Int32>& i_aChangedColumns)
+bool OptimisticSet::updateColumnValues(const ORowSetValueVector::Vector& io_aCachedRow,ORowSetValueVector::Vector& io_aRow,const std::vector<sal_Int32>& i_aChangedColumns)
{
bool bRet = false;
for( const auto& aColIdx : i_aChangedColumns )
{
- SelectColumnsMetaData::const_iterator aFind = ::std::find_if(
+ SelectColumnsMetaData::const_iterator aFind = std::find_if(
m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),
[&aColIdx]( const SelectColumnsMetaData::value_type& aType )
{ return aType.second.nPosition == aColIdx; } );
if ( aFind != m_pKeyColumnNames->end() )
{
const OUString sTableName = aFind->second.sTableName;
- aFind = ::std::find_if( m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),
+ aFind = std::find_if( m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),
[&sTableName]
( const SelectColumnsMetaData::value_type& rCurr )
{ return rCurr.second.sTableName == sTableName; } );
@@ -511,14 +511,14 @@ bool OptimisticSet::columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow
for( const auto& aCol : *m_pColumnNames )
{
sal_Int32 nPos = aCol.second.nPosition;
- SelectColumnsMetaData::const_iterator aFind = ::std::find_if(
+ SelectColumnsMetaData::const_iterator aFind = std::find_if(
m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),
[&nPos] ( const SelectColumnsMetaData::value_type& aType )
{ return aType.second.nPosition == nPos; } );
if ( aFind != m_pKeyColumnNames->end() )
{
const OUString sTableName = aFind->second.sTableName;
- aFind = ::std::find_if( m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),
+ aFind = std::find_if( m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),
[&sTableName]
( const SelectColumnsMetaData::value_type& rCurr )
{ return rCurr.second.sTableName == sTableName; } );
@@ -551,7 +551,7 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const
{
TSQLStatements aSql;
TSQLStatements aKeyConditions;
- ::std::map< OUString,bool > aResultSetChanged;
+ std::map< OUString,bool > aResultSetChanged;
OUString aQuote = getIdentifierQuoteString();
// here we build the condition part for the update statement
SelectColumnsMetaData::const_iterator aColIter = m_pColumnNames->begin();
diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx
index 92766fd..417ab83 100644
--- a/dbaccess/source/core/api/OptimisticSet.hxx
+++ b/dbaccess/source/core/api/OptimisticSet.hxx
@@ -36,13 +36,13 @@ namespace dbaccess
::connectivity::OSQLParser m_aSqlParser;
::connectivity::OSQLParseTreeIterator m_aSqlIterator;
- ::std::map<sal_Int32,sal_Int32> m_aJoinedColumns;
- ::std::map<sal_Int32,sal_Int32> m_aJoinedKeyColumns;
+ std::map<sal_Int32,sal_Int32> m_aJoinedColumns;
+ std::map<sal_Int32,sal_Int32> m_aJoinedKeyColumns;
mutable bool m_bResultSetChanged;
void executeDelete(const ORowSetRow& _rDeleteRow,const OUString& i_sSQL,const OUString& i_sTableName);
- void fillJoinedColumns_throw(const ::std::vector< ::connectivity::TNodePair>& i_aJoinColumns);
+ void fillJoinedColumns_throw(const std::vector< ::connectivity::TNodePair>& i_aJoinColumns);
void fillJoinedColumns_throw(const OUString& i_sLeftColumn,const OUString& i_sRightColumn);
protected:
virtual void makeNewStatement( ) override;
@@ -65,13 +65,13 @@ namespace dbaccess
// CacheSet
virtual bool isResultSetChanged() const override;
- virtual void mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& io_aInsertRow,ORowSetValueVector::Vector& io_aRow,::std::vector<sal_Int32>& o_aChangedColumns) override;
+ virtual void mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& io_aInsertRow,ORowSetValueVector::Vector& io_aRow,std::vector<sal_Int32>& o_aChangedColumns) override;
virtual bool columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow,const ORowSetValueVector::Vector& i_aRow) override;
- virtual bool updateColumnValues(const ORowSetValueVector::Vector& io_aCachedRow,ORowSetValueVector::Vector& io_aRow,const ::std::vector<sal_Int32>& i_aChangedColumns) override;
+ virtual bool updateColumnValues(const ORowSetValueVector::Vector& io_aCachedRow,ORowSetValueVector::Vector& io_aRow,const std::vector<sal_Int32>& i_aChangedColumns) override;
virtual void fillMissingValues(ORowSetValueVector::Vector& io_aRow) const override;
bool isReadOnly() const { return m_aJoinedKeyColumns.empty(); }
- const ::std::map<sal_Int32,sal_Int32>& getJoinedKeyColumns() const { return m_aJoinedKeyColumns; }
+ const std::map<sal_Int32,sal_Int32>& getJoinedKeyColumns() const { return m_aJoinedKeyColumns; }
};
}
#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_OPTIMISTICSET_HXX
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index f8e2604..aaaaab1 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -566,7 +566,7 @@ void ORowSet::freeResources( bool _bComplete )
// the columns must be disposed before the querycomposer is disposed because
// their owner can be the composer
TDataColumns().swap(m_aDataColumns);// clear and resize capacity
- ::std::vector<bool>().swap(m_aReadOnlyDataColumns);
+ std::vector<bool>().swap(m_aReadOnlyDataColumns);
m_xColumns = nullptr;
if ( m_pColumns )
@@ -909,7 +909,7 @@ void SAL_CALL ORowSet::insertRow()
RowsChangeEvent aEvt(*this,RowChangeAction::INSERT,1,aChangedBookmarks);
notifyAllListenersRowBeforeChange(aGuard,aEvt);
- ::std::vector< Any > aBookmarks;
+ std::vector< Any > aBookmarks;
bool bInserted = m_pCache->insertRow(aBookmarks);
// make sure that our row is set to the new inserted row before clearing the insert flags in the cache
@@ -963,7 +963,7 @@ void SAL_CALL ORowSet::updateRow( )
RowsChangeEvent aEvt(*this,RowChangeAction::UPDATE,1,aChangedBookmarks);
notifyAllListenersRowBeforeChange(aGuard,aEvt);
- ::std::vector< Any > aBookmarks;
+ std::vector< Any > aBookmarks;
m_pCache->updateRow(m_aCurrentRow.operator ->(),aBookmarks);
if ( !aBookmarks.empty() )
aEvt.Bookmarks = Sequence<Any>(&(*aBookmarks.begin()),aBookmarks.size());
@@ -1243,7 +1243,7 @@ void ORowSet::impl_setDataColumnsWriteable_throw()
impl_restoreDataColumnsWriteable_throw();
TDataColumns::const_iterator aIter = m_aDataColumns.begin();
m_aReadOnlyDataColumns.resize(m_aDataColumns.size(),false);
- ::std::vector<bool, std::allocator<bool> >::iterator aReadIter = m_aReadOnlyDataColumns.begin();
+ std::vector<bool, std::allocator<bool> >::iterator aReadIter = m_aReadOnlyDataColumns.begin();
for(;aIter != m_aDataColumns.end();++aIter,++aReadIter)
{
bool bReadOnly = false;
@@ -1258,7 +1258,7 @@ void ORowSet::impl_restoreDataColumnsWriteable_throw()
{
assert(m_aDataColumns.size() == m_aReadOnlyDataColumns.size() || m_aReadOnlyDataColumns.size() == 0 );
TDataColumns::const_iterator aIter = m_aDataColumns.begin();
- ::std::vector<bool, std::allocator<bool> >::const_iterator aReadIter = m_aReadOnlyDataColumns.begin();
+ std::vector<bool, std::allocator<bool> >::const_iterator aReadIter = m_aReadOnlyDataColumns.begin();
for(;aReadIter != m_aReadOnlyDataColumns.end();++aIter,++aReadIter)
{
(*aIter)->setPropertyValue(PROPERTY_ISREADONLY, makeAny( (bool)*aReadIter ) );
@@ -1849,10 +1849,10 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
m_xNumberFormatTypes.set(xNumberFormat->getNumberFormats(),UNO_QUERY);
::rtl::Reference< ::connectivity::OSQLColumns> aColumns = new ::connectivity::OSQLColumns();
- ::std::vector< OUString> aNames;
+ std::vector< OUString> aNames;
OUString aDescription;
- const ::std::map<sal_Int32,sal_Int32>& rKeyColumns = m_pCache->getKeyColumns();
+ const std::map<sal_Int32,sal_Int32>& rKeyColumns = m_pCache->getKeyColumns();
if(!m_xColumns.is())
{
SAL_INFO("dbaccess", "ORowSet::execute_NoApprove_NoNewConn::creating columns" );
@@ -1930,7 +1930,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
sal_Int32 nCount = xMeta->getColumnCount();
m_aDataColumns.reserve(nCount+1);
aColumns->get().reserve(nCount+1);
- ::std::set< Reference< XPropertySet > > aAllColumns;
+ std::set< Reference< XPropertySet > > aAllColumns;
for(sal_Int32 i=1; i <= nCount ;++i)
{
@@ -2448,7 +2448,7 @@ void ORowSet::impl_initParametersContainer_nothrow()
m_pParameters = new param::ParameterWrapperContainer( m_xComposer.get() );
// copy the premature parameters into the final ones
- size_t nParamCount( ::std::min( m_pParameters->size(), m_aPrematureParamValues->get().size() ) );
+ size_t nParamCount( std::min( m_pParameters->size(), m_aPrematureParamValues->get().size() ) );
for ( size_t i=0; i<nParamCount; ++i )
{
(*m_pParameters)[i] = m_aPrematureParamValues->get()[i];
@@ -2798,7 +2798,7 @@ ORowSetClone::ORowSetClone( const Reference<XComponentContext>& _rContext, ORowS
m_aOldRow = m_pCache->registerOldRow();
::rtl::Reference< ::connectivity::OSQLColumns> aColumns = new ::connectivity::OSQLColumns();
- ::std::vector< OUString> aNames;
+ std::vector< OUString> aNames;
OUString aDescription;
Locale aLocale = SvtSysLocale().GetLanguageTag().getLocale();
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index 0e92d1c..c580264 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -90,8 +90,8 @@ namespace dbaccess
*/
rtl::Reference<ORowSetValueVector> m_aPrematureParamValues;
rtl::Reference<ORowSetValueVector> m_aParameterValueForCache;
- ::std::vector<bool> m_aParametersSet;
- ::std::vector<bool> m_aReadOnlyDataColumns;
+ std::vector<bool> m_aParametersSet;
+ std::vector<bool> m_aReadOnlyDataColumns;
::comphelper::OInterfaceContainerHelper2 m_aRowsetListeners;
::comphelper::OInterfaceContainerHelper2 m_aApproveListeners;
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 0f37b64..d90ad84 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -60,7 +60,7 @@ protected:
virtual void impl_refresh() override;
virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName) override;
public:
- OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : OCollection(_rParent, true, _rMutex, ::std::vector< OUString>()){}
+ OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : OCollection(_rParent, true, _rMutex, std::vector< OUString>()){}
};
void OEmptyCollection::impl_refresh()
@@ -776,8 +776,8 @@ void SAL_CALL ORowSetBase::afterLast( )
SAL_INFO("dbaccess", "ORowSetBase::afterLast() Clone = " << m_bClone);
}
-bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<bool,ORowSetBase>& _aCheckFunctor,
- ::std::mem_fun_t<bool,ORowSetCache>& _aMovementFunctor)
+bool SAL_CALL ORowSetBase::move( std::mem_fun_t<bool,ORowSetBase>& _aCheckFunctor,
+ std::mem_fun_t<bool,ORowSetCache>& _aMovementFunctor)
{
SAL_INFO("dbaccess", "ORowSetBase::move() Clone = " << m_bClone);
::connectivity::checkDisposed(m_rBHelper.bDisposed);
@@ -826,16 +826,16 @@ bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<bool,ORowSetBase>& _aCheckF
sal_Bool SAL_CALL ORowSetBase::first( )
{
SAL_INFO("dbaccess", "ORowSetBase::first() Clone = " << m_bClone);
- ::std::mem_fun_t<bool,ORowSetBase> ioF_tmp(&ORowSetBase::isOnFirst);
- ::std::mem_fun_t<bool,ORowSetCache> F_tmp(&ORowSetCache::first);
+ std::mem_fun_t<bool,ORowSetBase> ioF_tmp(&ORowSetBase::isOnFirst);
+ std::mem_fun_t<bool,ORowSetCache> F_tmp(&ORowSetCache::first);
return move(ioF_tmp,F_tmp);
}
sal_Bool SAL_CALL ORowSetBase::last( )
{
SAL_INFO("dbaccess", "ORowSetBase::last() Clone = " << m_bClone);
- ::std::mem_fun_t<bool,ORowSetBase> ioL_tmp(&ORowSetBase::isOnLast);
- ::std::mem_fun_t<bool,ORowSetCache> L_tmp(&ORowSetCache::last);
+ std::mem_fun_t<bool,ORowSetBase> ioL_tmp(&ORowSetBase::isOnLast);
+ std::mem_fun_t<bool,ORowSetCache> L_tmp(&ORowSetCache::last);
return move(ioL_tmp,L_tmp);
}
@@ -1364,7 +1364,7 @@ sal_Int32 ORowSetBase::impl_getRowCount() const
struct ORowSetNotifierImpl
{
- ::std::vector<sal_Int32> aChangedColumns;
+ std::vector<sal_Int32> aChangedColumns;
ORowSetValueVector::Vector aRow;
};
@@ -1427,7 +1427,7 @@ void ORowSetNotifier::fire()
#endif
}
-::std::vector<sal_Int32>& ORowSetNotifier::getChangedColumns() const
+std::vector<sal_Int32>& ORowSetNotifier::getChangedColumns() const
{
OSL_ENSURE(m_pImpl.get(),"Illegal CTor call, use the other one!");
return m_pImpl->aChangedColumns;
@@ -1438,7 +1438,7 @@ void ORowSetNotifier::firePropertyChange()
OSL_ENSURE(m_pImpl.get(),"Illegal CTor call, use the other one!");
if( m_pImpl.get() )
{
- ::std::vector<sal_Int32>::const_iterator aIter = m_pImpl->aChangedColumns.begin();
+ std::vector<sal_Int32>::const_iterator aIter = m_pImpl->aChangedColumns.begin();
for(;aIter != m_pImpl->aChangedColumns.end();++aIter)
{
m_pRowSet->firePropertyChange((*aIter)-1 ,m_pImpl->aRow[(*aIter)-1], ORowSetBase::GrantNotifierAccess());
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index ca2a425..385ef02 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -74,7 +74,7 @@ namespace dbaccess
{
OModuleClient m_aModuleClient;
protected:
- typedef ::std::vector<ORowSetDataColumn*> TDataColumns;
+ typedef std::vector<ORowSetDataColumn*> TDataColumns;
::osl::Mutex* m_pMutex; // this the mutex form the rowset itself
::osl::Mutex // we need a extra mutex for columns to prevend deadlock when setting new values
// for a row
@@ -202,8 +202,8 @@ namespace dbaccess
@return
<TRUE/> if movement was successful.
*/
- bool SAL_CALL move( ::std::mem_fun_t<bool,ORowSetBase>& _aCheckFunctor,
- ::std::mem_fun_t<bool,ORowSetCache>& _aMovementFunctor);
+ bool SAL_CALL move( std::mem_fun_t<bool,ORowSetBase>& _aCheckFunctor,
+ std::mem_fun_t<bool,ORowSetCache>& _aMovementFunctor);
/** same meaning as isFirst. Only need by mem_fun
@return
@@ -356,7 +356,7 @@ namespace dbaccess
class ORowSetNotifier
{
private:
- ::std::unique_ptr<ORowSetNotifierImpl> m_pImpl;
+ std::unique_ptr<ORowSetNotifierImpl> m_pImpl;
ORowSetBase* m_pRowSet;
// not acquired! This is not necessary because this class here is to be used on the stack within
// a method of ORowSetBase (or derivees)
@@ -402,7 +402,7 @@ namespace dbaccess
/** use this one to store the inde of the changed column values
*/
- ::std::vector<sal_Int32>& getChangedColumns() const;
+ std::vector<sal_Int32>& getChangedColumns() const;
};
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index c1863f6..0f340a5 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -385,8 +385,8 @@ void ORowSetCache::setFetchSize(sal_Int32 _nSize)
else
{
// now correct the iterator in our iterator vector
- ::std::vector<sal_Int32> aPositions;
- ::std::map<sal_Int32,bool> aCacheIterToChange;
+ std::vector<sal_Int32> aPositions;
+ std::map<sal_Int32,bool> aCacheIterToChange;
// first get the positions where they stand now
ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin();
ORowSetCacheMap::const_iterator aCacheEnd = m_aCacheIterators.end();
@@ -411,8 +411,8 @@ void ORowSetCache::setFetchSize(sal_Int32 _nSize)
m_aMatrixEnd = m_pMatrix->end();
// now adjust their positions because a resize invalidates all iterators
- ::std::vector<sal_Int32>::const_iterator aIter = aPositions.begin();
- ::std::map<sal_Int32,bool>::const_iterator aPosChangeIter = aCacheIterToChange.begin();
+ std::vector<sal_Int32>::const_iterator aIter = aPositions.begin();
+ std::map<sal_Int32,bool>::const_iterator aPosChangeIter = aCacheIterToChange.begin();
for( aCacheIter = m_aCacheIterators.begin();
aPosChangeIter != aCacheIterToChange.end();
++aPosChangeIter,++aCacheIter)
@@ -552,7 +552,7 @@ sal_Int32 ORowSetCache::hashBookmark( const Any& bookmark )
// XRowUpdate
void ORowSetCache::updateNull(sal_Int32 columnIndex,ORowSetValueVector::Vector& io_aRow
- ,::std::vector<sal_Int32>& o_ChangedColumns
+ ,std::vector<sal_Int32>& o_ChangedColumns
)
{
checkUpdateConditions(columnIndex);
@@ -572,7 +572,7 @@ void ORowSetCache::updateNull(sal_Int32 columnIndex,ORowSetValueVector::Vector&
void ORowSetCache::updateValue(sal_Int32 columnIndex,const ORowSetValue& x
,ORowSetValueVector::Vector& io_aRow
- ,::std::vector<sal_Int32>& o_ChangedColumns
+ ,std::vector<sal_Int32>& o_ChangedColumns
)
{
checkUpdateConditions(columnIndex);
@@ -592,7 +592,7 @@ void ORowSetCache::updateValue(sal_Int32 columnIndex,const ORowSetValue& x
void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x
, sal_Int32 length,ORowSetValueVector::Vector& io_aRow
- ,::std::vector<sal_Int32>& o_ChangedColumns
+ ,std::vector<sal_Int32>& o_ChangedColumns
)
{
checkUpdateConditions(columnIndex);
@@ -613,7 +613,7 @@ void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference
void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x
,ORowSetValueVector::Vector& io_aRow
- ,::std::vector<sal_Int32>& o_ChangedColumns
+ ,std::vector<sal_Int32>& o_ChangedColumns
)
{
checkUpdateConditions(columnIndex);
@@ -635,7 +635,7 @@ void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x
void ORowSetCache::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/
,ORowSetValueVector::Vector& io_aRow
- ,::std::vector<sal_Int32>& o_ChangedColumns
+ ,std::vector<sal_Int32>& o_ChangedColumns
)
{
checkUpdateConditions(columnIndex);
@@ -795,7 +795,7 @@ bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos, sal_Int32 &_nNewEndPos)
bCheck = m_xCacheSet->next();
}
if(aIter != aEnd)
- ::std::rotate(m_pMatrix->begin(),aEnd,aIter);
+ std::rotate(m_pMatrix->begin(),aEnd,aIter);
break;
}
bCheck = m_xCacheSet->next();
@@ -912,7 +912,7 @@ void ORowSetCache::moveWindow()
fill(aIter, aNewEnd, nPos, bCheck);
}
- ::std::rotate(m_pMatrix->begin(), aEnd, aNewEnd);
+ std::rotate(m_pMatrix->begin(), aEnd, aNewEnd);
// now correct the iterator in our iterator vector
// rotateCacheIterator(aEnd-m_pMatrix->begin()); //can't be used because they decrement and here we need to increment
ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin();
@@ -994,7 +994,7 @@ void ORowSetCache::moveWindow()
{
OSL_ENSURE(aIter == aEnd, "fill() said went till end, but did not.");
// rotate the end to the front
- ::std::rotate(m_pMatrix->begin(), aIter, aDataEnd);
+ std::rotate(m_pMatrix->begin(), aIter, aDataEnd);
// now correct the iterator in our iterator vector
rotateCacheIterator( nNewStartPosInMatrix );
m_nStartPos = nNewStartPos;
@@ -1028,7 +1028,7 @@ void ORowSetCache::moveWindow()
nPos -= 1;
m_nStartPos += nFetchedRows;
m_nEndPos = nPos;
- ::std::rotate(m_pMatrix->begin(), aIter, aDataEnd);
+ std::rotate(m_pMatrix->begin(), aIter, aDataEnd);
// now correct the iterator in our iterator vector
rotateCacheIterator( nFetchedRows );
@@ -1271,7 +1271,7 @@ bool ORowSetCache::rowInserted( )
}
// XResultSetUpdate
-bool ORowSetCache::insertRow(::std::vector< Any >& o_aBookmarks)
+bool ORowSetCache::insertRow(std::vector< Any >& o_aBookmarks)
{
if ( !m_bNew || !m_aInsertRow->is() )
throw SQLException(DBACORE_RESSTRING(RID_STR_NO_MOVETOINSERTROW_CALLED),nullptr,SQLSTATE_GENERAL,1000,Any() );
@@ -1327,7 +1327,7 @@ void ORowSetCache::cancelRowModification()
resetInsertRow(false);
}
-void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow,::std::vector< Any >& o_aBookmarks )
+void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow,std::vector< Any >& o_aBookmarks )
{
if(isAfterLast() || isBeforeFirst())
throw SQLException(DBACORE_RESSTRING(RID_STR_NO_UPDATEROW),nullptr,SQLSTATE_GENERAL,1000,Any() );
@@ -1568,7 +1568,7 @@ bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection,
OUString sSql = _xAnalyzer->getQuery();
OUString sErrorMsg;
::connectivity::OSQLParser aSqlParser( m_aContext );
- ::std::unique_ptr< ::connectivity::OSQLParseNode> pSqlParseNode( aSqlParser.parseTree(sErrorMsg,sSql));
+ std::unique_ptr< ::connectivity::OSQLParseNode> pSqlParseNode( aSqlParser.parseTree(sErrorMsg,sSql));
if ( pSqlParseNode.get() && SQL_ISRULE(pSqlParseNode, select_statement) )
{
OSQLParseNode* pTableRefCommalist = pSqlParseNode->getByRule(::connectivity::OSQLParseNode::table_ref_commalist);
@@ -1719,7 +1719,7 @@ void ORowSetCache::reset(const Reference< XResultSet>& _xDriverSet)
}
void ORowSetCache::impl_updateRowFromCache_throw(ORowSetValueVector::Vector& io_aRow
- ,::std::vector<sal_Int32>& o_ChangedColumns)
+ ,std::vector<sal_Int32>& o_ChangedColumns)
{
if ( o_ChangedColumns.size() > 1 )
{
diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx
index 8838254..363731a 100644
--- a/dbaccess/source/core/api/RowSetCache.hxx
+++ b/dbaccess/source/core/api/RowSetCache.hxx
@@ -55,9 +55,9 @@ namespace dbaccess
friend class ORowSetClone;
friend class ORowSetCacheIterator;
- typedef ::std::vector< TORowSetOldRowHelperRef > TOldRowSetRows;
+ typedef std::vector< TORowSetOldRowHelperRef > TOldRowSetRows;
- ::std::map<sal_Int32,sal_Int32> m_aKeyColumns;
+ std::map<sal_Int32,sal_Int32> m_aKeyColumns;
//the set can be static, bookmarkable or keyset
css::uno::WeakReference< css::sdbc::XResultSet> m_xSet;
css::uno::Reference< css::sdbc::XResultSetMetaData > m_xMetaData; // must be before m_aInsertRow
@@ -101,11 +101,11 @@ namespace dbaccess
void updateValue(sal_Int32 columnIndex
,const connectivity::ORowSetValue& x
,ORowSetValueVector::Vector& io_aRow
- ,::std::vector<sal_Int32>& o_ChangedColumns
+ ,std::vector<sal_Int32>& o_ChangedColumns
);
void impl_updateRowFromCache_throw(ORowSetValueVector::Vector& io_aRow
- ,::std::vector<sal_Int32>& o_ChangedColumns
+ ,std::vector<sal_Int32>& o_ChangedColumns
);
// checks and set the flags isAfterLast isLast and position when afterlast is true
void checkPositionFlags();
@@ -160,13 +160,13 @@ namespace dbaccess
sal_Int32 hashBookmark( const css::uno::Any& bookmark );
// css::sdbc::XRowUpdate
- void updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length,ORowSetValueVector::Vector& io_aRow,::std::vector<sal_Int32>& o_ChangedColumns
+ void updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length,ORowSetValueVector::Vector& io_aRow,std::vector<sal_Int32>& o_ChangedColumns
);
- void updateObject( sal_Int32 columnIndex, const css::uno::Any& x,ORowSetValueVector::Vector& io_aRow ,::std::vector<sal_Int32>& o_ChangedColumns);
- void updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale,ORowSetValueVector::Vector& io_aRow ,::std::vector<sal_Int32>& o_ChangedColumns);
+ void updateObject( sal_Int32 columnIndex, const css::uno::Any& x,ORowSetValueVector::Vector& io_aRow ,std::vector<sal_Int32>& o_ChangedColumns);
+ void updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale,ORowSetValueVector::Vector& io_aRow ,std::vector<sal_Int32>& o_ChangedColumns);
void updateNull(sal_Int32 columnIndex
,ORowSetValueVector::Vector& io_aRow
- ,::std::vector<sal_Int32>& o_ChangedColumns
+ ,std::vector<sal_Int32>& o_ChangedColumns
);
// css::sdbc::XResultSet
@@ -188,15 +188,15 @@ namespace dbaccess
bool rowInserted( );
// css::sdbc::XResultSetUpdate
- bool insertRow(::std::vector< css::uno::Any >& o_aBookmarks);
+ bool insertRow(std::vector< css::uno::Any >& o_aBookmarks);
void resetInsertRow(bool _bClearInsertRow);
- void updateRow( ORowSetMatrix::iterator& _rUpdateRow,::std::vector< css::uno::Any >& o_aBookmarks );
+ void updateRow( ORowSetMatrix::iterator& _rUpdateRow,std::vector< css::uno::Any >& o_aBookmarks );
bool deleteRow();
void cancelRowUpdates( );
void moveToInsertRow( );
- const ::std::map<sal_Int32,sal_Int32>& getKeyColumns() const { return m_aKeyColumns; }
+ const std::map<sal_Int32,sal_Int32>& getKeyColumns() const { return m_aKeyColumns; }
bool isResultSetChanged() const;
void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet);
};
diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx
index 93368e0..2763fbf 100644
--- a/dbaccess/source/core/api/RowSetRow.hxx
+++ b/dbaccess/source/core/api/RowSetRow.hxx
@@ -29,7 +29,7 @@ namespace dbaccess
{
typedef connectivity::ORowVector< connectivity::ORowSetValue > ORowSetValueVector;
typedef ::rtl::Reference< ORowSetValueVector > ORowSetRow;
- typedef ::std::vector< ORowSetRow > ORowSetMatrix;
+ typedef std::vector< ORowSetRow > ORowSetMatrix;
class ORowSetOldRowHelper : public salhelper::SimpleReferenceObject
{
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index b580068..49515b8 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -265,13 +265,13 @@ OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAcc
OSingleSelectQueryComposer::~OSingleSelectQueryComposer()
{
- ::std::vector<OPrivateColumns*>::const_iterator aColIter = m_aColumnsCollection.begin();
- ::std::vector<OPrivateColumns*>::const_iterator aEnd = m_aColumnsCollection.end();
+ std::vector<OPrivateColumns*>::const_iterator aColIter = m_aColumnsCollection.begin();
+ std::vector<OPrivateColumns*>::const_iterator aEnd = m_aColumnsCollection.end();
for(;aColIter != aEnd;++aColIter)
delete *aColIter;
- ::std::vector<OPrivateTables*>::const_iterator aTabIter = m_aTablesCollection.begin();
- ::std::vector<OPrivateTables*>::const_iterator aTabEnd = m_aTablesCollection.end();
+ std::vector<OPrivateTables*>::const_iterator aTabIter = m_aTablesCollection.begin();
+ std::vector<OPrivateTables*>::const_iterator aTabEnd = m_aTablesCollection.end();
for(;aTabIter != aTabEnd;++aTabIter)
delete *aTabIter;
}
@@ -427,13 +427,13 @@ Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getSt
void SAL_CALL OSingleSelectQueryComposer::appendHavingClauseByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator )
{
- ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString&> F_tmp(&OSingleSelectQueryComposer::implSetHavingClause);
+ std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString&> F_tmp(&OSingleSelectQueryComposer::implSetHavingClause);
setConditionByColumn(column,andCriteria,F_tmp,filterOperator);
}
void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator )
{
- ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString&> F_tmp(&OSingleSelectQueryComposer::implSetFilter);
+ std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString&> F_tmp(&OSingleSelectQueryComposer::implSetFilter);
setConditionByColumn(column,andCriteria,F_tmp,filterOperator);
}
@@ -570,7 +570,7 @@ void SAL_CALL OSingleSelectQueryComposer::appendGroupByColumn( const Reference<
setGroup( aComposer.getComposedAndClear() );
}
-OUString OSingleSelectQueryComposer::composeStatementFromParts( const ::std::vector< OUString >& _rParts )
+OUString OSingleSelectQueryComposer::composeStatementFromParts( const std::vector< OUString >& _rParts )
{
OSL_ENSURE( _rParts.size() == (size_t)SQLPartCount, "OSingleSelectQueryComposer::composeStatementFromParts: invalid parts array!" );
@@ -596,7 +596,7 @@ void SAL_CALL OSingleSelectQueryComposer::setElementaryQuery( const OUString& _r
::osl::MutexGuard aGuard( m_aMutex );
// remember the 4 current "additive" clauses
- ::std::vector< OUString > aAdditiveClauses( SQLPartCount );
+ std::vector< OUString > aAdditiveClauses( SQLPartCount );
for ( SQLPart eLoopParts = Where; eLoopParts != SQLPartCount; incSQLPart( eLoopParts ) )
aAdditiveClauses[ eLoopParts ] = getSQLPart( eLoopParts, m_aAdditiveIterator, false );
@@ -649,7 +649,7 @@ void OSingleSelectQueryComposer::setSingleAdditiveClause( SQLPart _ePart, const
return;
// collect the 4 single parts as they're currently set
- ::std::vector< OUString > aClauses;
+ std::vector< OUString > aClauses;
aClauses.reserve( (size_t)SQLPartCount );
for ( SQLPart eLoopParts = Where; eLoopParts != SQLPartCount; incSQLPart( eLoopParts ) )
aClauses.push_back( getSQLPart( eLoopParts, m_aSqlIterator, true ) );
@@ -730,7 +730,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getTables( )
if ( !m_pTables )
{
const OSQLTables& aTables = m_aSqlIterator.getTables();
- ::std::vector< OUString> aNames;
+ std::vector< OUString> aNames;
OSQLTables::const_iterator aEnd = aTables.end();
for(OSQLTables::const_iterator aIter = aTables.begin(); aIter != aEnd;++aIter)
aNames.push_back(aIter->first);
@@ -749,7 +749,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( )
if ( !!m_aCurrentColumns[SelectColumns] )
return m_aCurrentColumns[SelectColumns];
- ::std::vector< OUString> aNames;
+ std::vector< OUString> aNames;
::rtl::Reference< OSQLColumns> aSelectColumns;
bool bCase = true;
Reference< XNameAccess> xQueryColumns;
@@ -837,7 +837,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( )
}
const ::comphelper::UStringMixEqual aCaseCompare( bCase );
- typedef ::std::set< size_t > SizeTSet;
+ typedef std::set< size_t > SizeTSet;
SizeTSet aUsedSelectColumns;
::connectivity::parse::OParseColumn::StringMap aColumnNames;
@@ -908,16 +908,16 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( )
OUString sRealName;
xProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName;
- ::std::vector< OUString>::const_iterator aFindName;
+ std::vector< OUString>::const_iterator aFindName;
if ( sColumnName.isEmpty() )
xProp->getPropertyValue(PROPERTY_NAME) >>= sColumnName;
- aFindName = ::std::find_if(aNames.begin(),aNames.end(),::std::bind2nd(aCaseCompare,sColumnName));
+ aFindName = std::find_if(aNames.begin(),aNames.end(),std::bind2nd(aCaseCompare,sColumnName));
sal_Int32 j = 0;
while ( aFindName != aNames.end() )
{
sColumnName += OUString::number(++j);
- aFindName = ::std::find_if(aNames.begin(),aNames.end(),::std::bind2nd(aCaseCompare,sColumnName));
+ aFindName = std::find_if(aNames.begin(),aNames.end(),std::bind2nd(aCaseCompare,sColumnName));
}
pColumn->setName(sColumnName);
@@ -960,7 +960,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( )
}
bool OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OSQLParseTreeIterator& _rIterator,
- ::std::vector< ::std::vector < PropertyValue > >& rFilters, const Reference< css::util::XNumberFormatter > & xFormatter) const
+ std::vector< std::vector < PropertyValue > >& rFilters, const Reference< css::util::XNumberFormatter > & xFormatter) const
{
// Round brackets around the expression
if (pCondition->count() == 3 &&
@@ -982,7 +982,7 @@ bool OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OSQLPa
bResult = setORCriteria(pCondition->getChild(i), _rIterator, rFilters, xFormatter);
else
{
- rFilters.push_back( ::std::vector < PropertyValue >());
+ rFilters.push_back( std::vector < PropertyValue >());
bResult = setANDCriteria(pCondition->getChild(i), _rIterator, rFilters[rFilters.size() - 1], xFormatter);
}
}
@@ -990,13 +990,13 @@ bool OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OSQLPa
}
else
{
- rFilters.push_back(::std::vector < PropertyValue >());
+ rFilters.push_back(std::vector < PropertyValue >());
return setANDCriteria(pCondition, _rIterator, rFilters[rFilters.size() - 1], xFormatter);
}
}
bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition,
- OSQLParseTreeIterator& _rIterator, ::std::vector < PropertyValue >& rFilter, const Reference< XNumberFormatter > & xFormatter) const
+ OSQLParseTreeIterator& _rIterator, std::vector < PropertyValue >& rFilter, const Reference< XNumberFormatter > & xFormatter) const
{
// Round brackets
if (SQL_ISRULE(pCondition,boolean_primary))
@@ -1112,7 +1112,7 @@ sal_Int32 OSingleSelectQueryComposer::getPredicateType(OSQLParseNode * _pPredica
}
bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCondition, OSQLParseTreeIterator& _rIterator,
- ::std::vector < PropertyValue >& rFilter, const Reference< css::util::XNumberFormatter > & xFormatter) const
+ std::vector < PropertyValue >& rFilter, const Reference< css::util::XNumberFormatter > & xFormatter) const
{
OSL_ENSURE(SQL_ISRULE(pCondition, comparison_predicate),"setComparsionPredicate: pCondition is not a ComparsionPredicate");
if (SQL_ISRULE(pCondition->getChild(0), column_ref) ||
@@ -1334,7 +1334,7 @@ Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters( )
if ( !m_aCurrentColumns[ParameterColumns] )
{
::rtl::Reference< OSQLColumns> aCols = m_aSqlIterator.getParameters();
- ::std::vector< OUString> aNames;
+ std::vector< OUString> aNames;
OSQLColumns::Vector::const_iterator aEnd = aCols->get().end();
for(OSQLColumns::Vector::const_iterator aIter = aCols->get().begin(); aIter != aEnd;++aIter)
aNames.push_back(getString((*aIter)->getPropertyValue(PROPERTY_NAME)));
@@ -1357,8 +1357,8 @@ void OSingleSelectQueryComposer::clearColumns( const EColumnType _eType )
void OSingleSelectQueryComposer::clearCurrentCollections()
{
- ::std::vector<OPrivateColumns*>::iterator aIter = m_aCurrentColumns.begin();
- ::std::vector<OPrivateColumns*>::const_iterator aEnd = m_aCurrentColumns.end();
+ std::vector<OPrivateColumns*>::iterator aIter = m_aCurrentColumns.begin();
+ std::vector<OPrivateColumns*>::const_iterator aEnd = m_aCurrentColumns.end();
for (;aIter != aEnd;++aIter)
{
if ( *aIter )
@@ -1386,7 +1386,7 @@ Reference< XIndexAccess > OSingleSelectQueryComposer::setCurrentColumns( EColumn
// now set the group columns
if ( !m_aCurrentColumns[_eType] )
{
- ::std::vector< OUString> aNames;
+ std::vector< OUString> aNames;
OSQLColumns::Vector::const_iterator aEnd = _rCols->get().end();
for(OSQLColumns::Vector::const_iterator aIter = _rCols->get().begin(); aIter != aEnd;++aIter)
aNames.push_back(getString((*aIter)->getPropertyValue(PROPERTY_NAME)));
@@ -1528,7 +1528,7 @@ void SAL_CALL OSingleSelectQueryComposer::setStructuredHavingClause( const Seque
setHavingClause(lcl_getCondition(filter, aPredicateInput, getColumns(), m_xMetaData->getIdentifierQuoteString()));
}
-void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropertySet >& column, bool andCriteria ,::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString& >& _aSetFunctor,sal_Int32 filterOperator)
+void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropertySet >& column, bool andCriteria ,std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString& >& _aSetFunctor,sal_Int32 filterOperator)
{
try
{
@@ -1756,7 +1756,7 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC
#endif
if ( pCondition )
{
- ::std::vector< ::std::vector < PropertyValue > > aFilters;
+ std::vector< std::vector < PropertyValue > > aFilters;
Reference< XNumberFormatter > xFormatter( NumberFormatter::create(m_aContext), UNO_QUERY_THROW );
xFormatter->attachNumberFormatsSupplier( m_xNumberFormatsSupplier );
@@ -1764,15 +1764,15 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC
{
aFilterSeq.realloc(aFilters.size());
Sequence<PropertyValue>* pFilters = aFilterSeq.getArray();
- ::std::vector< ::std::vector < PropertyValue > >::const_iterator aEnd = aFilters.end();
- ::std::vector< ::std::vector < PropertyValue > >::const_iterator i = aFilters.begin();
+ std::vector< std::vector < PropertyValue > >::const_iterator aEnd = aFilters.end();
+ std::vector< std::vector < PropertyValue > >::const_iterator i = aFilters.begin();
for ( ; i != aEnd ; ++i)
{
- const ::std::vector < PropertyValue >& rProperties = *i;
+ const std::vector < PropertyValue >& rProperties = *i;
pFilters->realloc(rProperties.size());
PropertyValue* pFilter = pFilters->getArray();
- ::std::vector < PropertyValue >::const_iterator j = rProperties.begin();
- ::std::vector < PropertyValue >::const_iterator aEnd2 = rProperties.end();
+ std::vector < PropertyValue >::const_iterator j = rProperties.begin();
+ std::vector < PropertyValue >::const_iterator aEnd2 = rProperties.end();
for ( ; j != aEnd2 ; ++j)
{
*pFilter = *j;
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index 267ca05..fa6a6d2 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -549,7 +549,7 @@ void ODBTableDecorator::refreshColumns()
::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
- ::std::vector< OUString> aVector;
+ std::vector< OUString> aVector;
Reference<XNameAccess> xNames;
if(m_xTable.is())
diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx
index 024ea15..443fd1d 100644
--- a/dbaccess/source/core/api/View.cxx
+++ b/dbaccess/source/core/api/View.cxx
@@ -86,7 +86,7 @@ namespace dbaccess
Type aAlterType = cppu::UnoType<XAlterView>::get();
Sequence< Type > aTypes( ::comphelper::concatSequences(View_Base::getTypes(),View_IBASE::getTypes()) );
- ::std::vector<Type> aOwnTypes;
+ std::vector<Type> aOwnTypes;
aOwnTypes.reserve(aTypes.getLength());
const Type* pIter = aTypes.getConstArray();
diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx
index cab05f9..292689f 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -145,7 +145,7 @@ void OColumn::registerMayBeVoidProperty( const OUString& _rName, sal_Int32 _nHan
OColumns::OColumns(::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
- bool _bCaseSensitive,const ::std::vector< OUString> &_rVector,
+ bool _bCaseSensitive,const std::vector< OUString> &_rVector,
IColumnFactory* _pColFactory,
::connectivity::sdbcx::IRefreshableColumns* _pRefresh,
bool _bAddColumn,
@@ -164,7 +164,7 @@ OColumns::OColumns(::cppu::OWeakObject& _rParent,
OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
const css::uno::Reference< css::container::XNameAccess >& _rxDrvColumns,
- bool _bCaseSensitive,const ::std::vector< OUString> &_rVector,
+ bool _bCaseSensitive,const std::vector< OUString> &_rVector,
IColumnFactory* _pColFactory,
::connectivity::sdbcx::IRefreshableColumns* _pRefresh,
bool _bAddColumn,
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index 477cd1c..572c6c2 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -429,7 +429,7 @@ Sequence< OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames( )
const sal_Int32 nHaveAlways = 7;
// Which optional properties are contained?
- const sal_Int32 nHaveOptionally (::std::bitset<7>(nId).count());
+ const sal_Int32 nHaveOptionally (std::bitset<7>(nId).count());
BEGIN_PROPERTY_SEQUENCE( nHaveAlways + nHaveOptionally )
diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx
index 5874a33..7a79ae4 100644
--- a/dbaccess/source/core/api/preparedstatement.cxx
+++ b/dbaccess/source/core/api/preparedstatement.cxx
@@ -52,7 +52,7 @@ OPreparedStatement::OPreparedStatement(const Reference< XConnection > & _xConn,
m_xAggregateAsParameters.set( m_xAggregateAsSet, UNO_QUERY_THROW );
Reference<XDatabaseMetaData> xMeta = _xConn->getMetaData();
- m_pColumns = new OColumns(*this, m_aMutex, xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),::std::vector< OUString>(), nullptr,nullptr);
+ m_pColumns = new OColumns(*this, m_aMutex, xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),std::vector< OUString>(), nullptr,nullptr);
}
OPreparedStatement::~OPreparedStatement()
diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx
index d30bd60..dc70aa9 100644
--- a/dbaccess/source/core/api/query.hxx
+++ b/dbaccess/source/core/api/query.hxx
@@ -56,7 +56,7 @@ class OQuery :public OContentHelper
friend struct TRelease;
public:
- typedef ::std::map< OUString,OColumn*,::comphelper::UStringMixLess> TNameColumnMap;
+ typedef std::map< OUString,OColumn*,::comphelper::UStringMixLess> TNameColumnMap;
protected:
// TNameColumnMap m_aColumnMap; // contains all columnnames to columns
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index 03f1b47..d0560d2 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -156,7 +156,7 @@ OUString SAL_CALL OQueryComposer::getFilter( )
::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
MutexGuard aGuard(m_aMutex);
FilterCreator aFilterCreator;
- aFilterCreator = ::std::for_each(m_aFilters.begin(),m_aFilters.end(),aFilterCreator);
+ aFilterCreator = std::for_each(m_aFilters.begin(),m_aFilters.end(),aFilterCreator);
return aFilterCreator.getComposedAndClear();
}
@@ -174,7 +174,7 @@ OUString SAL_CALL OQueryComposer::getOrder( )
::osl::MutexGuard aGuard( m_aMutex );
OrderCreator aOrderCreator;
- aOrderCreator = ::std::for_each(m_aOrders.begin(),m_aOrders.end(),aOrderCreator);
+ aOrderCreator = std::for_each(m_aOrders.begin(),m_aOrders.end(),aOrderCreator);
return aOrderCreator.getComposedAndClear();
}
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index a886d4a..484beb3 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -387,7 +387,7 @@ bool OQueryContainer::checkExistence(const OUString& _rName)
Documents::const_iterator aFind = m_aDocumentMap.find(_rName);
if ( !bRet && aFind != m_aDocumentMap.end() )
{
- m_aDocuments.erase( ::std::find(m_aDocuments.begin(),m_aDocuments.end(),aFind));
+ m_aDocuments.erase( std::find(m_aDocuments.begin(),m_aDocuments.end(),aFind));
m_aDocumentMap.erase(aFind);
}
else if ( bRet && aFind == m_aDocumentMap.end() )
diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx
index 1f9c3a5..22d37b8 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -121,14 +121,14 @@ OQueryDescriptor_Base::OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWea
:m_bColumnsOutOfDate(true)
,m_rMutex(_rMutex)
{
- m_pColumns = new OColumns(_rMySelf, m_rMutex, true,::std::vector< OUString>(), this,this);
+ m_pColumns = new OColumns(_rMySelf, m_rMutex, true,std::vector< OUString>(), this,this);
}
OQueryDescriptor_Base::OQueryDescriptor_Base(const OQueryDescriptor_Base& _rSource,::cppu::OWeakObject& _rMySelf)
:m_bColumnsOutOfDate(true)
,m_rMutex(_rSource.m_rMutex)
{
- m_pColumns = new OColumns(_rMySelf, m_rMutex, true,::std::vector< OUString>(), this,this);
+ m_pColumns = new OColumns(_rMySelf, m_rMutex, true,std::vector< OUString>(), this,this);
m_sCommand = _rSource.m_sCommand;
m_bEscapeProcessing = _rSource.m_bEscapeProcessing;
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
index 330aa38..a8fe61e 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -61,7 +61,7 @@ OResultSet::OResultSet(const css::uno::Reference< css::sdbc::XResultSet >& _xRes
,m_nResultSetConcurrency(0)
,m_bIsBookmarkable(false)
{
- m_pColumns = new OColumns(*this, m_aMutex, _bCaseSensitive, ::std::vector< OUString>(), nullptr,nullptr);
+ m_pColumns = new OColumns(*this, m_aMutex, _bCaseSensitive, std::vector< OUString>(), nullptr,nullptr);
try
{
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index a02c2f9..ab23f72 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -262,7 +262,7 @@ Sequence< Type > SAL_CALL ODBTable::getTypes( )
Type aAlterType = cppu::UnoType<XAlterTable>::get();
Sequence< Type > aTypes(OTable_Base::getTypes());
- ::std::vector<Type> aOwnTypes;
+ std::vector<Type> aOwnTypes;
aOwnTypes.reserve(aTypes.getLength());
const Type* pIter = aTypes.getConstArray();
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index 485104b..92a3c4b 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -198,7 +198,7 @@ Reference< XNameAccess> OComponentDefinition::getColumns()
if ( !m_xColumns.is() )
{
- ::std::vector< OUString> aNames;
+ std::vector< OUString> aNames;
const OComponentDefinition_Impl& rDefinition( getDefinition() );
aNames.reserve( rDefinition.size() );
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index 64a133a..784d4e4 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
@@ -44,7 +44,7 @@ namespace dbaccess
,public ODataSettings_Base
{
public:
- typedef ::std::map < OUString
+ typedef std::map < OUString
, css::uno::Reference< css::beans::XPropertySet >
> Columns;
typedef Columns::iterator iterator;
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 7afe82f..59b1e88 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -499,7 +499,7 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent
}
typedef Sequence< PropertyChangeEvent > PropertyEventSequence;
- typedef ::std::map< XPropertiesChangeListener*, PropertyEventSequence* > PropertiesEventListenerMap;
+ typedef std::map< XPropertiesChangeListener*, PropertyEventSequence* > PropertiesEventListenerMap;
PropertiesEventListenerMap aListeners;
const PropertyChangeEvent* propertyChangeEvent = evt.getConstArray();
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 726fb7e..f7bf18b 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -111,7 +111,7 @@ bool VosMutexFacade::tryToAcquire()
class DocumentStorageAccess : public ::cppu::WeakImplHelper< XDocumentSubStorageSupplier
, XTransactionListener >
{
- typedef ::std::map< OUString, Reference< XStorage > > NamedStorages;
+ typedef std::map< OUString, Reference< XStorage > > NamedStorages;
::osl::Mutex m_aMutex;
/// all sub storages which we ever gave to the outer world
@@ -320,7 +320,7 @@ Sequence< OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames
if ( !xRootStor.is() )
return Sequence< OUString >();
- ::std::vector< OUString > aNames;
+ std::vector< OUString > aNames;
Sequence< OUString > aElementNames( xRootStor->getElementNames() );
for ( sal_Int32 i=0; i<aElementNames.getLength(); ++i )
@@ -609,7 +609,7 @@ bool ODatabaseModelImpl::objectHasMacros( const Reference< XStorage >& _rxContai
void ODatabaseModelImpl::reset()
{
m_bReadOnly = false;
- ::std::vector< TContentPtr > aEmptyContainers( 4 );
+ std::vector< TContentPtr > aEmptyContainers( 4 );
m_aContainer.swap( aEmptyContainers );
if ( m_pStorageAccess.is() )
@@ -695,8 +695,8 @@ void ODatabaseModelImpl::dispose()
m_xDataSource = WeakReference<XDataSource>();
m_xModel = WeakReference< XModel >();
- ::std::vector<TContentPtr>::const_iterator aIter = m_aContainer.begin();
- ::std::vector<TContentPtr>::const_iterator aEnd = m_aContainer.end();
+ std::vector<TContentPtr>::const_iterator aIter = m_aContainer.begin();
+ std::vector<TContentPtr>::const_iterator aEnd = m_aContainer.end();
for (;aIter != aEnd ; ++aIter)
{
if ( aIter->get() )
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index fb02e0e..bd56e90 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -174,7 +174,7 @@ private:
rtl::Reference<DocumentStorageAccess> m_pStorageAccess;
::comphelper::SharedMutex m_aMutex;
VosMutexFacade m_aMutexFacade;
- ::std::vector< TContentPtr > m_aContainer; // one for each ObjectType
+ std::vector< TContentPtr > m_aContainer; // one for each ObjectType
::sfx2::DocumentMacroMode m_aMacroMode;
sal_Int16 m_nImposedMacroExecMode;
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 3cb9a0d..33267c0 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -381,19 +381,19 @@ void SAL_CALL OConnection::clearWarnings( )
namespace
{
- struct CompareTypeByName : public ::std::binary_function< Type, Type, bool >
+ struct CompareTypeByName : public std::binary_function< Type, Type, bool >
{
bool operator() ( const Type& _rLHS, const Type& _rRHS ) const
{
return _rLHS.getTypeName() < _rRHS.getTypeName();
}
};
- typedef ::std::set< Type, CompareTypeByName > TypeBag;
+ typedef std::set< Type, CompareTypeByName > TypeBag;
void lcl_copyTypes( TypeBag& _out_rTypes, const Sequence< Type >& _rTypes )
{
- ::std::copy( _rTypes.begin(), _rTypes.end(),
- ::std::insert_iterator< TypeBag >( _out_rTypes, _out_rTypes.begin() ) );
+ std::copy( _rTypes.begin(), _rTypes.end(),
+ std::insert_iterator< TypeBag >( _out_rTypes, _out_rTypes.begin() ) );
}
}
@@ -768,7 +768,7 @@ void OConnection::impl_checkTableQueryNames_nothrow()
{
Reference< XNameAccess > xTables( getTables() );
Sequence< OUString > aTableNames( xTables->getElementNames() );
- ::std::set< OUString > aSortedTableNames( aTableNames.getConstArray(), aTableNames.getConstArray() + aTableNames.getLength() );
+ std::set< OUString > aSortedTableNames( aTableNames.getConstArray(), aTableNames.getConstArray() + aTableNames.getLength() );
Reference< XNameAccess > xQueries( getQueries() );
Sequence< OUString > aQueryNames( xQueries->getElementNames() );
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index febaf9c..52367d4 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -99,7 +99,7 @@ namespace dbaccess
{
private:
Reference< XDesktop2 > m_xDesktop;
- ::std::list< const ODatabaseModelImpl* > m_aDatabaseDocuments;
+ std::list< const ODatabaseModelImpl* > m_aDatabaseDocuments;
public:
explicit DatabaseDocumentLoader( const Reference<XComponentContext> & rxContext);
@@ -134,7 +134,7 @@ namespace dbaccess
void SAL_CALL DatabaseDocumentLoader::queryTermination( const lang::EventObject& /*Event*/ )
{
- ::std::list< const ODatabaseModelImpl* > aCpy(m_aDatabaseDocuments);
+ std::list< const ODatabaseModelImpl* > aCpy(m_aDatabaseDocuments);
for( const auto& pCopy : aCpy )
{
try
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index e69abd7..3ecc3a3 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -244,22 +244,22 @@ Sequence< Type > SAL_CALL ODatabaseDocument::getTypes( )
// strip XEmbeddedScripts, and immediately re-assign to aTypes
aTypes = Sequence< Type >(
pStripTo,
- ::std::remove_copy_if(
+ std::remove_copy_if(
aTypes.getConstArray(),
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list