[Libreoffice-commits] core.git: dbaccess/source
Noel Grandin
noel at peralex.com
Thu Apr 17 02:18:07 PDT 2014
dbaccess/source/core/api/BookmarkSet.cxx | 6
dbaccess/source/core/api/BookmarkSet.hxx | 6
dbaccess/source/core/api/CRowSetDataColumn.cxx | 6
dbaccess/source/core/api/CRowSetDataColumn.hxx | 2
dbaccess/source/core/api/CacheSet.cxx | 54 +--
dbaccess/source/core/api/CacheSet.hxx | 44 +-
dbaccess/source/core/api/FilteredContainer.cxx | 18 -
dbaccess/source/core/api/HelperCollections.cxx | 8
dbaccess/source/core/api/HelperCollections.hxx | 8
dbaccess/source/core/api/KeySet.cxx | 100 ++---
dbaccess/source/core/api/KeySet.hxx | 48 +-
dbaccess/source/core/api/OptimisticSet.cxx | 2
dbaccess/source/core/api/RowSet.cxx | 150 ++++----
dbaccess/source/core/api/RowSet.hxx | 50 +-
dbaccess/source/core/api/RowSetBase.cxx | 144 ++++----
dbaccess/source/core/api/RowSetBase.hxx | 54 +--
dbaccess/source/core/api/RowSetCache.cxx | 194 +++++------
dbaccess/source/core/api/RowSetCache.hxx | 70 ++--
dbaccess/source/core/api/RowSetCacheIterator.cxx | 4
dbaccess/source/core/api/RowSetCacheIterator.hxx | 2
dbaccess/source/core/api/RowSetRow.hxx | 2
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 62 +--
dbaccess/source/core/api/StaticSet.cxx | 74 ++--
dbaccess/source/core/api/StaticSet.hxx | 38 +-
dbaccess/source/core/api/TableDeco.cxx | 4
dbaccess/source/core/api/View.cxx | 2
dbaccess/source/core/api/WrappedResultSet.cxx | 6
dbaccess/source/core/api/WrappedResultSet.hxx | 6
dbaccess/source/core/api/column.cxx | 30 -
dbaccess/source/core/api/columnsettings.cxx | 4
dbaccess/source/core/api/datasettings.cxx | 4
dbaccess/source/core/api/definitioncolumn.cxx | 12
dbaccess/source/core/api/query.cxx | 4
dbaccess/source/core/api/query.hxx | 2
dbaccess/source/core/api/querycontainer.cxx | 4
dbaccess/source/core/api/querydescriptor.cxx | 18 -
dbaccess/source/core/api/querydescriptor.hxx | 6
dbaccess/source/core/api/resultcolumn.cxx | 4
dbaccess/source/core/api/resultset.cxx | 4
dbaccess/source/core/api/resultset.hxx | 4
dbaccess/source/core/api/statement.cxx | 10
dbaccess/source/core/api/tablecontainer.cxx | 22 -
dbaccess/source/core/api/viewcontainer.cxx | 2
dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 6
dbaccess/source/core/dataaccess/ComponentDefinition.hxx | 6
dbaccess/source/core/dataaccess/ContentHelper.cxx | 2
dbaccess/source/core/dataaccess/ModelImpl.cxx | 76 ++--
dbaccess/source/core/dataaccess/ModelImpl.hxx | 12
dbaccess/source/core/dataaccess/bookmarkcontainer.cxx | 24 -
dbaccess/source/core/dataaccess/bookmarkcontainer.hxx | 6
dbaccess/source/core/dataaccess/commandcontainer.cxx | 2
dbaccess/source/core/dataaccess/commandcontainer.hxx | 4
dbaccess/source/core/dataaccess/commanddefinition.cxx | 6
dbaccess/source/core/dataaccess/commanddefinition.hxx | 2
dbaccess/source/core/dataaccess/connection.cxx | 12
dbaccess/source/core/dataaccess/connection.hxx | 6
dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx | 8
dbaccess/source/core/dataaccess/databasedocument.cxx | 26 -
dbaccess/source/core/dataaccess/databasedocument.hxx | 6
dbaccess/source/core/dataaccess/datasource.cxx | 40 +-
dbaccess/source/core/dataaccess/datasource.hxx | 4
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 12
dbaccess/source/core/dataaccess/documentcontainer.cxx | 12
dbaccess/source/core/dataaccess/documentcontainer.hxx | 4
dbaccess/source/core/dataaccess/documentdefinition.cxx | 76 ++--
dbaccess/source/core/dataaccess/documentdefinition.hxx | 26 -
dbaccess/source/core/dataaccess/intercept.cxx | 2
dbaccess/source/core/dataaccess/myucp_datasupplier.cxx | 8
dbaccess/source/core/inc/ContentHelper.hxx | 12
dbaccess/source/core/inc/DatabaseDataProvider.hxx | 10
dbaccess/source/core/inc/FilteredContainer.hxx | 6
dbaccess/source/core/inc/PropertyForward.hxx | 2
dbaccess/source/core/inc/SingleSelectQueryComposer.hxx | 10
dbaccess/source/core/inc/View.hxx | 2
dbaccess/source/core/inc/column.hxx | 26 -
dbaccess/source/core/inc/columnsettings.hxx | 2
dbaccess/source/core/inc/commandbase.hxx | 4
dbaccess/source/core/inc/datasettings.hxx | 6
dbaccess/source/core/inc/definitioncolumn.hxx | 12
dbaccess/source/core/inc/definitioncontainer.hxx | 4
dbaccess/source/core/inc/querycontainer.hxx | 2
dbaccess/source/core/inc/sdbcoretools.hxx | 2
dbaccess/source/core/inc/statement.hxx | 4
dbaccess/source/core/inc/tablecontainer.hxx | 4
dbaccess/source/core/inc/viewcontainer.hxx | 2
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 18 -
dbaccess/source/core/misc/PropertyForward.cxx | 6
dbaccess/source/core/misc/dsntypes.cxx | 10
dbaccess/source/core/misc/sdbcoretools.cxx | 2
dbaccess/source/core/misc/services.cxx | 4
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 2
dbaccess/source/ext/macromigration/migrationengine.cxx | 2
dbaccess/source/filter/xml/dbloader2.cxx | 28 -
dbaccess/source/filter/xml/xmlColumn.cxx | 2
dbaccess/source/filter/xml/xmlColumn.hxx | 2
dbaccess/source/filter/xml/xmlComponent.cxx | 2
dbaccess/source/filter/xml/xmlComponent.hxx | 2
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx | 2
dbaccess/source/filter/xml/xmlDataSourceSetting.hxx | 2
dbaccess/source/filter/xml/xmlExport.cxx | 46 +-
dbaccess/source/filter/xml/xmlExport.hxx | 10
dbaccess/source/filter/xml/xmlQuery.cxx | 2
dbaccess/source/filter/xml/xmlQuery.hxx | 2
dbaccess/source/filter/xml/xmlStyleImport.cxx | 4
dbaccess/source/filter/xml/xmlStyleImport.hxx | 6
dbaccess/source/filter/xml/xmlTable.cxx | 4
dbaccess/source/filter/xml/xmlTable.hxx | 4
dbaccess/source/filter/xml/xmlTableFilterList.cxx | 4
dbaccess/source/filter/xml/xmlTableFilterPattern.cxx | 2
dbaccess/source/filter/xml/xmlTableFilterPattern.hxx | 4
dbaccess/source/filter/xml/xmlfilter.cxx | 16
dbaccess/source/filter/xml/xmlfilter.hxx | 4
dbaccess/source/filter/xml/xmlservices.cxx | 4
dbaccess/source/inc/OAuthenticationContinuation.hxx | 8
dbaccess/source/inc/dsntypes.hxx | 10
dbaccess/source/sdbtools/misc/sdbt_services.cxx | 4
dbaccess/source/ui/app/AppController.cxx | 48 +-
dbaccess/source/ui/app/AppController.hxx | 30 -
dbaccess/source/ui/app/AppControllerDnD.cxx | 26 -
dbaccess/source/ui/app/AppControllerGen.cxx | 24 -
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 52 +--
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 22 -
dbaccess/source/ui/app/AppDetailView.cxx | 34 -
dbaccess/source/ui/app/AppDetailView.hxx | 26 -
dbaccess/source/ui/app/AppSwapWindow.cxx | 6
dbaccess/source/ui/app/AppSwapWindow.hxx | 10
dbaccess/source/ui/app/AppTitleWindow.cxx | 8
dbaccess/source/ui/app/AppTitleWindow.hxx | 6
dbaccess/source/ui/app/AppView.cxx | 22 -
dbaccess/source/ui/app/AppView.hxx | 22 -
dbaccess/source/ui/app/IApplicationController.hxx | 2
dbaccess/source/ui/app/subcomponentmanager.cxx | 2
dbaccess/source/ui/app/subcomponentmanager.hxx | 2
dbaccess/source/ui/browser/brwctrlr.cxx | 120 +++---
dbaccess/source/ui/browser/brwview.cxx | 10
dbaccess/source/ui/browser/dbexchange.cxx | 2
dbaccess/source/ui/browser/dbloader.cxx | 6
dbaccess/source/ui/browser/dsEntriesNoExp.cxx | 8
dbaccess/source/ui/browser/dsbrowserDnD.cxx | 16
dbaccess/source/ui/browser/exsrcbrw.cxx | 26 -
dbaccess/source/ui/browser/genericcontroller.cxx | 12
dbaccess/source/ui/browser/sbagrid.cxx | 56 +--
dbaccess/source/ui/browser/unodatbr.cxx | 196 +++++------
dbaccess/source/ui/control/ColumnControlWindow.cxx | 4
dbaccess/source/ui/control/FieldControls.cxx | 2
dbaccess/source/ui/control/FieldDescControl.cxx | 58 +--
dbaccess/source/ui/control/RelationControl.cxx | 4
dbaccess/source/ui/control/SqlNameEdit.cxx | 8
dbaccess/source/ui/control/TableGrantCtrl.cxx | 4
dbaccess/source/ui/control/VertSplitView.cxx | 8
dbaccess/source/ui/control/curledit.cxx | 6
dbaccess/source/ui/control/dbtreelistbox.cxx | 14
dbaccess/source/ui/control/sqledit.cxx | 14
dbaccess/source/ui/control/tabletree.cxx | 24 -
dbaccess/source/ui/dlg/CollectionView.cxx | 4
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 80 ++--
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 14
dbaccess/source/ui/dlg/ConnectionPage.cxx | 14
dbaccess/source/ui/dlg/ConnectionPage.hxx | 2
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 8
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 4
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 74 ++--
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 28 -
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 28 -
dbaccess/source/ui/dlg/DbAdminImpl.hxx | 6
dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx | 2
dbaccess/source/ui/dlg/RelationDlg.cxx | 4
dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 4
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 28 -
dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 6
dbaccess/source/ui/dlg/UserAdmin.cxx | 2
dbaccess/source/ui/dlg/UserAdmin.hxx | 2
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 2
dbaccess/source/ui/dlg/admincontrols.cxx | 2
dbaccess/source/ui/dlg/adminpages.cxx | 40 +-
dbaccess/source/ui/dlg/adminpages.hxx | 18 -
dbaccess/source/ui/dlg/advancedsettings.cxx | 18 -
dbaccess/source/ui/dlg/advancedsettings.hxx | 4
dbaccess/source/ui/dlg/dbadmin.cxx | 4
dbaccess/source/ui/dlg/dbfindex.cxx | 26 -
dbaccess/source/ui/dlg/dbfindex.hxx | 10
dbaccess/source/ui/dlg/dbwiz.cxx | 10
dbaccess/source/ui/dlg/dbwizsetup.cxx | 56 +--
dbaccess/source/ui/dlg/detailpages.cxx | 56 +--
dbaccess/source/ui/dlg/detailpages.hxx | 18 -
dbaccess/source/ui/dlg/directsql.cxx | 4
dbaccess/source/ui/dlg/dlgsave.cxx | 4
dbaccess/source/ui/dlg/dlgsize.cxx | 4
dbaccess/source/ui/dlg/finteraction.cxx | 4
dbaccess/source/ui/dlg/finteraction.hxx | 4
dbaccess/source/ui/dlg/generalpage.cxx | 30 -
dbaccess/source/ui/dlg/generalpage.hxx | 8
dbaccess/source/ui/dlg/indexdialog.cxx | 84 ++--
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 16
dbaccess/source/ui/dlg/odbcconfig.cxx | 14
dbaccess/source/ui/dlg/odbcconfig.hxx | 6
dbaccess/source/ui/dlg/paramdialog.cxx | 14
dbaccess/source/ui/dlg/queryfilter.cxx | 16
dbaccess/source/ui/dlg/queryorder.cxx | 2
dbaccess/source/ui/dlg/tablespage.cxx | 26 -
dbaccess/source/ui/dlg/tablespage.hxx | 6
dbaccess/source/ui/dlg/textconnectionsettings.cxx | 4
dbaccess/source/ui/inc/CollectionView.hxx | 2
dbaccess/source/ui/inc/ColumnControlWindow.hxx | 6
dbaccess/source/ui/inc/ConnectionLine.hxx | 4
dbaccess/source/ui/inc/ConnectionLineAccess.hxx | 10
dbaccess/source/ui/inc/DExport.hxx | 26 -
dbaccess/source/ui/inc/FieldControls.hxx | 2
dbaccess/source/ui/inc/FieldDescControl.hxx | 20 -
dbaccess/source/ui/inc/FieldDescriptions.hxx | 26 -
dbaccess/source/ui/inc/HtmlReader.hxx | 8
dbaccess/source/ui/inc/IClipBoardTest.hxx | 8
dbaccess/source/ui/inc/IItemSetHelper.hxx | 2
dbaccess/source/ui/inc/JAccess.hxx | 2
dbaccess/source/ui/inc/JoinExchange.hxx | 6
dbaccess/source/ui/inc/JoinTableView.hxx | 16
dbaccess/source/ui/inc/QueryDesignView.hxx | 16
dbaccess/source/ui/inc/QueryPropertiesDialog.hxx | 6
dbaccess/source/ui/inc/QueryTableView.hxx | 12
dbaccess/source/ui/inc/QueryTextView.hxx | 8
dbaccess/source/ui/inc/QueryViewSwitch.hxx | 16
dbaccess/source/ui/inc/RTableConnectionData.hxx | 12
dbaccess/source/ui/inc/RelationControl.hxx | 2
dbaccess/source/ui/inc/RelationController.hxx | 4
dbaccess/source/ui/inc/RelationDlg.hxx | 4
dbaccess/source/ui/inc/RelationTableView.hxx | 4
dbaccess/source/ui/inc/RtfReader.hxx | 4
dbaccess/source/ui/inc/SqlNameEdit.hxx | 14
dbaccess/source/ui/inc/TableConnection.hxx | 6
dbaccess/source/ui/inc/TableConnectionData.hxx | 6
dbaccess/source/ui/inc/TableController.hxx | 20 -
dbaccess/source/ui/inc/TableCopyHelper.hxx | 28 -
dbaccess/source/ui/inc/TableDesignControl.hxx | 16
dbaccess/source/ui/inc/TableDesignHelpBar.hxx | 8
dbaccess/source/ui/inc/TableDesignView.hxx | 12
dbaccess/source/ui/inc/TableFieldDescription.hxx | 34 -
dbaccess/source/ui/inc/TableGrantCtrl.hxx | 2
dbaccess/source/ui/inc/TableRow.hxx | 6
dbaccess/source/ui/inc/TableWindow.hxx | 16
dbaccess/source/ui/inc/TableWindowAccess.hxx | 2
dbaccess/source/ui/inc/TableWindowData.hxx | 10
dbaccess/source/ui/inc/TableWindowListBox.hxx | 2
dbaccess/source/ui/inc/TablesSingleDlg.hxx | 6
dbaccess/source/ui/inc/TokenWriter.hxx | 32 -
dbaccess/source/ui/inc/TypeInfo.hxx | 20 -
dbaccess/source/ui/inc/UITools.hxx | 30 -
dbaccess/source/ui/inc/UserAdminDlg.hxx | 4
dbaccess/source/ui/inc/VertSplitView.hxx | 6
dbaccess/source/ui/inc/WCPage.hxx | 22 -
dbaccess/source/ui/inc/WColumnSelect.hxx | 2
dbaccess/source/ui/inc/WCopyTable.hxx | 30 -
dbaccess/source/ui/inc/WNameMatch.hxx | 8
dbaccess/source/ui/inc/WTabPage.hxx | 6
dbaccess/source/ui/inc/WTypeSelect.hxx | 28 -
dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 2
dbaccess/source/ui/inc/brwctrlr.hxx | 32 -
dbaccess/source/ui/inc/callbacks.hxx | 4
dbaccess/source/ui/inc/curledit.hxx | 6
dbaccess/source/ui/inc/databaseobjectview.hxx | 4
dbaccess/source/ui/inc/datasourceconnector.hxx | 2
dbaccess/source/ui/inc/dbadmin.hxx | 10
dbaccess/source/ui/inc/dbexchange.hxx | 2
dbaccess/source/ui/inc/dbtreelistbox.hxx | 6
dbaccess/source/ui/inc/dbwiz.hxx | 12
dbaccess/source/ui/inc/dbwizsetup.hxx | 24 -
dbaccess/source/ui/inc/directsql.hxx | 2
dbaccess/source/ui/inc/dlgsize.hxx | 2
dbaccess/source/ui/inc/exsrcbrw.hxx | 6
dbaccess/source/ui/inc/indexcollection.hxx | 6
dbaccess/source/ui/inc/indexdialog.hxx | 18 -
dbaccess/source/ui/inc/indexes.hxx | 20 -
dbaccess/source/ui/inc/indexfieldscontrol.hxx | 8
dbaccess/source/ui/inc/linkeddocuments.hxx | 2
dbaccess/source/ui/inc/listviewitems.hxx | 8
dbaccess/source/ui/inc/paramdialog.hxx | 2
dbaccess/source/ui/inc/querycontainerwindow.hxx | 14
dbaccess/source/ui/inc/querycontroller.hxx | 28 -
dbaccess/source/ui/inc/queryfilter.hxx | 4
dbaccess/source/ui/inc/queryview.hxx | 6
dbaccess/source/ui/inc/sbagrid.hxx | 8
dbaccess/source/ui/inc/sbamultiplex.hxx | 2
dbaccess/source/ui/inc/sqledit.hxx | 6
dbaccess/source/ui/inc/tabletree.hxx | 10
dbaccess/source/ui/inc/unodatbr.hxx | 76 ++--
dbaccess/source/ui/misc/DExport.cxx | 60 +--
dbaccess/source/ui/misc/HtmlReader.cxx | 48 +-
dbaccess/source/ui/misc/RowSetDrop.cxx | 24 -
dbaccess/source/ui/misc/RtfReader.cxx | 22 -
dbaccess/source/ui/misc/TableCopyHelper.cxx | 26 -
dbaccess/source/ui/misc/TokenWriter.cxx | 74 ++--
dbaccess/source/ui/misc/ToolBoxHelper.cxx | 2
dbaccess/source/ui/misc/UITools.cxx | 106 +++---
dbaccess/source/ui/misc/WCPage.cxx | 36 +-
dbaccess/source/ui/misc/WColumnSelect.cxx | 20 -
dbaccess/source/ui/misc/WCopyTable.cxx | 70 ++--
dbaccess/source/ui/misc/WExtendPages.cxx | 2
dbaccess/source/ui/misc/WNameMatch.cxx | 32 -
dbaccess/source/ui/misc/WTypeSelect.cxx | 30 -
dbaccess/source/ui/misc/databaseobjectview.cxx | 2
dbaccess/source/ui/misc/datasourceconnector.cxx | 2
dbaccess/source/ui/misc/indexcollection.cxx | 14
dbaccess/source/ui/misc/uiservices.cxx | 4
dbaccess/source/ui/querydesign/ConnectionLine.cxx | 8
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx | 14
dbaccess/source/ui/querydesign/JAccess.cxx | 2
dbaccess/source/ui/querydesign/JoinController.cxx | 6
dbaccess/source/ui/querydesign/JoinExchange.cxx | 8
dbaccess/source/ui/querydesign/JoinTableView.cxx | 118 +++---
dbaccess/source/ui/querydesign/QTableConnection.cxx | 6
dbaccess/source/ui/querydesign/QTableConnection.hxx | 8
dbaccess/source/ui/querydesign/QTableConnectionData.cxx | 4
dbaccess/source/ui/querydesign/QTableConnectionData.hxx | 2
dbaccess/source/ui/querydesign/QTableWindow.cxx | 14
dbaccess/source/ui/querydesign/QTableWindow.hxx | 8
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 186 +++++-----
dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx | 22 -
dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx | 4
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx | 4
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx | 4
dbaccess/source/ui/querydesign/QueryTableView.cxx | 58 +--
dbaccess/source/ui/querydesign/QueryTextView.cxx | 14
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 22 -
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 206 ++++++------
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 62 +--
dbaccess/source/ui/querydesign/TableConnection.cxx | 8
dbaccess/source/ui/querydesign/TableConnectionData.cxx | 12
dbaccess/source/ui/querydesign/TableFieldDescription.cxx | 10
dbaccess/source/ui/querydesign/TableWindow.cxx | 36 +-
dbaccess/source/ui/querydesign/TableWindowAccess.cxx | 2
dbaccess/source/ui/querydesign/TableWindowData.cxx | 6
dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 14
dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 2
dbaccess/source/ui/querydesign/querycontroller.cxx | 50 +-
dbaccess/source/ui/querydesign/querydlg.cxx | 12
dbaccess/source/ui/querydesign/querydlg.hxx | 2
dbaccess/source/ui/relationdesign/RTableConnectionData.cxx | 24 -
dbaccess/source/ui/relationdesign/RelationController.cxx | 12
dbaccess/source/ui/relationdesign/RelationTableView.cxx | 14
dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 8
dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx | 10
dbaccess/source/ui/tabledesign/FieldDescriptions.cxx | 38 +-
dbaccess/source/ui/tabledesign/TEditControl.cxx | 104 +++---
dbaccess/source/ui/tabledesign/TEditControl.hxx | 44 +-
dbaccess/source/ui/tabledesign/TableController.cxx | 118 +++---
dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 8
dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx | 10
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 16
dbaccess/source/ui/tabledesign/TableFieldControl.cxx | 10
dbaccess/source/ui/tabledesign/TableFieldControl.hxx | 6
dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 10
dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx | 10
dbaccess/source/ui/tabledesign/TableRow.cxx | 8
dbaccess/source/ui/tabledesign/TableUndo.cxx | 8
dbaccess/source/ui/uno/ColumnModel.cxx | 2
dbaccess/source/ui/uno/ColumnModel.hxx | 2
dbaccess/source/ui/uno/ColumnPeer.cxx | 8
dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 4
dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 4
dbaccess/source/ui/uno/copytablewizard.cxx | 12
dbaccess/source/ui/uno/dbinteraction.cxx | 12
dbaccess/source/ui/uno/dbinteraction.hxx | 2
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 4
362 files changed, 3360 insertions(+), 3360 deletions(-)
New commits:
commit fee4efcb54c8162955f6fe626d9b68c3b74b3068
Author: Noel Grandin <noel at peralex.com>
Date: Thu Apr 17 11:16:55 2014 +0200
dbaccess: sal_Bool->bool
Change-Id: Ieb52470f9638b74898954db3890aaf2cf202290a
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index 5194ca3..37958b0 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -54,13 +54,13 @@ Any SAL_CALL OBookmarkSet::getBookmark() throw(SQLException, RuntimeException)
return m_xRowLocate->getBookmark();
}
-sal_Bool SAL_CALL OBookmarkSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
+bool SAL_CALL OBookmarkSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OBookmarkSet::moveToBookmark" );
return m_xRowLocate->moveToBookmark(bookmark);
}
-sal_Bool SAL_CALL OBookmarkSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException)
+bool SAL_CALL OBookmarkSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OBookmarkSet::moveRelativeToBookmark" );
return m_xRowLocate->moveRelativeToBookmark(bookmark,rows);
@@ -72,7 +72,7 @@ sal_Int32 SAL_CALL OBookmarkSet::compareBookmarks( const Any& _first, const Any&
return m_xRowLocate->compareBookmarks(_first,_second);
}
-sal_Bool SAL_CALL OBookmarkSet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OBookmarkSet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OBookmarkSet::hasOrderedBookmarks" );
return m_xRowLocate->hasOrderedBookmarks();
diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx
index 62b5140..2f86adc 100644
--- a/dbaccess/source/core/api/BookmarkSet.hxx
+++ b/dbaccess/source/core/api/BookmarkSet.hxx
@@ -44,10 +44,10 @@ namespace dbaccess
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 sal_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_Bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) 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 bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) 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 sal_Bool SAL_CALL hasOrderedBookmarks( ) 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::sdbcx::XDeleteRows
virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ,const connectivity::OSQLTable& _xTable) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index c9bf7a1..f0de794 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -131,7 +131,7 @@ void SAL_CALL ORowSetDataColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHan
break;
case PROPERTY_ID_ISREADONLY:
{
- sal_Bool bVal = sal_False;
+ bool bVal = false;
rValue >>= bVal;
m_isReadOnly.reset(bVal);
}
@@ -147,7 +147,7 @@ sal_Bool SAL_CALL ORowSetDataColumn::convertFastPropertyValue( Any & rConvertedV
sal_Int32 nHandle,
const Any& rValue ) throw (IllegalArgumentException)
{
- sal_Bool bModified = sal_False;
+ bool bModified = false;
switch( nHandle )
{
case PROPERTY_ID_VALUE:
@@ -198,7 +198,7 @@ void ORowSetDataColumn::fireValueChange(const ORowSetValue& _rOldValue)
}
ORowSetDataColumns::ORowSetDataColumns(
- sal_Bool _bCase,
+ bool _bCase,
const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,
::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx
index 18d3b92..bd6e641 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx
@@ -84,7 +84,7 @@ namespace dbaccess
virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
public:
ORowSetDataColumns(
- sal_Bool _bCase,
+ bool _bCase,
const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,
::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index b3b7098..0523a64 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -58,9 +58,9 @@ using namespace ::osl;
OCacheSet::OCacheSet(sal_Int32 i_nMaxRows)
:m_nMaxRows(i_nMaxRows)
- ,m_bInserted(sal_False)
- ,m_bUpdated(sal_False)
- ,m_bDeleted(sal_False)
+ ,m_bInserted(false)
+ ,m_bUpdated(false)
+ ,m_bDeleted(false)
{
SAL_INFO("dbaccess", "OCacheSet::OCacheSet" );
@@ -530,32 +530,32 @@ Reference< XArray > SAL_CALL OCacheSet::getArray( sal_Int32 columnIndex ) throw(
}
// XResultSet
-sal_Bool SAL_CALL OCacheSet::next( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::next( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OCacheSet::next" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
return m_xDriverSet->next();
}
-sal_Bool SAL_CALL OCacheSet::isBeforeFirst( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::isBeforeFirst( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OCacheSet::isBeforeFirst" );
return m_xDriverSet->isBeforeFirst();
}
-sal_Bool SAL_CALL OCacheSet::isAfterLast( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::isAfterLast( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OCacheSet::isAfterLast" );
return m_xDriverSet->isAfterLast();
}
-sal_Bool SAL_CALL OCacheSet::isFirst( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::isFirst( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OCacheSet::isFirst" );
return m_xDriverSet->isFirst();
}
-sal_Bool SAL_CALL OCacheSet::isLast( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::isLast( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OCacheSet::isLast" );
return m_xDriverSet->isLast();
@@ -564,28 +564,28 @@ sal_Bool SAL_CALL OCacheSet::isLast( ) throw(SQLException, RuntimeException)
void SAL_CALL OCacheSet::beforeFirst( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OCacheSet::beforeFirst" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
m_xDriverSet->beforeFirst();
}
void SAL_CALL OCacheSet::afterLast( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OCacheSet::afterLast" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
m_xDriverSet->afterLast();
}
-sal_Bool SAL_CALL OCacheSet::first( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::first( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OCacheSet::first" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
return m_xDriverSet->first();
}
-sal_Bool SAL_CALL OCacheSet::last( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::last( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OCacheSet::last" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
return m_xDriverSet->last();
}
@@ -595,38 +595,38 @@ sal_Int32 SAL_CALL OCacheSet::getRow( ) throw(SQLException, RuntimeException)
return m_xDriverSet->getRow();
}
-sal_Bool SAL_CALL OCacheSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OCacheSet::absolute" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
return m_xDriverSet->absolute(row);
}
-sal_Bool SAL_CALL OCacheSet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OCacheSet::relative" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
return m_xDriverSet->relative(rows);
}
-sal_Bool SAL_CALL OCacheSet::previous( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::previous( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OCacheSet::previous" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
return m_xDriverSet->previous();
}
-sal_Bool OCacheSet::last_checked( sal_Bool /*i_bFetchRow*/)
+bool OCacheSet::last_checked( sal_Bool /*i_bFetchRow*/)
{
return last();
}
-sal_Bool OCacheSet::previous_checked( sal_Bool /*i_bFetchRow*/ )
+bool OCacheSet::previous_checked( sal_Bool /*i_bFetchRow*/ )
{
return previous();
}
-sal_Bool OCacheSet::absolute_checked( sal_Int32 row,sal_Bool /*i_bFetchRow*/ )
+bool OCacheSet::absolute_checked( sal_Int32 row,sal_Bool /*i_bFetchRow*/ )
{
return absolute(row);
}
@@ -637,19 +637,19 @@ void SAL_CALL OCacheSet::refreshRow( ) throw(SQLException, RuntimeException)
m_xDriverSet->refreshRow();
}
-sal_Bool SAL_CALL OCacheSet::rowUpdated( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::rowUpdated( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OCacheSet::rowUpdated" );
return m_xDriverSet->rowUpdated();
}
-sal_Bool SAL_CALL OCacheSet::rowInserted( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::rowInserted( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OCacheSet::rowInserted" );
return m_xDriverSet->rowInserted();
}
-sal_Bool SAL_CALL OCacheSet::rowDeleted( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::rowDeleted( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OCacheSet::rowDeleted" );
return m_xDriverSet->rowDeleted();
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index a06af91..a42c3ee 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -50,9 +50,9 @@ namespace dbaccess
ORowSetRow m_aInsertRow;
OUString m_aComposedTableName;
sal_Int32 m_nMaxRows;
- sal_Bool m_bInserted;
- sal_Bool m_bUpdated;
- sal_Bool m_bDeleted;
+ bool m_bInserted;
+ bool m_bUpdated;
+ bool m_bDeleted;
OUString m_sRowSetFilter;
OCacheSet(sal_Int32 i_nMaxRows);
@@ -100,30 +100,30 @@ namespace dbaccess
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 sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ 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 bool SAL_CALL isFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ virtual bool SAL_CALL isLast( ) 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 sal_Bool SAL_CALL first( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL last( ) 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 sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL previous( ) 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 relative( sal_Int32 rows ) 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 sal_Bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL rowDeleted( ) 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);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) 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 sal_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_Bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) 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 bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) 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 sal_Bool SAL_CALL hasOrderedBookmarks( ) 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::sdbcx::XDeleteRows
virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0;
@@ -141,9 +141,9 @@ namespace dbaccess
virtual bool columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow,const ORowSetValueVector::Vector& i_aRow);
virtual bool updateColumnValues(const ORowSetValueVector::Vector& io_aCachedRow,ORowSetValueVector::Vector& io_aRow,const ::std::vector<sal_Int32>& i_aChangedColumns);
virtual void fillMissingValues(ORowSetValueVector::Vector& io_aRow) const;
- virtual sal_Bool previous_checked( sal_Bool i_bFetchRow );
- virtual sal_Bool absolute_checked( sal_Int32 row,sal_Bool i_bFetchRow );
- virtual sal_Bool last_checked( sal_Bool i_bFetchRow);
+ virtual bool previous_checked( sal_Bool i_bFetchRow );
+ virtual bool absolute_checked( sal_Int32 row,sal_Bool i_bFetchRow );
+ virtual bool last_checked( sal_Bool i_bFetchRow);
};
}
#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_CACHESET_HXX
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index 25c356b..4264c7f 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -168,7 +168,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
// first, filter for the table names
sal_Int32 nTableFilterCount = _tableFilter.getLength();
- sal_Bool dontFilterTableNames = ( ( nTableFilterCount == 1 ) && _tableFilter[0] == "%" );
+ bool dontFilterTableNames = ( ( nTableFilterCount == 1 ) && _tableFilter[0] == "%" );
if( dontFilterTableNames )
{
aFilteredTables = _unfilteredTables;
@@ -198,7 +198,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
// second, filter for the table types
sal_Int32 nTableTypeFilterCount = _tableTypeFilter.getLength();
- sal_Bool dontFilterTableTypes = ( ( nTableTypeFilterCount == 1 ) && _tableTypeFilter[0] == "%" );
+ bool dontFilterTableTypes = ( ( nTableTypeFilterCount == 1 ) && _tableTypeFilter[0] == "%" );
dontFilterTableTypes = dontFilterTableTypes || ( nTableTypeFilterCount == 0 );
// (for TableTypeFilter, unlike TableFilter, "empty" means "do not filter at all")
if ( !dontFilterTableTypes )
@@ -238,12 +238,12 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
OFilteredContainer::OFilteredContainer(::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
const Reference< XConnection >& _xCon,
- sal_Bool _bCase,
+ bool _bCase,
IRefreshListener* _pRefreshListener,
::dbtools::IWarningsContainer* _pWarningsContainer
,oslInterlockedCount& _nInAppend)
:OCollection(_rParent,_bCase,_rMutex,::std::vector< OUString>())
- ,m_bConstructed(sal_False)
+ ,m_bConstructed(false)
,m_pWarningsContainer(_pWarningsContainer)
,m_pRefreshListener(_pRefreshListener)
,m_nInAppend(_nInAppend)
@@ -283,7 +283,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
reFill( lcl_filter( aUnfilteredTables,
_rTableFilter, _rTableTypeFilter, m_xMetaData, m_xMasterContainer ) );
- m_bConstructed = sal_True;
+ m_bConstructed = true;
}
else
{
@@ -334,7 +334,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
if ( tableType == tableTypeEnd )
{ // the only table type which can be part of this container is not allowed
// by the externally provided table type filter.
- m_bConstructed = sal_True;
+ m_bConstructed = true;
return;
}
}
@@ -392,7 +392,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
return;
}
- m_bConstructed = sal_True;
+ m_bConstructed = true;
}
void OFilteredContainer::disposing()
@@ -406,7 +406,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
m_xMetaData = NULL;
m_pWarningsContainer = NULL;
m_pRefreshListener = NULL;
- m_bConstructed = sal_False;
+ m_bConstructed = false;
}
void OFilteredContainer::impl_refresh() throw(RuntimeException)
@@ -414,7 +414,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
SAL_INFO("dbaccess", "api OFilteredContainer::impl_refresh" );
if ( m_pRefreshListener )
{
- m_bConstructed = sal_False;
+ m_bConstructed = false;
Reference<XRefreshable> xRefresh(m_xMasterContainer,UNO_QUERY);
if ( xRefresh.is() )
xRefresh->refresh();
diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx
index 54366b4..3015964 100644
--- a/dbaccess/source/core/api/HelperCollections.cxx
+++ b/dbaccess/source/core/api/HelperCollections.cxx
@@ -38,18 +38,18 @@ namespace dbaccess
using namespace ::osl;
OPrivateColumns::OPrivateColumns(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,
- sal_Bool _bCase,
+ bool _bCase,
::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
const ::std::vector< OUString> &_rVector,
- sal_Bool _bUseAsIndex
+ bool _bUseAsIndex
) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector,_bUseAsIndex)
,m_aColumns(_rColumns)
{
}
OPrivateColumns* OPrivateColumns::createWithIntrinsicNames( const ::rtl::Reference< ::connectivity::OSQLColumns >& _rColumns,
- sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex )
+ bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex )
{
::std::vector< OUString > aNames; aNames.reserve( _rColumns->get().size() );
@@ -63,7 +63,7 @@ namespace dbaccess
xColumn->getPropertyValue( PROPERTY_NAME ) >>= sColumName;
aNames.push_back( sColumName );
}
- return new OPrivateColumns( _rColumns, _bCase, _rParent, _rMutex, aNames, sal_False );
+ return new OPrivateColumns( _rColumns, _bCase, _rParent, _rMutex, aNames, false );
}
void SAL_CALL OPrivateColumns::disposing(void)
diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx
index 39a472e..5a74ad6 100644
--- a/dbaccess/source/core/api/HelperCollections.hxx
+++ b/dbaccess/source/core/api/HelperCollections.hxx
@@ -54,18 +54,18 @@ namespace dbaccess
}
public:
OPrivateColumns(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,
- sal_Bool _bCase,
+ bool _bCase,
::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
const ::std::vector< OUString> &_rVector,
- sal_Bool _bUseAsIndex = sal_False
+ bool _bUseAsIndex = false
);
/** creates a columns instance as above, but taking the names from the columns itself
*/
static OPrivateColumns* createWithIntrinsicNames(
const ::rtl::Reference< ::connectivity::OSQLColumns >& _rColumns,
- sal_Bool _bCase,
+ bool _bCase,
::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex
);
@@ -87,7 +87,7 @@ namespace dbaccess
}
public:
OPrivateTables( const OSQLTables& _rTables,
- sal_Bool _bCase,
+ bool _bCase,
::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
const ::std::vector< OUString> &_rVector
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 78f6a37..59a9755 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -121,7 +121,7 @@ OKeySet::OKeySet(const connectivity::OSQLTable& _xTable,
,m_xComposer(_xComposer)
,m_sUpdateTableName(_rUpdateTableName)
,m_rRowCount(o_nRowCount)
- ,m_bRowCountFinal(sal_False)
+ ,m_bRowCountFinal(false)
{
SAL_INFO("dbaccess", "OKeySet::OKeySet" );
@@ -218,7 +218,7 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable,
continue;
Reference<XPropertySet> xProp( xTblColumns->getByName( keyColumn->second.sRealName ), UNO_QUERY );
- sal_Bool bAuto = sal_False;
+ bool bAuto = false;
if ( ( xProp->getPropertyValue( PROPERTY_ISAUTOINCREMENT ) >>= bAuto ) && bAuto )
m_aAutoColumns.push_back( keyColumn->first );
}
@@ -342,7 +342,7 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet, const OUStrin
void OKeySet::reset(const Reference< XResultSet>& _xDriverSet)
{
OCacheSet::construct(_xDriverSet, m_sRowSetFilter);
- m_bRowCountFinal = sal_False;
+ m_bRowCountFinal = false;
m_aKeyMap.clear();
OKeySetValue keySetValue((ORowSetValueVector *)NULL,::std::pair<sal_Int32,Reference<XRow> >(0,(Reference<XRow>)NULL));
m_aKeyMap.insert(OKeySetMatrix::value_type(0,keySetValue));
@@ -433,19 +433,19 @@ Any SAL_CALL OKeySet::getBookmark() throw(SQLException, RuntimeException)
return makeAny(m_aKeyIter->first);
}
-sal_Bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::moveToBookmark" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(bookmark));
invalidateRow();
return m_aKeyIter != m_aKeyMap.end();
}
-sal_Bool SAL_CALL OKeySet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::moveRelativeToBookmark" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(bookmark));
if(m_aKeyIter != m_aKeyMap.end())
{
@@ -466,10 +466,10 @@ sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _sec
return (nFirst != nSecond) ? CompareBookmark::NOT_EQUAL : CompareBookmark::EQUAL;
}
-sal_Bool SAL_CALL OKeySet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::hasOrderedBookmarks" );
- return sal_True;
+ return true;
}
sal_Int32 SAL_CALL OKeySet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
@@ -547,7 +547,7 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows
}
}
- sal_Bool bOk = xPrep->executeUpdate() > 0;
+ bool bOk = xPrep->executeUpdate() > 0;
Sequence< sal_Int32 > aRet(rows.getLength());
memset(aRet.getArray(),bOk,sizeof(sal_Int32)*aRet.getLength());
if(bOk)
@@ -561,7 +561,7 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows
if(m_aKeyIter == m_aKeyMap.find(nPos) && m_aKeyIter != m_aKeyMap.end())
++m_aKeyIter;
m_aKeyMap.erase(nPos);
- m_bDeleted = sal_True;
+ m_bDeleted = true;
}
}
return aRet;
@@ -756,7 +756,7 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi
SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end();
sal_Int32 j = 1;
bool bRefetch = true;
- sal_Bool bModified = sal_False;
+ bool bModified = false;
for(;aIter != aEnd;++aIter,++j)
{
if((_rInsertRow->get())[aIter->second.nPosition].isModified())
@@ -767,7 +767,7 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi
}
aSql.append(::dbtools::quoteName( aQuote,aIter->second.sRealName) + aComma);
aValues.append(aPara);
- bModified = sal_True;
+ bModified = true;
}
}
if ( !bModified )
@@ -809,7 +809,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
}
m_bInserted = xPrep->executeUpdate() > 0;
- sal_Bool bAutoValuesFetched = sal_False;
+ bool bAutoValuesFetched = false;
if ( m_bInserted )
{
// first insert the default values into the insertrow
@@ -842,7 +842,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
if ( aFind != m_pKeyColumnNames->end() )
(_rInsertRow->get())[aFind->second.nPosition].fill(i, aFind->second.nType, xRow);
}
- bAutoValuesFetched = sal_True;
+ bAutoValuesFetched = true;
}
}
}
@@ -1081,14 +1081,14 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit
if(m_aKeyIter == m_aKeyMap.find(nBookmark) && m_aKeyIter != m_aKeyMap.end())
++m_aKeyIter;
m_aKeyMap.erase(nBookmark);
- m_bDeleted = sal_True;
+ m_bDeleted = true;
}
}
void SAL_CALL OKeySet::cancelRowUpdates( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::cancelRowUpdates" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
}
void SAL_CALL OKeySet::moveToInsertRow( ) throw(SQLException, RuntimeException)
@@ -1142,13 +1142,13 @@ Reference<XNameAccess> OKeySet::getKeyColumns() const
return xKeyColumns;
}
-sal_Bool SAL_CALL OKeySet::next( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::next( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::next" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
if(isAfterLast())
- return sal_False;
+ return false;
++m_aKeyIter;
if(!m_bRowCountFinal && m_aKeyIter == m_aKeyMap.end())
{
@@ -1171,19 +1171,19 @@ sal_Bool SAL_CALL OKeySet::next( ) throw(SQLException, RuntimeException)
return !isAfterLast();
}
-sal_Bool SAL_CALL OKeySet::isBeforeFirst( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::isBeforeFirst( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::isBeforeFirst" );
return m_aKeyIter == m_aKeyMap.begin();
}
-sal_Bool SAL_CALL OKeySet::isAfterLast( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::isAfterLast( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::isAfterLast" );
return m_bRowCountFinal && m_aKeyIter == m_aKeyMap.end();
}
-sal_Bool SAL_CALL OKeySet::isFirst( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::isFirst( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::isFirst" );
OKeySetMatrix::iterator aTemp = m_aKeyMap.begin();
@@ -1191,11 +1191,11 @@ sal_Bool SAL_CALL OKeySet::isFirst( ) throw(SQLException, RuntimeException)
return m_aKeyIter == aTemp && m_aKeyIter != m_aKeyMap.end();
}
-sal_Bool SAL_CALL OKeySet::isLast( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::isLast( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::isLast" );
if(!m_bRowCountFinal)
- return sal_False;
+ return false;
OKeySetMatrix::iterator aTemp = m_aKeyMap.end();
--aTemp;
@@ -1205,7 +1205,7 @@ sal_Bool SAL_CALL OKeySet::isLast( ) throw(SQLException, RuntimeException)
void SAL_CALL OKeySet::beforeFirst( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::beforeFirst" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
m_aKeyIter = m_aKeyMap.begin();
invalidateRow();
}
@@ -1213,16 +1213,16 @@ void SAL_CALL OKeySet::beforeFirst( ) throw(SQLException, RuntimeException)
void SAL_CALL OKeySet::afterLast( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::afterLast" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
fillAllRows();
m_aKeyIter = m_aKeyMap.end();
invalidateRow();
}
-sal_Bool SAL_CALL OKeySet::first( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::first( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::first" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
m_aKeyIter = m_aKeyMap.begin();
++m_aKeyIter;
if(m_aKeyIter == m_aKeyMap.end())
@@ -1238,15 +1238,15 @@ sal_Bool SAL_CALL OKeySet::first( ) throw(SQLException, RuntimeException)
return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin();
}
-sal_Bool SAL_CALL OKeySet::last( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::last( ) throw(SQLException, RuntimeException)
{
return last_checked(sal_True);
}
-sal_Bool OKeySet::last_checked( sal_Bool /* i_bFetchRow */ )
+bool OKeySet::last_checked( sal_Bool /* i_bFetchRow */ )
{
SAL_INFO("dbaccess", "OKeySet::last_checked" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
bool fetchedRow = fillAllRows();
m_aKeyIter = m_aKeyMap.end();
@@ -1267,15 +1267,15 @@ sal_Int32 SAL_CALL OKeySet::getRow( ) throw(SQLException, RuntimeException)
return ::std::distance(m_aKeyMap.begin(),m_aKeyIter);
}
-sal_Bool SAL_CALL OKeySet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
{
return absolute_checked(row,sal_True);
}
-sal_Bool OKeySet::absolute_checked( sal_Int32 row, sal_Bool /* i_bFetchRow */ )
+bool OKeySet::absolute_checked( sal_Int32 row, sal_Bool /* i_bFetchRow */ )
{
SAL_INFO("dbaccess", "OKeySet::absolute" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
OSL_ENSURE(row,"absolute(0) isn't allowed!");
bool fetchedRow = false;
if(row < 0)
@@ -1294,7 +1294,7 @@ sal_Bool OKeySet::absolute_checked( sal_Int32 row, sal_Bool /* i_bFetchRow */ )
if(!m_bRowCountFinal)
{
// but there may still be rows to fetch.
- sal_Bool bNext = sal_True;
+ bool bNext = true;
for(sal_Int32 i=m_aKeyMap.size()-1;i < row && bNext;++i)
bNext = fetchRow();
// it is guaranteed that the above loop has executed at least once,
@@ -1332,21 +1332,21 @@ sal_Bool OKeySet::absolute_checked( sal_Int32 row, sal_Bool /* i_bFetchRow */ )
return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin();
}
-sal_Bool SAL_CALL OKeySet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::relative" );
if(!rows)
{
invalidateRow();
- return sal_True;
+ return true;
}
return absolute(getRow()+rows);
}
-sal_Bool OKeySet::previous_checked( sal_Bool /* i_bFetchRow */ )
+bool OKeySet::previous_checked( sal_Bool /* i_bFetchRow */ )
{
SAL_INFO("dbaccess", "OKeySet::previous" );
- m_bInserted = m_bUpdated = m_bDeleted = sal_False;
+ m_bInserted = m_bUpdated = m_bDeleted = false;
if(m_aKeyIter != m_aKeyMap.begin())
{
--m_aKeyIter;
@@ -1355,7 +1355,7 @@ sal_Bool OKeySet::previous_checked( sal_Bool /* i_bFetchRow */ )
return m_aKeyIter != m_aKeyMap.begin();
}
-sal_Bool SAL_CALL OKeySet::previous( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::previous( ) throw(SQLException, RuntimeException)
{
return previous_checked(sal_True);
}
@@ -1419,7 +1419,7 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException)
return;
}
- sal_Bool bOK = doTryRefetch_throw();
+ bool bOK = doTryRefetch_throw();
if ( !bOK )
{
// This row has disappeared; remove it.
@@ -1462,11 +1462,11 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException)
}
}
-sal_Bool OKeySet::fetchRow()
+bool OKeySet::fetchRow()
{
SAL_INFO("dbaccess", "OKeySet::fetchRow" );
// fetch the next row and append on the keyset
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( !m_bRowCountFinal && (!m_nMaxRows || sal_Int32(m_aKeyMap.size()) < m_nMaxRows) )
bRet = m_xDriverSet->next();
if ( bRet )
@@ -1496,7 +1496,7 @@ sal_Bool OKeySet::fetchRow()
m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(m_aKeyMap.rbegin()->first+1,OKeySetValue(aKeyRow,::std::pair<sal_Int32,Reference<XRow> >(0,(Reference<XRow>)NULL)))).first;
}
else
- m_bRowCountFinal = sal_True;
+ m_bRowCountFinal = true;
return bRet;
}
@@ -1669,23 +1669,23 @@ Reference< XArray > SAL_CALL OKeySet::getArray( sal_Int32 columnIndex ) throw(SQ
return m_xRow->getArray(columnIndex);
}
-sal_Bool SAL_CALL OKeySet::rowUpdated( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::rowUpdated( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::rowUpdated" );
return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 2;
}
-sal_Bool SAL_CALL OKeySet::rowInserted( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::rowInserted( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::rowInserted" );
return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 1;
}
-sal_Bool SAL_CALL OKeySet::rowDeleted( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::rowDeleted( ) throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::rowDeleted" );
- sal_Bool bDeleted = m_bDeleted;
- m_bDeleted = sal_False;
+ bool bDeleted = m_bDeleted;
+ m_bDeleted = false;
return bDeleted;
}
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index d2e5c31..5cc816b 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -42,17 +42,17 @@ namespace dbaccess
sal_Int32 nPosition;
sal_Int32 nType;
sal_Int32 nScale;
- sal_Bool bNullable;
+ bool bNullable;
SelectColumnDescription()
:nPosition( 0 )
,nType( 0 )
,nScale( 0 )
- ,bNullable(sal_False)
+ ,bNullable(false)
{
}
- SelectColumnDescription( sal_Int32 _nPosition, sal_Int32 _nType, sal_Int32 _nScale,sal_Bool _bNullable, const OUString& _rDefaultValue )
+ SelectColumnDescription( sal_Int32 _nPosition, sal_Int32 _nType, sal_Int32 _nScale,bool _bNullable, const OUString& _rDefaultValue )
:sDefaultValue( _rDefaultValue )
,nPosition( _nPosition )
,nType( _nType )
@@ -109,7 +109,7 @@ namespace dbaccess
::std::vector< OUString > m_aFilterColumns;
sal_Int32& m_rRowCount;
- sal_Bool m_bRowCountFinal;
+ bool m_bRowCountFinal;
/** copies the values from the insert row into the key row
*
@@ -122,7 +122,7 @@ namespace dbaccess
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getKeyColumns() const;
// returns true if it did any work
bool fillAllRows();
- sal_Bool fetchRow();
+ bool fetchRow();
void invalidateRow();
void impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData);
@@ -185,35 +185,35 @@ namespace dbaccess
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 rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL rowDeleted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) 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 sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ 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 bool SAL_CALL isFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual bool SAL_CALL isLast( ) 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 sal_Bool SAL_CALL first( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL last( ) 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 sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL previous( ) 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 relative( sal_Int32 rows ) 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;
virtual 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 sal_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 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_Bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) 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 sal_Bool SAL_CALL hasOrderedBookmarks( ) 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;
@@ -228,9 +228,9 @@ namespace dbaccess
virtual void SAL_CALL moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool previous_checked( sal_Bool i_bFetchRow ) SAL_OVERRIDE;
- virtual sal_Bool absolute_checked( sal_Int32 row,sal_Bool i_bFetchRow ) SAL_OVERRIDE;
- virtual sal_Bool last_checked( sal_Bool i_bFetchRow) SAL_OVERRIDE;
+ virtual bool previous_checked( sal_Bool i_bFetchRow ) SAL_OVERRIDE;
+ virtual bool absolute_checked( sal_Int32 row,sal_Bool i_bFetchRow ) SAL_OVERRIDE;
+ virtual bool last_checked( sal_Bool i_bFetchRow) SAL_OVERRIDE;
};
}
#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_KEYSET_HXX
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 341cbf8..2a60e22 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -414,7 +414,7 @@ void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const OUString&
if(m_aKeyIter == m_aKeyMap.find(nBookmark) && m_aKeyIter != m_aKeyMap.end())
++m_aKeyIter;
m_aKeyMap.erase(nBookmark);
- m_bDeleted = sal_True;
+ m_bDeleted = true;
}
}
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 508489e..6eeb20b 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -107,7 +107,7 @@ extern "C" void SAL_CALL createRegistryInfo_ORowSet()
const Reference< XInterface >* pxInt = pxIntBegin + aListenerSeq.getLength(); \
\
_rGuard.clear(); \
- sal_Bool bCheck = sal_True; \
+ bool bCheck = true; \
while( pxInt > pxIntBegin && bCheck ) \
{ \
try \
@@ -145,18 +145,18 @@ ORowSet::ORowSet( const Reference< ::com::sun::star::uno::XComponentContext >& _
,m_nPrivileges(0)
,m_nLastKnownRowCount(0)
,m_nInAppend(0)
- ,m_bLastKnownRowCountFinal(sal_False)
- ,m_bUseEscapeProcessing(sal_True)
- ,m_bApplyFilter(sal_False)
- ,m_bCommandFacetsDirty( sal_True )
+ ,m_bLastKnownRowCountFinal(false)
+ ,m_bUseEscapeProcessing(true)
+ ,m_bApplyFilter(false)
+ ,m_bCommandFacetsDirty( true )
,m_bParametersDirty( true )
- ,m_bModified(sal_False)
- ,m_bRebuildConnOnExecute(sal_False)
- ,m_bIsBookmarkable(sal_True)
- ,m_bNew(sal_False)
- ,m_bCanUpdateInsertedRows(sal_True)
- ,m_bOwnConnection(sal_False)
- ,m_bPropChangeNotifyEnabled(sal_True)
+ ,m_bModified(false)
+ ,m_bRebuildConnOnExecute(false)
+ ,m_bIsBookmarkable(true)
+ ,m_bNew(false)
+ ,m_bCanUpdateInsertedRows(true)
+ ,m_bOwnConnection(false)
+ ,m_bPropChangeNotifyEnabled(true)
{
m_nResultSetType = ResultSetType::SCROLL_SENSITIVE;
m_nResultSetConcurrency = ResultSetConcurrency::UPDATABLE;
@@ -305,7 +305,7 @@ void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const
|| ( nHandle == PROPERTY_ID_USER )
)
{
- m_bCommandFacetsDirty = sal_True;
+ m_bCommandFacetsDirty = true;
}
@@ -315,11 +315,11 @@ void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const
// the new connection
{
Reference< XConnection > xNewConnection(m_aActiveConnection,UNO_QUERY);
- setActiveConnection(xNewConnection, sal_False);
+ setActiveConnection(xNewConnection, false);
}
- m_bOwnConnection = sal_False;
- m_bRebuildConnOnExecute = sal_False;
+ m_bOwnConnection = false;
+ m_bRebuildConnOnExecute = false;
break;
case PROPERTY_ID_DATASOURCENAME:
@@ -331,7 +331,7 @@ void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const
setFastPropertyValue(PROPERTY_ID_ACTIVE_CONNECTION, aNewConn);
}
else
- m_bRebuildConnOnExecute = sal_True;
+ m_bRebuildConnOnExecute = true;
break;
case PROPERTY_ID_FETCHSIZE:
if(m_pCache)
@@ -347,7 +347,7 @@ void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const
// are we active at the moment ?
if (m_xStatement.is())
// yes -> the next execute needs to rebuild our connection because of this new property
- m_bRebuildConnOnExecute = sal_True;
+ m_bRebuildConnOnExecute = true;
else
{ // no -> drop our active connection (if we have one) as it doesn't correspond to this new property value anymore
Reference< XConnection > xNewConn;
@@ -356,7 +356,7 @@ void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const
setFastPropertyValue(PROPERTY_ID_ACTIVE_CONNECTION, aNewConn);
}
}
- m_bOwnConnection = sal_True;
+ m_bOwnConnection = true;
break;
case PROPERTY_ID_TYPEMAP:
m_xTypeMap.set(m_aTypeMap, css::uno::UNO_QUERY);
@@ -589,23 +589,23 @@ void ORowSet::freeResources( bool _bComplete )
m_xTypeMap = NULL;
m_aBookmark = Any();
- m_bBeforeFirst = sal_True;
- m_bAfterLast = sal_False;
- m_bNew = sal_False;
- m_bModified = sal_False;
- m_bIsInsertRow = sal_False;
- m_bLastKnownRowCountFinal = sal_False;
+ m_bBeforeFirst = true;
+ m_bAfterLast = false;
+ m_bNew = false;
+ m_bModified = false;
+ m_bIsInsertRow = false;
+ m_bLastKnownRowCountFinal = false;
m_nLastKnownRowCount = 0;
if ( m_aOldRow.is() )
m_aOldRow->clearRow();
impl_disposeParametersContainer_nothrow();
- m_bCommandFacetsDirty = sal_True;
+ m_bCommandFacetsDirty = true;
}
}
-void ORowSet::setActiveConnection( Reference< XConnection >& _rxNewConn, sal_Bool _bFireEvent )
+void ORowSet::setActiveConnection( Reference< XConnection >& _rxNewConn, bool _bFireEvent )
{
if (_rxNewConn.get() == m_xActiveConnection.get())
// nothing to do
@@ -883,7 +883,7 @@ void SAL_CALL ORowSet::insertRow( ) throw(SQLException, RuntimeException, std::
throwFunctionSequenceException(*this);
// remember old value for fire
- sal_Bool bOld = m_bNew;
+ bool bOld = m_bNew;
ORowSetRow aOldValues;
if ( !m_aCurrentRow.isNull() )
@@ -893,14 +893,14 @@ void SAL_CALL ORowSet::insertRow( ) throw(SQLException, RuntimeException, std::
notifyAllListenersRowBeforeChange(aGuard,aEvt);
::std::vector< Any > aBookmarks;
- sal_Bool bInserted = m_pCache->insertRow(aBookmarks);
+ bool bInserted = m_pCache->insertRow(aBookmarks);
// make sure that our row is set to the new inserted row before clearing the insert flags in the cache
m_pCache->resetInsertRow(bInserted);
// notification order
// - column values
- setCurrentRow( sal_False, sal_True, aOldValues, aGuard ); // we don't move here
+ setCurrentRow( false, true, aOldValues, aGuard ); // we don't move here
// read-only flag restored
impl_restoreDataColumnsWriteable_throw();
@@ -916,7 +916,7 @@ void SAL_CALL ORowSet::insertRow( ) throw(SQLException, RuntimeException, std::
// - IsModified
if(!m_bModified)
- fireProperty(PROPERTY_ID_ISMODIFIED,sal_False,sal_True);
+ fireProperty(PROPERTY_ID_ISMODIFIED,false,true);
OSL_ENSURE( !m_bModified, "ORowSet::insertRow: just updated, but _still_ modified?" );
// - IsNew
@@ -962,7 +962,7 @@ void SAL_CALL ORowSet::updateRow( ) throw(SQLException, RuntimeException, std::
aEvt.Rows += aBookmarks.size();
m_aBookmark = m_pCache->getBookmark();
m_aCurrentRow = m_pCache->m_aMatrixIter;
- m_bIsInsertRow = sal_False;
+ m_bIsInsertRow = false;
if ( m_pCache->m_aMatrixIter != m_pCache->getEnd() && (*m_pCache->m_aMatrixIter).is() )
{
if ( m_pCache->isResultSetChanged() )
@@ -982,7 +982,7 @@ void SAL_CALL ORowSet::updateRow( ) throw(SQLException, RuntimeException, std::
// - IsModified
if(!m_bModified)
- fireProperty(PROPERTY_ID_ISMODIFIED,sal_False,sal_True);
+ fireProperty(PROPERTY_ID_ISMODIFIED,false,true);
OSL_ENSURE( !m_bModified, "ORowSet::updateRow: just updated, but _still_ modified?" );
// - RowCount/IsRowCountFinal
@@ -1046,7 +1046,7 @@ void SAL_CALL ORowSet::deleteRow( ) throw(SQLException, RuntimeException, std::
fireRowcount();
}
-void ORowSet::implCancelRowUpdates( sal_Bool _bNotifyModified ) SAL_THROW( ( SQLException, RuntimeException ) )
+void ORowSet::implCancelRowUpdates( bool _bNotifyModified ) SAL_THROW( ( SQLException, RuntimeException ) )
{
::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
@@ -1072,7 +1072,7 @@ void ORowSet::implCancelRowUpdates( sal_Bool _bNotifyModified ) SAL_THROW( ( SQL
m_aBookmark = m_pCache->getBookmark();
m_aCurrentRow = m_pCache->m_aMatrixIter;
- m_bIsInsertRow = sal_False;
+ m_bIsInsertRow = false;
m_aCurrentRow.setBookmark(m_aBookmark);
// notification order
@@ -1081,13 +1081,13 @@ void ORowSet::implCancelRowUpdates( sal_Bool _bNotifyModified ) SAL_THROW( ( SQL
{
// - column values
ORowSetBase::firePropertyChange(aOldValues);
- fireProperty(PROPERTY_ID_ISMODIFIED,sal_False,sal_True);
+ fireProperty(PROPERTY_ID_ISMODIFIED,false,true);
}
}
void SAL_CALL ORowSet::cancelRowUpdates( ) throw(SQLException, RuntimeException, std::exception)
{
- implCancelRowUpdates( sal_True );
+ implCancelRowUpdates( true );
}
void SAL_CALL ORowSet::addRowSetListener( const Reference< XRowSetListener >& listener ) throw(RuntimeException, std::exception)
@@ -1132,7 +1132,7 @@ void ORowSet::notifyAllListenersRowChanged(::osl::ResettableMutexGuard& _rGuard,
_rGuard.reset();
}
-sal_Bool ORowSet::notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard& _rGuard)
+bool ORowSet::notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard& _rGuard)
{
EventObject aEvt(*m_pMySelf);
NOTIFY_LISTERNERS_CHECK(m_aApproveListeners,XRowSetApproveListener,approveCursorMove);
@@ -1149,7 +1149,7 @@ void ORowSet::notifyAllListenersRowBeforeChange(::osl::ResettableMutexGuard& _rG
void ORowSet::fireRowcount()
{
sal_Int32 nCurrentRowCount( impl_getRowCount() );
- sal_Bool bCurrentRowCountFinal( m_pCache->m_bRowCountFinal );
+ bool bCurrentRowCountFinal( m_pCache->m_bRowCountFinal );
if ( m_nLastKnownRowCount != nCurrentRowCount )
{
@@ -1187,7 +1187,7 @@ void SAL_CALL ORowSet::moveToInsertRow( ) throw(SQLException, RuntimeException,
{
positionCache( MOVE_FORWARD );
m_pCache->next();
- setCurrentRow( sal_True, sal_False, aOldValues, aGuard);
+ setCurrentRow( true, false, aOldValues, aGuard);
}
else
positionCache( MOVE_NONE_REFRESH_ONLY );
@@ -1200,12 +1200,12 @@ void SAL_CALL ORowSet::moveToInsertRow( ) throw(SQLException, RuntimeException,
)
aOldValues = new ORowSetValueVector( *(*(m_pCache->m_aMatrixIter)) );
- const sal_Bool bNewState = m_bNew;
- const sal_Bool bModState = m_bModified;
+ const bool bNewState = m_bNew;
+ const bool bModState = m_bModified;
m_pCache->moveToInsertRow();
m_aCurrentRow = m_pCache->m_aInsertRow;
- m_bIsInsertRow = sal_True;
+ m_bIsInsertRow = true;
// set read-only flag to false
impl_setDataColumnsWriteable_throw();
@@ -1238,7 +1238,7 @@ void ORowSet::impl_setDataColumnsWriteable_throw()
::std::vector<bool, std::allocator<bool> >::iterator aReadIter = m_aReadOnlyDataColumns.begin();
for(;aIter != m_aDataColumns.end();++aIter,++aReadIter)
{
- sal_Bool bReadOnly = sal_False;
+ bool bReadOnly = false;
(*aIter)->getPropertyValue(PROPERTY_ISREADONLY) >>= bReadOnly;
*aReadIter = bReadOnly;
@@ -1253,7 +1253,7 @@ void ORowSet::impl_restoreDataColumnsWriteable_throw()
::std::vector<bool, std::allocator<bool> >::iterator aReadIter = m_aReadOnlyDataColumns.begin();
for(;aReadIter != m_aReadOnlyDataColumns.end();++aIter,++aReadIter)
{
- (*aIter)->setPropertyValue(PROPERTY_ISREADONLY,makeAny((sal_Bool)*aReadIter ));
+ (*aIter)->setPropertyValue(PROPERTY_ISREADONLY, makeAny( (bool)*aReadIter ) );
}
m_aReadOnlyDataColumns.clear();
}
@@ -1464,7 +1464,7 @@ void SAL_CALL ORowSet::executeWithCompletion( const Reference< XInteractionHandl
setActiveConnection( xXConnection );
}
calcConnection( _rxHandler );
- m_bRebuildConnOnExecute = sal_False;
+ m_bRebuildConnOnExecute = false;
Reference< XSingleSelectQueryComposer > xComposer = getCurrentSettingsComposer( this, m_aContext );
Reference<XParametersSupplier> xParameters(xComposer, UNO_QUERY);
@@ -1572,7 +1572,7 @@ void SAL_CALL ORowSet::execute( ) throw(SQLException, RuntimeException, std::ex
}
calcConnection(NULL);
- m_bRebuildConnOnExecute = sal_False;
+ m_bRebuildConnOnExecute = false;
// do the real execute
execute_NoApprove_NoNewConn(aGuard);
@@ -1587,7 +1587,7 @@ void ORowSet::setStatementResultSetType( const Reference< XPropertySet >& _rxSta
// there *might* be a data source setting which tells use to be more defensive with those settings
// #i15113#
- sal_Bool bRespectDriverRST = sal_False;
+ bool bRespectDriverRST = false;
Any aSetting;
if ( getDataSourceSetting( ::dbaccess::getDataSource( m_xActiveConnection ), "RespectDriverResultSetType", aSetting ) )
{
@@ -1708,7 +1708,7 @@ Reference< XResultSet > ORowSet::impl_prepareAndExecute_throw()
}
m_pCache->setFetchSize(m_nFetchSize);
m_aCurrentRow = m_pCache->createIterator(this);
- m_bIsInsertRow = sal_False;
+ m_bIsInsertRow = false;
m_aOldRow = m_pCache->registerOldRow();
return xResultSet;
@@ -1922,7 +1922,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
// retrieve the column number |i|
Reference<XPropertySet> xColumn;
{
- sal_Bool bReFetchName = sal_False;
+ bool bReFetchName = false;
if (m_xColumns->hasByName(sColumnLabel))
m_xColumns->getByName(sColumnLabel) >>= xColumn;
if (!xColumn.is() && m_xColumns->hasByName(sName))
@@ -1932,7 +1932,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
if ( aAllColumns.find( xColumn ) != aAllColumns.end() )
{
xColumn = NULL;
- bReFetchName = sal_True;
+ bReFetchName = true;
sColumnLabel = "";
}
if(!xColumn.is())
@@ -2202,7 +2202,7 @@ Reference< XConnection > ORowSet::calcConnection(const Reference< XInteractionH
}
}
setActiveConnection(xNewConn);
- m_bOwnConnection = sal_True;
+ m_bOwnConnection = true;
}
return m_xActiveConnection;
}
@@ -2225,7 +2225,7 @@ Reference< XNameAccess > ORowSet::impl_getTables_throw()
if ( !m_xActiveConnection.is() )
throw SQLException(DBA_RES(RID_STR_CONNECTION_INVALID),*this,SQLSTATE_GENERAL,1000,Any() );
- sal_Bool bCase = sal_True;
+ bool bCase = true;
try
{
Reference<XDatabaseMetaData> xMeta = m_xActiveConnection->getMetaData();
@@ -2263,9 +2263,9 @@ void ORowSet::impl_resetTables_nothrow()
DELETEZ( m_pTables );
}
-sal_Bool ORowSet::impl_initComposer_throw( OUString& _out_rCommandToExecute )
+bool ORowSet::impl_initComposer_throw( OUString& _out_rCommandToExecute )
{
- sal_Bool bUseEscapeProcessing = impl_buildActiveCommand_throw( );
+ bool bUseEscapeProcessing = impl_buildActiveCommand_throw( );
_out_rCommandToExecute = m_aActiveCommand;
if ( !bUseEscapeProcessing )
return bUseEscapeProcessing;
@@ -2312,17 +2312,17 @@ sal_Bool ORowSet::impl_initComposer_throw( OUString& _out_rCommandToExecute )
_out_rCommandToExecute = m_xComposer->getQueryWithSubstitution();
- m_bCommandFacetsDirty = sal_False;
+ m_bCommandFacetsDirty = false;
return bUseEscapeProcessing;
}
-sal_Bool ORowSet::impl_buildActiveCommand_throw()
+bool ORowSet::impl_buildActiveCommand_throw()
{
// create the sql command
// from a table name or get the command out of a query (not a view)
// the last use the command as it is
- sal_Bool bDoEscapeProcessing = m_bUseEscapeProcessing;
+ bool bDoEscapeProcessing = m_bUseEscapeProcessing;
m_aActiveCommand = "";
OUString sCommand;
@@ -2373,7 +2373,7 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw()
xQuery->getPropertyValue(PROPERTY_ESCAPE_PROCESSING) >>= bDoEscapeProcessing;
if ( bDoEscapeProcessing != m_bUseEscapeProcessing )
{
- sal_Bool bOldValue = m_bUseEscapeProcessing;
+ bool bOldValue = m_bUseEscapeProcessing;
m_bUseEscapeProcessing = bDoEscapeProcessing;
fireProperty(PROPERTY_ID_ESCAPE_PROCESSING,bOldValue,bDoEscapeProcessing);
}
@@ -2663,26 +2663,26 @@ void ORowSet::doCancelModification( )
impl_restoreDataColumnsWriteable_throw();
m_pCache->cancelRowModification();
}
- m_bModified = sal_False;
- m_bIsInsertRow = sal_False;
+ m_bModified = false;
+ m_bIsInsertRow = false;
}
-sal_Bool ORowSet::isModification( )
+bool ORowSet::isModification( )
{
return isNew();
}
-sal_Bool ORowSet::isModified( )
+bool ORowSet::isModified( )
{
return m_bModified;
}
-sal_Bool ORowSet::isNew( )
+bool ORowSet::isNew( )
{
return m_bNew;
}
-sal_Bool ORowSet::isPropertyChangeNotificationEnabled() const
+bool ORowSet::isPropertyChangeNotificationEnabled() const
{
return m_bPropChangeNotifyEnabled;
}
@@ -2693,7 +2693,7 @@ void ORowSet::checkUpdateIterator()
{
m_pCache->setUpdateIterator(m_aCurrentRow);
m_aCurrentRow = m_pCache->m_aInsertRow;
- m_bIsInsertRow = sal_True;
+ m_bIsInsertRow = true;
}
}
@@ -2721,7 +2721,7 @@ void SAL_CALL ORowSet::refreshRow( ) throw(SQLException, RuntimeException, std:
// notification order:
if ( m_bModified && m_pCache )
- implCancelRowUpdates( sal_False ); // do _not_ notify the IsModify - will do this ourself below
+ implCancelRowUpdates( false ); // do _not_ notify the IsModify - will do this ourself below
// - column values
ORowSetBase::refreshRow();
@@ -2757,13 +2757,13 @@ ORowSetClone::ORowSetClone( const Reference<XComponentContext>& _rContext, ORowS
,m_pParent(&rParent)
,m_nFetchDirection(rParent.m_nFetchDirection)
,m_nFetchSize(rParent.m_nFetchSize)
- ,m_bIsBookmarkable(sal_True)
+ ,m_bIsBookmarkable(true)
{
m_nResultSetType = rParent.m_nResultSetType;
m_nResultSetConcurrency = ResultSetConcurrency::READ_ONLY;
m_pMySelf = this;
- m_bClone = sal_True;
+ m_bClone = true;
m_bBeforeFirst = rParent.m_bBeforeFirst;
m_bAfterLast = rParent.m_bAfterLast;
m_pCache = rParent.m_pCache;
@@ -2960,19 +2960,19 @@ void ORowSetClone::doCancelModification( )
{
}
-sal_Bool ORowSetClone::isModification( )
+bool ORowSetClone::isModification( )
{
- return sal_False;
+ return false;
}
-sal_Bool ORowSetClone::isModified( )
+bool ORowSetClone::isModified( )
{
- return sal_False;
+ return false;
}
-sal_Bool ORowSetClone::isNew( )
+bool ORowSetClone::isNew( )
{
- return sal_False;
+ return false;
}
void SAL_CALL ORowSetClone::execute( ) throw(SQLException, RuntimeException, std::exception)
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index a793f50..e4cf71b 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -124,18 +124,18 @@ namespace dbaccess
sal_Int32 m_nPrivileges;
sal_Int32 m_nLastKnownRowCount;
oslInterlockedCount m_nInAppend;
- sal_Bool m_bLastKnownRowCountFinal;
- sal_Bool m_bUseEscapeProcessing ;
- sal_Bool m_bApplyFilter ;
- sal_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
- sal_Bool m_bModified ;
- sal_Bool m_bRebuildConnOnExecute ;
- sal_Bool m_bIsBookmarkable ;
- sal_Bool m_bNew ;
- sal_Bool m_bCanUpdateInsertedRows;
- sal_Bool m_bOwnConnection;
- sal_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
@@ -145,7 +145,7 @@ namespace dbaccess
from our own EscapeProcessing property, and possibly overruled by the respective property
of a query we're based on.
*/
- sal_Bool impl_buildActiveCommand_throw();
+ bool impl_buildActiveCommand_throw();
/** initializes our query composer, and everything which has to do with it
@@ -173,7 +173,7 @@ namespace dbaccess
@throws com::sun::star::uno::RuntimeException
if any of the components involved throws a com::sun::star::uno::RuntimeException
*/
- sal_Bool impl_initComposer_throw( OUString& _out_rCommandToExecute );
+ bool impl_initComposer_throw( OUString& _out_rCommandToExecute );
/** returns the table container of our active connection
@@ -232,15 +232,15 @@ namespace dbaccess
virtual void fireRowcount() SAL_OVERRIDE;
void notifyAllListenersRowBeforeChange(::osl::ResettableMutexGuard& _rGuard,const ::com::sun::star::sdb::RowChangeEvent &rEvt);
void notifyAllListenersRowChanged(::osl::ResettableMutexGuard& _rGuard,const ::com::sun::star::sdb::RowsChangeEvent& rEvt);
- virtual sal_Bool notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard& _rGuard) SAL_OVERRIDE;
+ virtual bool notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard& _rGuard) SAL_OVERRIDE;
virtual void notifyAllListenersCursorMoved(::osl::ResettableMutexGuard& _rGuard) SAL_OVERRIDE;
virtual void notifyAllListeners(::osl::ResettableMutexGuard& _rGuard) SAL_OVERRIDE;
- virtual void doCancelModification( ) SAL_OVERRIDE;
- virtual sal_Bool isModification( ) SAL_OVERRIDE;
- virtual sal_Bool isModified( ) SAL_OVERRIDE;
- virtual sal_Bool isNew( ) SAL_OVERRIDE;
- virtual sal_Bool isPropertyChangeNotificationEnabled() const SAL_OVERRIDE;
+ virtual void doCancelModification( ) SAL_OVERRIDE;
+ virtual bool isModification( ) SAL_OVERRIDE;
+ virtual bool isModified( ) SAL_OVERRIDE;
+ virtual bool isNew( ) SAL_OVERRIDE;
+ virtual bool isPropertyChangeNotificationEnabled() const SAL_OVERRIDE;
virtual ~ORowSet();
@@ -412,9 +412,9 @@ namespace dbaccess
void approveExecution() throw (::com::sun::star::sdb::RowSetVetoException, ::com::sun::star::uno::RuntimeException);
/// set m_xActiveConnection, fire a PropertyChangeEvent if necessary, do the event listener handling etc
- void setActiveConnection( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxNewConn, sal_Bool _bFireEvent = sal_True );
+ void setActiveConnection( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxNewConn, bool _bFireEvent = true );
- void implCancelRowUpdates( sal_Bool _bNotifyModified ) SAL_THROW( ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) );
+ void implCancelRowUpdates( bool _bNotifyModified ) SAL_THROW( ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) );
/** sets the given result set type/concurrency at the given statement, while respecting
possibly related data source settings
@@ -467,14 +467,14 @@ namespace dbaccess
ORowSet* m_pParent;
sal_Int32 m_nFetchDirection;
sal_Int32 m_nFetchSize;
- sal_Bool m_bIsBookmarkable;
+ bool m_bIsBookmarkable;
protected:
// the clone can not insert anything
virtual void doCancelModification( ) SAL_OVERRIDE;
- virtual sal_Bool isModification( ) SAL_OVERRIDE;
- virtual sal_Bool isModified( ) SAL_OVERRIDE;
- virtual sal_Bool isNew( ) SAL_OVERRIDE;
+ virtual bool isModification( ) SAL_OVERRIDE;
+ virtual bool isModified( ) SAL_OVERRIDE;
+ virtual bool isNew( ) 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;
public:
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 1049274..204e37e 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -88,11 +88,11 @@ ORowSetBase::ORowSetBase( const Reference<XComponentContext>& _rContext, ::cppu:
,m_nDeletedPosition(-1)
,m_nResultSetType( ResultSetType::FORWARD_ONLY )
,m_nResultSetConcurrency( ResultSetConcurrency::READ_ONLY )
- ,m_bClone(sal_False)
- ,m_bIgnoreResult(sal_False)
- ,m_bBeforeFirst(sal_True) // changed from sal_False
- ,m_bAfterLast(sal_False)
- ,m_bIsInsertRow(sal_False)
+ ,m_bClone(false)
+ ,m_bIgnoreResult(false)
+ ,m_bBeforeFirst(true) // changed from sal_False
+ ,m_bAfterLast(false)
+ ,m_bIsInsertRow(false)
{
SAL_INFO("dbaccess", "ORowSetBase::ORowSetBase" );
@@ -200,7 +200,7 @@ sal_Bool SAL_CALL ORowSetBase::wasNull( ) throw(SQLException, RuntimeException,
return impl_wasNull();
}
-sal_Bool ORowSetBase::impl_wasNull()
+bool ORowSetBase::impl_wasNull()
{
SAL_INFO("dbaccess", "ORowSetBase::impl_wasNull" );
return ((m_nLastColumnIndex != -1) && !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is()) ? ((*m_aCurrentRow)->get())[m_nLastColumnIndex].isNull() : sal_True;
@@ -233,7 +233,7 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex)
// currentrow is null when the clone moves the window
positionCache( MOVE_NONE_REFRESH_ONLY );
m_aCurrentRow = m_pCache->m_aMatrixIter;
- m_bIsInsertRow = sal_False;
+ m_bIsInsertRow = false;
OSL_ENSURE(!m_aCurrentRow.isNull(),"ORowSetBase::getValue: we don't stand on a valid row! Row is null.");
bValidCurrentRow = ( !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is() );
@@ -373,7 +373,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getBinaryS
{
positionCache( MOVE_NONE_REFRESH_ONLY );
m_aCurrentRow = m_pCache->m_aMatrixIter;
- m_bIsInsertRow = sal_False;
+ m_bIsInsertRow = false;
OSL_ENSURE(!m_aCurrentRow.isNull(),"ORowSetBase::getBinaryStream: we don't stand on a valid row! Row is null.");
bValidCurrentRow = ( !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is() );
@@ -464,11 +464,11 @@ sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLEx
checkCache();
- sal_Bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) );
+ bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) );
if ( bRet )
{
// check if we are inserting a row
- sal_Bool bWasNew = m_pCache->m_bNew || impl_rowDeleted();
+ bool bWasNew = m_pCache->m_bNew || impl_rowDeleted();
ORowSetNotifier aNotifier( this );
// this will call cancelRowModification on the cache if necessary
@@ -482,7 +482,7 @@ sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLEx
// notification order
// - column values
// - cursorMoved
- setCurrentRow( sal_True, sal_True, aOldValues, aGuard );
+ setCurrentRow( true, true, aOldValues, aGuard );
}
else
{
@@ -507,11 +507,11 @@ sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_
checkPositioningAllowed();
- sal_Bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) );
+ bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) );
if ( bRet )
{
// check if we are inserting a row
- sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted();
+ bool bWasNew = m_pCache->m_bNew || rowDeleted();
ORowSetNotifier aNotifier( this );
// this will call cancelRowModification on the cache if necessary
@@ -525,7 +525,7 @@ sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_
// notification order
// - column values
// - cursorMoved
- setCurrentRow( sal_True, sal_True, aOldValues, aGuard );
+ setCurrentRow( true, true, aOldValues, aGuard );
}
else
movementFailed();
@@ -614,11 +614,11 @@ sal_Bool SAL_CALL ORowSetBase::next( ) throw(SQLException, RuntimeException, st
::osl::ResettableMutexGuard aGuard( *m_pMutex );
checkCache();
- sal_Bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) );
+ bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) );
if ( bRet )
{
// check if we are inserting a row
- sal_Bool bWasNew = m_pCache->m_bNew || impl_rowDeleted();
+ bool bWasNew = m_pCache->m_bNew || impl_rowDeleted();
ORowSetNotifier aNotifier( this );
// this will call cancelRowModification on the cache if necessary
@@ -626,7 +626,7 @@ sal_Bool SAL_CALL ORowSetBase::next( ) throw(SQLException, RuntimeException, st
ORowSetRow aOldValues = getOldRow(bWasNew);
positionCache( MOVE_FORWARD );
- sal_Bool bAfterLast = m_pCache->isAfterLast();
+ bool bAfterLast = m_pCache->isAfterLast();
bRet = m_pCache->next();
doCancelModification( );
@@ -635,7 +635,7 @@ sal_Bool SAL_CALL ORowSetBase::next( ) throw(SQLException, RuntimeException, st
// notification order
// - column values
// - cursorMoved
- setCurrentRow( bRet, sal_True, aOldValues, aGuard );
+ setCurrentRow( bRet, true, aOldValues, aGuard );
OSL_ENSURE(!m_bBeforeFirst,"BeforeFirst is true. I don't know why?");
}
else
@@ -679,7 +679,7 @@ sal_Bool SAL_CALL ORowSetBase::isAfterLast( ) throw(SQLException, RuntimeExcept
return m_bAfterLast;
}
-sal_Bool ORowSetBase::isOnFirst()
+bool ORowSetBase::isOnFirst()
{
SAL_INFO("dbaccess", "ORowSetBase::isOnFirst" );
return isFirst();
@@ -700,13 +700,13 @@ sal_Bool SAL_CALL ORowSetBase::isFirst( ) throw(SQLException, RuntimeException,
if ( impl_rowDeleted() )
return ( m_nDeletedPosition == 1 );
- sal_Bool bIsFirst = m_pCache->isFirst();
+ bool bIsFirst = m_pCache->isFirst();
SAL_INFO("dbaccess", "DBACCESS ORowSetBase::isFirst() = " << bIsFirst << " Clone = " << m_bClone);
return bIsFirst;
}
-sal_Bool ORowSetBase::isOnLast()
+bool ORowSetBase::isOnLast()
{
SAL_INFO("dbaccess", "ORowSetBase::isOnLast" );
return isLast();
@@ -731,7 +731,7 @@ sal_Bool SAL_CALL ORowSetBase::isLast( ) throw(SQLException, RuntimeException,
return ( m_nDeletedPosition == impl_getRowCount() );
}
- sal_Bool bIsLast = m_pCache->isLast();
+ bool bIsLast = m_pCache->isLast();
SAL_INFO("dbaccess", "DBACCESS ORowSetBase::isLast() = " << bIsLast << " Clone = " << m_bClone);
return bIsLast;
@@ -747,7 +747,7 @@ void SAL_CALL ORowSetBase::beforeFirst( ) throw(SQLException, RuntimeException,
checkPositioningAllowed();
// check if we are inserting a row
- sal_Bool bWasNew = m_pCache->m_bNew || impl_rowDeleted();
+ bool bWasNew = m_pCache->m_bNew || impl_rowDeleted();
if((bWasNew || !m_bBeforeFirst) && notifyAllListenersCursorBeforeMove(aGuard) )
{
@@ -763,7 +763,7 @@ void SAL_CALL ORowSetBase::beforeFirst( ) throw(SQLException, RuntimeException,
// notification order
// - column values
// - cursorMoved
- setCurrentRow( sal_True, sal_True, aOldValues, aGuard );
+ setCurrentRow( true, true, aOldValues, aGuard );
// - IsModified
// - Isnew
@@ -788,7 +788,7 @@ void SAL_CALL ORowSetBase::afterLast( ) throw(SQLException, RuntimeException, s
::osl::ResettableMutexGuard aGuard( *m_pMutex );
checkPositioningAllowed();
- sal_Bool bWasNew = m_pCache->m_bNew || impl_rowDeleted();
+ bool bWasNew = m_pCache->m_bNew || impl_rowDeleted();
if((bWasNew || !m_bAfterLast) && notifyAllListenersCursorBeforeMove(aGuard) )
{
@@ -806,7 +806,7 @@ void SAL_CALL ORowSetBase::afterLast( ) throw(SQLException, RuntimeException, s
// notification order
// - column values
// - cursorMoved
- setCurrentRow( sal_True, sal_True, aOldValues, aGuard );
+ setCurrentRow( true, true, aOldValues, aGuard );
// - IsModified
// - Isnew
@@ -819,8 +819,8 @@ void SAL_CALL ORowSetBase::afterLast( ) throw(SQLException, RuntimeException, s
SAL_INFO("dbaccess", "DBACCESS ORowSetBase::afterLast() Clone = " << m_bClone);
}
-sal_Bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<sal_Bool,ORowSetBase>& _aCheckFunctor,
- ::std::mem_fun_t<sal_Bool,ORowSetCache>& _aMovementFunctor)
+bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<bool,ORowSetBase>& _aCheckFunctor,
+ ::std::mem_fun_t<bool,ORowSetCache>& _aMovementFunctor)
{
SAL_INFO("dbaccess", "ORowSetBase::move" );
SAL_INFO("dbaccess", "DBACCESS ORowSetBase::move() Clone = " << m_bClone);
@@ -828,18 +828,18 @@ sal_Bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<sal_Bool,ORowSetBase>&
::osl::ResettableMutexGuard aGuard( *m_pMutex );
checkPositioningAllowed();
- sal_Bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) );
+ bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) );
if( bRet )
{
// check if we are inserting a row
- sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted();
+ bool bWasNew = m_pCache->m_bNew || rowDeleted();
ORowSetNotifier aNotifier( this );
// this will call cancelRowModification on the cache if necessary
ORowSetRow aOldValues = getOldRow(bWasNew);
- sal_Bool bMoved = ( bWasNew || !_aCheckFunctor(this) );
+ bool bMoved = ( bWasNew || !_aCheckFunctor(this) );
bRet = _aMovementFunctor(m_pCache);
doCancelModification( );
@@ -849,7 +849,7 @@ sal_Bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<sal_Bool,ORowSetBase>&
// notification order
// - column values
// - cursorMoved
- setCurrentRow( bMoved, sal_True, aOldValues, aGuard );
+ setCurrentRow( bMoved, true, aOldValues, aGuard );
}
else
{ // first goes wrong so there is no row
@@ -871,8 +871,8 @@ sal_Bool SAL_CALL ORowSetBase::first( ) throw(SQLException, RuntimeException, s
{
SAL_INFO("dbaccess", "ORowSetBase::first" );
SAL_INFO("dbaccess", "DBACCESS ORowSetBase::first() Clone = " << m_bClone);
- ::std::mem_fun_t<sal_Bool,ORowSetBase> ioF_tmp(&ORowSetBase::isOnFirst);
- ::std::mem_fun_t<sal_Bool,ORowSetCache> F_tmp(&ORowSetCache::first);
+ ::std::mem_fun_t<bool,ORowSetBase> ioF_tmp(&ORowSetBase::isOnFirst);
+ ::std::mem_fun_t<bool,ORowSetCache> F_tmp(&ORowSetCache::first);
return move(ioF_tmp,F_tmp);
}
@@ -880,8 +880,8 @@ sal_Bool SAL_CALL ORowSetBase::last( ) throw(SQLException, RuntimeException, st
{
SAL_INFO("dbaccess", "ORowSetBase::last" );
SAL_INFO("dbaccess", "DBACCESS ORowSetBase::last() Clone = " << m_bClone);
- ::std::mem_fun_t<sal_Bool,ORowSetBase> ioL_tmp(&ORowSetBase::isOnLast);
- ::std::mem_fun_t<sal_Bool,ORowSetCache> L_tmp(&ORowSetCache::last);
+ ::std::mem_fun_t<bool,ORowSetBase> ioL_tmp(&ORowSetBase::isOnLast);
+ ::std::mem_fun_t<bool,ORowSetCache> L_tmp(&ORowSetCache::last);
return move(ioL_tmp,L_tmp);
}
@@ -930,12 +930,12 @@ sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) throw(SQLException, Run
::osl::ResettableMutexGuard aGuard( *m_pMutex );
checkPositioningAllowed();
- sal_Bool bRet = ( row > 0 )
+ bool bRet = ( row > 0 )
&& notifyAllListenersCursorBeforeMove( aGuard );
if ( bRet )
{
// check if we are inserting a row
- sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted();
+ bool bWasNew = m_pCache->m_bNew || rowDeleted();
ORowSetNotifier aNotifier( this );
// this will call cancelRowModification on the cache if necessary
@@ -950,7 +950,7 @@ sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) throw(SQLException, Run
// notification order
// - column values
// - cursorMoved
- setCurrentRow( sal_True, sal_True, aOldValues, aGuard );
+ setCurrentRow( true, true, aOldValues, aGuard );
}
else
{ // absolute movement goes wrong we stand left or right side of the rows
@@ -981,7 +981,7 @@ sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, Ru
checkPositioningAllowed();
- sal_Bool bRet =
+ bool bRet =
( ( !m_bAfterLast || rows <= 0 )
&& ( !m_bBeforeFirst || rows >= 0 )
&& notifyAllListenersCursorBeforeMove( aGuard )
@@ -990,7 +990,7 @@ sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, Ru
if ( bRet )
{
// check if we are inserting a row
- sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted();
+ bool bWasNew = m_pCache->m_bNew || rowDeleted();
ORowSetNotifier aNotifier( this );
// this will call cancelRowModification on the cache if necessary
@@ -1006,7 +1006,7 @@ sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, Ru
// notification order
// - column values
// - cursorMoved
- setCurrentRow( sal_True, sal_True, aOldValues, aGuard );
+ setCurrentRow( true, true, aOldValues, aGuard );
}
else
{
@@ -1033,13 +1033,13 @@ sal_Bool SAL_CALL ORowSetBase::previous( ) throw(SQLException, RuntimeException
checkPositioningAllowed();
- sal_Bool bRet = !m_bBeforeFirst
+ bool bRet = !m_bBeforeFirst
&& notifyAllListenersCursorBeforeMove(aGuard);
if ( bRet )
{
// check if we are inserting a row
- sal_Bool bWasNew = m_pCache->m_bNew || rowDeleted();
+ bool bWasNew = m_pCache->m_bNew || rowDeleted();
ORowSetNotifier aNotifier( this );
// this will call cancelRowModification on the cache if necessary
@@ -1056,7 +1056,7 @@ sal_Bool SAL_CALL ORowSetBase::previous( ) throw(SQLException, RuntimeException
// notification order
// - column values
// - cursorMoved
- setCurrentRow( sal_True, sal_True, aOldValues, aGuard );
+ setCurrentRow( true, true, aOldValues, aGuard );
}
else
{
@@ -1077,7 +1077,7 @@ sal_Bool SAL_CALL ORowSetBase::previous( ) throw(SQLException, RuntimeException
return bRet;
}
-void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const ORowSetRow& _rOldValues, ::osl::ResettableMutexGuard& _rGuard )
+void ORowSetBase::setCurrentRow( bool _bMoved, bool _bDoNotify, const ORowSetRow& _rOldValues, ::osl::ResettableMutexGuard& _rGuard )
{
SAL_INFO("dbaccess", "ORowSetBase::setCurrentRow" );
SAL_INFO("dbaccess", "DBACCESS ORowSetBase::setCurrentRow() Clone = " << m_bClone);
@@ -1089,7 +1089,7 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR
m_aBookmark = m_pCache->getBookmark();
OSL_ENSURE(m_aBookmark.hasValue(),"Bookmark has no value!");
m_aCurrentRow = m_pCache->m_aMatrixIter;
- m_bIsInsertRow = sal_False;
+ m_bIsInsertRow = false;
OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is null!");
m_aCurrentRow.setBookmark(m_aBookmark);
OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd(),"Position of matrix iterator isn't valid!");
@@ -1097,7 +1097,7 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR
OSL_ENSURE(m_aBookmark.hasValue(),"Bookmark has no value!");
m_aCurrentRow = m_pCache->m_aMatrixIter;
- m_bIsInsertRow = sal_False;
+ m_bIsInsertRow = false;
OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!");
#if OSL_DEBUG_LEVEL > 0
ORowSetRow rRow = (*m_aCurrentRow);
@@ -1108,7 +1108,7 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR
{
positionCache( MOVE_NONE_REFRESH_ONLY );
m_aCurrentRow = m_pCache->m_aMatrixIter;
- m_bIsInsertRow = sal_False;
+ m_bIsInsertRow = false;
OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!");
}
}
@@ -1160,7 +1160,7 @@ void SAL_CALL ORowSetBase::refreshRow( ) throw(SQLException, RuntimeException,
if(!(m_bBeforeFirst || m_bAfterLast))
{
- sal_Bool bWasNew = m_pCache->m_bNew || impl_rowDeleted();
+ bool bWasNew = m_pCache->m_bNew || impl_rowDeleted();
ORowSetRow aOldValues = getOldRow(bWasNew);
positionCache( MOVE_NONE_REFRESH_ONLY );
m_pCache->refreshRow();
@@ -1201,7 +1201,7 @@ sal_Bool SAL_CALL ORowSetBase::rowDeleted( ) throw(SQLException, RuntimeExcepti
return impl_rowDeleted();
}
-sal_Bool ORowSetBase::impl_rowDeleted( )
+bool ORowSetBase::impl_rowDeleted( )
{
return !m_aBookmark.hasValue() && !m_bBeforeFirst && !m_bAfterLast;
}
@@ -1268,10 +1268,10 @@ void ORowSetBase::fireRowcount()
SAL_INFO("dbaccess", "ORowSetBase::fireRowcount" );
}
-sal_Bool ORowSetBase::notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard& /*_rGuard*/)
+bool ORowSetBase::notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard& /*_rGuard*/)
{
SAL_INFO("dbaccess", "ORowSetBase::notifyAllListenersCursorBeforeMove" );
- return sal_True;
+ return true;
}
void ORowSetBase::notifyAllListenersCursorMoved(::osl::ResettableMutexGuard& /*_rGuard*/)
@@ -1284,12 +1284,12 @@ void ORowSetBase::notifyAllListeners(::osl::ResettableMutexGuard& /*_rGuard*/)
SAL_INFO("dbaccess", "ORowSetBase::notifyAllListeners" );
}
-sal_Bool ORowSetBase::isPropertyChangeNotificationEnabled() const
+bool ORowSetBase::isPropertyChangeNotificationEnabled() const
{
- return sal_True;
+ return true;
}
-void ORowSetBase::fireProperty( sal_Int32 _nProperty, sal_Bool _bNew, sal_Bool _bOld )
+void ORowSetBase::fireProperty( sal_Int32 _nProperty, bool _bNew, bool _bOld )
{
SAL_INFO("dbaccess", "ORowSetBase::fireProperty" );
Any aNew = css::uno::makeAny( _bNew );
@@ -1302,14 +1302,14 @@ void ORowSetBase::positionCache( CursorMoveDirection _ePrepareForDirection )
SAL_INFO("dbaccess", "ORowSetBase::positionCache" );
SAL_INFO("dbaccess", "DBACCESS ORowSetBase::positionCache() Clone = " << m_bClone);
- sal_Bool bSuccess = sal_False;
+ bool bSuccess = false;
if ( m_aBookmark.hasValue() )
{
if ( _ePrepareForDirection == MOVE_NONE_REFRESH_ONLY ||
m_pCache->compareBookmarks( m_aBookmark, m_pCache->getBookmark() ) != CompareBookmark::EQUAL )
bSuccess = m_pCache->moveToBookmark( m_aBookmark );
else
- bSuccess = sal_True;
+ bSuccess = true;
}
else
{
@@ -1332,7 +1332,7 @@ void ORowSetBase::positionCache( CursorMoveDirection _ePrepareForDirection )
else
{
m_pCache->beforeFirst();
- bSuccess = sal_True;
+ bSuccess = true;
}
break;
@@ -1340,14 +1340,14 @@ void ORowSetBase::positionCache( CursorMoveDirection _ePrepareForDirection )
if ( m_pCache->m_bRowCountFinal && ( m_nDeletedPosition == impl_getRowCount() ) )
{
m_pCache->afterLast();
- bSuccess = sal_True;
+ bSuccess = true;
}
else
bSuccess = m_pCache->absolute( m_nDeletedPosition );
break;
case MOVE_NONE_REFRESH_ONLY:
- bSuccess = sal_False; // will be asserted below
+ bSuccess = false; // will be asserted below
break;
}
}
@@ -1380,7 +1380,7 @@ void ORowSetBase::movementFailed()
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list