[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang dbaccess/source
Luboš Luňák
l.lunak at suse.cz
Tue Aug 27 09:13:26 PDT 2013
compilerplugins/clang/store/valueof.cxx | 148 ++++++
compilerplugins/clang/valueof.cxx | 148 ------
dbaccess/source/core/api/BookmarkSet.cxx | 1
dbaccess/source/core/api/CIndexes.cxx | 1
dbaccess/source/core/api/CRowSetColumn.cxx | 1
dbaccess/source/core/api/CRowSetDataColumn.cxx | 1
dbaccess/source/core/api/CacheSet.cxx | 1
dbaccess/source/core/api/FilteredContainer.cxx | 5
dbaccess/source/core/api/HelperCollections.hxx | 4
dbaccess/source/core/api/KeySet.cxx | 11
dbaccess/source/core/api/OptimisticSet.cxx | 2
dbaccess/source/core/api/RowSet.cxx | 2
dbaccess/source/core/api/RowSetBase.cxx | 14
dbaccess/source/core/api/RowSetBase.hxx | 3
dbaccess/source/core/api/RowSetCache.cxx | 1
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 8
dbaccess/source/core/api/StaticSet.cxx | 1
dbaccess/source/core/api/TableDeco.cxx | 5
dbaccess/source/core/api/View.cxx | 6
dbaccess/source/core/api/WrappedResultSet.cxx | 1
dbaccess/source/core/api/column.cxx | 13
dbaccess/source/core/api/columnsettings.cxx | 9
dbaccess/source/core/api/datacolumn.cxx | 1
dbaccess/source/core/api/datasettings.cxx | 7
dbaccess/source/core/api/definitioncolumn.cxx | 26 -
dbaccess/source/core/api/preparedstatement.cxx | 1
dbaccess/source/core/api/query.cxx | 6
dbaccess/source/core/api/query.hxx | 11
dbaccess/source/core/api/querycomposer.cxx | 1
dbaccess/source/core/api/querycontainer.cxx | 6
dbaccess/source/core/api/querydescriptor.cxx | 4
dbaccess/source/core/api/querydescriptor.hxx | 9
dbaccess/source/core/api/resultcolumn.cxx | 1
dbaccess/source/core/api/resultset.cxx | 1
dbaccess/source/core/api/table.cxx | 6
dbaccess/source/core/api/tablecontainer.cxx | 7
dbaccess/source/core/api/viewcontainer.cxx | 5
dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 9
dbaccess/source/core/dataaccess/ComponentDefinition.hxx | 9
dbaccess/source/core/dataaccess/ContentHelper.cxx | 11
dbaccess/source/core/dataaccess/ModelImpl.cxx | 14
dbaccess/source/core/dataaccess/ModelImpl.hxx | 13
dbaccess/source/core/dataaccess/SharedConnection.cxx | 1
dbaccess/source/core/dataaccess/SharedConnection.hxx | 11
dbaccess/source/core/dataaccess/bookmarkcontainer.cxx | 7
dbaccess/source/core/dataaccess/bookmarkcontainer.hxx | 8
dbaccess/source/core/dataaccess/commandcontainer.cxx | 6
dbaccess/source/core/dataaccess/commandcontainer.hxx | 5
dbaccess/source/core/dataaccess/commanddefinition.cxx | 7
dbaccess/source/core/dataaccess/commanddefinition.hxx | 10
dbaccess/source/core/dataaccess/connection.cxx | 10
dbaccess/source/core/dataaccess/connection.hxx | 12
dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx | 11
dbaccess/source/core/dataaccess/databasecontext.cxx | 6
dbaccess/source/core/dataaccess/databasecontext.hxx | 10
dbaccess/source/core/dataaccess/databasedocument.cxx | 16
dbaccess/source/core/dataaccess/databasedocument.hxx | 12
dbaccess/source/core/dataaccess/databaseregistrations.cxx | 14
dbaccess/source/core/dataaccess/datasource.cxx | 17
dbaccess/source/core/dataaccess/datasource.hxx | 6
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 12
dbaccess/source/core/dataaccess/documentcontainer.cxx | 16
dbaccess/source/core/dataaccess/documentcontainer.hxx | 4
dbaccess/source/core/dataaccess/documentdefinition.cxx | 43 -
dbaccess/source/core/dataaccess/documentdefinition.hxx | 8
dbaccess/source/core/dataaccess/documenteventexecutor.cxx | 10
dbaccess/source/core/dataaccess/documenteventexecutor.hxx | 4
dbaccess/source/core/dataaccess/documenteventnotifier.cxx | 14
dbaccess/source/core/dataaccess/documenteventnotifier.hxx | 4
dbaccess/source/core/dataaccess/documentevents.cxx | 14
dbaccess/source/core/dataaccess/documentevents.hxx | 4
dbaccess/source/core/dataaccess/intercept.cxx | 1
dbaccess/source/core/dataaccess/myucp_datasupplier.cxx | 21
dbaccess/source/core/dataaccess/myucp_resultset.cxx | 12
dbaccess/source/core/inc/FilteredContainer.hxx | 2
dbaccess/source/core/inc/PropertyForward.hxx | 4
dbaccess/source/core/inc/RefreshListener.hxx | 4
dbaccess/source/core/inc/TableDeco.hxx | 7
dbaccess/source/core/inc/View.hxx | 4
dbaccess/source/core/inc/column.hxx | 12
dbaccess/source/core/inc/columnsettings.hxx | 4
dbaccess/source/core/inc/commandbase.hxx | 6
dbaccess/source/core/inc/composertools.hxx | 13
dbaccess/source/core/inc/containerapprove.hxx | 4
dbaccess/source/core/inc/core_resource.hxx | 10
dbaccess/source/core/inc/datasettings.hxx | 18
dbaccess/source/core/inc/definitioncolumn.hxx | 25 -
dbaccess/source/core/inc/definitioncontainer.hxx | 6
dbaccess/source/core/inc/objectnameapproval.hxx | 4
dbaccess/source/core/inc/querycontainer.hxx | 4
dbaccess/source/core/inc/recovery/dbdocrecovery.hxx | 4
dbaccess/source/core/inc/table.hxx | 5
dbaccess/source/core/inc/tablecontainer.hxx | 6
dbaccess/source/core/inc/veto.hxx | 4
dbaccess/source/core/inc/viewcontainer.hxx | 5
dbaccess/source/core/misc/ContainerMediator.cxx | 18
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 126 +----
dbaccess/source/core/misc/PropertyForward.cxx | 11
dbaccess/source/core/misc/apitools.cxx | 17
dbaccess/source/core/misc/dsntypes.cxx | 71 +-
dbaccess/source/core/misc/module_dba.cxx | 5
dbaccess/source/core/misc/objectnameapproval.cxx | 16
dbaccess/source/core/misc/sdbcoretools.cxx | 11
dbaccess/source/core/misc/services.cxx | 9
dbaccess/source/core/misc/userinformation.cxx | 2
dbaccess/source/core/misc/veto.cxx | 12
dbaccess/source/core/recovery/dbdocrecovery.cxx | 27 -
dbaccess/source/core/recovery/settingsimport.cxx | 39 -
dbaccess/source/core/recovery/settingsimport.hxx | 24
dbaccess/source/core/recovery/storagestream.cxx | 19
dbaccess/source/core/recovery/storagestream.hxx | 12
dbaccess/source/core/recovery/storagetextstream.cxx | 23
dbaccess/source/core/recovery/storagetextstream.hxx | 8
dbaccess/source/core/recovery/storagexmlstream.cxx | 32 -
dbaccess/source/core/recovery/storagexmlstream.hxx | 12
dbaccess/source/core/recovery/subcomponentloader.cxx | 26 -
dbaccess/source/core/recovery/subcomponentloader.hxx | 8
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 48 -
dbaccess/source/core/recovery/subcomponentrecovery.hxx | 9
dbaccess/source/core/recovery/subcomponents.hxx | 8
dbaccess/source/core/resource/core_resource.cxx | 15
dbaccess/source/ext/macromigration/dbmm_module.cxx | 5
dbaccess/source/ext/macromigration/dbmm_module.hxx | 4
dbaccess/source/ext/macromigration/dbmm_services.cxx | 6
dbaccess/source/ext/macromigration/dbmm_types.cxx | 10
dbaccess/source/ext/macromigration/dbmm_types.hxx | 16
dbaccess/source/ext/macromigration/docinteraction.cxx | 17
dbaccess/source/ext/macromigration/docinteraction.hxx | 8
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 35 -
dbaccess/source/ext/macromigration/macromigrationdialog.hxx | 8
dbaccess/source/ext/macromigration/macromigrationpages.cxx | 53 --
dbaccess/source/ext/macromigration/macromigrationpages.hxx | 24
dbaccess/source/ext/macromigration/macromigrationwizard.cxx | 28 -
dbaccess/source/ext/macromigration/migrationengine.cxx | 104 ----
dbaccess/source/ext/macromigration/migrationengine.hxx | 8
dbaccess/source/ext/macromigration/migrationerror.hxx | 8
dbaccess/source/ext/macromigration/migrationlog.cxx | 44 -
dbaccess/source/ext/macromigration/migrationlog.hxx | 10
dbaccess/source/ext/macromigration/migrationprogress.hxx | 8
dbaccess/source/ext/macromigration/progresscapture.cxx | 20
dbaccess/source/ext/macromigration/progresscapture.hxx | 8
dbaccess/source/ext/macromigration/progressmixer.cxx | 24
dbaccess/source/ext/macromigration/progressmixer.hxx | 12
dbaccess/source/ext/macromigration/rangeprogressbar.hxx | 13
dbaccess/source/filter/xml/dbloader2.cxx | 43 -
dbaccess/source/filter/xml/xmlAutoStyle.cxx | 7
dbaccess/source/filter/xml/xmlAutoStyle.hxx | 2
dbaccess/source/filter/xml/xmlColumn.cxx | 8
dbaccess/source/filter/xml/xmlColumn.hxx | 2
dbaccess/source/filter/xml/xmlComponent.cxx | 5
dbaccess/source/filter/xml/xmlComponent.hxx | 3
dbaccess/source/filter/xml/xmlConnectionData.cxx | 8
dbaccess/source/filter/xml/xmlConnectionData.hxx | 2
dbaccess/source/filter/xml/xmlConnectionResource.cxx | 5
dbaccess/source/filter/xml/xmlConnectionResource.hxx | 2
dbaccess/source/filter/xml/xmlDataSource.cxx | 7
dbaccess/source/filter/xml/xmlDataSource.hxx | 2
dbaccess/source/filter/xml/xmlDataSourceInfo.cxx | 5
dbaccess/source/filter/xml/xmlDataSourceInfo.hxx | 2
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx | 15
dbaccess/source/filter/xml/xmlDataSourceSetting.hxx | 3
dbaccess/source/filter/xml/xmlDataSourceSettings.cxx | 9
dbaccess/source/filter/xml/xmlDataSourceSettings.hxx | 2
dbaccess/source/filter/xml/xmlDatabase.cxx | 9
dbaccess/source/filter/xml/xmlDatabase.hxx | 2
dbaccess/source/filter/xml/xmlDatabaseDescription.cxx | 8
dbaccess/source/filter/xml/xmlDatabaseDescription.hxx | 2
dbaccess/source/filter/xml/xmlDocuments.cxx | 11
dbaccess/source/filter/xml/xmlDocuments.hxx | 2
dbaccess/source/filter/xml/xmlEnums.hxx | 2
dbaccess/source/filter/xml/xmlExport.cxx | 103 +---
dbaccess/source/filter/xml/xmlExport.hxx | 4
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx | 5
dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx | 2
dbaccess/source/filter/xml/xmlHelper.cxx | 16
dbaccess/source/filter/xml/xmlHelper.hxx | 2
dbaccess/source/filter/xml/xmlHierarchyCollection.cxx | 12
dbaccess/source/filter/xml/xmlHierarchyCollection.hxx | 3
dbaccess/source/filter/xml/xmlLogin.cxx | 4
dbaccess/source/filter/xml/xmlLogin.hxx | 2
dbaccess/source/filter/xml/xmlQuery.cxx | 8
dbaccess/source/filter/xml/xmlQuery.hxx | 3
dbaccess/source/filter/xml/xmlServerDatabase.cxx | 4
dbaccess/source/filter/xml/xmlServerDatabase.hxx | 2
dbaccess/source/filter/xml/xmlStyleImport.cxx | 26 -
dbaccess/source/filter/xml/xmlStyleImport.hxx | 3
dbaccess/source/filter/xml/xmlTable.cxx | 14
dbaccess/source/filter/xml/xmlTable.hxx | 3
dbaccess/source/filter/xml/xmlTableFilterList.cxx | 8
dbaccess/source/filter/xml/xmlTableFilterList.hxx | 2
dbaccess/source/filter/xml/xmlTableFilterPattern.cxx | 5
dbaccess/source/filter/xml/xmlTableFilterPattern.hxx | 2
dbaccess/source/filter/xml/xmlfilter.cxx | 58 --
dbaccess/source/filter/xml/xmlfilter.hxx | 5
dbaccess/source/filter/xml/xmlservices.cxx | 3
dbaccess/source/inc/OAuthenticationContinuation.hxx | 5
dbaccess/source/inc/apitools.hxx | 67 --
dbaccess/source/inc/dsntypes.hxx | 16
dbaccess/source/inc/registrationhelper.hxx | 3
dbaccess/source/sdbtools/connection/connectiondependent.hxx | 13
dbaccess/source/sdbtools/connection/connectiontools.cxx | 23
dbaccess/source/sdbtools/connection/connectiontools.hxx | 8
dbaccess/source/sdbtools/connection/datasourcemetadata.cxx | 16
dbaccess/source/sdbtools/connection/datasourcemetadata.hxx | 9
dbaccess/source/sdbtools/connection/objectnames.cxx | 47 -
dbaccess/source/sdbtools/connection/objectnames.hxx | 8
dbaccess/source/sdbtools/connection/tablename.cxx | 27 -
dbaccess/source/sdbtools/connection/tablename.hxx | 8
dbaccess/source/sdbtools/inc/module_sdbt.hxx | 4
dbaccess/source/sdbtools/misc/module_sdbt.cxx | 5
dbaccess/source/sdbtools/misc/sdbt_services.cxx | 4
dbaccess/source/shared/registrationhelper.cxx | 6
dbaccess/source/ui/app/AppController.cxx | 122 +----
dbaccess/source/ui/app/AppController.hxx | 10
dbaccess/source/ui/app/AppControllerDnD.cxx | 37 -
dbaccess/source/ui/app/AppControllerGen.cxx | 54 --
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 118 +---
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 3
dbaccess/source/ui/app/AppDetailView.cxx | 127 ++---
dbaccess/source/ui/app/AppDetailView.hxx | 2
dbaccess/source/ui/app/AppIconControl.cxx | 8
dbaccess/source/ui/app/AppIconControl.hxx | 2
dbaccess/source/ui/app/AppSwapWindow.cxx | 21
dbaccess/source/ui/app/AppSwapWindow.hxx | 5
dbaccess/source/ui/app/AppTitleWindow.cxx | 20
dbaccess/source/ui/app/AppTitleWindow.hxx | 3
dbaccess/source/ui/app/AppView.cxx | 101 +---
dbaccess/source/ui/app/AppView.hxx | 4
dbaccess/source/ui/app/IApplicationController.hxx | 4
dbaccess/source/ui/app/subcomponentmanager.cxx | 37 -
dbaccess/source/ui/app/subcomponentmanager.hxx | 8
dbaccess/source/ui/browser/AsyncronousLink.cxx | 10
dbaccess/source/ui/browser/brwctrlr.cxx | 176 -------
dbaccess/source/ui/browser/brwview.cxx | 34 -
dbaccess/source/ui/browser/dataview.cxx | 22
dbaccess/source/ui/browser/dbexchange.cxx | 11
dbaccess/source/ui/browser/dbloader.cxx | 19
dbaccess/source/ui/browser/dbtreemodel.cxx | 3
dbaccess/source/ui/browser/dbtreeview.cxx | 20
dbaccess/source/ui/browser/dbtreeview.hxx | 3
dbaccess/source/ui/browser/dsEntriesNoExp.cxx | 21
dbaccess/source/ui/browser/dsbrowserDnD.cxx | 17
dbaccess/source/ui/browser/exsrcbrw.cxx | 40 -
dbaccess/source/ui/browser/formadapter.cxx | 267 +++--------
dbaccess/source/ui/browser/genericcontroller.cxx | 140 +----
dbaccess/source/ui/browser/sbagrid.cxx | 95 ---
dbaccess/source/ui/browser/sbamultiplex.cxx | 3
dbaccess/source/ui/browser/unodatbr.cxx | 146 +-----
dbaccess/source/ui/control/ColumnControlWindow.cxx | 32 -
dbaccess/source/ui/control/FieldDescControl.cxx | 101 ----
dbaccess/source/ui/control/RelationControl.cxx | 42 -
dbaccess/source/ui/control/ScrollHelper.cxx | 9
dbaccess/source/ui/control/SqlNameEdit.cxx | 5
dbaccess/source/ui/control/TableGrantCtrl.cxx | 43 -
dbaccess/source/ui/control/VertSplitView.cxx | 17
dbaccess/source/ui/control/charsetlistbox.cxx | 11
dbaccess/source/ui/control/curledit.cxx | 18
dbaccess/source/ui/control/dbtreelistbox.cxx | 66 --
dbaccess/source/ui/control/listviewitems.cxx | 8
dbaccess/source/ui/control/opendoccontrols.cxx | 24
dbaccess/source/ui/control/tabletree.cxx | 38 -
dbaccess/source/ui/control/toolboxcontroller.cxx | 16
dbaccess/source/ui/control/undosqledit.cxx | 5
dbaccess/source/ui/dlg/CollectionView.cxx | 25 -
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 32 -
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 6
dbaccess/source/ui/dlg/ConnectionPage.cxx | 17
dbaccess/source/ui/dlg/ConnectionPage.hxx | 9
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 21
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 13
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 104 ----
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 53 --
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 64 --
dbaccess/source/ui/dlg/DbAdminImpl.hxx | 9
dbaccess/source/ui/dlg/RelationDlg.cxx | 20
dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 31 -
dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 10
dbaccess/source/ui/dlg/UserAdmin.cxx | 26 -
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 22
dbaccess/source/ui/dlg/admincontrols.cxx | 29 -
dbaccess/source/ui/dlg/admincontrols.hxx | 8
dbaccess/source/ui/dlg/adminpages.cxx | 34 -
dbaccess/source/ui/dlg/adminpages.hxx | 18
dbaccess/source/ui/dlg/adodatalinks.cxx | 2
dbaccess/source/ui/dlg/adtabdlg.cxx | 4
dbaccess/source/ui/dlg/advancedsettings.cxx | 47 -
dbaccess/source/ui/dlg/advancedsettings.hxx | 12
dbaccess/source/ui/dlg/dbadmin.cxx | 44 -
dbaccess/source/ui/dlg/dbfindex.cxx | 2
dbaccess/source/ui/dlg/dbfindex.hxx | 15
dbaccess/source/ui/dlg/dbwiz.cxx | 43 -
dbaccess/source/ui/dlg/dbwizsetup.cxx | 72 --
dbaccess/source/ui/dlg/detailpages.cxx | 105 ----
dbaccess/source/ui/dlg/detailpages.hxx | 51 --
dbaccess/source/ui/dlg/directsql.cxx | 25 -
dbaccess/source/ui/dlg/dlgattr.cxx | 4
dbaccess/source/ui/dlg/dlgsave.cxx | 24
dbaccess/source/ui/dlg/dlgsize.cxx | 13
dbaccess/source/ui/dlg/dsnItem.hxx | 12
dbaccess/source/ui/dlg/dsselect.cxx | 11
dbaccess/source/ui/dlg/dsselect.hxx | 8
dbaccess/source/ui/dlg/finteraction.cxx | 12
dbaccess/source/ui/dlg/finteraction.hxx | 8
dbaccess/source/ui/dlg/generalpage.cxx | 54 --
dbaccess/source/ui/dlg/generalpage.hxx | 16
dbaccess/source/ui/dlg/indexdialog.cxx | 52 --
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 35 -
dbaccess/source/ui/dlg/odbcconfig.cxx | 38 -
dbaccess/source/ui/dlg/odbcconfig.hxx | 16
dbaccess/source/ui/dlg/optionalboolitem.cxx | 13
dbaccess/source/ui/dlg/optionalboolitem.hxx | 8
dbaccess/source/ui/dlg/paramdialog.cxx | 22
dbaccess/source/ui/dlg/queryfilter.cxx | 1
dbaccess/source/ui/dlg/queryorder.cxx | 1
dbaccess/source/ui/dlg/sqlmessage.cxx | 37 -
dbaccess/source/ui/dlg/tablespage.cxx | 28 -
dbaccess/source/ui/dlg/tablespage.hxx | 11
dbaccess/source/ui/dlg/textconnectionsettings.cxx | 12
dbaccess/source/ui/inc/AppElementType.hxx | 4
dbaccess/source/ui/inc/CollectionView.hxx | 6
dbaccess/source/ui/inc/ColumnControlWindow.hxx | 6
dbaccess/source/ui/inc/ConnectionLine.hxx | 2
dbaccess/source/ui/inc/ConnectionLineData.hxx | 6
dbaccess/source/ui/inc/FieldControls.hxx | 7
dbaccess/source/ui/inc/GeneralUndo.hxx | 2
dbaccess/source/ui/inc/JoinController.hxx | 8
dbaccess/source/ui/inc/RTableConnectionData.hxx | 4
dbaccess/source/ui/inc/RefFunctor.hxx | 2
dbaccess/source/ui/inc/RelationControl.hxx | 1
dbaccess/source/ui/inc/RelationDlg.hxx | 4
dbaccess/source/ui/inc/SqlNameEdit.hxx | 2
dbaccess/source/ui/inc/TableCopyHelper.hxx | 4
dbaccess/source/ui/inc/TableDesignView.hxx | 3
dbaccess/source/ui/inc/TableWindow.hxx | 2
dbaccess/source/ui/inc/TablesSingleDlg.hxx | 8
dbaccess/source/ui/inc/TokenWriter.hxx | 17
dbaccess/source/ui/inc/TypeInfo.hxx | 6
dbaccess/source/ui/inc/UITools.hxx | 5
dbaccess/source/ui/inc/UserAdminDlg.hxx | 8
dbaccess/source/ui/inc/VertSplitView.hxx | 1
dbaccess/source/ui/inc/WCPage.hxx | 3
dbaccess/source/ui/inc/WColumnSelect.hxx | 7
dbaccess/source/ui/inc/WCopyTable.hxx | 8
dbaccess/source/ui/inc/WExtendPages.hxx | 8
dbaccess/source/ui/inc/WNameMatch.hxx | 6
dbaccess/source/ui/inc/WTabPage.hxx | 4
dbaccess/source/ui/inc/WTypeSelect.hxx | 10
dbaccess/source/ui/inc/adtabdlg.hxx | 3
dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 8
dbaccess/source/ui/inc/asyncmodaldialog.hxx | 8
dbaccess/source/ui/inc/brwctrlr.hxx | 7
dbaccess/source/ui/inc/brwview.hxx | 2
dbaccess/source/ui/inc/callbacks.hxx | 16
dbaccess/source/ui/inc/charsetlistbox.hxx | 8
dbaccess/source/ui/inc/charsets.hxx | 12
dbaccess/source/ui/inc/commontypes.hxx | 4
dbaccess/source/ui/inc/curledit.hxx | 9
dbaccess/source/ui/inc/databaseobjectview.hxx | 22
dbaccess/source/ui/inc/datasourceconnector.hxx | 8
dbaccess/source/ui/inc/dbadmin.hxx | 8
dbaccess/source/ui/inc/dbtreelistbox.hxx | 3
dbaccess/source/ui/inc/dbwiz.hxx | 8
dbaccess/source/ui/inc/dbwizsetup.hxx | 10
dbaccess/source/ui/inc/defaultobjectnamecheck.hxx | 12
dbaccess/source/ui/inc/directsql.hxx | 9
dbaccess/source/ui/inc/dlgattr.hxx | 7
dbaccess/source/ui/inc/dlgsize.hxx | 4
dbaccess/source/ui/inc/dsitems.hxx | 7
dbaccess/source/ui/inc/dsmeta.hxx | 18
dbaccess/source/ui/inc/exsrcbrw.hxx | 4
dbaccess/source/ui/inc/formadapter.hxx | 2
dbaccess/source/ui/inc/imageprovider.hxx | 8
dbaccess/source/ui/inc/indexcollection.hxx | 9
dbaccess/source/ui/inc/indexdialog.hxx | 12
dbaccess/source/ui/inc/indexes.hxx | 14
dbaccess/source/ui/inc/indexfieldscontrol.hxx | 6
dbaccess/source/ui/inc/linkeddocuments.hxx | 8
dbaccess/source/ui/inc/listviewitems.hxx | 8
dbaccess/source/ui/inc/localresaccess.hxx | 8
dbaccess/source/ui/inc/marktree.hxx | 9
dbaccess/source/ui/inc/moduledbu.hxx | 16
dbaccess/source/ui/inc/objectnamecheck.hxx | 8
dbaccess/source/ui/inc/opendoccontrols.hxx | 12
dbaccess/source/ui/inc/paramdialog.hxx | 9
dbaccess/source/ui/inc/propertysetitem.hxx | 8
dbaccess/source/ui/inc/propertystorage.hxx | 12
dbaccess/source/ui/inc/querycontainerwindow.hxx | 12
dbaccess/source/ui/inc/queryfilter.hxx | 3
dbaccess/source/ui/inc/queryorder.hxx | 4
dbaccess/source/ui/inc/sbagrid.hxx | 13
dbaccess/source/ui/inc/sbamultiplex.hxx | 27 -
dbaccess/source/ui/inc/singledoccontroller.hxx | 8
dbaccess/source/ui/inc/sqlmessage.hxx | 10
dbaccess/source/ui/inc/stringlistitem.hxx | 8
dbaccess/source/ui/inc/tabletree.hxx | 8
dbaccess/source/ui/inc/textconnectionsettings.hxx | 8
dbaccess/source/ui/inc/toolboxcontroller.hxx | 2
dbaccess/source/ui/inc/undosqledit.hxx | 3
dbaccess/source/ui/inc/unoadmin.hxx | 8
dbaccess/source/ui/inc/unodatbr.hxx | 9
dbaccess/source/ui/inc/unosqlmessage.hxx | 4
dbaccess/source/ui/misc/DExport.cxx | 31 -
dbaccess/source/ui/misc/HtmlReader.cxx | 27 -
dbaccess/source/ui/misc/ModuleHelper.cxx | 4
dbaccess/source/ui/misc/RowSetDrop.cxx | 12
dbaccess/source/ui/misc/RtfReader.cxx | 19
dbaccess/source/ui/misc/TableCopyHelper.cxx | 19
dbaccess/source/ui/misc/TokenWriter.cxx | 54 --
dbaccess/source/ui/misc/ToolBoxHelper.cxx | 7
dbaccess/source/ui/misc/UITools.cxx | 78 +--
dbaccess/source/ui/misc/WCPage.cxx | 23
dbaccess/source/ui/misc/WColumnSelect.cxx | 32 -
dbaccess/source/ui/misc/WCopyTable.cxx | 127 +----
dbaccess/source/ui/misc/WExtendPages.cxx | 10
dbaccess/source/ui/misc/WNameMatch.cxx | 43 -
dbaccess/source/ui/misc/WTypeSelect.cxx | 57 +-
dbaccess/source/ui/misc/asyncmodaldialog.cxx | 16
dbaccess/source/ui/misc/charsets.cxx | 32 -
dbaccess/source/ui/misc/controllerframe.cxx | 44 -
dbaccess/source/ui/misc/databaseobjectview.cxx | 40 -
dbaccess/source/ui/misc/datasourceconnector.cxx | 13
dbaccess/source/ui/misc/dbaundomanager.cxx | 56 --
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 52 --
dbaccess/source/ui/misc/defaultobjectnamecheck.cxx | 31 -
dbaccess/source/ui/misc/dsmeta.cxx | 24
dbaccess/source/ui/misc/imageprovider.cxx | 23
dbaccess/source/ui/misc/indexcollection.cxx | 26 -
dbaccess/source/ui/misc/linkeddocuments.cxx | 22
dbaccess/source/ui/misc/moduledbu.cxx | 20
dbaccess/source/ui/misc/propertysetitem.cxx | 14
dbaccess/source/ui/misc/propertystorage.cxx | 20
dbaccess/source/ui/misc/singledoccontroller.cxx | 22
dbaccess/source/ui/misc/stringlistitem.cxx | 13
dbaccess/source/ui/misc/uiservices.cxx | 3
dbaccess/source/ui/querydesign/ConnectionLine.cxx | 43 -
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx | 33 -
dbaccess/source/ui/querydesign/ConnectionLineData.cxx | 14
dbaccess/source/ui/querydesign/JAccess.cxx | 15
dbaccess/source/ui/querydesign/JoinController.cxx | 50 --
dbaccess/source/ui/querydesign/JoinDesignView.cxx | 20
dbaccess/source/ui/querydesign/JoinExchange.cxx | 16
dbaccess/source/ui/querydesign/JoinTableView.cxx | 138 +----
dbaccess/source/ui/querydesign/QTableConnection.cxx | 9
dbaccess/source/ui/querydesign/QTableConnection.hxx | 1
dbaccess/source/ui/querydesign/QTableConnectionData.cxx | 17
dbaccess/source/ui/querydesign/QTableWindow.cxx | 16
dbaccess/source/ui/querydesign/QTableWindow.hxx | 2
dbaccess/source/ui/querydesign/QTableWindowData.cxx | 9
dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx | 3
dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx | 11
dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx | 1
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 130 +----
dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx | 3
dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx | 3
dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx | 4
dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx | 31 -
dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx | 4
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx | 13
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx | 5
dbaccess/source/ui/querydesign/QueryTableView.cxx | 57 --
dbaccess/source/ui/querydesign/QueryTextView.cxx | 31 -
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 54 --
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 148 ++----
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 5
dbaccess/source/ui/querydesign/TableConnection.cxx | 30 -
dbaccess/source/ui/querydesign/TableConnectionData.cxx | 27 -
dbaccess/source/ui/querydesign/TableFieldDescription.cxx | 19
dbaccess/source/ui/querydesign/TableFieldInfo.cxx | 7
dbaccess/source/ui/querydesign/TableWindow.cxx | 76 +--
dbaccess/source/ui/querydesign/TableWindowAccess.cxx | 26 -
dbaccess/source/ui/querydesign/TableWindowData.cxx | 13
dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 26 -
dbaccess/source/ui/querydesign/TableWindowTitle.cxx | 15
dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 23
dbaccess/source/ui/querydesign/querycontroller.cxx | 86 +--
dbaccess/source/ui/querydesign/querydlg.cxx | 22
dbaccess/source/ui/querydesign/queryview.cxx | 8
dbaccess/source/ui/relationdesign/RTableConnection.cxx | 12
dbaccess/source/ui/relationdesign/RTableConnection.hxx | 4
dbaccess/source/ui/relationdesign/RTableConnectionData.cxx | 31 -
dbaccess/source/ui/relationdesign/RelationController.cxx | 50 --
dbaccess/source/ui/relationdesign/RelationDesignView.cxx | 17
dbaccess/source/ui/relationdesign/RelationTableView.cxx | 30 -
dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 44 -
dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx | 1
dbaccess/source/ui/tabledesign/FieldDescriptions.cxx | 83 +--
dbaccess/source/ui/tabledesign/TEditControl.cxx | 165 ------
dbaccess/source/ui/tabledesign/TEditControl.hxx | 3
dbaccess/source/ui/tabledesign/TableController.cxx | 82 +--
dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 14
dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx | 21
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 51 --
dbaccess/source/ui/tabledesign/TableFieldControl.cxx | 29 -
dbaccess/source/ui/tabledesign/TableFieldControl.hxx | 3
dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 38 -
dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx | 4
dbaccess/source/ui/tabledesign/TableRow.cxx | 19
dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 5
dbaccess/source/ui/tabledesign/TableUndo.cxx | 61 --
dbaccess/source/ui/tabledesign/TableUndo.hxx | 10
dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 21
dbaccess/source/ui/uno/ColumnControl.cxx | 12
dbaccess/source/ui/uno/ColumnControl.hxx | 2
dbaccess/source/ui/uno/ColumnModel.cxx | 25 -
dbaccess/source/ui/uno/ColumnModel.hxx | 7
dbaccess/source/ui/uno/ColumnPeer.cxx | 15
dbaccess/source/ui/uno/ColumnPeer.hxx | 5
dbaccess/source/ui/uno/DBTypeWizDlg.cxx | 19
dbaccess/source/ui/uno/DBTypeWizDlg.hxx | 8
dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 21
dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 8
dbaccess/source/ui/uno/TableFilterDlg.cxx | 20
dbaccess/source/ui/uno/TableFilterDlg.hxx | 8
dbaccess/source/ui/uno/UserSettingsDlg.cxx | 20
dbaccess/source/ui/uno/UserSettingsDlg.hxx | 8
dbaccess/source/ui/uno/admindlg.cxx | 20
dbaccess/source/ui/uno/admindlg.hxx | 8
dbaccess/source/ui/uno/composerdialogs.cxx | 33 -
dbaccess/source/ui/uno/composerdialogs.hxx | 17
dbaccess/source/ui/uno/copytablewizard.cxx | 64 --
dbaccess/source/ui/uno/dbinteraction.cxx | 30 -
dbaccess/source/ui/uno/dbinteraction.hxx | 16
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 25 -
dbaccess/source/ui/uno/unoDirectSql.cxx | 17
dbaccess/source/ui/uno/unoDirectSql.hxx | 8
dbaccess/source/ui/uno/unoadmin.cxx | 12
dbaccess/source/ui/uno/unosqlmessage.cxx | 19
527 files changed, 2251 insertions(+), 8294 deletions(-)
New commits:
commit b0b087cd1881142c09a77620312d653965a0d873
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Tue Aug 27 18:10:45 2013 +0200
move valueof compiler plugin
The mass-conversion has been already done, so it's most probably
not needed anymore.
Change-Id: I3f161b8ea122e4dd185746ea29509b0d7768d6c7
diff --git a/compilerplugins/clang/valueof.cxx b/compilerplugins/clang/store/valueof.cxx
similarity index 100%
rename from compilerplugins/clang/valueof.cxx
rename to compilerplugins/clang/store/valueof.cxx
commit 2ec606730bc95b58390a609df0a88958869a4066
Author: Jelle van der Waa <jelle at vdwaa.nl>
Date: Sat Aug 17 23:43:14 2013 +0200
fdo#62475 removed pointless comments
Conflicts:
dbaccess/source/filter/xml/xmlfilter.cxx
dbaccess/source/ui/dlg/ConnectionPage.cxx
dbaccess/source/ui/dlg/detailpages.cxx
dbaccess/source/ui/dlg/odbcconfig.cxx
dbaccess/source/ui/querydesign/querycontroller.cxx
Change-Id: I3a05649efa3a43dd8d8fb069fc1bce14ca0a6338
Reviewed-on: https://gerrit.libreoffice.org/5484
Reviewed-by: Petr Mladek <pmladek at suse.cz>
Tested-by: Petr Mladek <pmladek at suse.cz>
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index 0230f2e..96636e9 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -249,4 +249,5 @@ void OBookmarkSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xParamet
}
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx
index dc83d81..8d6203c 100644
--- a/dbaccess/source/core/api/CIndexes.cxx
+++ b/dbaccess/source/core/api/CIndexes.cxx
@@ -89,4 +89,5 @@ void SAL_CALL OIndexes::disposing(void)
else
OIndexesHelper::disposing();
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx
index a1fa8c9..004ec58 100644
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@ -89,4 +89,5 @@ void SAL_CALL ORowSetColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index f9b0066..2588806 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -255,4 +255,5 @@ void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColu
void ORowSetDataColumns::impl_refresh() throw(::com::sun::star::uno::RuntimeException)
{
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index b712470..09519c7 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -689,4 +689,5 @@ bool OCacheSet::updateColumnValues(const ORowSetValueVector::Vector& /*io_aCache
void OCacheSet::fillMissingValues(ORowSetValueVector::Vector& /*io_aRow*/) const
{
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index 186f4e6..58d102d 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -234,9 +234,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
return aReturn;
}
- //==========================================================================
- //= OViewContainer
- //==========================================================================
+ // OViewContainer
OFilteredContainer::OFilteredContainer(::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
const Reference< XConnection >& _xCon,
@@ -486,4 +484,5 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
}
} // namespace
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx
index 992b6c2..8ad3edf 100644
--- a/dbaccess/source/core/api/HelperCollections.hxx
+++ b/dbaccess/source/core/api/HelperCollections.hxx
@@ -74,9 +74,7 @@ namespace dbaccess
};
typedef connectivity::sdbcx::OCollection OPrivateTables_BASE;
- //==========================================================================
- //= OPrivateTables
- //==========================================================================
+ // OPrivateTables
class OPrivateTables : public OPrivateTables_BASE
{
OSQLTables m_aTables;
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index c008916..58135fe 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -101,6 +101,7 @@ namespace
}
}
}
+
DBG_NAME(OKeySet)
OKeySet::OKeySet(const connectivity::OSQLTable& _xTable,
@@ -144,6 +145,7 @@ OKeySet::~OKeySet()
DBG_DTOR(OKeySet,NULL);
}
+
void OKeySet::initColumns()
{
Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
@@ -224,6 +226,7 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable,
m_aAutoColumns.push_back( keyColumn->first );
}
}
+
SAL_WNODEPRECATED_DECLARATIONS_POP
namespace
@@ -484,7 +487,6 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows
static OUString aOr(" OR ");
static OUString aEqual(" = ?");
-
// use keys and indexes for exact postioning
// first the keys
Reference<XNameAccess> xKeyColumns = getKeyColumns();
@@ -577,7 +579,6 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
if ( xIndexSup.is() )
xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY);
-
::std::vector< Reference<XNameAccess> > aAllIndexColumns;
lcl_fillIndexColumns(xIndexes,aAllIndexColumns);
@@ -909,6 +910,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
tryRefetch(_rInsertRow,bRefetch);
}
}
+
void OKeySet::tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch)
{
if ( bRefetch )
@@ -1257,6 +1259,7 @@ sal_Bool SAL_CALL OKeySet::absolute( sal_Int32 row ) throw(SQLException, Runtime
{
return absolute_checked(row,sal_True);
}
+
sal_Bool OKeySet::absolute_checked( sal_Int32 row, sal_Bool /* i_bFetchRow */ )
{
SAL_INFO("dbaccess", "OKeySet::absolute" );
@@ -1339,6 +1342,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)
{
return previous_checked(sal_True);
@@ -1388,7 +1392,6 @@ bool OKeySet::doTryRefetch_throw() throw(SQLException, RuntimeException)
return m_xSet->next();
}
-// -----------------------------------------------------------------------------
void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException)
{
SAL_INFO("dbaccess", "OKeySet::refreshRow" );
@@ -1499,6 +1502,7 @@ bool OKeySet::fillAllRows()
return true;
}
}
+
// XRow
sal_Bool SAL_CALL OKeySet::wasNull( ) throw(SQLException, RuntimeException)
{
@@ -1758,4 +1762,5 @@ void OKeySet::impl_convertValue_throw(const ORowSetRow& _rInsertRow,const Select
break;
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 564720c..5e8aeab 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -503,6 +503,7 @@ void OptimisticSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVecto
o_aChangedColumns.push_back(aJoinIter->second);
}
}
+
namespace
{
struct PositionFunctor : ::std::unary_function<SelectColumnsMetaData::value_type,bool>
@@ -684,4 +685,5 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const
}
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index b0d300d..f451f98 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -2012,6 +2012,7 @@ void SAL_CALL ORowSet::removeRowSetApproveListener( const Reference< XRowSetAppr
m_aApproveListeners.removeInterface(listener);
}
+
// XRowsChangeBroadcaster
void SAL_CALL ORowSet::addRowsChangeListener( const Reference< XRowsChangeListener >& listener ) throw(RuntimeException)
{
@@ -2704,6 +2705,7 @@ void ORowSet::impl_rebuild_throw(::osl::ResettableMutexGuard& _rGuard)
m_pCache->reset(xResultSet);
notifyAllListeners(_rGuard);
}
+
// ***********************************************************
// ORowSetClone
// ***********************************************************
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index dc1e877..2b41f10 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "RowSetBase.hxx"
#include "CRowSetDataColumn.hxx"
#include <connectivity/sdbcx/VCollection.hxx>
@@ -55,9 +54,7 @@ using namespace ::osl;
namespace dbaccess
{
-// =========================================================================
-// = OEmptyCollection
-// =========================================================================
+// OEmptyCollection
class OEmptyCollection : public sdbcx::OCollection
{
protected:
@@ -76,9 +73,7 @@ connectivity::sdbcx::ObjectType OEmptyCollection::createObject(const OUString& /
return connectivity::sdbcx::ObjectType();
}
-// =========================================================================
-// = ORowSetBase
-// =========================================================================
+// ORowSetBase
DBG_NAME(ORowSetBase)
ORowSetBase::ORowSetBase( const Reference<XComponentContext>& _rContext, ::cppu::OBroadcastHelper& _rBHelper, ::osl::Mutex* _pMutex )
@@ -470,7 +465,6 @@ sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLEx
throwFunctionSequenceException(*m_pMySelf);
}
-
checkCache();
sal_Bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) );
@@ -1452,7 +1446,7 @@ sal_Int32 ORowSetBase::impl_getRowCount() const
++nRowCount;
return nRowCount;
}
-// =============================================================================
+
struct ORowSetNotifierImpl
{
::std::vector<sal_Int32> aChangedColumns;
@@ -1460,6 +1454,7 @@ struct ORowSetNotifierImpl
ORowSetValueVector::Vector aRow;
};
+
DBG_NAME(ORowSetNotifier)
ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet )
@@ -1544,6 +1539,7 @@ void ORowSetNotifier::firePropertyChange()
m_pRowSet->fireProperty(PROPERTY_ID_ISMODIFIED,sal_True,sal_False, ORowSetBase::GrantNotifierAccess());
}
}
+
} // namespace dbaccess
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index 1858086..780e000 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -44,7 +44,6 @@
#include <functional>
-
namespace com { namespace sun { namespace star {
namespace sdb { struct RowChangeEvent; }
namespace lang { struct Locale; }
@@ -327,7 +326,6 @@ namespace dbaccess
// is called when the rowset has deleted this bookmark _rBookmark
void onDeletedRow( const ::com::sun::star::uno::Any& _rBookmark, sal_Int32 _nPos );
- // ==========================================================
// granular access control
struct GrantNotifierAccess { friend class ORowSetNotifier; private: GrantNotifierAccess () { } };
@@ -350,7 +348,6 @@ namespace dbaccess
::osl::Mutex* getMutex() const { return m_pMutex; }
};
- // ========================================================================
/** eases the handling of the doCancelModification and notifyCancelInsert methods
<p>The class can only be used on the stack, within a method of ORowSetBase (or derivees)</p>
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index adcb5c2..4ac763e 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -1752,4 +1752,5 @@ void ORowSetCache::impl_updateRowFromCache_throw(ORowSetValueVector::Vector& io_
}
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 0863f0f..a658e2d 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -114,7 +114,6 @@ namespace
return pNewSqlParseNode;
}
- // .....................................................................
/** checks whether the given parse node describes a valid single select statement, throws
an error if not
*/
@@ -142,7 +141,6 @@ namespace
delete pOldNode;
}
- // .....................................................................
/** combines parseStatement_throwError and checkForSingleSelect_throwError
*/
void parseAndCheck_throwError( OSQLParser& _rParser, const OUString& _rStatement,
@@ -153,7 +151,6 @@ namespace
checkForSingleSelect_throwError( pNode, _rIterator, _rxContext, _rStatement );
}
- // .....................................................................
/** transforms a parse node describing a complete statement into a pure select
statement, without any filter/order/groupby/having clauses
*/
@@ -300,6 +297,7 @@ void SAL_CALL OSingleSelectQueryComposer::disposing(void)
clearCurrentCollections();
}
+
IMPLEMENT_FORWARD_XINTERFACE3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryComposer_BASE,OPropertyContainer)
IMPLEMENT_SERVICE_INFO1(OSingleSelectQueryComposer,"org.openoffice.comp.dba.OSingleSelectQueryComposer",SERVICE_NAME_SINGLESELECTQUERYCOMPOSER)
IMPLEMENT_TYPEPROVIDER3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryComposer_BASE,OPropertyContainer)
@@ -983,7 +981,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
//OSQLParseTreeIterator::appendColumns it creates some labels using those real names
//but the evo address book gives them proper labels of First Name, Second Name and City
//the munge means that here we have e.g. just "City" as a label because it matches
- //
+
//This is all a horrible mess
if (bMissingSomeColumnLabels)
aNames.clear();
@@ -1066,7 +1064,6 @@ sal_Bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition,
OUString aValue;
OUString aColumnName;
-
pCondition->parseNodeToStr( aValue, m_xConnection, NULL );
pCondition->getChild(0)->parseNodeToStr( aColumnName, m_xConnection, NULL );
@@ -1868,4 +1865,5 @@ OUString OSingleSelectQueryComposer::getSQLPart( SQLPart _ePart, OSQLParseTreeIt
sRet = sKeyword + sRet;
return sRet;
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index 433450e..5d252a5 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -357,4 +357,5 @@ void SAL_CALL OStaticSet::moveToCurrentRow( ) throw(SQLException, RuntimeExcept
{
SAL_INFO("dbaccess", "OStaticSet::moveToCurrentRow" );
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index 2707b12..d46fe96 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -56,9 +56,7 @@ using namespace ::comphelper;
using namespace ::dbtools;
using namespace ::cppu;
-//==========================================================================
-//= ODBTableDecorator
-//==========================================================================
+// ODBTableDecorator
DBG_NAME(ODBTableDecorator)
ODBTableDecorator::ODBTableDecorator( const Reference< XConnection >& _rxConnection, const Reference< XColumnsSupplier >& _rxNewTable,
@@ -682,4 +680,5 @@ void SAL_CALL ODBTableDecorator::setName( const OUString& /*aName*/ ) throw (::c
SAL_INFO("dbaccess", "ODBTableDecorator::setName" );
throwFunctionNotSupportedException( "XNamed::setName", *this );
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx
index 82c9d55..df46822 100644
--- a/dbaccess/source/core/api/View.cxx
+++ b/dbaccess/source/core/api/View.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "View.hxx"
#include "dbastrings.hrc"
@@ -56,9 +55,7 @@ namespace dbaccess
}
return sSupportService;
}
- //====================================================================
- //= View
- //====================================================================
+ // View
View::View( const Reference< XConnection >& _rxConnection, sal_Bool _bCaseSensitive,
const OUString& _rCatalogName,const OUString& _rSchemaName, const OUString& _rName )
:View_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, OUString(), _rSchemaName, _rCatalogName )
@@ -133,4 +130,5 @@ namespace dbaccess
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
index a7c3123..2cdf519 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -234,4 +234,5 @@ void WrappedResultSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xPar
}
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx
index 2b5fabb..43dca97 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "ContainerMediator.hxx"
#include "apitools.hxx"
#include "column.hxx"
@@ -63,9 +62,7 @@ using namespace ::cppu;
DBG_NAME(OColumn)
-//============================================================
-//= OColumn
-//============================================================
+// OColumn
OColumn::OColumn( const bool _bNameIsReadOnly )
:OColumnBase( m_aMutex )
,::comphelper::OPropertyContainer( OColumnBase::rBHelper )
@@ -153,9 +150,7 @@ void OColumn::registerPropertyNoMember( const OUString& _rName, sal_Int32 _nHand
::comphelper::OPropertyContainer::registerPropertyNoMember( _rName, _nHandle, _nAttributes, _rType, _pInitialValue );
}
-//============================================================
-//= OColumns
-//============================================================
+// OColumns
DBG_NAME(OColumns);
OColumns::OColumns(::cppu::OWeakObject& _rParent,
@@ -221,7 +216,6 @@ Sequence< OUString > OColumns::getSupportedServiceNames( ) throw (RuntimeExcept
return aSNS;
}
-//------------------------------------------------------------------
void OColumns::append( const OUString& _rName, OColumn* _pColumn )
{
MutexGuard aGuard(m_rMutex);
@@ -235,7 +229,6 @@ void OColumns::append( const OUString& _rName, OColumn* _pColumn )
insertElement( _rName, _pColumn );
}
-//------------------------------------------------------------------
void OColumns::clearColumns()
{
MutexGuard aGuard(m_rMutex);
@@ -331,7 +324,6 @@ Sequence< Type > SAL_CALL OColumns::getTypes( ) throw(RuntimeException)
Sequence< Type > aSecTypes(OColumns_BASE::getTypes());
-
const Type* pBegin = aTypes.getConstArray();
const Type* pEnd = pBegin + aTypes.getLength();
for (;pBegin != pEnd ; ++pBegin)
@@ -445,4 +437,5 @@ void SAL_CALL OColumns::setParent( const Reference< XInterface >& _xParent ) thr
::osl::MutexGuard aGuard(m_rMutex);
m_xParent = _xParent;
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx
index 6ea73ad..58eb794 100644
--- a/dbaccess/source/core/api/columnsettings.cxx
+++ b/dbaccess/source/core/api/columnsettings.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "columnsettings.hxx"
#include "dbastrings.hrc"
@@ -28,10 +27,8 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
-//........................................................................
namespace dbaccess
{
-//........................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -50,9 +47,7 @@ namespace dbaccess
namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
- //==============================================================================
- //= OColumnSettings
- //==============================================================================
+ // OColumnSettings
DBG_NAME( OColumnSettings )
OColumnSettings::OColumnSettings()
@@ -160,8 +155,6 @@ namespace dbaccess
return true;
}
-//........................................................................
} // namespace dbaccess
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx
index d08f59c..421d23d 100644
--- a/dbaccess/source/core/api/datacolumn.cxx
+++ b/dbaccess/source/core/api/datacolumn.cxx
@@ -414,4 +414,5 @@ void ODataColumn::updateObject(const Any& x) throw( SQLException, RuntimeExcepti
m_xRowUpdate->updateObject(m_nPos, x);
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx
index cfdf5cf..eeb64c4 100644
--- a/dbaccess/source/core/api/datasettings.cxx
+++ b/dbaccess/source/core/api/datasettings.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "datasettings.hxx"
#include "apitools.hxx"
#include "dbastrings.hrc"
@@ -32,7 +31,6 @@
#include <com/sun/star/awt/FontWidth.hpp>
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::lang;
@@ -42,9 +40,7 @@ using namespace ::cppu;
namespace dbaccess
{
-//==========================================================================
-//= ODataSettings
-//==========================================================================
+// ODataSettings
void ODataSettings::registerPropertiesFor(ODataSettings_Base* _pItem)
{
if ( m_bQuery )
@@ -209,4 +205,5 @@ void ODataSettings::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefau
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index adfb0be..962011b 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -56,9 +56,7 @@ namespace
const sal_Int32 HAS_TABLENAME = 0x00000040;
}
-//============================================================
-//= OTableColumnDescriptor
-//============================================================
+// OTableColumnDescriptor
IMPLEMENT_FORWARD_XINTERFACE2(OTableColumnDescriptor,OColumn,TXChild)
void OTableColumnDescriptor::impl_registerProperties()
@@ -130,9 +128,8 @@ void SAL_CALL OTableColumnDescriptor::setParent( const Reference< XInterface >&
::osl::MutexGuard aGuard(m_aMutex);
m_xParent = _xParent;
}
-//============================================================
-//= OTableColumn
-//============================================================
+
+// OTableColumn
DBG_NAME(OTableColumn);
OTableColumn::OTableColumn( const OUString& _rName )
@@ -164,9 +161,7 @@ OUString OTableColumn::getImplementationName( ) throw (RuntimeException)
return OTableColumnDescriptor::createArrayHelper();
}
-// =========================================================================
-//= OQueryColumn
-// =========================================================================
+// OQueryColumn
DBG_NAME( OQueryColumn );
OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, const Reference< XConnection >& _rxConnection, const OUString &i_sLabel )
@@ -322,9 +317,7 @@ void SAL_CALL OQueryColumn::getFastPropertyValue( Any& _rValue, sal_Int32 _nHand
}
}
-//==========================================================================
-//= OColumnWrapper
-//==========================================================================
+// OColumnWrapper
DBG_NAME(OColumnWrapper);
OColumnWrapper::OColumnWrapper( const Reference< XPropertySet > & rCol, const bool _bNameIsReadOnly )
@@ -420,9 +413,7 @@ sal_Int64 SAL_CALL OColumnWrapper::getSomething( const Sequence< sal_Int8 >& aId
return 0;
}
-//============================================================
-//= OTableColumnDescriptorWrapper
-//============================================================
+// OTableColumnDescriptorWrapper
OTableColumnDescriptorWrapper::OTableColumnDescriptorWrapper( const Reference< XPropertySet >& _rCol, const bool _bPureWrap, const bool _bIsDescriptor )
:OColumnWrapper( _rCol, !_bIsDescriptor )
,m_bPureWrap( _bPureWrap )
@@ -575,9 +566,7 @@ void OTableColumnDescriptorWrapper::setFastPropertyValue_NoBroadcast(
}
}
-//============================================================
-//= OTableColumnWrapper
-//============================================================
+// OTableColumnWrapper
OTableColumnWrapper::OTableColumnWrapper( const Reference< XPropertySet >& rCol, const Reference< XPropertySet >& _xColDefintion,
const bool _bPureWrap )
:OTableColumnDescriptorWrapper( rCol, _bPureWrap, false )
@@ -626,4 +615,5 @@ Sequence< OUString > OTableColumnWrapper::getSupportedServiceNames( ) throw (Ru
{
return OTableColumnDescriptorWrapper::createArrayHelper( nId );
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx
index f8f9680..811d545 100644
--- a/dbaccess/source/core/api/preparedstatement.cxx
+++ b/dbaccess/source/core/api/preparedstatement.cxx
@@ -420,4 +420,5 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim
m_xAggregateAsParameters->clearParameters();
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index 5bb8cb1..12d959a 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "query.hxx"
#include "dbastrings.hrc"
#include <connectivity/warningscontainer.hxx>
@@ -66,9 +65,7 @@ using namespace ::utl;
namespace dbaccess
{
-//==========================================================================
-//= OQuery
-//==========================================================================
+// OQuery
DBG_NAME(OQuery)
OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition
@@ -368,4 +365,5 @@ OUString OQuery::determineContentType() const
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx
index a0a8e78..cb96412 100644
--- a/dbaccess/source/core/api/query.hxx
+++ b/dbaccess/source/core/api/query.hxx
@@ -35,14 +35,10 @@ namespace dbtools
class IWarningsContainer;
}
-//........................................................................
namespace dbaccess
{
-//........................................................................
-//==========================================================================
-//= OQuery - an object implementing the sdb.Query service
-//==========================================================================
+// OQuery - an object implementing the sdb.Query service
typedef ::cppu::ImplHelper3 < ::com::sun::star::sdbcx::XDataDescriptorFactory,
::com::sun::star::beans::XPropertyChangeListener,
::com::sun::star::sdbcx::XRename
@@ -51,7 +47,6 @@ class OQuery;
class OColumn;
typedef ::comphelper::OPropertyArrayUsageHelper< OQuery > OQuery_ArrayHelperBase;
-
class OQuery :public OContentHelper
,public OQueryDescriptor_Base
,public OQuery_Base
@@ -76,7 +71,6 @@ protected:
enum AGGREGATE_ACTION { NONE, SETTING_PROPERTIES, FLUSHING };
AGGREGATE_ACTION m_eDoingCurrently;
- // ------------------------------------------------------------------------
/** a class which automatically resets m_eDoingCurrently in it's destructor
*/
class OAutoActionReset; // just for the following friend declaration
@@ -155,11 +149,8 @@ private:
void registerProperties();
};
-//........................................................................
} // namespace dbaccess
-//........................................................................
#endif // _DBA_COREAPI_QUERY_HXX_
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index 70cc6ce..3f7c5d5 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -323,4 +323,5 @@ void SAL_CALL OQueryComposer::release() throw()
{
OSubComponent::release();
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index fc5ccfc..fca43df76 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "querycontainer.hxx"
#include "dbastrings.hrc"
#include "query.hxx"
@@ -58,9 +57,7 @@ using namespace ::cppu;
namespace dbaccess
{
-//==========================================================================
-//= OQueryContainer
-//==========================================================================
+// OQueryContainer
DBG_NAME(OQueryContainer)
OQueryContainer::OQueryContainer(
@@ -408,4 +405,5 @@ Sequence< OUString > SAL_CALL OQueryContainer::getElementNames( ) throw(Runtime
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx
index 78f5499..1c2f650 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -42,9 +42,7 @@ using namespace ::cppu;
namespace dbaccess
{
-//==========================================================================
-//= OQueryDescriptor
-//==========================================================================
+// OQueryDescriptor
DBG_NAME(OQueryDescriptor)
OQueryDescriptor::OQueryDescriptor()
diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx
index ccd5174..27c8d0d 100644
--- a/dbaccess/source/core/api/querydescriptor.hxx
+++ b/dbaccess/source/core/api/querydescriptor.hxx
@@ -35,14 +35,10 @@
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/uno3.hxx>
-//........................................................................
namespace dbaccess
{
-//........................................................................
-//==========================================================================
-//= OQueryDescriptor_Base - a query descriptor (as the name suggests :)
-//==========================================================================
+// OQueryDescriptor_Base - a query descriptor (as the name suggests :)
typedef ::cppu::ImplHelper3<
::com::sun::star::sdbcx::XColumnsSupplier,
::com::sun::star::lang::XUnoTunnel,
@@ -142,11 +138,8 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
};
-//........................................................................
} // namespace dbaccess
-//........................................................................
#endif // _DBA_COREAPI_QUERYDESCRIPTOR_HXX_
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx
index e2dd8ba..d47a632 100644
--- a/dbaccess/source/core/api/resultcolumn.cxx
+++ b/dbaccess/source/core/api/resultcolumn.cxx
@@ -311,4 +311,5 @@ void OResultColumn::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
}
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
index 3476b65..f11a4ec 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -1098,4 +1098,5 @@ void OResultSet::checkBookmarkable() const
if ( !m_bIsBookmarkable )
throwSQLException( "The result set does not have bookmark support.", SQL_GENERAL_ERROR, *const_cast< OResultSet* >( this ) );
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index 2cd8ef5..55bcc68 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string.h>
#include "table.hxx"
@@ -61,9 +60,7 @@ using namespace ::osl;
using namespace ::comphelper;
using namespace ::cppu;
-//==========================================================================
-//= ODBTable
-//==========================================================================
+// ODBTable
DBG_NAME(ODBTable)
ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
@@ -399,4 +396,5 @@ sdbcx::OCollection* ODBTable::createIndexes(const TStringVector& _rNames)
SAL_INFO("dbaccess", "ODBTable::createIndexes" );
return new OIndexes(this,m_aMutex,_rNames,NULL);
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 34da7b9..422a2fe 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "tablecontainer.hxx"
#include "dbastrings.hrc"
#include "table.hxx"
@@ -94,9 +93,8 @@ namespace
return sal_False;
}
}
-//==========================================================================
-//= OTableContainer
-//==========================================================================
+
+// OTableContainer
DBG_NAME(OTableContainer)
OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent,
@@ -483,4 +481,5 @@ void OTableContainer::addMasterContainerListener()
DBG_UNHANDLED_EXCEPTION();
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index c839d8b..9e66780 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "viewcontainer.hxx"
#include "dbastrings.hrc"
#include "core_resource.hxx"
@@ -57,9 +56,7 @@ using namespace ::comphelper;
using namespace ::cppu;
using namespace ::connectivity::sdbcx;
-//==========================================================================
-//= OViewContainer
-//==========================================================================
+// OViewContainer
DBG_NAME(OViewContainer)
OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index 4904973..f32c918 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "ComponentDefinition.hxx"
#include "apitools.hxx"
#include "dbastrings.hrc"
@@ -74,6 +73,7 @@ public:
}
void clear() { m_pComponent = NULL; }
};
+
DBG_NAME(OComponentDefinition_Impl)
OComponentDefinition_Impl::OComponentDefinition_Impl()
{
@@ -84,9 +84,8 @@ OComponentDefinition_Impl::~OComponentDefinition_Impl()
{
DBG_DTOR(OComponentDefinition_Impl,NULL);
}
-//==========================================================================
-//= OComponentDefinition
-//==========================================================================
+
+// OComponentDefinition
DBG_NAME(OComponentDefinition)
@@ -142,7 +141,6 @@ OComponentDefinition::~OComponentDefinition()
DBG_DTOR(OComponentDefinition, NULL);
}
-
OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxContainer
,const OUString& _rElementName
,const Reference< XComponentContext >& _xORB
@@ -302,4 +300,5 @@ void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxS
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index 82a5518..67d203e 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
@@ -36,10 +36,8 @@
#include <comphelper/implementationreference.hxx>
#include <memory>
-//........................................................................
namespace dbaccess
{
-//........................................................................
typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XColumnsSupplier > OComponentDefinition_BASE;
@@ -81,9 +79,7 @@ namespace dbaccess
};
class OColumnPropertyListener;
-//=========================================================================
-//= OComponentDefinition - a database "document" which describes a query
-//=========================================================================
+// OComponentDefinition - a database "document" which describes a query
class OComponentDefinition :public OContentHelper
,public ODataSettings
,public IColumnFactory
@@ -101,7 +97,6 @@ protected:
virtual ~OComponentDefinition();
virtual void SAL_CALL disposing();
-
protected:
OComponentDefinition(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer
@@ -169,9 +164,7 @@ private:
void registerProperties();
};
-//........................................................................
} // namespace dbaccess
-//........................................................................
#endif // DBA_COREDATAACESS_COMPONENTDEFINITION_HXX
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index f6e89f4..9f36d7b 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -35,7 +35,6 @@
#include "dbastrings.hrc"
#include <tools/debug.hxx>
-
namespace dbaccess
{
using namespace ::com::sun::star::uno;
@@ -160,9 +159,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma
Any aRet;
if ( aCommand.Name.compareToAscii( "getPropertyValues" ) == 0 )
{
- //////////////////////////////////////////////////////////////////
// getPropertyValues
- //////////////////////////////////////////////////////////////////
Sequence< Property > Properties;
if ( !( aCommand.Argument >>= Properties ) )
@@ -180,9 +177,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma
}
else if ( aCommand.Name.compareToAscii( "setPropertyValues" ) == 0 )
{
- //////////////////////////////////////////////////////////////////
// setPropertyValues
- //////////////////////////////////////////////////////////////////
Sequence< PropertyValue > aProperties;
if ( !( aCommand.Argument >>= aProperties ) )
@@ -213,9 +208,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma
}
else if ( aCommand.Name.compareToAscii( "getPropertySetInfo" ) == 0 )
{
- //////////////////////////////////////////////////////////////////
// getPropertySetInfo
- //////////////////////////////////////////////////////////////////
Reference<XPropertySet> xProp(*this,UNO_QUERY);
if ( xProp.is() )
@@ -224,9 +217,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma
}
else
{
- //////////////////////////////////////////////////////////////////
// Unsupported command
- //////////////////////////////////////////////////////////////////
OSL_FAIL( "Content::execute - unsupported command!" );
@@ -417,7 +408,6 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
return aRet;
}
-//=========================================================================
// static
Reference< XRow > OContentHelper::getPropertyValues( const Sequence< Property >& rProperties)
{
@@ -639,4 +629,5 @@ void OContentHelper::notifyDataSourceModified()
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 36c1458..c553759 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "commandcontainer.hxx"
#include "connection.hxx"
#include "core_resource.hrc"
@@ -87,9 +86,7 @@ using namespace ::comphelper;
namespace dbaccess
{
-//============================================================
-//= VosMutexFacade
-//============================================================
+// VosMutexFacade
VosMutexFacade::VosMutexFacade( ::osl::Mutex& _rMutex )
:m_rMutex( _rMutex )
{
@@ -110,9 +107,7 @@ bool VosMutexFacade::tryToAcquire()
return m_rMutex.tryToAcquire();
}
-//============================================================
-//= DocumentStorageAccess
-//============================================================
+// DocumentStorageAccess
DBG_NAME( DocumentStorageAccess )
class DocumentStorageAccess : public ::cppu::WeakImplHelper2< XDocumentSubStorageSupplier
, XTransactionListener >
@@ -397,9 +392,7 @@ void SAL_CALL DocumentStorageAccess::disposing( const css::lang::EventObject& So
}
}
-//============================================================
-//= ODatabaseModelImpl
-//============================================================
+// ODatabaseModelImpl
DBG_NAME(ODatabaseModelImpl)
ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XComponentContext >& _rxContext, ODatabaseContext& _rDBContext )
@@ -1397,4 +1390,5 @@ ModelDependentComponent::~ModelDependentComponent()
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index eff4138..16544bd 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -78,10 +78,8 @@ namespace comphelper
class NamedValueCollection;
}
-//........................................................................
namespace dbaccess
{
-//........................................................................
typedef ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > OWeakConnection;
typedef std::vector< OWeakConnection > OWeakConnectionArray;
@@ -123,9 +121,7 @@ struct AsciiPropertyValue
class ODatabaseContext;
class OSharedConnectionManager;
-//============================================================
-//= VosMutexFacade
-//============================================================
+// VosMutexFacade
/** a class which provides an IMutex interface to an OSL-based mutex
*/
class VosMutexFacade : public comphelper::SolarMutex
@@ -144,10 +140,7 @@ private:
::osl::Mutex& m_rMutex;
};
-
-//============================================================
-//= ODatabaseModelImpl
-//============================================================
+// ODatabaseModelImpl
typedef ::utl::SharedUNOComponent< ::com::sun::star::embed::XStorage > SharedStorage;
class ODatabaseContext;
@@ -621,9 +614,7 @@ public:
}
};
-//........................................................................
} // namespace dbaccess
-//........................................................................
#endif // _DBA_COREDATAACCESS_DATALINK_HXX_
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx
index 242741e..4bbd822 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.cxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx
@@ -155,4 +155,5 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OSharedConnection
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx
index 916c4fe..b4e28f4 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.hxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx
@@ -34,15 +34,12 @@
#include <com/sun/star/sdb/XQueriesSupplier.hpp>
#include <comphelper/sequence.hxx>
-
namespace dbaccess
{
- //=======================================================================================
- //= OSharedConnection: This class implements a simple forwarding of connection calls.
- //= All methods will be forwarded with exception of the set methods, which are not allowed
- //= to be called on shared connections. Instances of this class will be created when the
- //= datasource is asked for not isolated connection.
- //=======================================================================================
+ // OSharedConnection: This class implements a simple forwarding of connection calls.
+ // All methods will be forwarded with exception of the set methods, which are not allowed
+ // to be called on shared connections. Instances of this class will be created when the
+ // datasource is asked for not isolated connection.
typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::sdbc::XConnection
> OSharedConnection_BASE;
typedef ::connectivity::OConnectionWrapper OSharedConnection_BASE2;
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index 291d9e1..9313d93 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "bookmarkcontainer.hxx"
#include "dbastrings.hrc"
#include "apitools.hxx"
@@ -43,9 +42,7 @@ using namespace ::cppu;
namespace dbaccess
{
-//==========================================================================
-//= OBookmarkContainer
-//==========================================================================
+// OBookmarkContainer
DBG_NAME(OBookmarkContainer)
OBookmarkContainer::OBookmarkContainer(OWeakObject& _rParent, Mutex& _rMutex)
@@ -121,7 +118,6 @@ void SAL_CALL OBookmarkContainer::insertByName( const OUString& _rName, const An
if (!(aElement >>= sNewLink))
throw IllegalArgumentException();
-
implAppend(_rName, sNewLink);
// notify the listeners
@@ -355,4 +351,5 @@ void SAL_CALL OBookmarkContainer::setParent( const Reference< XInterface >& /*Pa
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
index 36a7cb40..81ba669 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
@@ -37,10 +37,8 @@
namespace dbaccess
{
-//==========================================================================
-//= OBookmarkContainer - base class of collections of database definition
-//= documents
-//==========================================================================
+// OBookmarkContainer - base class of collections of database definition
+// documents
typedef ::cppu::WeakImplHelper6 <
::com::sun::star::container::XIndexAccess
, ::com::sun::star::container::XNameContainer
@@ -66,7 +64,6 @@ protected:
m_aContainerListeners;
::osl::Mutex& m_rMutex;
-
public:
/** constructs the container.<BR>
after the construction of the object the creator has to call <code>initialize</code>.
@@ -128,7 +125,6 @@ public:
*/
virtual void dispose();
-
protected:
/** checks whether the object is basically alive, i.e. it has been fully initialized (@see initialize) and
not disposed (@see dispose)
diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx
index 8fe6ec6..4154675 100644
--- a/dbaccess/source/core/dataaccess/commandcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "commandcontainer.hxx"
#include "commanddefinition.hxx"
@@ -38,9 +37,7 @@ using namespace ::cppu;
namespace dbaccess
{
-//==========================================================================
-//= OCommandContainer
-//==========================================================================
+// OCommandContainer
DBG_NAME(OCommandContainer)
OCommandContainer::OCommandContainer( const Reference< ::com::sun::star::uno::XComponentContext >& _xORB
@@ -93,4 +90,5 @@ OUString OCommandContainer::determineContentType() const
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/commandcontainer.hxx b/dbaccess/source/core/dataaccess/commandcontainer.hxx
index cf952d7..3603e31 100644
--- a/dbaccess/source/core/dataaccess/commandcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/commandcontainer.hxx
@@ -28,9 +28,7 @@
namespace dbaccess
{
-//==========================================================================
-//= OCommandContainer
-//==========================================================================
+// OCommandContainer
typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XSingleServiceFactory
> OCommandContainer_BASE;
@@ -70,7 +68,6 @@ protected:
} // namespace dbaccess
-
#endif // _DBA_COREDATAACCESS_COMMANDCONTAINER_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 3adf401..ece84a5 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "commanddefinition.hxx"
#include "apitools.hxx"
#include "dbastrings.hrc"
@@ -41,9 +40,7 @@ using namespace ::cppu;
namespace dbaccess
{
-//==========================================================================
-//= OCommandDefinition
-//==========================================================================
+// OCommandDefinition
extern "C" void SAL_CALL createRegistryInfo_OCommandDefinition()
{
static ::dba::OAutoRegistration< OCommandDefinition > aAutoRegistration;
@@ -127,7 +124,6 @@ void OCommandDefinition::setUpdateSchemaName(const OUString& p1) throw( ::com::s
setPropertyValue(PROPERTY_UPDATE_SCHEMANAME, Any(p1) );
}
-
OCommandDefinition::OCommandDefinition(const Reference< XComponentContext >& _xORB
,const Reference< XInterface >& _rxContainer
,const TContentPtr& _pImpl)
@@ -207,4 +203,5 @@ void SAL_CALL OCommandDefinition::rename( const OUString& newName ) throw (SQLEx
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx
index b94e0c7..3a4a79c 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.hxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx
@@ -34,15 +34,10 @@
#include <comphelper/uno3.hxx>
#include <cppuhelper/implbase2.hxx>
-
-//........................................................................
namespace dbaccess
{
-//........................................................................
-//=========================================================================
-//= OCommandDefinition - a database "document" which describes a query
-//=========================================================================
+// OCommandDefinition - a database "document" which describes a query
class OCommandDefinition_Impl : public OComponentDefinition_Impl
,public OCommandBase
{
@@ -148,11 +143,8 @@ private:
void registerProperties();
};
-//........................................................................
} // namespace dbaccess
-//........................................................................
#endif // _DBA_COREDATAACESS_COMMANDDEFINITION_HXX_
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 3675c83..6f3b682 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "connection.hxx"
#include "dbastrings.hrc"
#include "datasource.hxx"
@@ -71,7 +70,6 @@ using ::com::sun::star::sdb::tools::XDataSourceMetaData;
namespace dbaccess
{
-//==========================================================================
// XServiceInfo
OUString OConnection::getImplementationName( ) throw(RuntimeException)
{
@@ -131,6 +129,7 @@ Reference< XStatement > OConnection::createStatement(void) throw( SQLException,
}
return xStatement;
}
+
Reference< XPreparedStatement > OConnection::prepareStatement(const OUString& sql) throw( SQLException, RuntimeException )
{
SAL_INFO("dbaccess", "OConnection::prepareStatement" );
@@ -275,9 +274,8 @@ void OConnection::setTypeMap(const Reference< XNameAccess > & typeMap) throw( SQ
checkDisposed();
m_xMasterConnection->setTypeMap(typeMap);
}
-//==========================================================================
-//= OConnection
-//==========================================================================
+
+// OConnection
DBG_NAME(OConnection)
OConnection::OConnection(ODatabaseSource& _rDB
@@ -622,6 +620,7 @@ Reference< XNameAccess > SAL_CALL OConnection::getViews( ) throw(RuntimeExcepti
return m_pViews;
}
+
// XQueriesSupplier
Reference< XNameAccess > OConnection::getQueries(void) throw( RuntimeException )
{
@@ -877,4 +876,5 @@ Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< X
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index 856a81d..4ae8015 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -47,13 +47,9 @@
#include <connectivity/ConnectionWrapper.hxx>
#include <connectivity/warningscontainer.hxx>
-//........................................................................
namespace dbaccess
{
-//........................................................................
-//==========================================================================
-//==========================================================================
typedef ::comphelper::ImplHelper14 < ::com::sun::star::container::XChild
, ::com::sun::star::sdbcx::XTablesSupplier
, ::com::sun::star::sdbcx::XViewsSupplier
@@ -71,9 +67,7 @@ typedef ::comphelper::ImplHelper14 < ::com::sun::star::container::XChild
> OConnection_Base;
class ODatabaseSource;
-//==========================================================================
-//= OConnection
-//==========================================================================
+// OConnection
class OConnection :public ::comphelper::OBaseMutex
,public OSubComponent
,public ::connectivity::OConnectionWrapper
@@ -101,7 +95,6 @@ protected:
DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>, TSupportServices);
TSupportServices m_aSupportServices;
-
OTableContainer* m_pTables;
OViewContainer* m_pViews;
::dbtools::WarningsContainer m_aWarnings;
@@ -232,11 +225,8 @@ private:
void impl_fillTableFilter();
};
-//........................................................................
} // namespace dbaccess
-//........................................................................
#endif // _DBA_CORE_CONNECTION_HXX_
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index c340634..9e96227 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dbastrings.hrc"
#include "module_dba.hxx"
@@ -35,10 +34,8 @@
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
-//........................................................................
namespace dbaccess
{
-//........................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -64,9 +61,7 @@ namespace dbaccess
namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
namespace CommandType = ::com::sun::star::sdb::CommandType;
- //====================================================================
- //= DataAccessDescriptor
- //====================================================================
+ // DataAccessDescriptor
typedef ::comphelper::OMutexAndBroadcastHelper DataAccessDescriptor_MutexBase;
typedef ::cppu::WeakImplHelper1 < XServiceInfo
@@ -217,9 +212,7 @@ namespace dbaccess
return new ::cppu::OPropertyArrayHelper( aProps );
}
- //====================================================================
- //= DataAccessDescriptorFactory
- //====================================================================
+ // DataAccessDescriptorFactory
typedef ::cppu::WeakImplHelper2 < XServiceInfo
, XDataAccessDescriptorFactory
> DataAccessDescriptorFactory_Base;
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 5211222..d5a642f 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "apitools.hxx"
#include "core_resource.hrc"
#include "core_resource.hxx"
@@ -87,7 +86,6 @@ using ::com::sun::star::ucb::InteractiveIOException;
using ::com::sun::star::ucb::IOErrorCode_NOT_EXISTING;
using ::com::sun::star::ucb::IOErrorCode_NOT_EXISTING_PATH;
-
namespace dbaccess
{
@@ -164,8 +162,7 @@ namespace dbaccess
{
}
-//= ODatabaseContext
-//==========================================================================
+// ODatabaseContext
ODatabaseContext::ODatabaseContext( const Reference< XComponentContext >& _rxContext )
:DatabaseAccessContext_Base(m_aMutex)
@@ -762,4 +759,5 @@ void ODatabaseContext::onBasicManagerCreated( const Reference< XModel >& _rxForD
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx
index 03fa975..635006d 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.hxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.hxx
@@ -53,14 +53,10 @@ namespace com { namespace sun { namespace star {
}
} } }
-//........................................................................
namespace dbaccess
{
-//........................................................................
class DatabaseDocumentLoader;
-//============================================================
-//= ODatabaseContext
-//============================================================
+// ODatabaseContext
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
ODatabaseContext_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
@@ -119,7 +115,6 @@ public:
ODatabaseContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& );
virtual ~ODatabaseContext();
-
// OComponentHelper
virtual void SAL_CALL disposing(void);
@@ -189,11 +184,8 @@ private:
);
};
-//........................................................................
} // namespace dbaccess
-//........................................................................
#endif // _DBA_COREDATAACCESS_DATABASECONTEXT_HXX_
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 8ae2254..613ee0a 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "core_resource.hxx"
#include "core_resource.hrc"
#include "datasource.hxx"
@@ -64,7 +63,6 @@
#include <com/sun/star/awt/DialogProvider.hpp>
#include <com/sun/star/document/XGraphicObjectResolver.hpp>
-
#include <comphelper/documentconstants.hxx>
#include <comphelper/enumhelper.hxx>
#include <comphelper/genericpropertyset.hxx>
@@ -122,9 +120,7 @@ using ::com::sun::star::sdb::application::XDatabaseDocumentUI;
namespace dbaccess
{
-//============================================================
-//= ViewMonitor
-//============================================================
+// ViewMonitor
bool ViewMonitor::onControllerConnected( const Reference< XController >& _rxController )
{
@@ -151,9 +147,7 @@ bool ViewMonitor::onSetCurrentController( const Reference< XController >& _rxCon
return bLoadFinished;
}
-//============================================================
-//= ODatabaseDocument
-//============================================================
+// ODatabaseDocument
DBG_NAME(ODatabaseDocument)
extern "C" void SAL_CALL createRegistryInfo_ODatabaseDocument()
@@ -392,10 +386,15 @@ static OUString sPictures( "Pictures" );
// try to load the dialog which will try and access the embed images, if those images are not cached in
// memory it will try to read them from the Picture directory which is now gone, so... we have to use this
// inglorious hack below which basically will
+//
// a) create a temp storage
+//
// b) introspect any dialogs for any embed graphics and grab the associate URL(s)
+//
// c) populate the temp storage with the associated embed images ( will be stored in a 'Pictures' folder )
+//
// d) delete the 'Picture' element from the root storage
+//
// e) copy the Pictures element of the temp storage to the root storage
//
// this assumes that we don't use the Pictures folder in the root of the base
@@ -2173,4 +2172,5 @@ OUString SAL_CALL ODatabaseDocument::getUntitledPrefix() throw (uno::RuntimeE
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index bea00d3..ad3eeec 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -68,10 +68,8 @@ namespace comphelper {
class NamedValueCollection;
}
-//........................................................................
namespace dbaccess
{
-//........................................................................
class DocumentEvents;
class DocumentEventExecutor;
@@ -79,9 +77,7 @@ class DocumentGuard;
typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > > Controllers;
-//============================================================
-//= ViewMonitor
-//============================================================
+// ViewMonitor
/** helper class monitoring the views of a document, and firing appropriate events
when views are attached / detached
*/
@@ -133,9 +129,7 @@ private:
m_xLastConnectedController;
};
-//============================================================
-//= ODatabaseDocument
-//============================================================
+// ODatabaseDocument
typedef ::comphelper::PartialWeakComponentImplHelper17 < ::com::sun::star::frame::XModel2
, ::com::sun::star::util::XModifiable
, ::com::sun::star::frame::XStorable
@@ -246,7 +240,6 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _xStorageToSaveTo
) const;
-
/// write a single output stream
/// (to be called either directly or by WriteThroughComponent(...))
void WriteThroughComponent(
@@ -604,7 +597,6 @@ private:
DocumentGuard& _rDocGuard
) const;
-
/** impl-version of attachResource
@param i_rLogicalDocumentURL
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index a02c2be..aa122e7 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/sdb/XDatabaseRegistrations.hpp>
#include <cppuhelper/basemutex.hxx>
@@ -69,9 +68,7 @@ namespace dbaccess
return s_sNodeName;
}
- //====================================================================
- //= DatabaseRegistrations - declaration
- //====================================================================
+ // DatabaseRegistrations - declaration
typedef ::cppu::WeakAggImplHelper1 < XDatabaseRegistrations
> DatabaseRegistrations_Base;
class DatabaseRegistrations :public ::cppu::BaseMutex
@@ -128,9 +125,7 @@ namespace dbaccess
::cppu::OInterfaceContainerHelper m_aRegistrationListeners;
};
- //====================================================================
- //= DatabaseRegistrations - implementation
- //====================================================================
+ // DatabaseRegistrations - implementation
DatabaseRegistrations::DatabaseRegistrations( const Reference<XComponentContext> & _rxContext )
:m_aContext( _rxContext )
,m_aConfigurationRoot()
@@ -351,13 +346,12 @@ namespace dbaccess
m_aRegistrationListeners.removeInterface( _Listener );
}
- //====================================================================
- //= DatabaseRegistrations - factory
- //====================================================================
+ // DatabaseRegistrations - factory
Reference< XAggregation > createDataSourceRegistrations( const Reference<XComponentContext> & _rxContext )
{
return new DatabaseRegistrations( _rxContext );
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 79053b7..adfe1f9 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "datasource.hxx"
#include "module_dba.hxx"
#include "userinformation.hxx"
@@ -30,7 +29,6 @@
#include "databasedocument.hxx"
#include "OAuthenticationContinuation.hxx"
-
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
@@ -94,9 +92,7 @@ using namespace ::comphelper;
namespace dbaccess
{
-//============================================================
-//= FlushNotificationAdapter
-//============================================================
+// FlushNotificationAdapter
typedef ::cppu::WeakImplHelper1< XFlushListener > FlushNotificationAdapter_Base;
/** helper class which implements a XFlushListener, and forwards all
notification events to another XFlushListener
@@ -133,9 +129,7 @@ protected:
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
};
-//------------------------------------------------------------
DBG_NAME( FlushNotificationAdapter )
-//------------------------------------------------------------
FlushNotificationAdapter::FlushNotificationAdapter( const Reference< XFlushable >& _rxBroadcaster, const Reference< XFlushListener >& _rxListener )
:m_aBroadcaster( _rxBroadcaster )
,m_aListener( _rxListener )
@@ -152,7 +146,6 @@ FlushNotificationAdapter::FlushNotificationAdapter( const Reference< XFlushable
OSL_ENSURE( m_refCount == 1, "FlushNotificationAdapter::FlushNotificationAdapter: broadcaster isn't holding by hard ref!?" );
}
-//------------------------------------------------------------
FlushNotificationAdapter::~FlushNotificationAdapter()
{
DBG_DTOR( FlushNotificationAdapter, NULL );
@@ -401,6 +394,7 @@ Reference<XConnection> OSharedConnectionManager::getConnection( const OUString&
return xRet;
}
+
void OSharedConnectionManager::addEventListener(const Reference<XConnection>& _rxConnection,TConnectionMap::iterator& _rIter)
{
Reference<XComponent> xComp(_rxConnection,UNO_QUERY);
@@ -483,9 +477,8 @@ namespace
}
};
}
-//============================================================
-//= ODatabaseContext
-//============================================================
+
+// ODatabaseContext
DBG_NAME(ODatabaseSource)
extern "C" void SAL_CALL createRegistryInfo_ODatabaseSource()
@@ -580,6 +573,7 @@ void SAL_CALL ODatabaseSource::disposing( const ::com::sun::star::lang::EventObj
if ( m_pImpl.is() )
m_pImpl->disposing(Source);
}
+
// XServiceInfo
OUString ODatabaseSource::getImplementationName( ) throw(RuntimeException)
{
@@ -1402,4 +1396,5 @@ Reference< XInterface > ODatabaseSource::getThis() const
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx
index 33e241a..676f643 100644
--- a/dbaccess/source/core/dataaccess/datasource.hxx
+++ b/dbaccess/source/core/dataaccess/datasource.hxx
@@ -57,9 +57,7 @@ namespace dbaccess
class OSharedConnectionManager;
-//============================================================
-//= ODatabaseSource
-//============================================================
+// ODatabaseSource
typedef ::cppu::WeakComponentImplHelper11 < ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::sdbc::XDataSource
, ::com::sun::star::sdb::XBookmarksSupplier
@@ -73,7 +71,6 @@ typedef ::cppu::WeakComponentImplHelper11 < ::com::sun::star::lang::XService
, ::com::sun::star::sdb::XDocumentDataSource
> ODatabaseSource_Base;
-
class ODatabaseSource :public ModelDependentComponent // must be first
,public ODatabaseSource_Base
,public ::cppu::OPropertySetHelper
@@ -224,5 +221,4 @@ protected:
#endif // _DBA_COREDATAACCESS_DATALINK_HXX_
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index 50ef79d..dc31e69 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "definitioncontainer.hxx"
#include "dbastrings.hrc"
#include "apitools.hxx"
@@ -38,7 +37,6 @@
#include <ucbhelper/contentidentifier.hxx>
#include <o3tl/compat_functional.hxx>
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
@@ -54,9 +52,7 @@ using namespace ::com::sun::star::ucb;
namespace dbaccess
{
-//==========================================================================
-//= ODefinitionContainer_Impl
-//==========================================================================
+// ODefinitionContainer_Impl
void ODefinitionContainer_Impl::erase( TContentPtr _pDefinition )
{
NamedDefinitions::iterator aPos = find( _pDefinition );
@@ -88,9 +84,7 @@ ODefinitionContainer_Impl::iterator ODefinitionContainer_Impl::find( TContentPtr
);
}
-//==========================================================================
-//= ODefinitionContainer
-//==========================================================================
+// ODefinitionContainer
DBG_NAME(ODefinitionContainer)
ODefinitionContainer::ODefinitionContainer( const Reference< XComponentContext >& _xORB
@@ -538,7 +532,6 @@ void ODefinitionContainer::implAppend(const OUString& _rName, const Reference< X
}
}
-
m_aDocuments.push_back(m_aDocumentMap.insert(Documents::value_type(_rName,_rxNewObject)).first);
notifyDataSourceModified();
// now update our structures
@@ -668,5 +661,6 @@ sal_Bool ODefinitionContainer::checkExistence(const OUString& _rName)
}
}
+
// namespace dbaccess
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index c28643c..155c1bd 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "documentcontainer.hxx"
#include "dbastrings.hrc"
#include "documentdefinition.hxx"
@@ -60,9 +59,7 @@ using namespace ::cppu;
namespace dbaccess
{
-//==========================================================================
-//= LocalNameApproval
-//==========================================================================
+// LocalNameApproval
class LocalNameApproval : public IContainerApprove
{
::connectivity::SQLError m_aErrors;
@@ -89,9 +86,7 @@ void SAL_CALL LocalNameApproval::approveElement( const OUString& _rName, const R
);
}
-//==========================================================================
-//= ODocumentContainer
-//==========================================================================
+// ODocumentContainer
DBG_NAME(ODocumentContainer)
ODocumentContainer::ODocumentContainer(const Reference< XComponentContext >& _xORB
@@ -404,9 +399,7 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com
Any aRet;
if ( aCommand.Name.compareToAscii( "open" ) == 0 )
{
- //////////////////////////////////////////////////////////////////
// open command for a folder content
- //////////////////////////////////////////////////////////////////
OpenCommandArgument2 aOpenCommand;
if ( !( aCommand.Argument >>= aOpenCommand ) )
{
@@ -449,9 +442,7 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com
}
else if ( aCommand.Name == "insert" )
{
- //////////////////////////////////////////////////////////////////
// insert
- //////////////////////////////////////////////////////////////////
InsertCommandArgument arg;
if ( !( aCommand.Argument >>= arg ) )
@@ -468,9 +459,7 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com
}
else if ( aCommand.Name == "delete" )
{
- //////////////////////////////////////////////////////////////////
// delete
- //////////////////////////////////////////////////////////////////
Sequence< OUString> aSeq = getElementNames();
const OUString* pIter = aSeq.getConstArray();
const OUString* pEnd = pIter + aSeq.getLength();
@@ -767,4 +756,5 @@ void SAL_CALL ODocumentContainer::rename( const OUString& newName ) throw (SQLEx
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.hxx b/dbaccess/source/core/dataaccess/documentcontainer.hxx
index 2ff2269..23aa71d 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.hxx
@@ -39,9 +39,7 @@ typedef ::cppu::ImplHelper5 < ::com::sun::star::frame::XComponentLoader
, ::com::sun::star::container::XHierarchicalName
, ::com::sun::star::embed::XTransactedObject
> ODocumentContainer_Base;
-//==========================================================================
-//= ODocumentContainer - collections of database documents (reports/forms)
-//==========================================================================
+// ODocumentContainer - collections of database documents (reports/forms)
class ODocumentContainer : public ODefinitionContainer
, public ODocumentContainer_Base
, public ::comphelper::OPropertyStateContainer
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 5ed8118..d5e6d6b 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "documentdefinition.hxx"
#include "dbastrings.hrc"
#include "sdbcoretools.hxx"
@@ -129,7 +128,6 @@ using namespace ::cppu;
using sdb::application::XDatabaseDocumentUI;
namespace DatabaseObject = sdb::application::DatabaseObject;
-
#define DEFAULT_WIDTH 10000
#define DEFAULT_HEIGHT 7500
@@ -138,12 +136,9 @@ namespace dbaccess
typedef ::boost::optional< bool > optional_bool;
- //=========================================================================
- //= helper
- //=========================================================================
+ // helper
namespace
{
- // --------------------------------------------------------------------
OUString lcl_determineContentType_nothrow( const Reference< XStorage >& _rxContainerStorage,
const OUString& _rEntityName )
{
@@ -162,9 +157,7 @@ namespace dbaccess
}
}
- //==================================================================
// OEmbedObjectHolder
- //==================================================================
typedef ::cppu::WeakComponentImplHelper1< embed::XStateChangeListener > TEmbedObjectHolder;
class OEmbedObjectHolder : public ::comphelper::OBaseMutex
,public TEmbedObjectHolder
@@ -233,9 +226,7 @@ namespace dbaccess
m_xBroadCaster = NULL;
}
- //==================================================================
// OEmbeddedClientHelper
- //==================================================================
typedef ::cppu::WeakImplHelper1 < XEmbeddedClient
> EmbeddedClientHelper_BASE;
class OEmbeddedClientHelper : public EmbeddedClientHelper_BASE
@@ -263,9 +254,7 @@ namespace dbaccess
inline void resetClient(ODocumentDefinition* _pClient) { m_pClient = _pClient; }
};
- //==================================================================
// LockModifiable
- //==================================================================
class LockModifiable
{
public:
@@ -297,9 +286,7 @@ namespace dbaccess
Reference< XModifiable2 > m_xModifiable;
};
- //==================================================================
// LifetimeCoupler
- //==================================================================
typedef ::cppu::WeakImplHelper1 < css::lang::XEventListener
> LifetimeCoupler_Base;
/** helper class which couples the lifetime of a component to the lifetime
@@ -346,9 +333,7 @@ namespace dbaccess
m_xClient.clear();
}
- //==================================================================
// ODocumentSaveContinuation
- //==================================================================
class ODocumentSaveContinuation : public OInteraction< XInteractionDocumentSave >
{
OUString m_sName;
@@ -426,9 +411,7 @@ OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const OUString& _
return sResult;
}
-//==========================================================================
-//= ODocumentDefinition
-//==========================================================================
+// ODocumentDefinition
DBG_NAME(ODocumentDefinition)
ODocumentDefinition::ODocumentDefinition( const Reference< XInterface >& _rxContainer, const Reference< XComponentContext >& _xORB,
@@ -648,9 +631,7 @@ void ODocumentDefinition::impl_onActivateEmbeddedObject_nothrow( const bool i_bR
namespace
{
- // =========================================================================
- // = PreserveVisualAreaSize
- // =========================================================================
+ // PreserveVisualAreaSize
/** stack-guard for preserving the size of the VisArea of an XModel
*/
class PreserveVisualAreaSize
@@ -692,9 +673,7 @@ namespace
}
};
- // =========================================================================
- // = LayoutManagerLock
- // =========================================================================
+ // LayoutManagerLock
/** helper class for stack-usage which during its lifetime locks a layout manager
*/
class LayoutManagerLock
@@ -1096,9 +1075,7 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co
}
else if ( aCommand.Name == "delete" )
{
- //////////////////////////////////////////////////////////////////
// delete
- //////////////////////////////////////////////////////////////////
closeObject();
Reference< XStorage> xStorage = getContainerStorage();
if ( xStorage.is() )
@@ -1440,7 +1417,6 @@ sal_Bool ODocumentDefinition::saveAs()
namespace
{
- // .........................................................................
void lcl_putLoadArgs( ::comphelper::NamedValueCollection& _io_rArgs, const optional_bool _bSuppressMacros, const optional_bool _bReadOnly )
{
if ( !!_bSuppressMacros )
@@ -1524,7 +1500,6 @@ void ODocumentDefinition::separateOpenCommandArguments( const Sequence< Property
Sequence< PropertyValue > ODocumentDefinition::fillLoadArgs( const Reference< XConnection>& _xConnection, const bool _bSuppressMacros, const bool _bReadOnly,
const Sequence< PropertyValue >& i_rOpenCommandArguments, Sequence< PropertyValue >& _out_rEmbeddedObjectDescriptor )
{
- // .........................................................................
// (re-)create interceptor, and put it into the descriptor of the embedded object
if ( m_pInterceptor )
{
@@ -1540,11 +1515,9 @@ Sequence< PropertyValue > ODocumentDefinition::fillLoadArgs( const Reference< XC
::comphelper::NamedValueCollection aEmbeddedDescriptor;
aEmbeddedDescriptor.put( "OutplaceDispatchInterceptor", xInterceptor );
- // .........................................................................
::comphelper::NamedValueCollection aMediaDesc;
separateOpenCommandArguments( i_rOpenCommandArguments, aMediaDesc, aEmbeddedDescriptor );
- // .........................................................................
// create the OutplaceFrameProperties, and put them into the descriptor of the embedded object
::comphelper::NamedValueCollection OutplaceFrameProperties;
OutplaceFrameProperties.put( "TopWindow", (sal_Bool)sal_True );
@@ -1570,19 +1543,15 @@ Sequence< PropertyValue > ODocumentDefinition::fillLoadArgs( const Reference< XC
aEmbeddedDescriptor.put( "OutplaceFrameProperties", OutplaceFrameProperties.getNamedValues() );
- // .........................................................................
// tell the embedded object to have (or not have) script support
aEmbeddedDescriptor.put( "EmbeddedScriptSupport", (sal_Bool)objectSupportsEmbeddedScripts() );
- // .........................................................................
// tell the embedded object to not participate in the document recovery game - the DB doc will handle it
aEmbeddedDescriptor.put( "DocumentRecoverySupport", (sal_Bool)sal_False );
- // .........................................................................
// pass the descriptor of the embedded object to the caller
aEmbeddedDescriptor >>= _out_rEmbeddedObjectDescriptor;
- // .........................................................................
// create the ComponentData, and put it into the document's media descriptor
{
::comphelper::NamedValueCollection aComponentData;
@@ -1596,7 +1565,6 @@ Sequence< PropertyValue > ODocumentDefinition::fillLoadArgs( const Reference< XC
aMediaDesc.put( "DocumentBaseURL", m_pImpl->m_pDataSource->getURL() );
- // .........................................................................
// put the common load arguments into the document's media descriptor
lcl_putLoadArgs( aMediaDesc, optional_bool( _bSuppressMacros ), optional_bool( _bReadOnly ) );
@@ -2154,9 +2122,7 @@ void ODocumentDefinition::firePropertyChange( sal_Int32 i_nHandle, const Any& i_
fire( &i_nHandle, &i_rNewValue, &i_rOldValue, 1, i_bVetoable );
}
-// =============================================================================
// NameChangeNotifier
-// =============================================================================
NameChangeNotifier::NameChangeNotifier( ODocumentDefinition& i_rDocumentDefinition, const OUString& i_rNewName,
::osl::ResettableMutexGuard& i_rClearForNotify )
:m_rDocumentDefinition( i_rDocumentDefinition )
@@ -2181,4 +2147,5 @@ void NameChangeNotifier::impl_fireEvent_throw( const sal_Bool i_bVetoable )
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx
index b3630df..2f57ed3 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.hxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx
@@ -40,17 +40,13 @@ namespace comphelper
class NamedValueCollection;
}
-//........................................................................
namespace dbaccess
{
-//........................................................................
class OInterceptor;
class OEmbeddedClientHelper;
-//==========================================================================
-//= ODocumentDefinition - a database "document" which is simply a link to a real
-//= document
-//==========================================================================
+// ODocumentDefinition - a database "document" which is simply a link to a real
+// document
typedef ::cppu::ImplHelper4 < ::com::sun::star::embed::XComponentSupplier
, ::com::sun::star::sdb::XSubDocument
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
index f2d4c32..b05b797 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "documenteventexecutor.hxx"
#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
@@ -63,9 +62,7 @@ namespace dbaccess
using namespace ::com::sun::star;
- //====================================================================
- //= DocumentEventExecutor_Data
- //====================================================================
+ // DocumentEventExecutor_Data
struct DocumentEventExecutor_Data
{
WeakReference< XEventsSupplier > xDocument;
@@ -118,9 +115,7 @@ namespace dbaccess
}
}
- //====================================================================
- //= DocumentEventExecutor
- //====================================================================
+ // DocumentEventExecutor
DocumentEventExecutor::DocumentEventExecutor( const Reference<XComponentContext> & _rContext,
const Reference< XEventsSupplier >& _rxDocument )
:m_pData( new DocumentEventExecutor_Data( _rxDocument ) )
@@ -205,4 +200,5 @@ namespace dbaccess
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
index 48fbd3b..984dfa6 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
@@ -31,9 +31,7 @@ namespace dbaccess
{
struct DocumentEventExecutor_Data;
- //====================================================================
- //= DocumentEventExecutor
- //====================================================================
+ // DocumentEventExecutor
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::document::XDocumentEventListener
> DocumentEventExecutor_Base;
class DocumentEventExecutor : public DocumentEventExecutor_Base
diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
index 18155d0..0f97771 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "documenteventnotifier.hxx"
#include <com/sun/star/frame/DoubleInitializationException.hpp>
@@ -48,14 +47,10 @@ namespace dbaccess
using namespace ::com::sun::star;
- //==================================================================
- //= DocumentEventHolder
- //==================================================================
+ // DocumentEventHolder
typedef ::comphelper::EventHolder< DocumentEvent > DocumentEventHolder;
- //====================================================================
- //= DocumentEventNotifier_Impl
- //====================================================================
+ // DocumentEventNotifier_Impl
class DocumentEventNotifier_Impl : public ::comphelper::IEventProcessor
{
oslInterlockedCount m_refCount;
@@ -236,9 +231,7 @@ namespace dbaccess
impl_notifyEvent_nothrow( rEventHolder.getEventObject() );
}
- //====================================================================
- //= DocumentEventNotifier
- //====================================================================
+ // DocumentEventNotifier
DocumentEventNotifier::DocumentEventNotifier( ::cppu::OWeakObject& _rBroadcasterDocument, ::osl::Mutex& _rMutex )
:m_pImpl( new DocumentEventNotifier_Impl( _rBroadcasterDocument, _rMutex ) )
{
@@ -291,4 +284,5 @@ namespace dbaccess
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
index cd365ed..f6a69b2 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
@@ -35,9 +35,7 @@ namespace dbaccess
{
class DocumentEventNotifier_Impl;
- //====================================================================
- //= DocumentEventNotifier
- //====================================================================
+ // DocumentEventNotifier
class DocumentEventNotifier
{
public:
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
index 41a7e41..d4e9fbe 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "documentevents.hxx"
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -47,9 +46,7 @@ namespace dbaccess
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Type;
- //====================================================================
- //= DocumentEvents_Data
- //====================================================================
+ // DocumentEvents_Data
struct DocumentEvents_Data : public ::boost::noncopyable
{
::cppu::OWeakObject& rParent;
@@ -64,9 +61,7 @@ namespace dbaccess
}
};
- //====================================================================
- //= helper
- //====================================================================
+ // helper
struct DocumentEventData
{
const sal_Char* pAsciiEventName;
@@ -108,9 +103,7 @@ namespace dbaccess
}
}
- //====================================================================
- //= DocumentEvents
- //====================================================================
+ // DocumentEvents
DocumentEvents::DocumentEvents( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, DocumentEventsData& _rEventsData )
:m_pData( new DocumentEvents_Data( _rParent, _rMutex, _rEventsData ) )
{
@@ -234,4 +227,5 @@ namespace dbaccess
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx b/dbaccess/source/core/dataaccess/documentevents.hxx
index 12bd8b8..1b19a0f 100644
--- a/dbaccess/source/core/dataaccess/documentevents.hxx
+++ b/dbaccess/source/core/dataaccess/documentevents.hxx
@@ -35,9 +35,7 @@ namespace dbaccess
typedef ::std::map< OUString, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >
DocumentEventsData;
- //====================================================================
- //= DocumentEvents
- //====================================================================
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list