[Libreoffice-commits] core.git: dbaccess/source
Noel Grandin
noel at peralex.com
Mon Aug 3 04:39:22 PDT 2015
dbaccess/source/core/api/BookmarkSet.hxx | 28
dbaccess/source/core/api/CIndexes.hxx | 8
dbaccess/source/core/api/CRowSetColumn.hxx | 8
dbaccess/source/core/api/CRowSetDataColumn.cxx | 2
dbaccess/source/core/api/CRowSetDataColumn.hxx | 27
dbaccess/source/core/api/CacheSet.cxx | 12
dbaccess/source/core/api/CacheSet.hxx | 124 -
dbaccess/source/core/api/KeySet.cxx | 14
dbaccess/source/core/api/KeySet.hxx | 164 +-
dbaccess/source/core/api/OptimisticSet.hxx | 16
dbaccess/source/core/api/PrivateRow.cxx | 16
dbaccess/source/core/api/PrivateRow.hxx | 42
dbaccess/source/core/api/RowSet.cxx | 58
dbaccess/source/core/api/RowSet.hxx | 384 ++---
dbaccess/source/core/api/RowSetBase.cxx | 20
dbaccess/source/core/api/RowSetBase.hxx | 196 +-
dbaccess/source/core/api/RowSetCache.cxx | 4
dbaccess/source/core/api/RowSetCache.hxx | 56
dbaccess/source/core/api/RowSetCacheIterator.cxx | 2
dbaccess/source/core/api/RowSetCacheIterator.hxx | 4
dbaccess/source/core/api/RowSetRow.hxx | 12
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 10
dbaccess/source/core/api/StaticSet.cxx | 4
dbaccess/source/core/api/StaticSet.hxx | 52
dbaccess/source/core/api/TableDeco.cxx | 6
dbaccess/source/core/api/View.cxx | 2
dbaccess/source/core/api/WrappedResultSet.hxx | 32
dbaccess/source/core/api/callablestatement.cxx | 16
dbaccess/source/core/api/column.cxx | 20
dbaccess/source/core/api/datacolumn.cxx | 28
dbaccess/source/core/api/datacolumn.hxx | 110 -
dbaccess/source/core/api/datasettings.cxx | 10
dbaccess/source/core/api/definitioncolumn.cxx | 6
dbaccess/source/core/api/preparedstatement.cxx | 18
dbaccess/source/core/api/query.cxx | 2
dbaccess/source/core/api/query.hxx | 50
dbaccess/source/core/api/querycomposer.cxx | 2
dbaccess/source/core/api/querycontainer.cxx | 8
dbaccess/source/core/api/querydescriptor.hxx | 32
dbaccess/source/core/api/resultcolumn.cxx | 2
dbaccess/source/core/api/resultcolumn.hxx | 27
dbaccess/source/core/api/resultset.cxx | 50
dbaccess/source/core/api/statement.cxx | 14
dbaccess/source/core/api/table.cxx | 2
dbaccess/source/core/api/tablecontainer.cxx | 2
dbaccess/source/core/api/viewcontainer.cxx | 2
dbaccess/source/core/dataaccess/ComponentDefinition.hxx | 44
dbaccess/source/core/dataaccess/ContentHelper.cxx | 2
dbaccess/source/core/dataaccess/ModelImpl.cxx | 12
dbaccess/source/core/dataaccess/ModelImpl.hxx | 136 +-
dbaccess/source/core/dataaccess/SharedConnection.cxx | 4
dbaccess/source/core/dataaccess/SharedConnection.hxx | 60
dbaccess/source/core/dataaccess/bookmarkcontainer.hxx | 68 -
dbaccess/source/core/dataaccess/commandcontainer.cxx | 2
dbaccess/source/core/dataaccess/commandcontainer.hxx | 12
dbaccess/source/core/dataaccess/commanddefinition.hxx | 58
dbaccess/source/core/dataaccess/connection.cxx | 12
dbaccess/source/core/dataaccess/connection.hxx | 184 +-
dbaccess/source/core/dataaccess/databasecontext.cxx | 12
dbaccess/source/core/dataaccess/databasecontext.hxx | 92 -
dbaccess/source/core/dataaccess/databasedocument.cxx | 12
dbaccess/source/core/dataaccess/databasedocument.hxx | 306 ++--
dbaccess/source/core/dataaccess/databaseregistrations.hxx | 4
dbaccess/source/core/dataaccess/datasource.cxx | 20
dbaccess/source/core/dataaccess/datasource.hxx | 132 -
dbaccess/source/core/dataaccess/documentcontainer.cxx | 4
dbaccess/source/core/dataaccess/documentcontainer.hxx | 62
dbaccess/source/core/dataaccess/documentdefinition.cxx | 6
dbaccess/source/core/dataaccess/documentdefinition.hxx | 142 +-
dbaccess/source/core/dataaccess/documenteventexecutor.hxx | 10
dbaccess/source/core/dataaccess/documenteventnotifier.hxx | 24
dbaccess/source/core/dataaccess/documentevents.hxx | 16
dbaccess/source/core/dataaccess/intercept.cxx | 8
dbaccess/source/core/dataaccess/intercept.hxx | 81 -
dbaccess/source/core/dataaccess/myucp_datasupplier.hxx | 9
dbaccess/source/core/dataaccess/myucp_resultset.hxx | 15
dbaccess/source/core/inc/ContainerMediator.hxx | 32
dbaccess/source/core/inc/ContentHelper.hxx | 93 -
dbaccess/source/core/inc/DatabaseDataProvider.hxx | 302 ++--
dbaccess/source/core/inc/FilteredContainer.hxx | 26
dbaccess/source/core/inc/PropertyForward.hxx | 28
dbaccess/source/core/inc/RefreshListener.hxx | 2
dbaccess/source/core/inc/SingleSelectQueryComposer.hxx | 116 -
dbaccess/source/core/inc/TableDeco.hxx | 102 -
dbaccess/source/core/inc/View.hxx | 12
dbaccess/source/core/inc/callablestatement.hxx | 72 -
dbaccess/source/core/inc/column.hxx | 74 -
dbaccess/source/core/inc/columnsettings.hxx | 26
dbaccess/source/core/inc/commandbase.hxx | 6
dbaccess/source/core/inc/containerapprove.hxx | 2
dbaccess/source/core/inc/datasettings.hxx | 24
dbaccess/source/core/inc/definitioncolumn.hxx | 120 -
dbaccess/source/core/inc/definitioncontainer.hxx | 104 -
dbaccess/source/core/inc/objectnameapproval.hxx | 4
dbaccess/source/core/inc/preparedstatement.hxx | 100 -
dbaccess/source/core/inc/querycomposer.hxx | 64
dbaccess/source/core/inc/querycontainer.hxx | 78 -
dbaccess/source/core/inc/recovery/dbdocrecovery.hxx | 14
dbaccess/source/core/inc/sdbcoretools.hxx | 12
dbaccess/source/core/inc/statement.hxx | 122 -
dbaccess/source/core/inc/table.hxx | 46
dbaccess/source/core/inc/tablecontainer.hxx | 26
dbaccess/source/core/inc/userinformation.hxx | 4
dbaccess/source/core/inc/veto.hxx | 14
dbaccess/source/core/inc/viewcontainer.hxx | 20
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 16
dbaccess/source/core/misc/PropertyForward.cxx | 4
dbaccess/source/core/misc/apitools.cxx | 2
dbaccess/source/core/misc/dsntypes.cxx | 2
dbaccess/source/core/misc/sdbcoretools.cxx | 2
dbaccess/source/core/recovery/settingsimport.cxx | 2
dbaccess/source/core/recovery/settingsimport.hxx | 6
dbaccess/source/core/recovery/storagestream.hxx | 24
dbaccess/source/core/recovery/storagetextstream.hxx | 4
dbaccess/source/core/recovery/storagexmlstream.hxx | 10
dbaccess/source/core/recovery/subcomponentloader.hxx | 20
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 2
dbaccess/source/ext/macromigration/docinteraction.cxx | 2
dbaccess/source/ext/macromigration/docinteraction.hxx | 6
dbaccess/source/ext/macromigration/macromigrationdialog.hxx | 8
dbaccess/source/ext/macromigration/macromigrationwizard.cxx | 2
dbaccess/source/ext/macromigration/migrationengine.hxx | 4
dbaccess/source/ext/macromigration/migrationerror.hxx | 12
dbaccess/source/ext/macromigration/progresscapture.hxx | 12
dbaccess/source/filter/xml/dbloader2.cxx | 18
dbaccess/source/filter/xml/xmlColumn.hxx | 22
dbaccess/source/filter/xml/xmlComponent.hxx | 4
dbaccess/source/filter/xml/xmlConnectionData.hxx | 2
dbaccess/source/filter/xml/xmlConnectionResource.hxx | 2
dbaccess/source/filter/xml/xmlDataSource.hxx | 4
dbaccess/source/filter/xml/xmlDataSourceInfo.hxx | 2
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx | 4
dbaccess/source/filter/xml/xmlDataSourceSetting.hxx | 16
dbaccess/source/filter/xml/xmlDataSourceSettings.hxx | 2
dbaccess/source/filter/xml/xmlDatabase.hxx | 2
dbaccess/source/filter/xml/xmlDatabaseDescription.hxx | 2
dbaccess/source/filter/xml/xmlDocuments.hxx | 8
dbaccess/source/filter/xml/xmlExport.cxx | 10
dbaccess/source/filter/xml/xmlExport.hxx | 14
dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx | 2
dbaccess/source/filter/xml/xmlHierarchyCollection.hxx | 16
dbaccess/source/filter/xml/xmlLogin.hxx | 2
dbaccess/source/filter/xml/xmlQuery.cxx | 2
dbaccess/source/filter/xml/xmlQuery.hxx | 8
dbaccess/source/filter/xml/xmlServerDatabase.hxx | 2
dbaccess/source/filter/xml/xmlStyleImport.hxx | 16
dbaccess/source/filter/xml/xmlTable.cxx | 2
dbaccess/source/filter/xml/xmlTable.hxx | 18
dbaccess/source/filter/xml/xmlTableFilterList.hxx | 2
dbaccess/source/filter/xml/xmlfilter.cxx | 8
dbaccess/source/filter/xml/xmlfilter.hxx | 12
dbaccess/source/inc/OAuthenticationContinuation.hxx | 26
dbaccess/source/inc/apitools.hxx | 98 -
dbaccess/source/inc/dsntypes.hxx | 6
dbaccess/source/inc/registrationhelper.hxx | 32
dbaccess/source/sdbtools/connection/connectiondependent.hxx | 18
dbaccess/source/sdbtools/connection/connectiontools.cxx | 2
dbaccess/source/sdbtools/connection/connectiontools.hxx | 34
dbaccess/source/sdbtools/connection/datasourcemetadata.hxx | 10
dbaccess/source/sdbtools/connection/objectnames.hxx | 18
dbaccess/source/sdbtools/connection/tablename.hxx | 30
dbaccess/source/ui/app/AppController.cxx | 2
dbaccess/source/ui/app/AppControllerGen.cxx | 4
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 32
dbaccess/source/ui/app/AppDetailView.hxx | 18
dbaccess/source/ui/app/AppView.cxx | 4
dbaccess/source/ui/app/AppView.hxx | 22
dbaccess/source/ui/app/IApplicationController.hxx | 2
dbaccess/source/ui/app/subcomponentmanager.hxx | 14
dbaccess/source/ui/browser/brwctrlr.cxx | 276 ++--
dbaccess/source/ui/browser/brwview.cxx | 18
dbaccess/source/ui/browser/dbexchange.cxx | 4
dbaccess/source/ui/browser/dbloader.cxx | 8
dbaccess/source/ui/browser/dbtreemodel.hxx | 4
dbaccess/source/ui/browser/exsrcbrw.cxx | 62
dbaccess/source/ui/browser/formadapter.cxx | 794 ++++++------
dbaccess/source/ui/browser/genericcontroller.cxx | 8
dbaccess/source/ui/browser/sbagrid.cxx | 46
dbaccess/source/ui/browser/sbamultiplex.cxx | 102 -
dbaccess/source/ui/browser/unodatbr.cxx | 40
dbaccess/source/ui/control/ColumnControlWindow.cxx | 2
dbaccess/source/ui/control/FieldDescControl.cxx | 14
dbaccess/source/ui/control/TableGrantCtrl.cxx | 2
dbaccess/source/ui/control/opendoccontrols.cxx | 2
dbaccess/source/ui/control/toolboxcontroller.cxx | 4
dbaccess/source/ui/dlg/CollectionView.cxx | 4
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 4
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 4
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2
dbaccess/source/ui/dlg/DbAdminImpl.hxx | 46
dbaccess/source/ui/dlg/DriverSettings.cxx | 2
dbaccess/source/ui/dlg/DriverSettings.hxx | 2
dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 2
dbaccess/source/ui/dlg/UserAdmin.hxx | 6
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 2
dbaccess/source/ui/dlg/adminpages.hxx | 8
dbaccess/source/ui/dlg/adtabdlg.cxx | 24
dbaccess/source/ui/dlg/dbadmin.cxx | 4
dbaccess/source/ui/dlg/dbfindex.cxx | 2
dbaccess/source/ui/dlg/dbwiz.cxx | 2
dbaccess/source/ui/dlg/dbwizsetup.cxx | 16
dbaccess/source/ui/dlg/directsql.cxx | 4
dbaccess/source/ui/dlg/dlgsave.cxx | 19
dbaccess/source/ui/dlg/finteraction.hxx | 10
dbaccess/source/ui/dlg/tablespage.cxx | 4
dbaccess/source/ui/dlg/tablespage.hxx | 18
dbaccess/source/ui/inc/AppElementType.hxx | 8
dbaccess/source/ui/inc/CollectionView.hxx | 12
dbaccess/source/ui/inc/ColumnControlWindow.hxx | 20
dbaccess/source/ui/inc/ConnectionLineAccess.hxx | 44
dbaccess/source/ui/inc/DExport.hxx | 38
dbaccess/source/ui/inc/FieldDescControl.hxx | 12
dbaccess/source/ui/inc/FieldDescriptions.hxx | 34
dbaccess/source/ui/inc/HtmlReader.hxx | 10
dbaccess/source/ui/inc/IItemSetHelper.hxx | 6
dbaccess/source/ui/inc/IUpdateHelper.hxx | 6
dbaccess/source/ui/inc/JAccess.hxx | 18
dbaccess/source/ui/inc/JoinController.hxx | 14
dbaccess/source/ui/inc/JoinDesignView.hxx | 2
dbaccess/source/ui/inc/JoinExchange.hxx | 10
dbaccess/source/ui/inc/JoinTableView.hxx | 2
dbaccess/source/ui/inc/QueryDesignView.hxx | 10
dbaccess/source/ui/inc/QueryViewSwitch.hxx | 4
dbaccess/source/ui/inc/RTableConnectionData.hxx | 2
dbaccess/source/ui/inc/RelControliFace.hxx | 2
dbaccess/source/ui/inc/RelationController.hxx | 24
dbaccess/source/ui/inc/RelationDesignView.hxx | 2
dbaccess/source/ui/inc/RelationDlg.hxx | 12
dbaccess/source/ui/inc/RelationTableView.hxx | 6
dbaccess/source/ui/inc/RtfReader.hxx | 8
dbaccess/source/ui/inc/TableConnection.hxx | 2
dbaccess/source/ui/inc/TableController.hxx | 50
dbaccess/source/ui/inc/TableCopyHelper.hxx | 8
dbaccess/source/ui/inc/TableDesignControl.hxx | 4
dbaccess/source/ui/inc/TableDesignView.hxx | 6
dbaccess/source/ui/inc/TableFieldDescription.hxx | 2
dbaccess/source/ui/inc/TableGrantCtrl.hxx | 24
dbaccess/source/ui/inc/TableRow.hxx | 2
dbaccess/source/ui/inc/TableRowExchange.hxx | 2
dbaccess/source/ui/inc/TableWindow.hxx | 16
dbaccess/source/ui/inc/TableWindowAccess.hxx | 48
dbaccess/source/ui/inc/TableWindowData.hxx | 26
dbaccess/source/ui/inc/TablesSingleDlg.hxx | 8
dbaccess/source/ui/inc/TokenWriter.hxx | 82 -
dbaccess/source/ui/inc/TypeInfo.hxx | 4
dbaccess/source/ui/inc/UITools.hxx | 90 -
dbaccess/source/ui/inc/UserAdminDlg.hxx | 18
dbaccess/source/ui/inc/WCopyTable.hxx | 114 -
dbaccess/source/ui/inc/WTypeSelect.hxx | 10
dbaccess/source/ui/inc/adtabdlg.hxx | 2
dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 10
dbaccess/source/ui/inc/asyncmodaldialog.hxx | 2
dbaccess/source/ui/inc/brwctrlr.hxx | 194 +-
dbaccess/source/ui/inc/brwview.hxx | 20
dbaccess/source/ui/inc/callbacks.hxx | 3
dbaccess/source/ui/inc/commontypes.hxx | 2
dbaccess/source/ui/inc/databaseobjectview.hxx | 78 -
dbaccess/source/ui/inc/datasourceconnector.hxx | 12
dbaccess/source/ui/inc/dbadmin.hxx | 16
dbaccess/source/ui/inc/dbexchange.hxx | 20
dbaccess/source/ui/inc/dbwiz.hxx | 12
dbaccess/source/ui/inc/dbwizsetup.hxx | 12
dbaccess/source/ui/inc/defaultobjectnamecheck.hxx | 10
dbaccess/source/ui/inc/directsql.hxx | 6
dbaccess/source/ui/inc/dlgsave.hxx | 8
dbaccess/source/ui/inc/exsrcbrw.hxx | 56
dbaccess/source/ui/inc/formadapter.hxx | 616 ++++-----
dbaccess/source/ui/inc/imageprovider.hxx | 2
dbaccess/source/ui/inc/indexcollection.hxx | 10
dbaccess/source/ui/inc/indexdialog.hxx | 26
dbaccess/source/ui/inc/indexfieldscontrol.hxx | 2
dbaccess/source/ui/inc/linkeddocuments.hxx | 28
dbaccess/source/ui/inc/paramdialog.hxx | 38
dbaccess/source/ui/inc/propertysetitem.hxx | 6
dbaccess/source/ui/inc/propertystorage.hxx | 8
dbaccess/source/ui/inc/querycontainerwindow.hxx | 8
dbaccess/source/ui/inc/querycontroller.hxx | 64
dbaccess/source/ui/inc/queryfilter.hxx | 28
dbaccess/source/ui/inc/queryorder.hxx | 16
dbaccess/source/ui/inc/queryview.hxx | 2
dbaccess/source/ui/inc/sbagrid.hxx | 88 -
dbaccess/source/ui/inc/sbamultiplex.hxx | 164 +-
dbaccess/source/ui/inc/singledoccontroller.hxx | 10
dbaccess/source/ui/inc/sqledit.hxx | 9
dbaccess/source/ui/inc/sqlmessage.hxx | 2
dbaccess/source/ui/inc/stringlistitem.hxx | 6
dbaccess/source/ui/inc/tabletree.hxx | 26
dbaccess/source/ui/inc/toolboxcontroller.hxx | 12
dbaccess/source/ui/inc/unoadmin.hxx | 10
dbaccess/source/ui/inc/unodatbr.hxx | 128 -
dbaccess/source/ui/inc/unosqlmessage.hxx | 26
dbaccess/source/ui/misc/DExport.cxx | 6
dbaccess/source/ui/misc/HtmlReader.cxx | 16
dbaccess/source/ui/misc/RtfReader.cxx | 16
dbaccess/source/ui/misc/TokenWriter.cxx | 34
dbaccess/source/ui/misc/UITools.cxx | 48
dbaccess/source/ui/misc/UpdateHelperImpl.hxx | 30
dbaccess/source/ui/misc/WCPage.cxx | 2
dbaccess/source/ui/misc/WCopyTable.cxx | 12
dbaccess/source/ui/misc/WNameMatch.cxx | 2
dbaccess/source/ui/misc/WTypeSelect.cxx | 6
dbaccess/source/ui/misc/controllerframe.cxx | 16
dbaccess/source/ui/misc/linkeddocuments.cxx | 10
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx | 2
dbaccess/source/ui/querydesign/JAccess.cxx | 2
dbaccess/source/ui/querydesign/JoinController.cxx | 2
dbaccess/source/ui/querydesign/QTableWindow.cxx | 2
dbaccess/source/ui/querydesign/QTableWindow.hxx | 4
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 6
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 6
dbaccess/source/ui/querydesign/TableFieldDescription.cxx | 2
dbaccess/source/ui/querydesign/TableWindow.cxx | 6
dbaccess/source/ui/querydesign/TableWindowAccess.cxx | 2
dbaccess/source/ui/querydesign/TableWindowData.cxx | 2
dbaccess/source/ui/querydesign/limitboxcontroller.hxx | 22
dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 2
dbaccess/source/ui/querydesign/querycontroller.cxx | 8
dbaccess/source/ui/querydesign/querydlg.hxx | 6
dbaccess/source/ui/relationdesign/RelationTableView.cxx | 6
dbaccess/source/ui/tabledesign/FieldDescriptions.cxx | 8
dbaccess/source/ui/tabledesign/TEditControl.cxx | 8
dbaccess/source/ui/tabledesign/TEditControl.hxx | 4
dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 2
dbaccess/source/ui/tabledesign/TableFieldControl.cxx | 6
dbaccess/source/ui/tabledesign/TableFieldControl.hxx | 10
dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 2
dbaccess/source/ui/tabledesign/TableUndo.hxx | 8
dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 18
dbaccess/source/ui/uno/ColumnControl.cxx | 4
dbaccess/source/ui/uno/ColumnControl.hxx | 8
dbaccess/source/ui/uno/ColumnModel.cxx | 6
dbaccess/source/ui/uno/ColumnModel.hxx | 44
dbaccess/source/ui/uno/ColumnPeer.hxx | 14
dbaccess/source/ui/uno/DBTypeWizDlg.hxx | 18
dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 18
dbaccess/source/ui/uno/TableFilterDlg.hxx | 18
dbaccess/source/ui/uno/UserSettingsDlg.hxx | 18
dbaccess/source/ui/uno/admindlg.hxx | 18
dbaccess/source/ui/uno/composerdialogs.cxx | 18
dbaccess/source/ui/uno/composerdialogs.hxx | 30
dbaccess/source/ui/uno/copytablewizard.cxx | 2
dbaccess/source/ui/uno/dbinteraction.hxx | 32
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 10
dbaccess/source/ui/uno/unoDirectSql.cxx | 4
dbaccess/source/ui/uno/unoDirectSql.hxx | 8
dbaccess/source/ui/uno/unosqlmessage.cxx | 28
348 files changed, 5212 insertions(+), 5237 deletions(-)
New commits:
commit 7dc5e8731fdc3a11ca429e717ec4a05e67ea1d21
Author: Noel Grandin <noel at peralex.com>
Date: Mon Aug 3 09:14:58 2015 +0200
com::sun::star->css in dbaccess
Change-Id: I4fbdd3fb7d1e0ad4423148aaaed3a15aebb26d14
diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx
index 08d3221..acaa85c 100644
--- a/dbaccess/source/core/api/BookmarkSet.hxx
+++ b/dbaccess/source/core/api/BookmarkSet.hxx
@@ -28,9 +28,9 @@ namespace dbaccess
// this set is used when we have a bookmarkable set from the driver
class OBookmarkSet : public OCacheSet
{
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XRowLocate> m_xRowLocate;
+ css::uno::Reference< css::sdbcx::XRowLocate> m_xRowLocate;
- void updateColumn(sal_Int32 nPos,::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > _xParameter,const connectivity::ORowSetValue& _rValue);
+ void updateColumn(sal_Int32 nPos,css::uno::Reference< css::sdbc::XRowUpdate > _xParameter,const connectivity::ORowSetValue& _rValue);
public:
explicit OBookmarkSet(sal_Int32 i_nMaxRows) : OCacheSet(i_nMaxRows)
{}
@@ -39,19 +39,19 @@ namespace dbaccess
m_xRowLocate = NULL;
}
- virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) SAL_OVERRIDE;
- virtual void reset(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet) SAL_OVERRIDE;
+ virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) SAL_OVERRIDE;
+ virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) SAL_OVERRIDE;
virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition) SAL_OVERRIDE;
- // ::com::sun::star::sdbcx::XRowLocate
- virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL compareBookmarks( const ::com::sun::star::uno::Any& first, const ::com::sun::star::uno::Any& second ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual bool SAL_CALL hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- // ::com::sun::star::sdbc::XResultSetUpdate
- virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ // css::sdbcx::XRowLocate
+ virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ // css::sdbc::XResultSetUpdate
+ virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
};
}
#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_BOOKMARKSET_HXX
diff --git a/dbaccess/source/core/api/CIndexes.hxx b/dbaccess/source/core/api/CIndexes.hxx
index 837a154..f42c433 100644
--- a/dbaccess/source/core/api/CIndexes.hxx
+++ b/dbaccess/source/core/api/CIndexes.hxx
@@ -26,17 +26,17 @@ namespace dbaccess
{
class OIndexes : public connectivity::OIndexesHelper
{
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xIndexes;
+ css::uno::Reference< css::container::XNameAccess > m_xIndexes;
protected:
virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() SAL_OVERRIDE;
- virtual connectivity::sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() SAL_OVERRIDE;
+ virtual connectivity::sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) SAL_OVERRIDE;
virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) SAL_OVERRIDE;
public:
OIndexes(connectivity::OTableHelper* _pTable,
::osl::Mutex& _rMutex,
const ::std::vector< OUString> &_rVector,
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes
+ const css::uno::Reference< css::container::XNameAccess >& _rxIndexes
) : connectivity::OIndexesHelper(_pTable,_rMutex,_rVector)
,m_xIndexes(_rxIndexes)
{}
diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx b/dbaccess/source/core/api/CRowSetColumn.hxx
index 63f7c65..120efd5 100644
--- a/dbaccess/source/core/api/CRowSetColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetColumn.hxx
@@ -32,17 +32,17 @@ namespace dbaccess
{
public:
- ORowSetColumn( const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData >& _xMetaData,
- const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow >& _xRow,
+ ORowSetColumn( const css::uno::Reference < css::sdbc::XResultSetMetaData >& _xMetaData,
+ const css::uno::Reference < css::sdbc::XRow >& _xRow,
sal_Int32 _nPos,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMeta,
+ const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rxDBMeta,
const OUString& _rDescription,
const OUString& i_sLabel,
const std::function<const ::connectivity::ORowSetValue& (sal_Int32)> &_getValue);
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
- virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue )throw (::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,const css::uno::Any& rValue )throw (css::uno::Exception, std::exception ) SAL_OVERRIDE;
};
}
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index 4431da1..ee94dbf 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -231,7 +231,7 @@ void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColu
reFill(_rVector);
}
-void ORowSetDataColumns::impl_refresh() throw(::com::sun::star::uno::RuntimeException)
+void ORowSetDataColumns::impl_refresh() throw(css::uno::RuntimeException)
{
}
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx
index 6a7809d..be1a6a5 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx
@@ -39,37 +39,36 @@ namespace dbaccess
{
protected:
const std::function<const ::connectivity::ORowSetValue& (sal_Int32)> m_pGetValue;
- ::com::sun::star::uno::Any m_aOldValue;
-
+ css::uno::Any m_aOldValue;
OUString m_sLabel;
OUString m_aDescription; // description
virtual ~ORowSetDataColumn();
public:
- ORowSetDataColumn(const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData >& _xMetaData,
- const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow >& _xRow,
- const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRowUpdate >& _xRowUpdate,
+ ORowSetDataColumn(const css::uno::Reference < css::sdbc::XResultSetMetaData >& _xMetaData,
+ const css::uno::Reference < css::sdbc::XRow >& _xRow,
+ const css::uno::Reference < css::sdbc::XRowUpdate >& _xRowUpdate,
sal_Int32 _nPos,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMeta,
+ const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rxDBMeta,
const OUString& _rDescription,
const OUString& i_sLabel,
const std::function<const ::connectivity::ORowSetValue& (sal_Int32)> &_getValue);
- // com::sun::star::lang::XTypeProvider
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ // css::lang::XTypeProvider
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// comphelper::OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
// cppu::OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue,
- ::com::sun::star::uno::Any & rOldValue,
+ virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue,
+ css::uno::Any & rOldValue,
sal_Int32 nHandle,
- const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE;
- virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE;
- virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue )throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE;
+ const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException) SAL_OVERRIDE;
+ virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE;
+ virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue )throw (css::uno::Exception, std::exception) SAL_OVERRIDE;
virtual void fireValueChange(const ::connectivity::ORowSetValue& _rOldValue) SAL_OVERRIDE;
protected:
@@ -82,7 +81,7 @@ namespace dbaccess
::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns;
protected:
virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName) SAL_OVERRIDE;
- virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void impl_refresh() throw(css::uno::RuntimeException) SAL_OVERRIDE;
public:
ORowSetDataColumns(
bool _bCase,
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index e0ed967..124f2fd 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -449,32 +449,32 @@ Sequence< sal_Int8 > SAL_CALL OCacheSet::getBytes( sal_Int32 columnIndex ) throw
return m_xDriverRow->getBytes(columnIndex);
}
-::com::sun::star::util::Date SAL_CALL OCacheSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Date SAL_CALL OCacheSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
return m_xDriverRow->getDate(columnIndex);
}
-::com::sun::star::util::Time SAL_CALL OCacheSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Time SAL_CALL OCacheSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
return m_xDriverRow->getTime(columnIndex);
}
-::com::sun::star::util::DateTime SAL_CALL OCacheSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::DateTime SAL_CALL OCacheSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
return m_xDriverRow->getTimestamp(columnIndex);
}
-Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCacheSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL OCacheSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
return m_xDriverRow->getBinaryStream(columnIndex);
}
-Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCacheSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL OCacheSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
return m_xDriverRow->getCharacterStream(columnIndex);
}
-Any SAL_CALL OCacheSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OCacheSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception)
{
return m_xDriverRow->getObject(columnIndex,typeMap);
}
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index 0b9d377..8a749b1 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -36,30 +36,30 @@ namespace com{ namespace sun { namespace star{namespace sdbc{ class XParameters;
namespace dbaccess
{
- class OCacheSet : public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XRow>
+ class OCacheSet : public ::cppu::WeakImplHelper< css::sdbc::XRow>
{
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xDriverSet;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xDriverRow;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xSetMetaData;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection;
+ css::uno::Reference< css::sdbc::XResultSet> m_xDriverSet;
+ css::uno::Reference< css::sdbc::XRow> m_xDriverRow;
+ css::uno::Reference< css::sdbc::XResultSetMetaData> m_xSetMetaData;
+ css::uno::Reference< css::sdbc::XConnection> m_xConnection;
- ::com::sun::star::uno::Sequence<sal_Bool> m_aNullable;
- ::com::sun::star::uno::Sequence<sal_Bool> m_aSignedFlags;
- ::com::sun::star::uno::Sequence<sal_Int32> m_aColumnTypes;
- ORowSetRow m_aInsertRow;
- OUString m_aComposedTableName;
- sal_Int32 m_nMaxRows;
+ css::uno::Sequence<sal_Bool> m_aNullable;
+ css::uno::Sequence<sal_Bool> m_aSignedFlags;
+ css::uno::Sequence<sal_Int32> m_aColumnTypes;
+ ORowSetRow m_aInsertRow;
+ OUString m_aComposedTableName;
+ sal_Int32 m_nMaxRows;
bool m_bInserted;
bool m_bUpdated;
bool m_bDeleted;
- OUString m_sRowSetFilter;
+ OUString m_sRowSetFilter;
explicit OCacheSet(sal_Int32 i_nMaxRows);
virtual ~OCacheSet();
static void setParameter(sal_Int32 nPos
- ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters >& _xParameter
+ ,const css::uno::Reference< css::sdbc::XParameters >& _xParameter
,const connectivity::ORowSetValue& _rValue
,sal_Int32 _nType
,sal_Int32 _nScale
@@ -69,64 +69,64 @@ namespace dbaccess
,OUStringBuffer& _sCondition
,OUStringBuffer& _sParameter
,::std::list< sal_Int32>& _rOrgValues);
- void fillTableName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ void fillTableName(const css::uno::Reference< css::beans::XPropertySet>& _xTable) throw(css::sdbc::SQLException, css::uno::RuntimeException);
OUString getIdentifierQuoteString() const;
public:
// late constructor
- virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter);
+ virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter);
virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition);
- // ::com::sun::star::sdbc::XRow
- virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- // ::com::sun::star::sdbc::XResultSet
- virtual bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual bool SAL_CALL isBeforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual bool SAL_CALL first( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual bool SAL_CALL rowDeleted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- // ::com::sun::star::sdbcx::XRowLocate
- virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0;
- virtual bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0;
- virtual sal_Int32 SAL_CALL compareBookmarks( const ::com::sun::star::uno::Any& first, const ::com::sun::star::uno::Any& second ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0;
- virtual bool SAL_CALL hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0;
- virtual sal_Int32 SAL_CALL hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0;
- // ::com::sun::star::sdbc::XResultSetUpdate
- virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL updateRow( const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) = 0;
- virtual void SAL_CALL deleteRow( const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0;
+ // css::sdbc::XRow
+ virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ // css::sdbc::XResultSet
+ virtual bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ // css::sdbcx::XRowLocate
+ virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+ virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+ virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+ virtual bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+ virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+ // css::sdbc::XResultSetUpdate
+ virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL updateRow( const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) = 0;
+ virtual void SAL_CALL deleteRow( const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
virtual bool isResultSetChanged() const;
- virtual void reset(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet) = 0;
+ 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 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);
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index b4bfdc4..404e016 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1403,37 +1403,37 @@ Sequence< sal_Int8 > SAL_CALL OKeySet::getBytes( sal_Int32 columnIndex ) throw(S
return m_xRow->getBytes(columnIndex);
}
-::com::sun::star::util::Date SAL_CALL OKeySet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Date SAL_CALL OKeySet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
ensureRowForData();
return m_xRow->getDate(columnIndex);
}
-::com::sun::star::util::Time SAL_CALL OKeySet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Time SAL_CALL OKeySet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
ensureRowForData();
return m_xRow->getTime(columnIndex);
}
-::com::sun::star::util::DateTime SAL_CALL OKeySet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::DateTime SAL_CALL OKeySet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
ensureRowForData();
return m_xRow->getTimestamp(columnIndex);
}
-Reference< ::com::sun::star::io::XInputStream > SAL_CALL OKeySet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL OKeySet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
ensureRowForData();
return m_xRow->getBinaryStream(columnIndex);
}
-Reference< ::com::sun::star::io::XInputStream > SAL_CALL OKeySet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL OKeySet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
ensureRowForData();
return m_xRow->getCharacterStream(columnIndex);
}
-Any SAL_CALL OKeySet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OKeySet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception)
{
ensureRowForData();
return m_xRow->getObject(columnIndex,typeMap);
@@ -1484,7 +1484,7 @@ namespace dbaccess
{
void getColumnPositions(const Reference<XNameAccess>& _rxQueryColumns,
- const ::com::sun::star::uno::Sequence< OUString >& _aColumnNames,
+ const css::uno::Sequence< OUString >& _aColumnNames,
const OUString& _rsUpdateTableName,
SelectColumnsMetaData& o_rColumnNames,
bool i_bAppendTableName)
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index 5a837c5..6ce838e 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -64,13 +64,13 @@ namespace dbaccess
typedef ::std::map< OUString, SelectColumnDescription, ::comphelper::UStringMixLess > SelectColumnsMetaData;
// the elements of _rxQueryColumns must have the properties PROPERTY_REALNAME and PROPERTY_TABLENAME
- void getColumnPositions(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxQueryColumns,
- const ::com::sun::star::uno::Sequence< OUString >& _rColumnNames,
+ void getColumnPositions(const css::uno::Reference< css::container::XNameAccess >& _rxQueryColumns,
+ const css::uno::Sequence< OUString >& _rColumnNames,
const OUString& _rsUpdateTableName,
SelectColumnsMetaData& o_rColumnNames /* out */,
bool i_bAppendTableName = false);
- typedef ::std::pair<ORowSetRow,::std::pair<sal_Int32,::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> > > OKeySetValue;
+ 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,ORowSetValueVector > OUpdatedParameter;
// is used when the source supports keys
@@ -80,31 +80,31 @@ 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
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
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xTableKeys;
+ 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,
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > >
+ css::uno::Reference< css::sdbc::XPreparedStatement > >
vStatements_t;
vStatements_t m_vStatements;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement> m_xStatement;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xSet;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer > m_xComposer;
- const OUString m_sUpdateTableName;
- ::std::vector< OUString > m_aFilterColumns;
+ css::uno::Reference< css::sdbc::XPreparedStatement> m_xStatement;
+ css::uno::Reference< css::sdbc::XResultSet> m_xSet;
+ 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;
sal_Int32& m_rRowCount;
bool m_bRowCountFinal;
@@ -117,7 +117,7 @@ namespace dbaccess
*/
void copyRowValue(const ORowSetRow& _rInsertRow,ORowSetRow& _rKeyRow,sal_Int32 i_nBookmark);
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getKeyColumns() const;
+ css::uno::Reference< css::container::XNameAccess > getKeyColumns() const;
// returns true if it did any work
bool fillAllRows();
bool fetchRow();
@@ -125,93 +125,93 @@ namespace dbaccess
static void impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData);
void initColumns();
- void findTableColumnsMatching_throw( const ::com::sun::star::uno::Any& i_aTable,
+ void findTableColumnsMatching_throw( const css::uno::Any& i_aTable,
const OUString& i_rUpdateTableName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& i_xMeta,
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& i_xQueryColumns,
+ const css::uno::Reference< css::sdbc::XDatabaseMetaData>& i_xMeta,
+ const css::uno::Reference< css::container::XNameAccess>& i_xQueryColumns,
::std::unique_ptr<SelectColumnsMetaData>& o_pKeyColumnNames);
void ensureStatement( );
virtual void makeNewStatement( );
static void setOneKeyColumnParameter( sal_Int32 &nPos,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters > &_xParameter,
+ const css::uno::Reference< css::sdbc::XParameters > &_xParameter,
const connectivity::ORowSetValue &_rValue,
sal_Int32 _nType,
sal_Int32 _nScale );
OUStringBuffer createKeyFilter( );
- bool doTryRefetch_throw() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);;
+ bool doTryRefetch_throw() throw(css::sdbc::SQLException, css::uno::RuntimeException);;
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 executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQL,const OUString& i_sTableName = OUString(),bool bRefetch = false);
- void executeStatement(OUStringBuffer& io_aFilter, ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& io_xAnalyzer);
+ void executeStatement(OUStringBuffer& io_aFilter, css::uno::Reference< css::sdb::XSingleSelectQueryComposer>& io_xAnalyzer);
virtual ~OKeySet();
public:
OKeySet(const connectivity::OSQLTable& _xTable,
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xTableKeys,
+ const css::uno::Reference< css::container::XIndexAccess>& _xTableKeys,
const OUString& _rUpdateTableName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xComposer,
+ const css::uno::Reference< css::sdb::XSingleSelectQueryAnalyzer >& _xComposer,
const ORowSetValueVector& _aParameterValueForCache,
sal_Int32 i_nMaxRows,
sal_Int32& o_nRowCount);
// late ctor which can throw exceptions
- virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) SAL_OVERRIDE;
- virtual void reset(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet) SAL_OVERRIDE;
-
- // ::com::sun::star::sdbc::XRow
- virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-
- virtual bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual bool SAL_CALL rowDeleted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- // ::com::sun::star::sdbc::XResultSet
- virtual bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual bool SAL_CALL isBeforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual bool SAL_CALL first( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL getRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- void SAL_CALL ensureRowForData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- // ::com::sun::star::sdbcx::XRowLocate
- virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-
- virtual bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-
- virtual sal_Int32 SAL_CALL compareBookmarks( const ::com::sun::star::uno::Any& first, const ::com::sun::star::uno::Any& second ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-
- virtual bool SAL_CALL hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-
- virtual sal_Int32 SAL_CALL hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-
- // ::com::sun::star::sdbc::XResultSetUpdate
- virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) SAL_OVERRIDE;
+ virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) SAL_OVERRIDE;
+
+ // css::sdbc::XRow
+ virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+
+ virtual bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ // css::sdbc::XResultSet
+ virtual bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ void SAL_CALL ensureRowForData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ // css::sdbcx::XRowLocate
+ virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+
+ virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+
+ virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+
+ virtual bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+
+ virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+
+ // css::sdbc::XResultSetUpdate
+ virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual bool previous_checked( bool i_bFetchRow ) SAL_OVERRIDE;
diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx
index abfde43..d10187c 100644
--- a/dbaccess/source/core/api/OptimisticSet.hxx
+++ b/dbaccess/source/core/api/OptimisticSet.hxx
@@ -49,20 +49,20 @@ namespace dbaccess
virtual void makeNewStatement( ) SAL_OVERRIDE;
virtual ~OptimisticSet();
public:
- OptimisticSet(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rContext,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& i_xConnection,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xComposer,
+ OptimisticSet(const css::uno::Reference< css::uno::XComponentContext>& _rContext,
+ const css::uno::Reference< css::sdbc::XConnection>& i_xConnection,
+ const css::uno::Reference< css::sdb::XSingleSelectQueryAnalyzer >& _xComposer,
const ORowSetValueVector& _aParameterValueForCache,
sal_Int32 i_nMaxRows,
sal_Int32& o_nRowCount);
// late ctor which can throw exceptions
- virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) SAL_OVERRIDE;
+ virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) SAL_OVERRIDE;
- // ::com::sun::star::sdbc::XResultSetUpdate
- virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ // css::sdbc::XResultSetUpdate
+ virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// CacheSet
virtual bool isResultSetChanged() const SAL_OVERRIDE;
diff --git a/dbaccess/source/core/api/PrivateRow.cxx b/dbaccess/source/core/api/PrivateRow.cxx
index af8eee0..cf44a2a 100644
--- a/dbaccess/source/core/api/PrivateRow.cxx
+++ b/dbaccess/source/core/api/PrivateRow.cxx
@@ -79,32 +79,32 @@ sal_Bool SAL_CALL OPrivateRow::wasNull( ) throw (SQLException, RuntimeException
m_nPos = columnIndex;
return m_aRow[m_nPos];
}
- ::com::sun::star::util::Date SAL_CALL OPrivateRow::getDate( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+ css::util::Date SAL_CALL OPrivateRow::getDate( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
{
m_nPos = columnIndex;
return m_aRow[m_nPos];
}
- ::com::sun::star::util::Time SAL_CALL OPrivateRow::getTime( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+ css::util::Time SAL_CALL OPrivateRow::getTime( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
{
m_nPos = columnIndex;
return m_aRow[m_nPos];
}
- ::com::sun::star::util::DateTime SAL_CALL OPrivateRow::getTimestamp( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+ css::util::DateTime SAL_CALL OPrivateRow::getTimestamp( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
{
m_nPos = columnIndex;
return m_aRow[m_nPos];
}
- Reference< ::com::sun::star::io::XInputStream > SAL_CALL OPrivateRow::getBinaryStream( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+ Reference< css::io::XInputStream > SAL_CALL OPrivateRow::getBinaryStream( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
{
m_nPos = columnIndex;
- return Reference< ::com::sun::star::io::XInputStream >(m_aRow[m_nPos].makeAny(),UNO_QUERY);
+ return Reference< css::io::XInputStream >(m_aRow[m_nPos].makeAny(),UNO_QUERY);
}
- Reference< ::com::sun::star::io::XInputStream > SAL_CALL OPrivateRow::getCharacterStream( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+ Reference< css::io::XInputStream > SAL_CALL OPrivateRow::getCharacterStream( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
{
m_nPos = columnIndex;
- return Reference< ::com::sun::star::io::XInputStream >(m_aRow[m_nPos].makeAny(),UNO_QUERY);
+ return Reference< css::io::XInputStream >(m_aRow[m_nPos].makeAny(),UNO_QUERY);
}
- Any SAL_CALL OPrivateRow::getObject( ::sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& ) throw (SQLException, RuntimeException, std::exception)
+ Any SAL_CALL OPrivateRow::getObject( ::sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& ) throw (SQLException, RuntimeException, std::exception)
{
m_nPos = columnIndex;
return m_aRow[m_nPos].makeAny();
diff --git a/dbaccess/source/core/api/PrivateRow.hxx b/dbaccess/source/core/api/PrivateRow.hxx
index e949904..1b7bb9a 100644
--- a/dbaccess/source/core/api/PrivateRow.hxx
+++ b/dbaccess/source/core/api/PrivateRow.hxx
@@ -25,7 +25,7 @@
namespace dbaccess
{
- class OPrivateRow : public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XRow>
+ class OPrivateRow : public ::cppu::WeakImplHelper< css::sdbc::XRow>
{
ORowSetValueVector::Vector m_aRow;
sal_Int32 m_nPos;
@@ -33,26 +33,26 @@ namespace dbaccess
explicit OPrivateRow(const ORowSetValueVector::Vector& i_aRow) : m_aRow(i_aRow),m_nPos(0)
{
}
- virtual sal_Bool SAL_CALL wasNull( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getString( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL getBoolean( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::sal_Int8 SAL_CALL getByte( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::sal_Int16 SAL_CALL getShort( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::sal_Int32 SAL_CALL getInt( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::sal_Int64 SAL_CALL getLong( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual float SAL_CALL getFloat( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual double SAL_CALL getDouble( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getBytes( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::util::Date SAL_CALL getDate( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::util::Time SAL_CALL getTime( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Any SAL_CALL getObject( ::sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL wasNull( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getString( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL getBoolean( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::sal_Int8 SAL_CALL getByte( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::sal_Int16 SAL_CALL getShort( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::sal_Int32 SAL_CALL getInt( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::sal_Int64 SAL_CALL getLong( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual float SAL_CALL getFloat( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual double SAL_CALL getDouble( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getBytes( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::util::Date SAL_CALL getDate( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::util::Time SAL_CALL getTime( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::util::DateTime SAL_CALL getTimestamp( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL getObject( ::sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
} // dbaccess
#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_PRIVATEROW_HXX
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index c4dbac9..9e03c14 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -130,7 +130,7 @@ com_sun_star_comp_dba_ORowSet_get_implementation(css::uno::XComponentContext* co
namespace dbaccess
{
-ORowSet::ORowSet( const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext )
+ORowSet::ORowSet( const Reference< css::uno::XComponentContext >& _rxContext )
:ORowSet_BASE1(m_aMutex)
,ORowSetBase( _rxContext, ORowSet_BASE1::rBHelper, &m_aMutex )
,m_pParameters( NULL )
@@ -417,7 +417,7 @@ void SAL_CALL ORowSet::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
}
}
-// com::sun::star::XTypeProvider
+// css::XTypeProvider
Sequence< Type > SAL_CALL ORowSet::getTypes() throw (RuntimeException, std::exception)
{
OTypeCollection aTypes(cppu::UnoType<XPropertySet>::get(),
@@ -432,7 +432,7 @@ Sequence< sal_Int8 > SAL_CALL ORowSet::getImplementationId() throw (RuntimeExcep
return css::uno::Sequence<sal_Int8>();
}
-// com::sun::star::XInterface
+// css::XInterface
Any SAL_CALL ORowSet::queryInterface( const Type & rType ) throw (RuntimeException, std::exception)
{
return ORowSet_BASE1::queryInterface( rType);
@@ -448,7 +448,7 @@ void SAL_CALL ORowSet::release() throw()
ORowSet_BASE1::release();
}
-// com::sun::star::XUnoTunnel
+// css::XUnoTunnel
sal_Int64 SAL_CALL ORowSet::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception)
{
if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) )
@@ -472,7 +472,7 @@ Sequence< sal_Int8 > ORowSet::getUnoTunnelImplementationId()
return pId->getImplementationId();
}
-// com::sun::star::XAggregation
+// css::XAggregation
Any SAL_CALL ORowSet::queryAggregation( const Type& rType ) throw(RuntimeException, std::exception)
{
Any aRet(ORowSetBase::queryInterface(rType));
@@ -486,7 +486,7 @@ OUString ORowSet::getImplementationName_static( ) throw(RuntimeException)
return OUString("com.sun.star.comp.dba.ORowSet");
}
-// ::com::sun::star::XServiceInfo
+// css::XServiceInfo
OUString SAL_CALL ORowSet::getImplementationName( ) throw(RuntimeException, std::exception)
{
return getImplementationName_static();
@@ -652,8 +652,8 @@ void ORowSet::setActiveConnection( Reference< XConnection >& _rxNewConn, bool _b
}
}
-// ::com::sun::star::XEventListener
-void SAL_CALL ORowSet::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(RuntimeException, std::exception)
+// css::XEventListener
+void SAL_CALL ORowSet::disposing( const css::lang::EventObject& Source ) throw(RuntimeException, std::exception)
{
// close rowset because the connection is going to be deleted (someone told me :-)
Reference<XConnection> xCon(Source.Source,UNO_QUERY);
@@ -770,22 +770,22 @@ void SAL_CALL ORowSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_I
updateValue(columnIndex,x);
}
-void SAL_CALL ORowSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(SQLException, RuntimeException, std::exception)
{
updateValue(columnIndex,x);
}
-void SAL_CALL ORowSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception)
{
updateValue(columnIndex,x);
}
-void SAL_CALL ORowSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception)
{
updateValue(columnIndex,x);
}
-void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
{
::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
::osl::MutexGuard aGuard( *m_pMutex );
@@ -800,7 +800,7 @@ void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Referenc
}
}
-void SAL_CALL ORowSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
{
::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
::osl::MutexGuard aGuard( *m_pMutex );
@@ -1360,25 +1360,25 @@ Sequence< sal_Int8 > SAL_CALL ORowSet::getBytes( sal_Int32 columnIndex ) throw(S
return getInsertValue(columnIndex);
}
-::com::sun::star::util::Date SAL_CALL ORowSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Date SAL_CALL ORowSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( *m_pMutex );
return getInsertValue(columnIndex);
}
-::com::sun::star::util::Time SAL_CALL ORowSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Time SAL_CALL ORowSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( *m_pMutex );
return getInsertValue(columnIndex);
}
-::com::sun::star::util::DateTime SAL_CALL ORowSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::DateTime SAL_CALL ORowSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( *m_pMutex );
return getInsertValue(columnIndex);
}
-Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL ORowSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( *m_pMutex );
if ( m_pCache && isInsertRow() )
@@ -1390,7 +1390,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSet::getBinaryStrea
return ORowSetBase::getBinaryStream(columnIndex);
}
-Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL ORowSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( *m_pMutex );
if(m_pCache && isInsertRow() )
@@ -2084,13 +2084,13 @@ Reference< XResultSet > SAL_CALL ORowSet::createResultSet( ) throw(SQLException
return Reference< XResultSet >();
}
-// ::com::sun::star::util::XCancellable
+// css::util::XCancellable
void SAL_CALL ORowSet::cancel( ) throw(RuntimeException, std::exception)
{
::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
}
-// ::com::sun::star::sdbcx::XDeleteRows
+// css::sdbcx::XDeleteRows
Sequence< sal_Int32 > SAL_CALL ORowSet::deleteRows( const Sequence< Any >& rows ) throw(SQLException, RuntimeException, std::exception)
{
::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
@@ -2378,7 +2378,7 @@ bool ORowSet::impl_buildActiveCommand_throw()
Reference< XQueriesSupplier > xQueriesAccess(m_xActiveConnection, UNO_QUERY);
if (xQueriesAccess.is())
{
- Reference< ::com::sun::star::container::XNameAccess > xQueries(xQueriesAccess->getQueries());
+ Reference< css::container::XNameAccess > xQueries(xQueriesAccess->getQueries());
if (xQueries->hasByName(m_aCommand))
{
Reference< XPropertySet > xQuery(xQueries->getByName(m_aCommand),UNO_QUERY);
@@ -2552,22 +2552,22 @@ void SAL_CALL ORowSet::setBytes( sal_Int32 parameterIndex, const Sequence< sal_I
setParameter(parameterIndex,x);
}
-void SAL_CALL ORowSet::setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(SQLException, RuntimeException, std::exception)
{
setParameter(parameterIndex,x);
}
-void SAL_CALL ORowSet::setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception)
{
setParameter(parameterIndex,x);
}
-void SAL_CALL ORowSet::setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception)
{
setParameter(parameterIndex,x);
}
-void SAL_CALL ORowSet::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aColumnsMutex );
ORowSetValue& rParamValue( getParameterStorage( parameterIndex ) );
@@ -2586,7 +2586,7 @@ void SAL_CALL ORowSet::setBinaryStream( sal_Int32 parameterIndex, const Referenc
}
}
-void SAL_CALL ORowSet::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aColumnsMutex );
ORowSetValue& rParamValue( getParameterStorage( parameterIndex ) );
@@ -2848,13 +2848,13 @@ ORowSetClone::~ORowSetClone()
{
}
-// com::sun::star::XTypeProvider
+// css::XTypeProvider
Sequence< Type > ORowSetClone::getTypes() throw (RuntimeException, std::exception)
{
return ::comphelper::concatSequences(OSubComponent::getTypes(),ORowSetBase::getTypes());
}
-// com::sun::star::XInterface
+// css::XInterface
Any ORowSetClone::queryInterface( const Type & rType ) throw (RuntimeException, std::exception)
{
Any aRet = ORowSetBase::queryInterface(rType);
@@ -2944,7 +2944,7 @@ Sequence< sal_Int8 > ORowSetClone::getUnoTunnelImplementationId()
return pId->getImplementationId();
}
-// com::sun::star::XUnoTunnel
+// css::XUnoTunnel
sal_Int64 SAL_CALL ORowSetClone::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception)
{
if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) )
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index 71cf72e..845df9a 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -48,18 +48,18 @@
namespace dbaccess
{
- typedef ::cppu::WeakAggComponentImplHelper12 < ::com::sun::star::sdb::XResultSetAccess
- , ::com::sun::star::sdb::XRowSetApproveBroadcaster
- , ::com::sun::star::sdb::XRowsChangeBroadcaster
- , ::com::sun::star::sdbcx::XDeleteRows
- , ::com::sun::star::sdbc::XParameters
- , ::com::sun::star::lang::XEventListener
- , ::com::sun::star::sdbc::XResultSetUpdate
- , ::com::sun::star::sdbc::XRowUpdate
- , ::com::sun::star::util::XCancellable
- , ::com::sun::star::sdb::XCompletedExecution
- , ::com::sun::star::sdb::XParametersSupplier
- , ::com::sun::star::sdbc::XWarningsSupplier
+ typedef ::cppu::WeakAggComponentImplHelper12 < css::sdb::XResultSetAccess
+ , css::sdb::XRowSetApproveBroadcaster
+ , css::sdb::XRowsChangeBroadcaster
+ , css::sdbcx::XDeleteRows
+ , css::sdbc::XParameters
+ , css::lang::XEventListener
+ , css::sdbc::XResultSetUpdate
+ , css::sdbc::XRowUpdate
+ , css::util::XCancellable
+ , css::sdb::XCompletedExecution
+ , css::sdb::XParametersSupplier
+ , css::sdbc::XWarningsSupplier
> ORowSet_BASE1;
class OTableContainer;
@@ -70,14 +70,14 @@ namespace dbaccess
{
friend class ORowSetClone;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xOldConnection;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection;
- ::com::sun::star::uno::Any m_aActiveConnection;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTypeMap;
- ::com::sun::star::uno::Any m_aTypeMap;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > m_xStatement;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > m_xComposer;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; // the columns from a table or query
+ css::uno::Reference< css::sdbc::XConnection > m_xOldConnection;
+ css::uno::Reference< css::sdbc::XConnection > m_xActiveConnection;
+ css::uno::Any m_aActiveConnection;
+ css::uno::Reference< css::container::XNameAccess > m_xTypeMap;
+ css::uno::Any m_aTypeMap;
+ css::uno::Reference< css::sdbc::XPreparedStatement > m_xStatement;
+ css::uno::Reference< css::sdb::XSingleSelectQueryComposer > m_xComposer;
+ css::uno::Reference< css::container::XNameAccess > m_xColumns; // the columns from a table or query
connectivity::OWeakRefArray m_aClones;
/** our parameters as XPropertySet instances and ORowSetValue instances
@@ -123,18 +123,18 @@ namespace dbaccess
sal_Int32 m_nPrivileges;
sal_Int32 m_nLastKnownRowCount;
oslInterlockedCount m_nInAppend;
- bool m_bLastKnownRowCountFinal;
- bool m_bUseEscapeProcessing ;
- bool m_bApplyFilter ;
- bool m_bCommandFacetsDirty; // any of the facets which define the active command is dirty
+ bool m_bLastKnownRowCountFinal;
+ bool m_bUseEscapeProcessing ;
+ bool m_bApplyFilter ;
+ bool m_bCommandFacetsDirty; // any of the facets which define the active command is dirty
bool m_bParametersDirty; // parameters changed since execute
- bool m_bModified ;
- bool m_bRebuildConnOnExecute ;
- bool m_bIsBookmarkable ;
- bool m_bNew ;
- bool m_bCanUpdateInsertedRows;
- bool m_bOwnConnection;
- bool m_bPropChangeNotifyEnabled;
+ bool m_bModified ;
+ bool m_bRebuildConnOnExecute ;
+ bool m_bIsBookmarkable ;
+ bool m_bNew ;
+ bool m_bCanUpdateInsertedRows;
+ bool m_bOwnConnection;
+ bool m_bPropChangeNotifyEnabled;
private:
/** builds m_aActiveCommand from our settings
@@ -166,11 +166,11 @@ namespace dbaccess
@precond
m_xActiveConnection points to a valid SDB-level connection
- @throws com::sun::star::sdb::SQLException
+ @throws css::sdb::SQLException
if an database-related error occurred
- @throws com::sun::star::uno::RuntimeException
- if any of the components involved throws a com::sun::star::uno::RuntimeException
+ @throws css::uno::RuntimeException
+ if any of the components involved throws a css::uno::RuntimeException
*/
bool impl_initComposer_throw( OUString& _out_rCommandToExecute );
@@ -181,12 +181,12 @@ namespace dbaccess
Else, m_pTables will be constructed and returned.
@precond m_xActiveConnection is not <NULL/>
- @throws ::com::sun::star::sdbc::SQLException
+ @throws css::sdbc::SQLException
if retrieving or constructing the tables container goes wrong
@see impl_resetTables_nothrow
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
+ css::uno::Reference< css::container::XNameAccess >
impl_getTables_throw();
/** cleans up m_pTables, and resets it to <NULL/>
@@ -195,19 +195,19 @@ namespace dbaccess
/** prepares and executes our command
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >
+ css::uno::Reference< css::sdbc::XResultSet >
impl_prepareAndExecute_throw();
void impl_ensureStatement_throw();
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > calcConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxHandler) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception );
+ css::uno::Reference< css::sdbc::XConnection > calcConnection(const css::uno::Reference< css::task::XInteractionHandler >& _rxHandler) throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception );
// free clones and ParseTree. Plus, if _bComplete is <TRUE/>, *all* other associated resources
void freeResources( bool _bComplete );
/// informs the clones (and ourself) that we are going to delete a record with a given bookmark
- void notifyRowSetAndClonesRowDelete( const ::com::sun::star::uno::Any& _rBookmark );
+ void notifyRowSetAndClonesRowDelete( const css::uno::Any& _rBookmark );
/// inform the clones (and ourself) that we have deleted a record with a given bookmark
- void notifyRowSetAndClonesRowDeleted( const ::com::sun::star::uno::Any& _rBookmark, sal_Int32 _nPos );
+ void notifyRowSetAndClonesRowDeleted( const css::uno::Any& _rBookmark, sal_Int32 _nPos );
void checkUpdateIterator();
const connectivity::ORowSetValue& getInsertValue(sal_Int32 columnIndex);
@@ -224,13 +224,13 @@ namespace dbaccess
void impl_restoreDataColumnsWriteable_throw();
protected:
- virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue,sal_Int32 nHandle) const SAL_OVERRIDE;
- virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _rDefault ) const SAL_OVERRIDE;
+ virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue,sal_Int32 nHandle) const SAL_OVERRIDE;
+ virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, css::uno::Any& _rDefault ) const SAL_OVERRIDE;
virtual void fireRowcount() SAL_OVERRIDE;
- void notifyAllListenersRowBeforeChange(::osl::ResettableMutexGuard& _rGuard,const ::com::sun::star::sdb::RowChangeEvent &rEvt);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list