summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dbaccess/source/core/api/BookmarkSet.cxx1
-rw-r--r--dbaccess/source/core/api/CIndexes.cxx1
-rw-r--r--dbaccess/source/core/api/CRowSetColumn.cxx1
-rw-r--r--dbaccess/source/core/api/CRowSetDataColumn.cxx1
-rw-r--r--dbaccess/source/core/api/CacheSet.cxx1
-rw-r--r--dbaccess/source/core/api/FilteredContainer.cxx5
-rw-r--r--dbaccess/source/core/api/HelperCollections.hxx4
-rw-r--r--dbaccess/source/core/api/KeySet.cxx11
-rw-r--r--dbaccess/source/core/api/OptimisticSet.cxx2
-rw-r--r--dbaccess/source/core/api/RowSet.cxx2
-rw-r--r--dbaccess/source/core/api/RowSetBase.cxx14
-rw-r--r--dbaccess/source/core/api/RowSetBase.hxx3
-rw-r--r--dbaccess/source/core/api/RowSetCache.cxx1
-rw-r--r--dbaccess/source/core/api/SingleSelectQueryComposer.cxx8
-rw-r--r--dbaccess/source/core/api/StaticSet.cxx1
-rw-r--r--dbaccess/source/core/api/TableDeco.cxx5
-rw-r--r--dbaccess/source/core/api/View.cxx6
-rw-r--r--dbaccess/source/core/api/WrappedResultSet.cxx1
-rw-r--r--dbaccess/source/core/api/column.cxx13
-rw-r--r--dbaccess/source/core/api/columnsettings.cxx9
-rw-r--r--dbaccess/source/core/api/datacolumn.cxx1
-rw-r--r--dbaccess/source/core/api/datasettings.cxx7
-rw-r--r--dbaccess/source/core/api/definitioncolumn.cxx26
-rw-r--r--dbaccess/source/core/api/preparedstatement.cxx1
-rw-r--r--dbaccess/source/core/api/query.cxx6
-rw-r--r--dbaccess/source/core/api/query.hxx11
-rw-r--r--dbaccess/source/core/api/querycomposer.cxx1
-rw-r--r--dbaccess/source/core/api/querycontainer.cxx6
-rw-r--r--dbaccess/source/core/api/querydescriptor.cxx4
-rw-r--r--dbaccess/source/core/api/querydescriptor.hxx9
-rw-r--r--dbaccess/source/core/api/resultcolumn.cxx1
-rw-r--r--dbaccess/source/core/api/resultset.cxx1
-rw-r--r--dbaccess/source/core/api/table.cxx6
-rw-r--r--dbaccess/source/core/api/tablecontainer.cxx7
-rw-r--r--dbaccess/source/core/api/viewcontainer.cxx5
-rw-r--r--dbaccess/source/core/dataaccess/ComponentDefinition.cxx9
-rw-r--r--dbaccess/source/core/dataaccess/ComponentDefinition.hxx9
-rw-r--r--dbaccess/source/core/dataaccess/ContentHelper.cxx11
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.cxx14
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.hxx13
-rw-r--r--dbaccess/source/core/dataaccess/SharedConnection.cxx1
-rw-r--r--dbaccess/source/core/dataaccess/SharedConnection.hxx11
-rw-r--r--dbaccess/source/core/dataaccess/bookmarkcontainer.cxx7
-rw-r--r--dbaccess/source/core/dataaccess/bookmarkcontainer.hxx8
-rw-r--r--dbaccess/source/core/dataaccess/commandcontainer.cxx6
-rw-r--r--dbaccess/source/core/dataaccess/commandcontainer.hxx5
-rw-r--r--dbaccess/source/core/dataaccess/commanddefinition.cxx7
-rw-r--r--dbaccess/source/core/dataaccess/commanddefinition.hxx10
-rw-r--r--dbaccess/source/core/dataaccess/connection.cxx10
-rw-r--r--dbaccess/source/core/dataaccess/connection.hxx12
-rw-r--r--dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx11
-rw-r--r--dbaccess/source/core/dataaccess/databasecontext.cxx6
-rw-r--r--dbaccess/source/core/dataaccess/databasecontext.hxx10
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.cxx16
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.hxx12
-rw-r--r--dbaccess/source/core/dataaccess/databaseregistrations.cxx14
-rw-r--r--dbaccess/source/core/dataaccess/datasource.cxx17
-rw-r--r--dbaccess/source/core/dataaccess/datasource.hxx6
-rw-r--r--dbaccess/source/core/dataaccess/definitioncontainer.cxx12
-rw-r--r--dbaccess/source/core/dataaccess/documentcontainer.cxx16
-rw-r--r--dbaccess/source/core/dataaccess/documentcontainer.hxx4
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.cxx43
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.hxx8
-rw-r--r--dbaccess/source/core/dataaccess/documenteventexecutor.cxx10
-rw-r--r--dbaccess/source/core/dataaccess/documenteventexecutor.hxx4
-rw-r--r--dbaccess/source/core/dataaccess/documenteventnotifier.cxx14
-rw-r--r--dbaccess/source/core/dataaccess/documenteventnotifier.hxx4
-rw-r--r--dbaccess/source/core/dataaccess/documentevents.cxx14
-rw-r--r--dbaccess/source/core/dataaccess/documentevents.hxx4
-rw-r--r--dbaccess/source/core/dataaccess/intercept.cxx1
-rw-r--r--dbaccess/source/core/dataaccess/myucp_datasupplier.cxx21
-rw-r--r--dbaccess/source/core/dataaccess/myucp_resultset.cxx12
-rw-r--r--dbaccess/source/core/inc/FilteredContainer.hxx2
-rw-r--r--dbaccess/source/core/inc/PropertyForward.hxx4
-rw-r--r--dbaccess/source/core/inc/RefreshListener.hxx4
-rw-r--r--dbaccess/source/core/inc/TableDeco.hxx7
-rw-r--r--dbaccess/source/core/inc/View.hxx4
-rw-r--r--dbaccess/source/core/inc/column.hxx12
-rw-r--r--dbaccess/source/core/inc/columnsettings.hxx4
-rw-r--r--dbaccess/source/core/inc/commandbase.hxx6
-rw-r--r--dbaccess/source/core/inc/composertools.hxx13
-rw-r--r--dbaccess/source/core/inc/containerapprove.hxx4
-rw-r--r--dbaccess/source/core/inc/core_resource.hxx10
-rw-r--r--dbaccess/source/core/inc/datasettings.hxx18
-rw-r--r--dbaccess/source/core/inc/definitioncolumn.hxx25
-rw-r--r--dbaccess/source/core/inc/definitioncontainer.hxx6
-rw-r--r--dbaccess/source/core/inc/objectnameapproval.hxx4
-rw-r--r--dbaccess/source/core/inc/querycontainer.hxx4
-rw-r--r--dbaccess/source/core/inc/recovery/dbdocrecovery.hxx4
-rw-r--r--dbaccess/source/core/inc/table.hxx5
-rw-r--r--dbaccess/source/core/inc/tablecontainer.hxx6
-rw-r--r--dbaccess/source/core/inc/veto.hxx4
-rw-r--r--dbaccess/source/core/inc/viewcontainer.hxx5
-rw-r--r--dbaccess/source/core/misc/ContainerMediator.cxx18
-rw-r--r--dbaccess/source/core/misc/DatabaseDataProvider.cxx126
-rw-r--r--dbaccess/source/core/misc/PropertyForward.cxx11
-rw-r--r--dbaccess/source/core/misc/apitools.cxx17
-rw-r--r--dbaccess/source/core/misc/dsntypes.cxx71
-rw-r--r--dbaccess/source/core/misc/module_dba.cxx5
-rw-r--r--dbaccess/source/core/misc/objectnameapproval.cxx16
-rw-r--r--dbaccess/source/core/misc/sdbcoretools.cxx11
-rw-r--r--dbaccess/source/core/misc/services.cxx9
-rw-r--r--dbaccess/source/core/misc/userinformation.cxx2
-rw-r--r--dbaccess/source/core/misc/veto.cxx12
-rw-r--r--dbaccess/source/core/recovery/dbdocrecovery.cxx27
-rw-r--r--dbaccess/source/core/recovery/settingsimport.cxx39
-rw-r--r--dbaccess/source/core/recovery/settingsimport.hxx24
-rw-r--r--dbaccess/source/core/recovery/storagestream.cxx19
-rw-r--r--dbaccess/source/core/recovery/storagestream.hxx12
-rw-r--r--dbaccess/source/core/recovery/storagetextstream.cxx23
-rw-r--r--dbaccess/source/core/recovery/storagetextstream.hxx8
-rw-r--r--dbaccess/source/core/recovery/storagexmlstream.cxx32
-rw-r--r--dbaccess/source/core/recovery/storagexmlstream.hxx12
-rw-r--r--dbaccess/source/core/recovery/subcomponentloader.cxx26
-rw-r--r--dbaccess/source/core/recovery/subcomponentloader.hxx8
-rw-r--r--dbaccess/source/core/recovery/subcomponentrecovery.cxx48
-rw-r--r--dbaccess/source/core/recovery/subcomponentrecovery.hxx9
-rw-r--r--dbaccess/source/core/recovery/subcomponents.hxx8
-rw-r--r--dbaccess/source/core/resource/core_resource.cxx15
-rw-r--r--dbaccess/source/ext/macromigration/dbmm_module.cxx5
-rw-r--r--dbaccess/source/ext/macromigration/dbmm_module.hxx4
-rw-r--r--dbaccess/source/ext/macromigration/dbmm_services.cxx6
-rw-r--r--dbaccess/source/ext/macromigration/dbmm_types.cxx10
-rw-r--r--dbaccess/source/ext/macromigration/dbmm_types.hxx16
-rw-r--r--dbaccess/source/ext/macromigration/docinteraction.cxx17
-rw-r--r--dbaccess/source/ext/macromigration/docinteraction.hxx8
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationdialog.cxx35
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationdialog.hxx8
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationpages.cxx53
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationpages.hxx24
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationwizard.cxx28
-rw-r--r--dbaccess/source/ext/macromigration/migrationengine.cxx104
-rw-r--r--dbaccess/source/ext/macromigration/migrationengine.hxx8
-rw-r--r--dbaccess/source/ext/macromigration/migrationerror.hxx8
-rw-r--r--dbaccess/source/ext/macromigration/migrationlog.cxx44
-rw-r--r--dbaccess/source/ext/macromigration/migrationlog.hxx10
-rw-r--r--dbaccess/source/ext/macromigration/migrationprogress.hxx8
-rw-r--r--dbaccess/source/ext/macromigration/progresscapture.cxx20
-rw-r--r--dbaccess/source/ext/macromigration/progresscapture.hxx8
-rw-r--r--dbaccess/source/ext/macromigration/progressmixer.cxx24
-rw-r--r--dbaccess/source/ext/macromigration/progressmixer.hxx12
-rw-r--r--dbaccess/source/ext/macromigration/rangeprogressbar.hxx13
-rw-r--r--dbaccess/source/filter/xml/dbloader2.cxx43
-rw-r--r--dbaccess/source/filter/xml/xmlAutoStyle.cxx7
-rw-r--r--dbaccess/source/filter/xml/xmlAutoStyle.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlColumn.cxx8
-rw-r--r--dbaccess/source/filter/xml/xmlColumn.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlComponent.cxx5
-rw-r--r--dbaccess/source/filter/xml/xmlComponent.hxx3
-rw-r--r--dbaccess/source/filter/xml/xmlConnectionData.cxx8
-rw-r--r--dbaccess/source/filter/xml/xmlConnectionData.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlConnectionResource.cxx5
-rw-r--r--dbaccess/source/filter/xml/xmlConnectionResource.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlDataSource.cxx7
-rw-r--r--dbaccess/source/filter/xml/xmlDataSource.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceInfo.cxx5
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceInfo.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceSetting.cxx15
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceSetting.hxx3
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceSettings.cxx9
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceSettings.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlDatabase.cxx9
-rw-r--r--dbaccess/source/filter/xml/xmlDatabase.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlDatabaseDescription.cxx8
-rw-r--r--dbaccess/source/filter/xml/xmlDatabaseDescription.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlDocuments.cxx11
-rw-r--r--dbaccess/source/filter/xml/xmlDocuments.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlEnums.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlExport.cxx103
-rw-r--r--dbaccess/source/filter/xml/xmlExport.hxx4
-rw-r--r--dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx5
-rw-r--r--dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlHelper.cxx16
-rw-r--r--dbaccess/source/filter/xml/xmlHelper.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlHierarchyCollection.cxx12
-rw-r--r--dbaccess/source/filter/xml/xmlHierarchyCollection.hxx3
-rw-r--r--dbaccess/source/filter/xml/xmlLogin.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlLogin.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlQuery.cxx8
-rw-r--r--dbaccess/source/filter/xml/xmlQuery.hxx3
-rw-r--r--dbaccess/source/filter/xml/xmlServerDatabase.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlServerDatabase.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlStyleImport.cxx26
-rw-r--r--dbaccess/source/filter/xml/xmlStyleImport.hxx3
-rw-r--r--dbaccess/source/filter/xml/xmlTable.cxx14
-rw-r--r--dbaccess/source/filter/xml/xmlTable.hxx3
-rw-r--r--dbaccess/source/filter/xml/xmlTableFilterList.cxx8
-rw-r--r--dbaccess/source/filter/xml/xmlTableFilterList.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlTableFilterPattern.cxx5
-rw-r--r--dbaccess/source/filter/xml/xmlTableFilterPattern.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx58
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.hxx5
-rw-r--r--dbaccess/source/filter/xml/xmlservices.cxx3
-rw-r--r--dbaccess/source/inc/OAuthenticationContinuation.hxx5
-rw-r--r--dbaccess/source/inc/apitools.hxx67
-rw-r--r--dbaccess/source/inc/dsntypes.hxx16
-rw-r--r--dbaccess/source/inc/registrationhelper.hxx3
-rw-r--r--dbaccess/source/sdbtools/connection/connectiondependent.hxx13
-rw-r--r--dbaccess/source/sdbtools/connection/connectiontools.cxx23
-rw-r--r--dbaccess/source/sdbtools/connection/connectiontools.hxx8
-rw-r--r--dbaccess/source/sdbtools/connection/datasourcemetadata.cxx16
-rw-r--r--dbaccess/source/sdbtools/connection/datasourcemetadata.hxx9
-rw-r--r--dbaccess/source/sdbtools/connection/objectnames.cxx47
-rw-r--r--dbaccess/source/sdbtools/connection/objectnames.hxx8
-rw-r--r--dbaccess/source/sdbtools/connection/tablename.cxx27
-rw-r--r--dbaccess/source/sdbtools/connection/tablename.hxx8
-rw-r--r--dbaccess/source/sdbtools/inc/module_sdbt.hxx4
-rw-r--r--dbaccess/source/sdbtools/misc/module_sdbt.cxx5
-rw-r--r--dbaccess/source/sdbtools/misc/sdbt_services.cxx4
-rw-r--r--dbaccess/source/shared/registrationhelper.cxx6
-rw-r--r--dbaccess/source/ui/app/AppController.cxx122
-rw-r--r--dbaccess/source/ui/app/AppController.hxx10
-rw-r--r--dbaccess/source/ui/app/AppControllerDnD.cxx37
-rw-r--r--dbaccess/source/ui/app/AppControllerGen.cxx54
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx118
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.hxx3
-rw-r--r--dbaccess/source/ui/app/AppDetailView.cxx127
-rw-r--r--dbaccess/source/ui/app/AppDetailView.hxx2
-rw-r--r--dbaccess/source/ui/app/AppIconControl.cxx8
-rw-r--r--dbaccess/source/ui/app/AppIconControl.hxx2
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.cxx21
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.hxx5
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.cxx20
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.hxx3
-rw-r--r--dbaccess/source/ui/app/AppView.cxx101
-rw-r--r--dbaccess/source/ui/app/AppView.hxx4
-rw-r--r--dbaccess/source/ui/app/IApplicationController.hxx4
-rw-r--r--dbaccess/source/ui/app/subcomponentmanager.cxx37
-rw-r--r--dbaccess/source/ui/app/subcomponentmanager.hxx8
-rw-r--r--dbaccess/source/ui/browser/AsyncronousLink.cxx10
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx176
-rw-r--r--dbaccess/source/ui/browser/brwview.cxx34
-rw-r--r--dbaccess/source/ui/browser/dataview.cxx22
-rw-r--r--dbaccess/source/ui/browser/dbexchange.cxx11
-rw-r--r--dbaccess/source/ui/browser/dbloader.cxx19
-rw-r--r--dbaccess/source/ui/browser/dbtreemodel.cxx3
-rw-r--r--dbaccess/source/ui/browser/dbtreeview.cxx20
-rw-r--r--dbaccess/source/ui/browser/dbtreeview.hxx3
-rw-r--r--dbaccess/source/ui/browser/dsEntriesNoExp.cxx21
-rw-r--r--dbaccess/source/ui/browser/dsbrowserDnD.cxx17
-rw-r--r--dbaccess/source/ui/browser/exsrcbrw.cxx40
-rw-r--r--dbaccess/source/ui/browser/formadapter.cxx267
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx140
-rw-r--r--dbaccess/source/ui/browser/sbagrid.cxx95
-rw-r--r--dbaccess/source/ui/browser/sbamultiplex.cxx3
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx146
-rw-r--r--dbaccess/source/ui/control/ColumnControlWindow.cxx32
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx101
-rw-r--r--dbaccess/source/ui/control/RelationControl.cxx42
-rw-r--r--dbaccess/source/ui/control/ScrollHelper.cxx9
-rw-r--r--dbaccess/source/ui/control/SqlNameEdit.cxx5
-rw-r--r--dbaccess/source/ui/control/TableGrantCtrl.cxx43
-rw-r--r--dbaccess/source/ui/control/VertSplitView.cxx17
-rw-r--r--dbaccess/source/ui/control/charsetlistbox.cxx11
-rw-r--r--dbaccess/source/ui/control/curledit.cxx18
-rw-r--r--dbaccess/source/ui/control/dbtreelistbox.cxx66
-rw-r--r--dbaccess/source/ui/control/listviewitems.cxx8
-rw-r--r--dbaccess/source/ui/control/opendoccontrols.cxx24
-rw-r--r--dbaccess/source/ui/control/tabletree.cxx38
-rw-r--r--dbaccess/source/ui/control/toolboxcontroller.cxx16
-rw-r--r--dbaccess/source/ui/control/undosqledit.cxx5
-rw-r--r--dbaccess/source/ui/dlg/CollectionView.cxx25
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.cxx32
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.hxx6
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.cxx17
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.hxx9
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPageSetup.cxx21
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPageSetup.hxx13
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx104
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx53
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.cxx64
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.hxx9
-rw-r--r--dbaccess/source/ui/dlg/RelationDlg.cxx20
-rw-r--r--dbaccess/source/ui/dlg/TablesSingleDlg.cxx31
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.hxx10
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.cxx26
-rw-r--r--dbaccess/source/ui/dlg/UserAdminDlg.cxx22
-rw-r--r--dbaccess/source/ui/dlg/admincontrols.cxx29
-rw-r--r--dbaccess/source/ui/dlg/admincontrols.hxx8
-rw-r--r--dbaccess/source/ui/dlg/adminpages.cxx34
-rw-r--r--dbaccess/source/ui/dlg/adminpages.hxx18
-rw-r--r--dbaccess/source/ui/dlg/adodatalinks.cxx2
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.cxx4
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.cxx47
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.hxx12
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.cxx44
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.hxx15
-rw-r--r--dbaccess/source/ui/dlg/dbwiz.cxx43
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx72
-rw-r--r--dbaccess/source/ui/dlg/detailpages.cxx105
-rw-r--r--dbaccess/source/ui/dlg/detailpages.hxx51
-rw-r--r--dbaccess/source/ui/dlg/directsql.cxx25
-rw-r--r--dbaccess/source/ui/dlg/dlgattr.cxx4
-rw-r--r--dbaccess/source/ui/dlg/dlgsave.cxx24
-rw-r--r--dbaccess/source/ui/dlg/dlgsize.cxx13
-rw-r--r--dbaccess/source/ui/dlg/dsnItem.hxx12
-rw-r--r--dbaccess/source/ui/dlg/dsselect.cxx11
-rw-r--r--dbaccess/source/ui/dlg/dsselect.hxx8
-rw-r--r--dbaccess/source/ui/dlg/finteraction.cxx12
-rw-r--r--dbaccess/source/ui/dlg/finteraction.hxx8
-rw-r--r--dbaccess/source/ui/dlg/generalpage.cxx54
-rw-r--r--dbaccess/source/ui/dlg/generalpage.hxx16
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.cxx52
-rw-r--r--dbaccess/source/ui/dlg/indexfieldscontrol.cxx35
-rw-r--r--dbaccess/source/ui/dlg/odbcconfig.cxx38
-rw-r--r--dbaccess/source/ui/dlg/odbcconfig.hxx16
-rw-r--r--dbaccess/source/ui/dlg/optionalboolitem.cxx13
-rw-r--r--dbaccess/source/ui/dlg/optionalboolitem.hxx8
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.cxx22
-rw-r--r--dbaccess/source/ui/dlg/queryfilter.cxx1
-rw-r--r--dbaccess/source/ui/dlg/queryorder.cxx1
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx37
-rw-r--r--dbaccess/source/ui/dlg/tablespage.cxx28
-rw-r--r--dbaccess/source/ui/dlg/tablespage.hxx11
-rw-r--r--dbaccess/source/ui/dlg/textconnectionsettings.cxx12
-rw-r--r--dbaccess/source/ui/inc/AppElementType.hxx4
-rw-r--r--dbaccess/source/ui/inc/CollectionView.hxx6
-rw-r--r--dbaccess/source/ui/inc/ColumnControlWindow.hxx6
-rw-r--r--dbaccess/source/ui/inc/ConnectionLine.hxx2
-rw-r--r--dbaccess/source/ui/inc/ConnectionLineData.hxx6
-rw-r--r--dbaccess/source/ui/inc/FieldControls.hxx7
-rw-r--r--dbaccess/source/ui/inc/GeneralUndo.hxx2
-rw-r--r--dbaccess/source/ui/inc/JoinController.hxx8
-rw-r--r--dbaccess/source/ui/inc/RTableConnectionData.hxx4
-rw-r--r--dbaccess/source/ui/inc/RefFunctor.hxx2
-rw-r--r--dbaccess/source/ui/inc/RelationControl.hxx1
-rw-r--r--dbaccess/source/ui/inc/RelationDlg.hxx4
-rw-r--r--dbaccess/source/ui/inc/SqlNameEdit.hxx2
-rw-r--r--dbaccess/source/ui/inc/TableCopyHelper.hxx4
-rw-r--r--dbaccess/source/ui/inc/TableDesignView.hxx3
-rw-r--r--dbaccess/source/ui/inc/TableWindow.hxx2
-rw-r--r--dbaccess/source/ui/inc/TablesSingleDlg.hxx8
-rw-r--r--dbaccess/source/ui/inc/TokenWriter.hxx17
-rw-r--r--dbaccess/source/ui/inc/TypeInfo.hxx6
-rw-r--r--dbaccess/source/ui/inc/UITools.hxx5
-rw-r--r--dbaccess/source/ui/inc/UserAdminDlg.hxx8
-rw-r--r--dbaccess/source/ui/inc/VertSplitView.hxx1
-rw-r--r--dbaccess/source/ui/inc/WCPage.hxx3
-rw-r--r--dbaccess/source/ui/inc/WColumnSelect.hxx7
-rw-r--r--dbaccess/source/ui/inc/WCopyTable.hxx8
-rw-r--r--dbaccess/source/ui/inc/WExtendPages.hxx8
-rw-r--r--dbaccess/source/ui/inc/WNameMatch.hxx6
-rw-r--r--dbaccess/source/ui/inc/WTabPage.hxx4
-rw-r--r--dbaccess/source/ui/inc/WTypeSelect.hxx10
-rw-r--r--dbaccess/source/ui/inc/adtabdlg.hxx3
-rw-r--r--dbaccess/source/ui/inc/advancedsettingsdlg.hxx8
-rw-r--r--dbaccess/source/ui/inc/asyncmodaldialog.hxx8
-rw-r--r--dbaccess/source/ui/inc/brwctrlr.hxx7
-rw-r--r--dbaccess/source/ui/inc/brwview.hxx2
-rw-r--r--dbaccess/source/ui/inc/callbacks.hxx16
-rw-r--r--dbaccess/source/ui/inc/charsetlistbox.hxx8
-rw-r--r--dbaccess/source/ui/inc/charsets.hxx12
-rw-r--r--dbaccess/source/ui/inc/commontypes.hxx4
-rw-r--r--dbaccess/source/ui/inc/curledit.hxx9
-rw-r--r--dbaccess/source/ui/inc/databaseobjectview.hxx22
-rw-r--r--dbaccess/source/ui/inc/datasourceconnector.hxx8
-rw-r--r--dbaccess/source/ui/inc/dbadmin.hxx8
-rw-r--r--dbaccess/source/ui/inc/dbtreelistbox.hxx3
-rw-r--r--dbaccess/source/ui/inc/dbwiz.hxx8
-rw-r--r--dbaccess/source/ui/inc/dbwizsetup.hxx10
-rw-r--r--dbaccess/source/ui/inc/defaultobjectnamecheck.hxx12
-rw-r--r--dbaccess/source/ui/inc/directsql.hxx9
-rw-r--r--dbaccess/source/ui/inc/dlgattr.hxx7
-rw-r--r--dbaccess/source/ui/inc/dlgsize.hxx4
-rw-r--r--dbaccess/source/ui/inc/dsitems.hxx7
-rw-r--r--dbaccess/source/ui/inc/dsmeta.hxx18
-rw-r--r--dbaccess/source/ui/inc/exsrcbrw.hxx4
-rw-r--r--dbaccess/source/ui/inc/formadapter.hxx2
-rw-r--r--dbaccess/source/ui/inc/imageprovider.hxx8
-rw-r--r--dbaccess/source/ui/inc/indexcollection.hxx9
-rw-r--r--dbaccess/source/ui/inc/indexdialog.hxx12
-rw-r--r--dbaccess/source/ui/inc/indexes.hxx14
-rw-r--r--dbaccess/source/ui/inc/indexfieldscontrol.hxx6
-rw-r--r--dbaccess/source/ui/inc/linkeddocuments.hxx8
-rw-r--r--dbaccess/source/ui/inc/listviewitems.hxx8
-rw-r--r--dbaccess/source/ui/inc/localresaccess.hxx8
-rw-r--r--dbaccess/source/ui/inc/marktree.hxx9
-rw-r--r--dbaccess/source/ui/inc/moduledbu.hxx16
-rw-r--r--dbaccess/source/ui/inc/objectnamecheck.hxx8
-rw-r--r--dbaccess/source/ui/inc/opendoccontrols.hxx12
-rw-r--r--dbaccess/source/ui/inc/paramdialog.hxx9
-rw-r--r--dbaccess/source/ui/inc/propertysetitem.hxx8
-rw-r--r--dbaccess/source/ui/inc/propertystorage.hxx12
-rw-r--r--dbaccess/source/ui/inc/querycontainerwindow.hxx12
-rw-r--r--dbaccess/source/ui/inc/queryfilter.hxx3
-rw-r--r--dbaccess/source/ui/inc/queryorder.hxx4
-rw-r--r--dbaccess/source/ui/inc/sbagrid.hxx13
-rw-r--r--dbaccess/source/ui/inc/sbamultiplex.hxx27
-rw-r--r--dbaccess/source/ui/inc/singledoccontroller.hxx8
-rw-r--r--dbaccess/source/ui/inc/sqlmessage.hxx10
-rw-r--r--dbaccess/source/ui/inc/stringlistitem.hxx8
-rw-r--r--dbaccess/source/ui/inc/tabletree.hxx8
-rw-r--r--dbaccess/source/ui/inc/textconnectionsettings.hxx8
-rw-r--r--dbaccess/source/ui/inc/toolboxcontroller.hxx2
-rw-r--r--dbaccess/source/ui/inc/undosqledit.hxx3
-rw-r--r--dbaccess/source/ui/inc/unoadmin.hxx8
-rw-r--r--dbaccess/source/ui/inc/unodatbr.hxx9
-rw-r--r--dbaccess/source/ui/inc/unosqlmessage.hxx4
-rw-r--r--dbaccess/source/ui/misc/DExport.cxx31
-rw-r--r--dbaccess/source/ui/misc/HtmlReader.cxx27
-rw-r--r--dbaccess/source/ui/misc/ModuleHelper.cxx4
-rw-r--r--dbaccess/source/ui/misc/RowSetDrop.cxx12
-rw-r--r--dbaccess/source/ui/misc/RtfReader.cxx19
-rw-r--r--dbaccess/source/ui/misc/TableCopyHelper.cxx19
-rw-r--r--dbaccess/source/ui/misc/TokenWriter.cxx54
-rw-r--r--dbaccess/source/ui/misc/ToolBoxHelper.cxx7
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx78
-rw-r--r--dbaccess/source/ui/misc/WCPage.cxx23
-rw-r--r--dbaccess/source/ui/misc/WColumnSelect.cxx32
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx127
-rw-r--r--dbaccess/source/ui/misc/WExtendPages.cxx10
-rw-r--r--dbaccess/source/ui/misc/WNameMatch.cxx43
-rw-r--r--dbaccess/source/ui/misc/WTypeSelect.cxx57
-rw-r--r--dbaccess/source/ui/misc/asyncmodaldialog.cxx16
-rw-r--r--dbaccess/source/ui/misc/charsets.cxx32
-rw-r--r--dbaccess/source/ui/misc/controllerframe.cxx44
-rw-r--r--dbaccess/source/ui/misc/databaseobjectview.cxx40
-rw-r--r--dbaccess/source/ui/misc/datasourceconnector.cxx13
-rw-r--r--dbaccess/source/ui/misc/dbaundomanager.cxx56
-rw-r--r--dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx52
-rw-r--r--dbaccess/source/ui/misc/defaultobjectnamecheck.cxx31
-rw-r--r--dbaccess/source/ui/misc/dsmeta.cxx24
-rw-r--r--dbaccess/source/ui/misc/imageprovider.cxx23
-rw-r--r--dbaccess/source/ui/misc/indexcollection.cxx26
-rw-r--r--dbaccess/source/ui/misc/linkeddocuments.cxx22
-rw-r--r--dbaccess/source/ui/misc/moduledbu.cxx20
-rw-r--r--dbaccess/source/ui/misc/propertysetitem.cxx14
-rw-r--r--dbaccess/source/ui/misc/propertystorage.cxx20
-rw-r--r--dbaccess/source/ui/misc/singledoccontroller.cxx22
-rw-r--r--dbaccess/source/ui/misc/stringlistitem.cxx13
-rw-r--r--dbaccess/source/ui/misc/uiservices.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/ConnectionLine.cxx43
-rw-r--r--dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx33
-rw-r--r--dbaccess/source/ui/querydesign/ConnectionLineData.cxx14
-rw-r--r--dbaccess/source/ui/querydesign/JAccess.cxx15
-rw-r--r--dbaccess/source/ui/querydesign/JoinController.cxx50
-rw-r--r--dbaccess/source/ui/querydesign/JoinDesignView.cxx20
-rw-r--r--dbaccess/source/ui/querydesign/JoinExchange.cxx16
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx138
-rw-r--r--dbaccess/source/ui/querydesign/QTableConnection.cxx9
-rw-r--r--dbaccess/source/ui/querydesign/QTableConnection.hxx1
-rw-r--r--dbaccess/source/ui/querydesign/QTableConnectionData.cxx17
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindow.cxx16
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindow.hxx2
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindowData.cxx9
-rw-r--r--dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx3
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx11
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx1
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx130
-rw-r--r--dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx3
-rw-r--r--dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx4
-rw-r--r--dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx31
-rw-r--r--dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx4
-rw-r--r--dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx13
-rw-r--r--dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx5
-rw-r--r--dbaccess/source/ui/querydesign/QueryTableView.cxx57
-rw-r--r--dbaccess/source/ui/querydesign/QueryTextView.cxx31
-rw-r--r--dbaccess/source/ui/querydesign/QueryViewSwitch.cxx54
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx148
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx5
-rw-r--r--dbaccess/source/ui/querydesign/TableConnection.cxx30
-rw-r--r--dbaccess/source/ui/querydesign/TableConnectionData.cxx27
-rw-r--r--dbaccess/source/ui/querydesign/TableFieldDescription.cxx19
-rw-r--r--dbaccess/source/ui/querydesign/TableFieldInfo.cxx7
-rw-r--r--dbaccess/source/ui/querydesign/TableWindow.cxx76
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowAccess.cxx26
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowData.cxx13
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowListBox.cxx26
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowTitle.cxx15
-rw-r--r--dbaccess/source/ui/querydesign/querycontainerwindow.cxx23
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx86
-rw-r--r--dbaccess/source/ui/querydesign/querydlg.cxx22
-rw-r--r--dbaccess/source/ui/querydesign/queryview.cxx8
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnection.cxx12
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnection.hxx4
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnectionData.cxx31
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx50
-rw-r--r--dbaccess/source/ui/relationdesign/RelationDesignView.cxx17
-rw-r--r--dbaccess/source/ui/relationdesign/RelationTableView.cxx30
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx44
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx1
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescriptions.cxx83
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx165
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.hxx3
-rw-r--r--dbaccess/source/ui/tabledesign/TableController.cxx82
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignControl.cxx14
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx21
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignView.cxx51
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldControl.cxx29
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldControl.hxx3
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx38
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx4
-rw-r--r--dbaccess/source/ui/tabledesign/TableRow.cxx19
-rw-r--r--dbaccess/source/ui/tabledesign/TableRowExchange.cxx5
-rw-r--r--dbaccess/source/ui/tabledesign/TableUndo.cxx61
-rw-r--r--dbaccess/source/ui/tabledesign/TableUndo.hxx10
-rw-r--r--dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx21
-rw-r--r--dbaccess/source/ui/uno/ColumnControl.cxx12
-rw-r--r--dbaccess/source/ui/uno/ColumnControl.hxx2
-rw-r--r--dbaccess/source/ui/uno/ColumnModel.cxx25
-rw-r--r--dbaccess/source/ui/uno/ColumnModel.hxx7
-rw-r--r--dbaccess/source/ui/uno/ColumnPeer.cxx15
-rw-r--r--dbaccess/source/ui/uno/ColumnPeer.hxx5
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlg.cxx19
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlg.hxx8
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx21
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx8
-rw-r--r--dbaccess/source/ui/uno/TableFilterDlg.cxx20
-rw-r--r--dbaccess/source/ui/uno/TableFilterDlg.hxx8
-rw-r--r--dbaccess/source/ui/uno/UserSettingsDlg.cxx20
-rw-r--r--dbaccess/source/ui/uno/UserSettingsDlg.hxx8
-rw-r--r--dbaccess/source/ui/uno/admindlg.cxx20
-rw-r--r--dbaccess/source/ui/uno/admindlg.hxx8
-rw-r--r--dbaccess/source/ui/uno/composerdialogs.cxx33
-rw-r--r--dbaccess/source/ui/uno/composerdialogs.hxx17
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx64
-rw-r--r--dbaccess/source/ui/uno/dbinteraction.cxx30
-rw-r--r--dbaccess/source/ui/uno/dbinteraction.hxx16
-rw-r--r--dbaccess/source/ui/uno/textconnectionsettings_uno.cxx25
-rw-r--r--dbaccess/source/ui/uno/unoDirectSql.cxx17
-rw-r--r--dbaccess/source/ui/uno/unoDirectSql.hxx8
-rw-r--r--dbaccess/source/ui/uno/unoadmin.cxx12
-rw-r--r--dbaccess/source/ui/uno/unosqlmessage.cxx19
525 files changed, 2103 insertions, 8146 deletions
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index 0230f2e836c9..96636e93fefc 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 dc83d81dd42e..8d6203c29553 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 a1fa8c941fd8..004ec580dc09 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 f9b00667a98a..25888060175b 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 b712470d9aea..09519c72c1b8 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 186f4e6fa3b0..58d102dbe54e 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 992b6c23c4ce..8ad3edfee7c1 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 c008916525fa..58135fe02db8 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 564720cbd57e..5e8aeabc0725 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 b0d300d10e0c..f451f9894c9a 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 dc1e8777e445..2b41f105d406 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 185808602f88..780e000d00b0 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 adcb5c257d47..4ac763ebbfc4 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 0863f0ff57e5..a658e2d80332 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 433450e712e1..5d252a59b1ba 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 2707b124de1b..d46fe96ddf82 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 82c9d5561a94..df46822f99bc 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 a7c312316988..2cdf5192751e 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 2b5fabb4225c..43dca97d7091 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 6ea73ad6fa3e..58eb794e5efb 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 d08f59c81633..421d23df8be3 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 cfdf5cff3a78..eeb64c4b68f1 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 adfb0be5b4bf..962011bc862b 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 f8f9680b6150..811d5450004a 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 5bb8cb1e8586..12d959a8aba0 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 a0a8e781954f..cb96412d748a 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 70cc6cee2829..3f7c5d50f0cb 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 fc5ccfcdbce9..fca43df761d3 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 78f549984951..1c2f6501ec32 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 ccd51749c862..27c8d0d35c41 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 e2dd8ba86fa5..d47a6327c6a7 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 3476b654a3f6..f11a4ec8bfde 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 2cd8ef522813..55bcc6870d4c 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 34da7b91ef98..422a2fe9ecaa 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 c839d8b9b939..9e66780750cc 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 490497369c36..f32c9188bd18 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 82a5518779f7..67d203e241d2 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 f6e89f461c9c..9f36d7b70325 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 36c1458cb824..c553759bd582 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 eff4138ea316..16544bd0528f 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 242741ee5585..4bbd822294a5 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 916c4fec8cb8..b4e28f465292 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 291d9e1507ba..9313d9357431 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 36a7cb40d057..81ba669e7177 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 8fe6ec685150..4154675da695 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 cf952d78baaf..3603e315855b 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 3adf40195ab0..ece84a5a35ff 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 b94e0c7083c0..3a4a79c06fff 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 3675c83f2138..6f3b68234ce3 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 856a81d082e7..4ae80154e501 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 c34063488680..9e9622785c3c 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 5211222837d4..d5a642f6a9df 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 03fa975240ef..635006d2c688 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 8ae22546ed5d..613ee0a1f10d 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 bea00d3665fd..ad3eeeccc87f 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 a02c2be89c31..aa122e741617 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 79053b706b3a..adfe1f97138d 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 33e241a36af0..676f64352f82 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 50ef79dc31d6..dc31e69558a7 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 c28643c4bf02..155c1bdf940a 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 2ff2269e1180..23aa71d3fc49 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 5ed81181b33e..d5e6d6bcd047 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 b3630dfb5f9f..2f57ed3a032d 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 f2d4c32f94a4..b05b7970af72 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 48fbd3b2309a..984dfa60c453 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 18155d0a45a1..0f977710d3c7 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 cd365ed91d24..f6a69b2036a9 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 41a7e416ad37..d4e9fbe895cc 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 12bd8b8fc5f4..1b19a0fbcf3d 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
- //====================================================================
+ // DocumentEvents
struct DocumentEvents_Data;
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::container::XNameReplace
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index af3587b16608..5cfd72e4b360 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -428,4 +428,5 @@ void SAL_CALL OInterceptor::disposing( const ::com::sun::star::lang::EventObject
}
} // namespace dbaccess
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
index b005e9cdcc4a..60d06b4e172b 100644
--- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
+++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
@@ -42,12 +42,7 @@ using namespace dbaccess;
namespace dbaccess
{
-//=========================================================================
-//
// struct ResultListEntry.
-//
-//=========================================================================
-
struct ResultListEntry
{
OUString aId;
@@ -59,20 +54,10 @@ struct ResultListEntry
ResultListEntry( const ContentProperties& rEntry ) : rData( rEntry ) {}
};
-//=========================================================================
-//
// ResultList.
-//
-//=========================================================================
-
typedef std::vector< ResultListEntry* > ResultList;
-//=========================================================================
-//
// struct DataSupplier_Impl.
-//
-//=========================================================================
-
struct DataSupplier_Impl
{
osl::Mutex m_aMutex;
@@ -89,7 +74,6 @@ struct DataSupplier_Impl
~DataSupplier_Impl();
};
-//=========================================================================
DataSupplier_Impl::~DataSupplier_Impl()
{
ResultList::const_iterator it = m_aResults.begin();
@@ -104,11 +88,7 @@ DataSupplier_Impl::~DataSupplier_Impl()
}
-//=========================================================================
-//
// DataSupplier Implementation.
-//
-//=========================================================================
DBG_NAME(DataSupplier)
DataSupplier::DataSupplier( const rtl::Reference< ODocumentContainer >& rContent,
@@ -367,4 +347,5 @@ void DataSupplier::validate()
throw( ResultSetException )
{
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/myucp_resultset.cxx b/dbaccess/source/core/dataaccess/myucp_resultset.cxx
index f9dab3313935..a0bc50b69d18 100644
--- a/dbaccess/source/core/dataaccess/myucp_resultset.cxx
+++ b/dbaccess/source/core/dataaccess/myucp_resultset.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
/**************************************************************************
TODO
**************************************************************************
@@ -31,7 +30,6 @@
#include "myucp_resultset.hxx"
#include <comphelper/processfactory.hxx>
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::beans;
@@ -42,12 +40,7 @@ using namespace ::com::sun::star::container;
using namespace dbaccess;
-//=========================================================================
-//
// DynamicResultSet Implementation.
-//
-//=========================================================================
-
DynamicResultSet::DynamicResultSet(
const Reference< XComponentContext >& rxContext,
const rtl::Reference< ODocumentContainer >& rxContent,
@@ -59,11 +52,7 @@ DynamicResultSet::DynamicResultSet(
{
}
-//=========================================================================
-//
// Non-interface methods.
-//
-//=========================================================================
void DynamicResultSet::initStatic()
{
m_xResultSet1
@@ -84,4 +73,5 @@ void DynamicResultSet::initDynamic()
m_xEnv );
m_xResultSet2 = m_xResultSet1;
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx
index a166cf977338..f1edd5ff2ee9 100644
--- a/dbaccess/source/core/inc/FilteredContainer.hxx
+++ b/dbaccess/source/core/inc/FilteredContainer.hxx
@@ -129,9 +129,7 @@ namespace dbaccess
inline sal_Bool isInitialized() const { return m_bConstructed; }
};
-// ..............................................................................
} // namespace
-// ..............................................................................
#endif // DBACCESS_CORE_FILTERED_CONTAINER_HXX
diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx
index df40f3383931..ebe44ff43d23 100644
--- a/dbaccess/source/core/inc/PropertyForward.hxx
+++ b/dbaccess/source/core/inc/PropertyForward.hxx
@@ -31,9 +31,7 @@
namespace dbaccess
{
- // ===================================================================
- // = OPropertyForward
- // ===================================================================
+ // OPropertyForward
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::beans::XPropertyChangeListener
> OPropertyForward_Base;
class OPropertyForward :public ::comphelper::OBaseMutex
diff --git a/dbaccess/source/core/inc/RefreshListener.hxx b/dbaccess/source/core/inc/RefreshListener.hxx
index 4cf224f43d60..11390b1cd0de 100644
--- a/dbaccess/source/core/inc/RefreshListener.hxx
+++ b/dbaccess/source/core/inc/RefreshListener.hxx
@@ -31,9 +31,7 @@ namespace com { namespace sun { namespace star { namespace container
namespace dbaccess
{
- //=====================================================================
- //= IRefreshListener
- //=====================================================================
+ // IRefreshListener
class SAL_NO_VTABLE IRefreshListener
{
public:
diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx
index 4e6b6b042e70..5dd54a5f268e 100644
--- a/dbaccess/source/core/inc/TableDeco.hxx
+++ b/dbaccess/source/core/inc/TableDeco.hxx
@@ -51,9 +51,7 @@ namespace dbaccess
::com::sun::star::sdbcx::XRename,
::com::sun::star::lang::XUnoTunnel,
::com::sun::star::sdbcx::XAlterTable> OTableDescriptor_BASE;
- //==========================================================================
- //= OTables
- //==========================================================================
+ // OTables
class ODBTableDecorator;
typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTableDecorator > ODBTableDecorator_PROP;
@@ -121,8 +119,6 @@ namespace dbaccess
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumnDefinitions
) throw(::com::sun::star::sdbc::SQLException);
-
-
// ODescriptor
virtual void construct();
@@ -173,5 +169,4 @@ namespace dbaccess
}
#endif // _DBA_CORE_TABLEDECORATOR_HXX_
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/View.hxx b/dbaccess/source/core/inc/View.hxx
index 69d4f45975ce..34282aee65f7 100644
--- a/dbaccess/source/core/inc/View.hxx
+++ b/dbaccess/source/core/inc/View.hxx
@@ -31,9 +31,7 @@
namespace dbaccess
{
- //====================================================================
- //= View
- //====================================================================
+ // View
typedef ::connectivity::sdbcx::OView View_Base;
typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XAlterView > View_IBASE;
class View :public View_Base
diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx
index fb048127269f..7772a75b201b 100644
--- a/dbaccess/source/core/inc/column.hxx
+++ b/dbaccess/source/core/inc/column.hxx
@@ -116,9 +116,7 @@ namespace dbaccess
virtual void registerPropertyNoMember( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const ::com::sun::star::uno::Type& _rType, const void* _pInitialValue );
};
- //============================================================
- //= IColumnFactory - used by OColumns for creating new columns
- //============================================================
+ // IColumnFactory - used by OColumns for creating new columns
class SAL_NO_VTABLE IColumnFactory
{
public:
@@ -146,11 +144,9 @@ namespace dbaccess
~IColumnFactory() {}
};
- //============================================================
- //= OColumns
- //= general columns map, could be used for readonly access
- //= no appending and dropping is supported
- //============================================================
+ // OColumns
+ // general columns map, could be used for readonly access
+ // no appending and dropping is supported
typedef ::boost::unordered_map<OUString, OColumn*, ::comphelper::UStringMixHash, ::comphelper::UStringMixEqual> OColumnMap;
typedef ::std::vector<OColumn*> OColumnArray;
diff --git a/dbaccess/source/core/inc/columnsettings.hxx b/dbaccess/source/core/inc/columnsettings.hxx
index 7f37e12b4e11..4dd6d2c42e5e 100644
--- a/dbaccess/source/core/inc/columnsettings.hxx
+++ b/dbaccess/source/core/inc/columnsettings.hxx
@@ -57,9 +57,7 @@ namespace dbaccess
~IPropertyContainer() {}
};
- //====================================================================
- //= OColumnSettings
- //====================================================================
+ // OColumnSettings
class OColumnSettings
{
// <properties>
diff --git a/dbaccess/source/core/inc/commandbase.hxx b/dbaccess/source/core/inc/commandbase.hxx
index a1c2a9240a9c..1859fdd36c09 100644
--- a/dbaccess/source/core/inc/commandbase.hxx
+++ b/dbaccess/source/core/inc/commandbase.hxx
@@ -26,10 +26,8 @@
namespace dbaccess
{
-//==========================================================================
-//= OCommandBase - a base class (in fact just a container for some members)
-//= for classes implementing the sdb.CommandDefinition service
-//==========================================================================
+// OCommandBase - a base class (in fact just a container for some members)
+// for classes implementing the sdb.CommandDefinition service
class OCommandBase
{
public: // need public access
diff --git a/dbaccess/source/core/inc/composertools.hxx b/dbaccess/source/core/inc/composertools.hxx
index 34dae33c82b9..3a8da65f426e 100644
--- a/dbaccess/source/core/inc/composertools.hxx
+++ b/dbaccess/source/core/inc/composertools.hxx
@@ -20,7 +20,6 @@
#ifndef DBACCESS_SOURCE_CORE_INC_COMPOSERTOOLS_HXX
#define DBACCESS_SOURCE_CORE_INC_COMPOSERTOOLS_HXX
-
#include <rtl/ustrbuf.hxx>
#include <functional>
@@ -28,9 +27,7 @@
namespace dbaccess
{
- //====================================================================
- //= TokenComposer
- //====================================================================
+ // TokenComposer
struct TokenComposer : public ::std::unary_function< OUString, void >
{
private:
@@ -93,9 +90,7 @@ namespace dbaccess
virtual void appendNonEmptyToNonEmpty( const OUString& lhs ) = 0;
};
- //====================================================================
- //= FilterCreator
- //====================================================================
+ // FilterCreator
struct FilterCreator : public TokenComposer
{
virtual void appendNonEmptyToNonEmpty( const OUString& lhs )
@@ -108,9 +103,7 @@ namespace dbaccess
}
};
- //====================================================================
- //= FilterCreator
- //====================================================================
+ // FilterCreator
struct OrderCreator : public TokenComposer
{
virtual void appendNonEmptyToNonEmpty( const OUString& lhs )
diff --git a/dbaccess/source/core/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx
index 0be528513450..808dcf1c4fe5 100644
--- a/dbaccess/source/core/inc/containerapprove.hxx
+++ b/dbaccess/source/core/inc/containerapprove.hxx
@@ -27,9 +27,7 @@
namespace dbaccess
{
- //====================================================================
- //= IContainerApprove
- //====================================================================
+ // IContainerApprove
/** interface for approving elements to be inserted into a container
On the long run, one could imagine that this interface completely encapsulates
diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/source/core/inc/core_resource.hxx
index 47e18e84b5d7..8b3c784a7165 100644
--- a/dbaccess/source/core/inc/core_resource.hxx
+++ b/dbaccess/source/core/inc/core_resource.hxx
@@ -34,10 +34,8 @@ namespace dbaccess
#define DBACORE_RESSTRING( id ) DBA_RES( id )
// (compatibility)
- //==================================================================
- //= ResourceManager
- //= handling resources within the DBA-Core library
- //==================================================================
+ // ResourceManager
+ // handling resources within the DBA-Core library
class ResourceManager
{
friend class OModuleClient;
@@ -98,9 +96,7 @@ namespace dbaccess
);
};
- //=========================================================================
- //= OModuleClient
- //=========================================================================
+ // OModuleClient
/** base class for objects which uses any global module-specific resources
*/
class OModuleClient
diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx
index bf161ebf560d..422f717e0826 100644
--- a/dbaccess/source/core/inc/datasettings.hxx
+++ b/dbaccess/source/core/inc/datasettings.hxx
@@ -30,12 +30,10 @@
namespace dbaccess
{
-//==========================================================================
-//= ODataSettings_Base - a base class which implements the property member
-//= for an object implementing the sdb::DataSettings
-//= service
-//= the properties have to to be registered when used
-//==========================================================================
+// ODataSettings_Base - a base class which implements the property member
+// for an object implementing the sdb::DataSettings
+// service
+// the properties have to to be registered when used
class ODataSettings_Base
{
public:
@@ -58,11 +56,9 @@ protected:
ODataSettings_Base(const ODataSettings_Base& _rSource);
~ODataSettings_Base();
};
-//==========================================================================
-//= ODataSettings - a base class which implements the property handling
-//= for an object implementing the sdb::DataSettings
-//= service
-//==========================================================================
+// ODataSettings - a base class which implements the property handling
+// for an object implementing the sdb::DataSettings
+// service
class ODataSettings : public ::comphelper::OPropertyStateContainer
, public ODataSettings_Base
diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx
index fef0d2c79f67..41429c1c18f6 100644
--- a/dbaccess/source/core/inc/definitioncolumn.hxx
+++ b/dbaccess/source/core/inc/definitioncolumn.hxx
@@ -31,14 +31,11 @@
#include <comphelper/uno3.hxx>
#include <cppuhelper/implbase1.hxx>
-
namespace dbaccess
{
typedef ::cppu::ImplHelper1< ::com::sun::star::container::XChild > TXChild;
- // =========================================================================
- //= OTableColumnDescriptor
- // =========================================================================
+ // OTableColumnDescriptor
/**
* provides the properties for description. A descriptor could be used to create a new table column.
*/
@@ -104,9 +101,7 @@ namespace dbaccess
void impl_registerProperties();
};
- // =========================================================================
- // = OTableColumn
- // =========================================================================
+ // OTableColumn
class OTableColumn;
typedef ::comphelper::OPropertyArrayUsageHelper < OTableColumn > OTableColumn_PBase;
/** describes a column of a table
@@ -131,9 +126,7 @@ namespace dbaccess
virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const;
};
- // =========================================================================
- // = OQueryColumn
- // =========================================================================
+ // OQueryColumn
class OQueryColumn;
typedef ::comphelper::OPropertyArrayUsageHelper< OQueryColumn > OQueryColumn_PBase;
/** a column of a Query, with additional information obtained from parsing the query statement
@@ -181,9 +174,7 @@ namespace dbaccess
using ::cppu::OPropertySetHelper::getFastPropertyValue;
};
- // =========================================================================
- // = OColumnWrapper
- // =========================================================================
+ // OColumnWrapper
/**
* describes all properties for a columns of a table. Only the view parts are provided
* directly, all the other parts are derived from a driver implementation
@@ -227,9 +218,7 @@ namespace dbaccess
using OColumn::getFastPropertyValue;
};
- // =========================================================================
- // = OTableColumnDescriptorWrapper
- // =========================================================================
+ // OTableColumnDescriptorWrapper
/**
* provides the properties for description. A descriptor could be used to create a new table column.
*/
@@ -276,9 +265,7 @@ namespace dbaccess
using OColumnWrapper::getFastPropertyValue;
};
- // =========================================================================
- // = OTableColumnWrapper
- // =========================================================================
+ // OTableColumnWrapper
/**
* describes all properties for a columns of a table. Only the view parts are provided
* directly, all the other parts are derived from a driver implementation
diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx
index 1c3f654be3d9..3283487de2fd 100644
--- a/dbaccess/source/core/inc/definitioncontainer.hxx
+++ b/dbaccess/source/core/inc/definitioncontainer.hxx
@@ -75,10 +75,8 @@ private:
// (for the moment, this is private. Make it public if needed. If really needed.)
};
-//==========================================================================
-//= ODefinitionContainer - base class of collections of database definition
-//= documents
-//==========================================================================
+// ODefinitionContainer - base class of collections of database definition
+// documents
typedef ::cppu::ImplHelper7 < ::com::sun::star::container::XIndexAccess
, ::com::sun::star::container::XNameContainer
, ::com::sun::star::container::XEnumerationAccess
diff --git a/dbaccess/source/core/inc/objectnameapproval.hxx b/dbaccess/source/core/inc/objectnameapproval.hxx
index 8a2a077f1867..f137b187de69 100644
--- a/dbaccess/source/core/inc/objectnameapproval.hxx
+++ b/dbaccess/source/core/inc/objectnameapproval.hxx
@@ -27,9 +27,7 @@
namespace dbaccess
{
- //====================================================================
- //= ObjectNameApproval
- //====================================================================
+ // ObjectNameApproval
struct ObjectNameApproval_Impl;
/** implementation of the IContainerApprove interface which approves
elements for insertion into a query or tables container.
diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx
index 0dd74c078cbb..fa37b08d9204 100644
--- a/dbaccess/source/core/inc/querycontainer.hxx
+++ b/dbaccess/source/core/inc/querycontainer.hxx
@@ -59,9 +59,7 @@ namespace dbaccess
, ::com::sun::star::sdbcx::XDrop
> OQueryContainer_Base;
- //==========================================================================
- //= OQueryContainer
- //==========================================================================
+ // OQueryContainer
class OQueryContainer : public ODefinitionContainer
, public OQueryContainer_Base
{
diff --git a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx
index 96920f8e3f74..5811e3653873 100644
--- a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx
+++ b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx
@@ -32,9 +32,7 @@
namespace dbaccess
{
- //====================================================================
- //= DatabaseDocumentRecovery
- //====================================================================
+ // DatabaseDocumentRecovery
struct DatabaseDocumentRecovery_Data;
class DBACCESS_DLLPRIVATE DatabaseDocumentRecovery
{
diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx
index ff3e179d0114..7dc6bfcd75d9 100644
--- a/dbaccess/source/core/inc/table.hxx
+++ b/dbaccess/source/core/inc/table.hxx
@@ -42,9 +42,7 @@
namespace dbaccess
{
- //==========================================================================
- //= OTables
- //==========================================================================
+ // OTables
class ODBTable;
class OContainerMediator;
typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTable > ODBTable_PROP;
@@ -152,5 +150,4 @@ namespace dbaccess
}
#endif // _DBA_CORE_TABLE_HXX_
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx
index f11dda2612ff..ffba84a0bb72 100644
--- a/dbaccess/source/core/inc/tablecontainer.hxx
+++ b/dbaccess/source/core/inc/tablecontainer.hxx
@@ -41,9 +41,7 @@ namespace dbaccess
{
typedef ::cppu::ImplHelper1< ::com::sun::star::container::XContainerListener> OTableContainer_Base;
- //==========================================================================
- //= OTableContainer
- //==========================================================================
+ // OTableContainer
class OContainerMediator;
class OTableContainer : public OFilteredContainer,
@@ -53,7 +51,6 @@ namespace dbaccess
::rtl::Reference< OContainerMediator > m_pTableMediator;
sal_Bool m_bInDrop; // set when we are in the drop method
-
// OFilteredContainer
virtual void addMasterContainerListener();
virtual void removeMasterContainerListener();
@@ -104,5 +101,4 @@ namespace dbaccess
}
#endif // _DBA_CORE_TABLECONTAINER_HXX_
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/veto.hxx b/dbaccess/source/core/inc/veto.hxx
index 0f2a7a9bc5c0..a418b102f301 100644
--- a/dbaccess/source/core/inc/veto.hxx
+++ b/dbaccess/source/core/inc/veto.hxx
@@ -27,9 +27,7 @@
namespace dbaccess
{
- //====================================================================
- //= Veto
- //====================================================================
+ // Veto
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::util::XVeto
> Veto_Base;
/** implements ::com::sun::star::util::XVeto
diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx
index f91991416c09..6c0aede10bb9 100644
--- a/dbaccess/source/core/inc/viewcontainer.hxx
+++ b/dbaccess/source/core/inc/viewcontainer.hxx
@@ -45,9 +45,7 @@ namespace dbaccess
{
typedef ::cppu::ImplHelper1< ::com::sun::star::container::XContainerListener> OViewContainer_Base;
- //==========================================================================
- //= OViewContainer
- //==========================================================================
+ // OViewContainer
class OViewContainer : public OFilteredContainer,
public OViewContainer_Base
{
@@ -102,5 +100,4 @@ namespace dbaccess
}
#endif // _DBA_CORE_VIEWCONTAINER_HXX_
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx
index d707a618b157..fae5b202d591 100644
--- a/dbaccess/source/core/misc/ContainerMediator.cxx
+++ b/dbaccess/source/core/misc/ContainerMediator.cxx
@@ -30,11 +30,8 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
-
-//........................................................................
namespace dbaccess
{
-//........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdbc;
@@ -73,7 +70,7 @@ OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContain
m_xContainer.clear();
}
}
-// -----------------------------------------------------------------------------
+
OContainerMediator::~OContainerMediator()
{
DBG_DTOR(OContainerMediator,NULL);
@@ -81,7 +78,6 @@ OContainerMediator::~OContainerMediator()
impl_cleanup_nothrow();
}
-// -----------------------------------------------------------------------------
void OContainerMediator::impl_cleanup_nothrow()
{
try
@@ -104,7 +100,6 @@ void OContainerMediator::impl_cleanup_nothrow()
}
}
-// -----------------------------------------------------------------------------
void SAL_CALL OContainerMediator::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -120,7 +115,7 @@ void SAL_CALL OContainerMediator::elementInserted( const ContainerEvent& _rEvent
}
}
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL OContainerMediator::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -142,7 +137,7 @@ void SAL_CALL OContainerMediator::elementRemoved( const ContainerEvent& _rEvent
}
}
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException)
{
Reference< XContainer > xContainer = m_xContainer;
@@ -175,7 +170,6 @@ void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent
}
}
-// -----------------------------------------------------------------------------
void SAL_CALL OContainerMediator::disposing( const EventObject& /*Source*/ ) throw(RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -183,7 +177,6 @@ void SAL_CALL OContainerMediator::disposing( const EventObject& /*Source*/ ) thr
impl_cleanup_nothrow();
}
-// -----------------------------------------------------------------------------
void OContainerMediator::impl_initSettings_nothrow( const OUString& _rName, const Reference< XPropertySet >& _rxDestination )
{
try
@@ -200,7 +193,6 @@ void OContainerMediator::impl_initSettings_nothrow( const OUString& _rName, cons
}
}
-// -----------------------------------------------------------------------------
void OContainerMediator::notifyElementCreated( const OUString& _sName, const Reference< XPropertySet >& _xDest )
{
if ( !m_xSettings.is() )
@@ -244,9 +236,7 @@ void OContainerMediator::notifyElementCreated( const OUString& _sName, const Ref
::rtl::Reference< OPropertyForward > pForward( new OPropertyForward( _xDest, m_xSettings, _sName, aPropertyList ) );
m_aForwardList[ _sName ] = pForward;
}
-// -----------------------------------------------------------------------------
-//........................................................................
+
} // namespace dbaccess
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index 9168e10575d0..79056db9fc5e 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star;
using ::com::sun::star::sdbc::SQLException;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::RuntimeException;
-// -----------------------------------------------------------------------------
+
DatabaseDataProvider::DatabaseDataProvider(uno::Reference< uno::XComponentContext > const & context) :
TDatabaseDataProvider(m_aMutex),
::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >(
@@ -83,7 +83,7 @@ DatabaseDataProvider::DatabaseDataProvider(uno::Reference< uno::XComponentContex
}
osl_atomic_decrement( &m_refCount );
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL DatabaseDataProvider::disposing()
{
lang::EventObject aEvt(static_cast<XWeak*>(this));
@@ -100,7 +100,7 @@ void SAL_CALL DatabaseDataProvider::disposing()
::comphelper::disposeComponent(m_xInternal);
m_xActiveConnection.clear();
}
-// -----------------------------------------------------------------------------
+
uno::Any DatabaseDataProvider::queryInterface(uno::Type const & type) throw (uno::RuntimeException)
{
return TDatabaseDataProvider::queryInterface(type);
@@ -116,31 +116,29 @@ OUString SAL_CALL DatabaseDataProvider::getImplementationName( ) throw(uno::Run
{
return getImplementationName_Static();
}
-// -----------------------------------------------------------------------------
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL DatabaseDataProvider::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException)
{
return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
}
-// -----------------------------------------------------------------------------
-//------------------------------------------------------------------------------
+
uno::Sequence< OUString > DatabaseDataProvider::getSupportedServiceNames_Static( ) throw (uno::RuntimeException)
{
uno::Sequence< OUString > aSNS( 1 );
aSNS[0] = "com.sun.star.chart2.data.DatabaseDataProvider";
return aSNS;
}
-// -----------------------------------------------------------------------------
+
uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
return getSupportedServiceNames_Static();
}
-// -----------------------------------------------------------------------------
+
uno::Reference< uno::XInterface > DatabaseDataProvider::Create(uno::Reference< uno::XComponentContext > const & context)
{
return *(new DatabaseDataProvider(context)) ;
}
-// -----------------------------------------------------------------------------
+
// lang::XInitialization:
void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > & aArguments) throw (uno::RuntimeException, uno::Exception)
{
@@ -156,7 +154,6 @@ void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > &
}
m_xAggregateSet->setPropertyValue( PROPERTY_ACTIVE_CONNECTION, uno::makeAny( m_xActiveConnection ) );
}
-// -----------------------------------------------------------------------------
// chart2::data::XDataProvider:
::sal_Bool SAL_CALL DatabaseDataProvider::createDataSourcePossible(const uno::Sequence< beans::PropertyValue > & _aArguments) throw (uno::RuntimeException)
@@ -189,8 +186,7 @@ void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > &
}
return sal_True;
}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::createDataSource(const uno::Sequence< beans::PropertyValue > & _aArguments) throw (uno::RuntimeException, lang::IllegalArgumentException)
{
osl::ResettableMutexGuard aClearForNotifies(m_aMutex);
@@ -243,7 +239,6 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat
}
return m_xInternal->createDataSource(_aArguments);
}
-// -----------------------------------------------------------------------------
uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArguments(const uno::Reference< chart2::data::XDataSource > & _xDataSource) throw (uno::RuntimeException)
{
@@ -278,13 +273,12 @@ uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArgum
aArguments.put( "HasCategories", uno::makeAny( bHasCategories ) );
return aArguments.getPropertyValues();
}
-// -----------------------------------------------------------------------------
::sal_Bool SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentationPossible(const OUString & /*aRangeRepresentation*/) throw (uno::RuntimeException)
{
return sal_True;
}
-// -----------------------------------------------------------------------------
+
uno::Any DatabaseDataProvider::impl_getNumberFormatKey_nothrow(const OUString & _sRangeRepresentation) const
{
::std::map< OUString,com::sun::star::uno::Any>::const_iterator aFind = m_aNumberFormats.find(_sRangeRepresentation);
@@ -292,7 +286,7 @@ uno::Any DatabaseDataProvider::impl_getNumberFormatKey_nothrow(const OUString &
return aFind->second;
return uno::makeAny(sal_Int32(0));
}
-// -----------------------------------------------------------------------------
+
uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentation(const OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException)
{
osl::MutexGuard g(m_aMutex);
@@ -310,18 +304,22 @@ uno::Sequence< uno::Sequence< OUString > > SAL_CALL DatabaseDataProvider::getCom
{
return m_xComplexDescriptionAccess->getComplexRowDescriptions();
}
+
void SAL_CALL DatabaseDataProvider::setComplexRowDescriptions( const uno::Sequence< uno::Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException)
{
m_xComplexDescriptionAccess->setComplexRowDescriptions(aRowDescriptions);
}
+
uno::Sequence< uno::Sequence< OUString > > SAL_CALL DatabaseDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException)
{
return m_xComplexDescriptionAccess->getComplexColumnDescriptions();
}
+
void SAL_CALL DatabaseDataProvider::setComplexColumnDescriptions( const uno::Sequence< uno::Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException)
{
m_xComplexDescriptionAccess->setComplexColumnDescriptions(aColumnDescriptions);
}
+
// ____ XChartDataArray ____
uno::Sequence< uno::Sequence< double > > SAL_CALL DatabaseDataProvider::getData() throw (uno::RuntimeException)
{
@@ -374,8 +372,6 @@ double SAL_CALL DatabaseDataProvider::getNotANumber() throw (uno::RuntimeExce
return m_xComplexDescriptionAccess->isNotANumber(nNumber);
}
-// -----------------------------------------------------------------------------
-
uno::Reference< sheet::XRangeSelection > SAL_CALL DatabaseDataProvider::getRangeSelection() throw (uno::RuntimeException)
{
// TODO: Exchange the default return implementation for "getRangeSelection" !!!
@@ -385,52 +381,45 @@ uno::Reference< sheet::XRangeSelection > SAL_CALL DatabaseDataProvider::getRange
// different Any initialization in Java and C++ polymorphic structs.
return uno::Reference< sheet::XRangeSelection >();
}
-// -----------------------------------------------------------------------------
+
// chart2::data::XRangeXMLConversion:
OUString SAL_CALL DatabaseDataProvider::convertRangeToXML(const OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException)
{
osl::MutexGuard g(m_aMutex);
return m_xRangeConversion->convertRangeToXML(_sRangeRepresentation);
}
-// -----------------------------------------------------------------------------
OUString SAL_CALL DatabaseDataProvider::convertRangeFromXML(const OUString & _sXMLRange) throw (uno::RuntimeException, lang::IllegalArgumentException)
{
osl::MutexGuard g(m_aMutex);
return m_xRangeConversion->convertRangeFromXML(_sXMLRange);
}
-// -----------------------------------------------------------------------------
// com.sun.star.beans.XPropertySet:
uno::Reference< beans::XPropertySetInfo > SAL_CALL DatabaseDataProvider::getPropertySetInfo() throw (uno::RuntimeException)
{
return ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::getPropertySetInfo();
}
-// -----------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setPropertyValue(const OUString & aPropertyName, const uno::Any & aValue) throw (uno::RuntimeException, beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException)
{
::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::setPropertyValue(aPropertyName, aValue);
}
-// -----------------------------------------------------------------------------
uno::Any SAL_CALL DatabaseDataProvider::getPropertyValue(const OUString & aPropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException)
{
return ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::getPropertyValue(aPropertyName);
}
-// -----------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::addPropertyChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException)
{
::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::addPropertyChangeListener(aPropertyName, xListener);
}
-// -----------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::removePropertyChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException)
{
::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::removePropertyChangeListener(aPropertyName, xListener);
}
-// -----------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::addVetoableChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException)
{
@@ -471,7 +460,6 @@ OUString SAL_CALL DatabaseDataProvider::getCommand() throw (uno::RuntimeExceptio
osl::MutexGuard g(m_aMutex);
return m_Command;
}
-// -----------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setCommand(const OUString & the_value) throw (uno::RuntimeException)
{
@@ -482,14 +470,12 @@ void SAL_CALL DatabaseDataProvider::setCommand(const OUString & the_value) throw
}
set(PROPERTY_COMMAND,the_value,m_Command);
}
-// -----------------------------------------------------------------------------
::sal_Int32 SAL_CALL DatabaseDataProvider::getCommandType() throw (uno::RuntimeException)
{
osl::MutexGuard g(m_aMutex);
return m_CommandType;
}
-// -----------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setCommandType(::sal_Int32 the_value) throw (uno::RuntimeException)
{
@@ -499,14 +485,12 @@ void SAL_CALL DatabaseDataProvider::setCommandType(::sal_Int32 the_value) throw
}
set(PROPERTY_COMMAND_TYPE,the_value,m_CommandType);
}
-// -----------------------------------------------------------------------------
OUString SAL_CALL DatabaseDataProvider::getFilter() throw (uno::RuntimeException)
{
osl::MutexGuard g(m_aMutex);
return m_aFilterManager.getFilterComponent( dbtools::FilterManager::fcPublicFilter );
}
-// -----------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setFilter(const OUString & the_value) throw (uno::RuntimeException)
{
@@ -516,13 +500,13 @@ void SAL_CALL DatabaseDataProvider::setFilter(const OUString & the_value) throw
}
set(PROPERTY_FILTER,the_value,m_Filter);
}
-// -----------------------------------------------------------------------------
+
::sal_Bool SAL_CALL DatabaseDataProvider::getApplyFilter() throw (RuntimeException)
{
osl::MutexGuard g(m_aMutex);
return m_ApplyFilter;
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL DatabaseDataProvider::setApplyFilter( ::sal_Bool the_value ) throw (RuntimeException)
{
{
@@ -531,13 +515,13 @@ void SAL_CALL DatabaseDataProvider::setApplyFilter( ::sal_Bool the_value ) throw
}
set(PROPERTY_APPLYFILTER,the_value,m_ApplyFilter);
}
-// -----------------------------------------------------------------------------
+
OUString SAL_CALL DatabaseDataProvider::getHavingClause() throw (uno::RuntimeException)
{
osl::MutexGuard g(m_aMutex);
return m_HavingClause;
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL DatabaseDataProvider::setHavingClause( const OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException)
{
{
@@ -546,13 +530,13 @@ void SAL_CALL DatabaseDataProvider::setHavingClause( const OUString& the_value )
}
set(PROPERTY_HAVING_CLAUSE,the_value,m_HavingClause);
}
-// -----------------------------------------------------------------------------
+
OUString SAL_CALL DatabaseDataProvider::getGroupBy() throw (uno::RuntimeException)
{
osl::MutexGuard g(m_aMutex);
return m_GroupBy;
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL DatabaseDataProvider::setGroupBy( const OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException)
{
{
@@ -561,13 +545,13 @@ void SAL_CALL DatabaseDataProvider::setGroupBy( const OUString& the_value ) thro
}
set(PROPERTY_GROUP_BY,the_value,m_GroupBy);
}
-// -----------------------------------------------------------------------------
+
OUString SAL_CALL DatabaseDataProvider::getOrder() throw (uno::RuntimeException)
{
osl::MutexGuard g(m_aMutex);
return m_Order;
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL DatabaseDataProvider::setOrder( const OUString& the_value ) throw (uno::RuntimeException)
{
{
@@ -839,14 +823,14 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat
}
xData->setData(aData);
}
-// -----------------------------------------------------------------------------
+
void DatabaseDataProvider::impl_fillRowSet_throw()
{
m_xAggregateSet->setPropertyValue( PROPERTY_FILTER, uno::makeAny( getFilter() ) );
uno::Reference< sdbc::XParameters> xParam(m_xRowSet,uno::UNO_QUERY_THROW);
xParam->clearParameters( );
}
-// -----------------------------------------------------------------------------
+
bool DatabaseDataProvider::impl_fillParameters_nothrow( ::osl::ResettableMutexGuard& _rClearForNotifies)
{
// do we have to fill the parameters again?
@@ -858,292 +842,250 @@ bool DatabaseDataProvider::impl_fillParameters_nothrow( ::osl::ResettableMutexGu
return true;
}
+
// com::sun::star::sdbc::XParameters
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw( SQLException, RuntimeException )
{
m_aParameterManager.setNull(parameterIndex, sqlType);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( SQLException, RuntimeException )
{
m_aParameterManager.setObjectNull(parameterIndex, sqlType, typeName);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setBoolean(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setByte(sal_Int32 parameterIndex, sal_Int8 x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setByte(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setShort(sal_Int32 parameterIndex, sal_Int16 x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setShort(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setInt(sal_Int32 parameterIndex, sal_Int32 x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setInt(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setLong(sal_Int32 parameterIndex, sal_Int64 x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setLong(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setFloat(sal_Int32 parameterIndex, float x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setFloat(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setDouble(sal_Int32 parameterIndex, double x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setDouble(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setString(sal_Int32 parameterIndex, const OUString& x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setString(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setBytes(sal_Int32 parameterIndex, const uno::Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setBytes(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setDate(sal_Int32 parameterIndex, const util::Date& x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setDate(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setTime(sal_Int32 parameterIndex, const util::Time& x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setTime(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setTimestamp(sal_Int32 parameterIndex, const util::DateTime& x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setTimestamp(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setBinaryStream(sal_Int32 parameterIndex, const uno::Reference<io::XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException )
{
m_aParameterManager.setBinaryStream(parameterIndex, x, length);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setCharacterStream(sal_Int32 parameterIndex, const uno::Reference<io::XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException )
{
m_aParameterManager.setCharacterStream(parameterIndex, x, length);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setObjectWithInfo(sal_Int32 parameterIndex, const uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw( SQLException, RuntimeException )
{
m_aParameterManager.setObjectWithInfo(parameterIndex, x, targetSqlType, scale);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setObject(sal_Int32 parameterIndex, const uno::Any& x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setObject(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setRef(sal_Int32 parameterIndex, const uno::Reference<sdbc::XRef>& x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setRef(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setBlob(sal_Int32 parameterIndex, const uno::Reference<sdbc::XBlob>& x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setBlob(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setClob(sal_Int32 parameterIndex, const uno::Reference<sdbc::XClob>& x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setClob(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::setArray(sal_Int32 parameterIndex, const Reference<sdbc::XArray>& x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setArray(parameterIndex, x);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::clearParameters() throw( SQLException, RuntimeException )
{
m_aParameterManager.clearParameters();
}
-//==============================================================================
+
// com::sun::star::sdbc::XRowSet
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::execute() throw( SQLException, RuntimeException )
{
uno::Sequence< beans::PropertyValue > aEmpty;
createDataSource(aEmpty);
}
-//------------------------------------------------------------------------------
+
void SAL_CALL DatabaseDataProvider::addRowSetListener(const uno::Reference<sdbc::XRowSetListener>& _rListener) throw( RuntimeException )
{
if (m_xRowSet.is())
m_xRowSet->addRowSetListener(_rListener);
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::removeRowSetListener(const uno::Reference<sdbc::XRowSetListener>& _rListener) throw( RuntimeException )
{
if (m_xRowSet.is())
m_xRowSet->removeRowSetListener(_rListener);
}
-//==============================================================================
+
// com::sun::star::sdbc::XResultSet
-//------------------------------------------------------------------------------
sal_Bool SAL_CALL DatabaseDataProvider::next() throw( SQLException, RuntimeException )
{
return m_xRowSet->next();
}
-//------------------------------------------------------------------------------
sal_Bool SAL_CALL DatabaseDataProvider::isBeforeFirst() throw( SQLException, RuntimeException )
{
return m_xRowSet->isBeforeFirst();
}
-//------------------------------------------------------------------------------
sal_Bool SAL_CALL DatabaseDataProvider::isAfterLast() throw( SQLException, RuntimeException )
{
return m_xRowSet->isAfterLast();
}
-//------------------------------------------------------------------------------
sal_Bool SAL_CALL DatabaseDataProvider::isFirst() throw( SQLException, RuntimeException )
{
return m_xRowSet->isFirst();
}
-//------------------------------------------------------------------------------
sal_Bool SAL_CALL DatabaseDataProvider::isLast() throw( SQLException, RuntimeException )
{
return m_xRowSet->isLast();
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::beforeFirst() throw( SQLException, RuntimeException )
{
m_xRowSet->beforeFirst();
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::afterLast() throw( SQLException, RuntimeException )
{
m_xRowSet->afterLast();
}
-//------------------------------------------------------------------------------
sal_Bool SAL_CALL DatabaseDataProvider::first() throw( SQLException, RuntimeException )
{
return m_xRowSet->first();
}
-//------------------------------------------------------------------------------
sal_Bool SAL_CALL DatabaseDataProvider::last() throw( SQLException, RuntimeException )
{
return m_xRowSet->last();
}
-//------------------------------------------------------------------------------
sal_Int32 SAL_CALL DatabaseDataProvider::getRow() throw( SQLException, RuntimeException )
{
return m_xRowSet->getRow();
}
-//------------------------------------------------------------------------------
sal_Bool SAL_CALL DatabaseDataProvider::absolute(sal_Int32 row) throw( SQLException, RuntimeException )
{
return m_xRowSet->absolute(row);
}
-//------------------------------------------------------------------------------
sal_Bool SAL_CALL DatabaseDataProvider::relative(sal_Int32 rows) throw( SQLException, RuntimeException )
{
return m_xRowSet->relative(rows);
}
-//------------------------------------------------------------------------------
sal_Bool SAL_CALL DatabaseDataProvider::previous() throw( SQLException, RuntimeException )
{
return m_xRowSet->previous();
}
-//------------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::refreshRow() throw( SQLException, RuntimeException )
{
m_xRowSet->refreshRow();
}
-//------------------------------------------------------------------------------
sal_Bool SAL_CALL DatabaseDataProvider::rowUpdated() throw( SQLException, RuntimeException )
{
return m_xRowSet->rowUpdated();
}
-//------------------------------------------------------------------------------
sal_Bool SAL_CALL DatabaseDataProvider::rowInserted() throw( SQLException, RuntimeException )
{
return m_xRowSet->rowInserted();
}
-//------------------------------------------------------------------------------
sal_Bool SAL_CALL DatabaseDataProvider::rowDeleted() throw( SQLException, RuntimeException )
{
return m_xRowSet->rowDeleted();
}
-//------------------------------------------------------------------------------
uno::Reference< uno::XInterface > SAL_CALL DatabaseDataProvider::getStatement() throw( SQLException, RuntimeException )
{
return m_xRowSet->getStatement();
}
-// -----------------------------------------------------------------------------
+
uno::Reference< uno::XInterface > SAL_CALL DatabaseDataProvider::getParent( ) throw (uno::RuntimeException)
{
return m_xParent;
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL DatabaseDataProvider::setParent( const uno::Reference< uno::XInterface >& _xParent ) throw (lang::NoSupportException, uno::RuntimeException)
{
osl::MutexGuard g(m_aMutex);
m_xParent = _xParent;
}
-// -----------------------------------------------------------------------------
+
void DatabaseDataProvider::impl_invalidateParameter_nothrow()
{
osl::MutexGuard g(m_aMutex);
m_aParameterManager.clearAllParameterInformation();
}
-// -----------------------------------------------------------------------------
+
} // namespace dbaccess
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx
index 09a3882f6bec..a58cfe47f0b7 100644
--- a/dbaccess/source/core/misc/PropertyForward.cxx
+++ b/dbaccess/source/core/misc/PropertyForward.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "PropertyForward.hxx"
#include "dbastrings.hrc"
@@ -29,11 +28,8 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
-
-//........................................................................
namespace dbaccess
{
-//........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -43,7 +39,6 @@ namespace dbaccess
DBG_NAME(OPropertyForward)
- //------------------------------------------------------------------------
OPropertyForward::OPropertyForward( const Reference< XPropertySet>& _xSource, const Reference< XNameAccess>& _xDestContainer,
const OUString& _sName, const ::std::vector< OUString>& _aPropertyList )
:m_xSource( _xSource, UNO_SET_THROW )
@@ -73,13 +68,11 @@ namespace dbaccess
osl_atomic_decrement( &m_refCount );
}
- // -----------------------------------------------------------------------------
OPropertyForward::~OPropertyForward()
{
DBG_DTOR(OPropertyForward,NULL);
}
- // -----------------------------------------------------------------------------
void SAL_CALL OPropertyForward::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -122,7 +115,6 @@ namespace dbaccess
}
}
- // -----------------------------------------------------------------------------
void SAL_CALL OPropertyForward::disposing( const ::com::sun::star::lang::EventObject& /*_rSource*/ ) throw (RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -137,7 +129,6 @@ namespace dbaccess
m_xDest = NULL;
}
- // -----------------------------------------------------------------------------
void OPropertyForward::setDefinition( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDest )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -157,8 +148,6 @@ namespace dbaccess
}
}
-//........................................................................
} // namespace dbaccess
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx
index 880c5ab59fa6..d0fbfb19e1f2 100644
--- a/dbaccess/source/core/misc/apitools.cxx
+++ b/dbaccess/source/core/misc/apitools.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "apitools.hxx"
#include "dbastrings.hrc"
#include <cppuhelper/typeprovider.hxx>
@@ -30,14 +29,9 @@ using namespace ::com::sun::star::lang;
using namespace cppu;
using namespace osl;
-//==================================================================================
-//= various helper functions
-//==================================================================================
-//============================================================
-//= OSubComponent
-//============================================================
+// various helper functions
+// OSubComponent
DBG_NAME(OSubComponent)
-//--------------------------------------------------------------------------
OSubComponent::OSubComponent(Mutex& _rMutex, const Reference< XInterface > & xParent)
:OComponentHelper(_rMutex)
,m_xParent(xParent)
@@ -45,7 +39,7 @@ OSubComponent::OSubComponent(Mutex& _rMutex, const Reference< XInterface > & xPa
DBG_CTOR(OSubComponent,NULL);
}
-// -----------------------------------------------------------------------------
+
OSubComponent::~OSubComponent()
{
m_xParent = NULL;
@@ -54,7 +48,6 @@ OSubComponent::~OSubComponent()
}
// com::sun::star::lang::XTypeProvider
-//--------------------------------------------------------------------------
Sequence< Type > OSubComponent::getTypes() throw (RuntimeException)
{
OTypeCollection aTypes(::getCppuType( (const Reference< XComponent > *)0 ),
@@ -65,13 +58,11 @@ Sequence< Type > OSubComponent::getTypes() throw (RuntimeException)
}
// XInterface
-//--------------------------------------------------------------------------
void OSubComponent::acquire() throw ( )
{
OComponentHelper::acquire();
}
-//--------------------------------------------------------------------------
void OSubComponent::release() throw ( )
{
Reference< XInterface > x( xDelegator );
@@ -121,7 +112,6 @@ void OSubComponent::release() throw ( )
OWeakAggObject::release();
}
-//--------------------------------------------------------------------------
Any OSubComponent::queryInterface( const Type & rType ) throw(RuntimeException)
{
Any aReturn;
@@ -131,5 +121,4 @@ Any OSubComponent::queryInterface( const Type & rType ) throw(RuntimeException)
return aReturn;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index 51113b30f8a7..2d5844680b64 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dsntypes.hxx"
#include "dbamiscres.hrc"
#include <unotools/confignode.hxx>
@@ -31,10 +30,8 @@
#include <comphelper/documentconstants.hxx>
#include <comphelper/string.hxx>
-//.........................................................................
namespace dbaccess
{
-//.........................................................................
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -52,11 +49,8 @@ namespace dbaccess
}
}
}
-//=========================================================================
-//= ODsnTypeCollection
-//=========================================================================
+// ODsnTypeCollection
DBG_NAME(ODsnTypeCollection)
-//-------------------------------------------------------------------------
ODsnTypeCollection::ODsnTypeCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext)
:m_aDriverConfig(_xContext)
,m_xContext(_xContext)
@@ -78,18 +72,17 @@ ODsnTypeCollection::ODsnTypeCollection(const ::com::sun::star::uno::Reference< :
"ODsnTypeCollection::ODsnTypeCollection : invalid resources !");
}
-//-------------------------------------------------------------------------
ODsnTypeCollection::~ODsnTypeCollection()
{
DBG_DTOR(ODsnTypeCollection,NULL);
OSL_ENSURE(0 == m_nLivingIterators, "ODsnTypeCollection::~ODsnTypeCollection : there are still living iterator objects!");
}
-//-------------------------------------------------------------------------
+
OUString ODsnTypeCollection::getTypeDisplayName(const OUString& _sURL) const
{
return m_aDriverConfig.getDriverTypeDisplayName(_sURL);
}
-//-------------------------------------------------------------------------
+
OUString ODsnTypeCollection::cutPrefix(const OUString& _sURL) const
{
OUString sURL( _sURL);
@@ -116,7 +109,6 @@ OUString ODsnTypeCollection::cutPrefix(const OUString& _sURL) const
return sRet;
}
-//-------------------------------------------------------------------------
OUString ODsnTypeCollection::getPrefix(const OUString& _sURL) const
{
OUString sURL( _sURL);
@@ -141,14 +133,12 @@ OUString ODsnTypeCollection::getPrefix(const OUString& _sURL) const
return sRet;
}
-//-------------------------------------------------------------------------
bool ODsnTypeCollection::hasDriver( const sal_Char* _pAsciiPattern ) const
{
OUString sPrefix( getPrefix( OUString::createFromAscii( _pAsciiPattern ) ) );
return ( sPrefix.getLength() > 0 );
}
-// -----------------------------------------------------------------------------
bool ODsnTypeCollection::isConnectionUrlRequired(const OUString& _sURL) const
{
OUString sURL( _sURL);
@@ -167,13 +157,13 @@ bool ODsnTypeCollection::isConnectionUrlRequired(const OUString& _sURL) const
}
return sRet.getLength() > 0 && sRet[sRet.getLength()-1] == '*';
}
-// -----------------------------------------------------------------------------
+
OUString ODsnTypeCollection::getMediaType(const OUString& _sURL) const
{
const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
return aFeatures.getOrDefault("MediaType",OUString());
}
-// -----------------------------------------------------------------------------
+
OUString ODsnTypeCollection::getDatasourcePrefixFromMediaType(const OUString& _sMediaType,const OUString& _sExtension)
{
OUString sURL, sFallbackURL;
@@ -202,7 +192,7 @@ OUString ODsnTypeCollection::getDatasourcePrefixFromMediaType(const OUString& _s
sURL = comphelper::string::stripEnd(sURL, '*');
return sURL;
}
-// -----------------------------------------------------------------------------
+
bool ODsnTypeCollection::isShowPropertiesEnabled( const OUString& _sURL ) const
{
return !( _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")-1)
@@ -216,7 +206,7 @@ bool ODsnTypeCollection::isShowPropertiesEnabled( const OUString& _sURL ) const
|| _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:ldap",sizeof("sdbc:address:evolution:ldap")-1)
|| _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:macab",sizeof("sdbc:address:macab")-1) );
}
-// -----------------------------------------------------------------------------
+
void ODsnTypeCollection::extractHostNamePort(const OUString& _rDsn,OUString& _sDatabaseName,OUString& _rsHostname,sal_Int32& _nPortNumber) const
{
OUString sUrl = cutPrefix(_rDsn);
@@ -254,55 +244,54 @@ void ODsnTypeCollection::extractHostNamePort(const OUString& _rDsn,OUString& _sD
}
}
}
-// -----------------------------------------------------------------------------
+
OUString ODsnTypeCollection::getJavaDriverClass(const OUString& _sURL) const
{
const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getProperties(_sURL);
return aFeatures.getOrDefault("JavaDriverClass",OUString());
}
-//-------------------------------------------------------------------------
+
sal_Bool ODsnTypeCollection::isFileSystemBased(const OUString& _sURL) const
{
const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
return aFeatures.getOrDefault("FileSystemBased",sal_False);
}
-// -----------------------------------------------------------------------------
+
sal_Bool ODsnTypeCollection::supportsTableCreation(const OUString& _sURL) const
{
const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
return aFeatures.getOrDefault("SupportsTableCreation",sal_False);
}
-// -----------------------------------------------------------------------------
+
sal_Bool ODsnTypeCollection::supportsColumnDescription(const OUString& _sURL) const
{
const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
return aFeatures.getOrDefault("SupportsColumnDescription",sal_False);
}
-// -----------------------------------------------------------------------------
+
sal_Bool ODsnTypeCollection::supportsBrowsing(const OUString& _sURL) const
{
const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
return aFeatures.getOrDefault("SupportsBrowsing",sal_False);
}
-// -----------------------------------------------------------------------------
+
bool ODsnTypeCollection::needsJVM(const OUString& _sURL) const
{
const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
return aFeatures.getOrDefault("UseJava",sal_False);
}
-// -----------------------------------------------------------------------------
+
Sequence<PropertyValue> ODsnTypeCollection::getDefaultDBSettings( const OUString& _sURL ) const
{
const ::comphelper::NamedValueCollection& aProperties = m_aDriverConfig.getProperties(_sURL);
return aProperties.getPropertyValues();
}
-//-------------------------------------------------------------------------
bool ODsnTypeCollection::isEmbeddedDatabase( const OUString& _sURL ) const
{
return _sURL.startsWith( "sdbc:embedded:" );
}
-// -----------------------------------------------------------------------------
+
OUString ODsnTypeCollection::getEmbeddedDatabase() const
{
OUString sEmbeddedDatabaseURL;
@@ -324,18 +313,17 @@ OUString ODsnTypeCollection::getEmbeddedDatabase() const
return sEmbeddedDatabaseURL;
}
-//-------------------------------------------------------------------------
+
ODsnTypeCollection::TypeIterator ODsnTypeCollection::begin() const
{
return TypeIterator(this, 0);
}
-//-------------------------------------------------------------------------
ODsnTypeCollection::TypeIterator ODsnTypeCollection::end() const
{
return TypeIterator(this, m_aDsnTypesDisplayNames.size());
}
-//-------------------------------------------------------------------------
+
DATASOURCE_TYPE ODsnTypeCollection::determineType(const OUString& _rDsn) const
{
OUString sDsn(comphelper::string::stripEnd(_rDsn, '*'));
@@ -437,7 +425,7 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const OUString& _rDsn) const
return DST_UNKNOWN;
}
-// -----------------------------------------------------------------------------
+
void ODsnTypeCollection::fillPageIds(const OUString& _sURL,::std::vector<sal_Int16>& _rOutPathIds) const
{
DATASOURCE_TYPE eType = determineType(_sURL);
@@ -500,7 +488,7 @@ void ODsnTypeCollection::fillPageIds(const OUString& _sURL,::std::vector<sal_Int
break;
}
}
-// -----------------------------------------------------------------------------
+
OUString ODsnTypeCollection::getType(const OUString& _sURL) const
{
OUString sOldPattern;
@@ -516,7 +504,7 @@ OUString ODsnTypeCollection::getType(const OUString& _sURL) const
}
return sOldPattern;
}
-// -----------------------------------------------------------------------------
+
sal_Int32 ODsnTypeCollection::getIndexOf(const OUString& _sURL) const
{
sal_Int32 nRet = -1;
@@ -536,15 +524,13 @@ sal_Int32 ODsnTypeCollection::getIndexOf(const OUString& _sURL) const
return nRet;
}
-// -----------------------------------------------------------------------------
+
sal_Int32 ODsnTypeCollection::size() const
{
return m_aDsnPrefixes.size();
}
-//=========================================================================
-//= ODsnTypeCollection::TypeIterator
-//=========================================================================
-//-------------------------------------------------------------------------
+
+// ODsnTypeCollection::TypeIterator
ODsnTypeCollection::TypeIterator::TypeIterator(const ODsnTypeCollection* _pContainer, sal_Int32 _nInitialPos)
:m_pContainer(_pContainer)
,m_nPosition(_nInitialPos)
@@ -555,7 +541,6 @@ ODsnTypeCollection::TypeIterator::TypeIterator(const ODsnTypeCollection* _pConta
#endif
}
-//-------------------------------------------------------------------------
ODsnTypeCollection::TypeIterator::TypeIterator(const TypeIterator& _rSource)
:m_pContainer(_rSource.m_pContainer)
,m_nPosition(_rSource.m_nPosition)
@@ -565,7 +550,6 @@ ODsnTypeCollection::TypeIterator::TypeIterator(const TypeIterator& _rSource)
#endif
}
-//-------------------------------------------------------------------------
ODsnTypeCollection::TypeIterator::~TypeIterator()
{
#if OSL_DEBUG_LEVEL > 0
@@ -573,19 +557,18 @@ ODsnTypeCollection::TypeIterator::~TypeIterator()
#endif
}
-//-------------------------------------------------------------------------
OUString ODsnTypeCollection::TypeIterator::getDisplayName() const
{
OSL_ENSURE(m_nPosition < (sal_Int32)m_pContainer->m_aDsnTypesDisplayNames.size(), "ODsnTypeCollection::TypeIterator::getDisplayName : invalid position!");
return m_pContainer->m_aDsnTypesDisplayNames[m_nPosition];
}
-// -----------------------------------------------------------------------------
+
OUString ODsnTypeCollection::TypeIterator::getURLPrefix() const
{
OSL_ENSURE(m_nPosition < (sal_Int32)m_pContainer->m_aDsnPrefixes.size(), "ODsnTypeCollection::TypeIterator::getDisplayName : invalid position!");
return m_pContainer->m_aDsnPrefixes[m_nPosition];
}
-//-------------------------------------------------------------------------
+
const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operator++()
{
OSL_ENSURE(m_nPosition < (sal_Int32)m_pContainer->m_aDsnTypesDisplayNames.size(), "ODsnTypeCollection::TypeIterator::operator++ : invalid position!");
@@ -594,7 +577,6 @@ const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operat
return *this;
}
-//-------------------------------------------------------------------------
const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operator--()
{
OSL_ENSURE(m_nPosition >= 0, "ODsnTypeCollection::TypeIterator::operator-- : invalid position!");
@@ -603,14 +585,11 @@ const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operat
return *this;
}
-//-------------------------------------------------------------------------
bool operator==(const ODsnTypeCollection::TypeIterator& lhs, const ODsnTypeCollection::TypeIterator& rhs)
{
return (lhs.m_pContainer == rhs.m_pContainer) && (lhs.m_nPosition == rhs.m_nPosition);
}
-//.........................................................................
} // namespace dbaccess
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/module_dba.cxx b/dbaccess/source/core/misc/module_dba.cxx
index ffb9b895bdcc..7b554e789153 100644
--- a/dbaccess/source/core/misc/module_dba.cxx
+++ b/dbaccess/source/core/misc/module_dba.cxx
@@ -17,18 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "module_dba.hxx"
-//........................................................................
namespace dba
{
-//........................................................................
IMPLEMENT_MODULE( DbaModule, "dba" )
-//........................................................................
} // namespace sdbtools
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx
index 0a9c241dfc62..dfeb3c8ca16e 100644
--- a/dbaccess/source/core/misc/objectnameapproval.cxx
+++ b/dbaccess/source/core/misc/objectnameapproval.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "objectnameapproval.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
@@ -28,10 +27,8 @@
#include <cppuhelper/weakref.hxx>
#include <cppuhelper/exc_hlp.hxx>
-//........................................................................
namespace dbaccess
{
-//........................................................................
using ::com::sun::star::sdbc::XConnection;
using ::com::sun::star::uno::WeakReference;
@@ -45,19 +42,14 @@ namespace dbaccess
namespace CommandType = com::sun::star::sdb::CommandType;
- //====================================================================
- //= ObjectNameApproval_Impl
- //====================================================================
+ // ObjectNameApproval_Impl
struct ObjectNameApproval_Impl
{
WeakReference< XConnection > aConnection;
sal_Int32 nCommandType;
};
- //====================================================================
- //= ObjectNameApproval
- //====================================================================
- //--------------------------------------------------------------------
+ // ObjectNameApproval
ObjectNameApproval::ObjectNameApproval( const Reference< XConnection >& _rxConnection, ObjectType _eType )
:m_pImpl( new ObjectNameApproval_Impl )
{
@@ -65,12 +57,10 @@ namespace dbaccess
m_pImpl->nCommandType = _eType == TypeQuery ? CommandType::QUERY : CommandType::TABLE;
}
- //--------------------------------------------------------------------
ObjectNameApproval::~ObjectNameApproval()
{
}
- //--------------------------------------------------------------------
void SAL_CALL ObjectNameApproval::approveElement( const OUString& _rName, const Reference< XInterface >& /*_rxElement*/ )
{
Reference< XConnection > xConnection( m_pImpl->aConnection );
@@ -82,8 +72,6 @@ namespace dbaccess
xObjectNames->checkNameForCreate( m_pImpl->nCommandType, _rName );
}
-//........................................................................
} // namespace dbaccess
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx
index 1e3891fac5cd..83c7016ccb6d 100644
--- a/dbaccess/source/core/misc/sdbcoretools.cxx
+++ b/dbaccess/source/core/misc/sdbcoretools.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "sdbcoretools.hxx"
#include "dbastrings.hrc"
@@ -36,10 +35,8 @@
#include <rtl/ref.hxx>
#include <rtl/ustrbuf.hxx>
-//.........................................................................
namespace dbaccess
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -52,8 +49,6 @@ namespace dbaccess
using namespace ::com::sun::star::embed;
using namespace ::com::sun::star::container;
- // =========================================================================
- // -------------------------------------------------------------------------
void notifyDataSourceModified(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject,sal_Bool _bModified)
{
Reference< XInterface > xDs = getDataSource( _rxObject );
@@ -65,7 +60,6 @@ namespace dbaccess
xModi->setModified(_bModified);
}
- // -------------------------------------------------------------------------
Reference< XInterface > getDataSource( const Reference< XInterface >& _rxDependentObject )
{
Reference< XInterface > xParent = _rxDependentObject;
@@ -79,7 +73,6 @@ namespace dbaccess
return xReturn;
}
-// -----------------------------------------------------------------------------
OUString extractExceptionMessage( const Reference<XComponentContext> & _rContext, const Any& _rError )
{
OUString sDisplayMessage;
@@ -118,7 +111,6 @@ namespace dbaccess
namespace tools { namespace stor {
- // -----------------------------------------------------------------------------
bool storageIsWritable_nothrow( const Reference< XStorage >& _rxStorage )
{
if ( !_rxStorage.is() )
@@ -137,7 +129,6 @@ namespace dbaccess
return ( nMode & ElementModes::WRITE ) != 0;
}
- // -----------------------------------------------------------------------------
bool commitStorageIfWriteable( const Reference< XStorage >& _rxStorage ) SAL_THROW(( IOException, WrappedTargetException, RuntimeException ))
{
bool bSuccess = false;
@@ -153,8 +144,6 @@ namespace dbaccess
} } // tools::stor
-//.........................................................................
} // namespace dbaccess
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
index ba98e212aedb..750ddcd5dcd0 100644
--- a/dbaccess/source/core/misc/services.cxx
+++ b/dbaccess/source/core/misc/services.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx>
#include "module_dba.hxx"
@@ -27,13 +26,10 @@
#include <../dataaccess/databasecontext.hxx>
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-//***************************************************************************************
-//
// registry functions
extern "C" void SAL_CALL createRegistryInfo_OCommandDefinition();
extern "C" void SAL_CALL createRegistryInfo_OComponentDefinition();
@@ -43,7 +39,6 @@ extern "C" void SAL_CALL createRegistryInfo_ODatabaseSource();
extern "C" void SAL_CALL createRegistryInfo_DataAccessDescriptorFactory();
namespace dba{
-//--------------------------------------------------------------------------
::cppu::ImplementationEntry entries[] = {
{
&::dbaccess::DatabaseDataProvider::Create,
@@ -63,11 +58,8 @@ namespace dba{
};
}
-//***************************************************************************************
-//
// The prescribed C api must be complied with
// It consists of three functions which must be exported by the module.
-//
extern "C" void SAL_CALL createRegistryInfo_DBA()
{
static sal_Bool bInit = sal_False;
@@ -83,7 +75,6 @@ extern "C" void SAL_CALL createRegistryInfo_DBA()
}
}
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dba_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/dbaccess/source/core/misc/userinformation.cxx b/dbaccess/source/core/misc/userinformation.cxx
index 5ab2f2ac4a8b..6910d76cfa38 100644
--- a/dbaccess/source/core/misc/userinformation.cxx
+++ b/dbaccess/source/core/misc/userinformation.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "userinformation.hxx"
#include <osl/diagnose.h>
@@ -28,7 +27,6 @@ using namespace ::utl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-//--------------------------------------------------------------------------
UserInformation::UserInformation():
m_aUserLocale( LanguageTag( ConfigManager::getLocale()).getLocale())
{}
diff --git a/dbaccess/source/core/misc/veto.cxx b/dbaccess/source/core/misc/veto.cxx
index 732f924a2b7a..7b994728b747 100644
--- a/dbaccess/source/core/misc/veto.cxx
+++ b/dbaccess/source/core/misc/veto.cxx
@@ -19,43 +19,33 @@
#include "veto.hxx"
-//........................................................................
namespace dbaccess
{
-//........................................................................
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::RuntimeException;
- //====================================================================
- //= Veto
- //====================================================================
- //--------------------------------------------------------------------
+ // Veto
Veto::Veto( const OUString& _rReason, const Any& _rDetails )
:m_sReason( _rReason )
,m_aDetails( _rDetails )
{
}
- //--------------------------------------------------------------------
Veto::~Veto()
{
}
- //--------------------------------------------------------------------
OUString SAL_CALL Veto::getReason() throw (RuntimeException)
{
return m_sReason;
}
- //--------------------------------------------------------------------
Any SAL_CALL Veto::getDetails() throw (RuntimeException)
{
return m_aDetails;
}
-//........................................................................
} // namespace dbaccess
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index 45a09f76692c..312a6862fc18 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "recovery/dbdocrecovery.hxx"
#include "sdbcoretools.hxx"
#include "storagetextstream.hxx"
@@ -41,10 +40,8 @@
#include <algorithm>
-//........................................................................
namespace dbaccess
{
-//........................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -76,12 +73,9 @@ namespace dbaccess
namespace ElementModes = ::com::sun::star::embed::ElementModes;
- //====================================================================
- //= helpers
- //====================================================================
+ // helpers
namespace
{
- // .........................................................................
static void lcl_getPersistentRepresentation( const MapStringToCompDesc::value_type& i_rComponentDesc, OUStringBuffer& o_rBuffer )
{
o_rBuffer.append( i_rComponentDesc.first );
@@ -91,7 +85,6 @@ namespace dbaccess
o_rBuffer.append( sal_Unicode( i_rComponentDesc.second.bForEditing ? '1' : '0' ) );
}
- // .........................................................................
static bool lcl_extractCompDesc( const OUString& i_rIniLine, OUString& o_rStorName, SubComponentDescriptor& o_rCompDesc )
{
const sal_Int32 nEqualSignPos = i_rIniLine.indexOf( sal_Unicode( '=' ) );
@@ -156,7 +149,6 @@ namespace dbaccess
aTextOutput.writeLine();
}
- // .........................................................................
static bool lcl_isSectionStart( const OUString& i_rIniLine, OUString& o_rSectionName )
{
const sal_Int32 nLen = i_rIniLine.getLength();
@@ -168,7 +160,6 @@ namespace dbaccess
return false;
}
- // .........................................................................
static void lcl_stripTrailingLineFeed( OUString& io_rLine )
{
const sal_Int32 nLen = io_rLine.getLength();
@@ -176,7 +167,6 @@ namespace dbaccess
io_rLine = io_rLine.copy( 0, nLen - 1 );
}
- // .........................................................................
static void lcl_readObjectMap_throw( const Reference<XComponentContext> & i_rxContext, const Reference< XStorage >& i_rStorage,
MapStringToCompDesc& o_mapStorageToObjectName )
{
@@ -228,7 +218,6 @@ namespace dbaccess
}
}
- // .........................................................................
static void lcl_markModified( const Reference< XComponent >& i_rSubComponent )
{
const Reference< XModifiable > xModify( i_rSubComponent, UNO_QUERY );
@@ -242,9 +231,7 @@ namespace dbaccess
}
}
- //====================================================================
- //= DatabaseDocumentRecovery_Data
- //====================================================================
+ // DatabaseDocumentRecovery_Data
struct DBACCESS_DLLPRIVATE DatabaseDocumentRecovery_Data
{
const Reference<XComponentContext> aContext;
@@ -255,21 +242,16 @@ namespace dbaccess
}
};
- //====================================================================
- //= DatabaseDocumentRecovery
- //====================================================================
- //--------------------------------------------------------------------
+ // DatabaseDocumentRecovery
DatabaseDocumentRecovery::DatabaseDocumentRecovery( const Reference<XComponentContext> & i_rContext )
:m_pData( new DatabaseDocumentRecovery_Data( i_rContext ) )
{
}
- //--------------------------------------------------------------------
DatabaseDocumentRecovery::~DatabaseDocumentRecovery()
{
}
- //--------------------------------------------------------------------
void DatabaseDocumentRecovery::saveModifiedSubComponents( const Reference< XStorage >& i_rTargetStorage,
const ::std::vector< Reference< XController > >& i_rControllers )
{
@@ -324,7 +306,6 @@ namespace dbaccess
tools::stor::commitStorageIfWriteable( xRecoveryStorage );
}
- //--------------------------------------------------------------------
void DatabaseDocumentRecovery::recoverSubDocuments( const Reference< XStorage >& i_rDocumentStorage,
const Reference< XController >& i_rTargetController )
{
@@ -412,8 +393,6 @@ namespace dbaccess
}
}
-//........................................................................
} // namespace dbaccess
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx
index bd9c8b2d09c8..fc5cdc6bafea 100644
--- a/dbaccess/source/core/recovery/settingsimport.cxx
+++ b/dbaccess/source/core/recovery/settingsimport.cxx
@@ -23,10 +23,8 @@
#include <sax/tools/converter.hxx>
#include <xmloff/xmltoken.hxx>
-//........................................................................
namespace dbaccess
{
-//........................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -41,16 +39,12 @@ namespace dbaccess
using ::com::sun::star::uno::Type;
using ::com::sun::star::xml::sax::XAttributeList;
- //====================================================================
- //= SettingsImport
- //====================================================================
- //--------------------------------------------------------------------
+ // SettingsImport
SettingsImport::SettingsImport()
:m_refCount( 0 )
{
}
- //--------------------------------------------------------------------
SettingsImport::~SettingsImport()
{
}
@@ -103,31 +97,23 @@ namespace dbaccess
// If there is, then just ignore it ...
}
- //====================================================================
- //= IgnoringSettingsImport
- //====================================================================
- //--------------------------------------------------------------------
+ // IgnoringSettingsImport
::rtl::Reference< SettingsImport > IgnoringSettingsImport::nextState( const OUString& i_rElementName )
{
(void)i_rElementName;
return this;
}
- //====================================================================
- //= OfficeSettingsImport
- //====================================================================
- //--------------------------------------------------------------------
+ // OfficeSettingsImport
OfficeSettingsImport::OfficeSettingsImport( ::comphelper::NamedValueCollection& o_rSettings )
:m_rSettings( o_rSettings )
{
}
- //--------------------------------------------------------------------
OfficeSettingsImport::~OfficeSettingsImport()
{
}
- //--------------------------------------------------------------------
::rtl::Reference< SettingsImport > OfficeSettingsImport::nextState( const OUString& i_rElementName )
{
// separate the namespace part from the element name
@@ -147,21 +133,16 @@ namespace dbaccess
return new IgnoringSettingsImport;
}
- //====================================================================
- //= ConfigItemImport
- //====================================================================
- //--------------------------------------------------------------------
+ // ConfigItemImport
ConfigItemImport::ConfigItemImport( ::comphelper::NamedValueCollection& o_rSettings )
:m_rSettings( o_rSettings )
{
}
- //--------------------------------------------------------------------
ConfigItemImport::~ConfigItemImport()
{
}
- //--------------------------------------------------------------------
::rtl::Reference< SettingsImport > ConfigItemImport::nextState( const OUString& i_rElementName )
{
OSL_FAIL( "ConfigItemImport::nextState: unexpected: this class is responsible for child-less items only!" );
@@ -169,7 +150,6 @@ namespace dbaccess
return new IgnoringSettingsImport;
}
- //--------------------------------------------------------------------
void ConfigItemImport::endElement()
{
SettingsImport::endElement();
@@ -181,7 +161,6 @@ namespace dbaccess
m_rSettings.put( sItemName, aValue );
}
- //--------------------------------------------------------------------
void ConfigItemImport::getItemValue( ::com::sun::star::uno::Any& o_rValue ) const
{
o_rValue.clear();
@@ -232,21 +211,16 @@ namespace dbaccess
#endif
}
- //====================================================================
- //= ConfigItemSetImport
- //====================================================================
- //--------------------------------------------------------------------
+ // ConfigItemSetImport
ConfigItemSetImport::ConfigItemSetImport( ::comphelper::NamedValueCollection& o_rSettings )
:ConfigItemImport( o_rSettings )
{
}
- //--------------------------------------------------------------------
ConfigItemSetImport::~ConfigItemSetImport()
{
}
- //--------------------------------------------------------------------
::rtl::Reference< SettingsImport > ConfigItemSetImport::nextState( const OUString& i_rElementName )
{
// separate the namespace part from the element name
@@ -268,14 +242,11 @@ namespace dbaccess
return new IgnoringSettingsImport;
}
- //--------------------------------------------------------------------
void ConfigItemSetImport::getItemValue( Any& o_rValue ) const
{
o_rValue <<= m_aChildSettings.getPropertyValues();
}
-//........................................................................
} // namespace dbaccess
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/settingsimport.hxx b/dbaccess/source/core/recovery/settingsimport.hxx
index accad5c714b0..832bd516a93c 100644
--- a/dbaccess/source/core/recovery/settingsimport.hxx
+++ b/dbaccess/source/core/recovery/settingsimport.hxx
@@ -26,14 +26,10 @@
#include <rtl/ref.hxx>
#include <rtl/ustrbuf.hxx>
-//........................................................................
namespace dbaccess
{
-//........................................................................
- //====================================================================
- //= SettingsImport
- //====================================================================
+ // SettingsImport
/** a simplified version of xmloff/DocumentSettingsContext
It would be nice if the DocumentSettingsContext would not be that tightly interwoven with the SvXMLImport
@@ -79,9 +75,7 @@ namespace dbaccess
OUStringBuffer m_aCharacters;
};
- //====================================================================
- //= IgnoringSettingsImport
- //====================================================================
+ // IgnoringSettingsImport
class IgnoringSettingsImport : public SettingsImport
{
public:
@@ -100,9 +94,7 @@ namespace dbaccess
}
};
- //====================================================================
- //= OfficeSettingsImport
- //====================================================================
+ // OfficeSettingsImport
class OfficeSettingsImport : public SettingsImport
{
public:
@@ -121,9 +113,7 @@ namespace dbaccess
::comphelper::NamedValueCollection& m_rSettings;
};
- //====================================================================
- //= ConfigItemSetImport
- //====================================================================
+ // ConfigItemSetImport
class ConfigItemImport : public SettingsImport
{
public:
@@ -149,9 +139,7 @@ namespace dbaccess
::comphelper::NamedValueCollection& m_rSettings;
};
- //====================================================================
- //= ConfigItemSetImport
- //====================================================================
+ // ConfigItemSetImport
class ConfigItemSetImport : public ConfigItemImport
{
public:
@@ -175,9 +163,7 @@ namespace dbaccess
::comphelper::NamedValueCollection m_aChildSettings;
};
-//........................................................................
} // namespace dbaccess
-//........................................................................
#endif // SETTINGSIMPORT_HXX
diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx
index bac839e28f09..90761120e6bc 100644
--- a/dbaccess/source/core/recovery/storagestream.cxx
+++ b/dbaccess/source/core/recovery/storagestream.cxx
@@ -17,17 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "storagestream.hxx"
#include <com/sun/star/embed/ElementModes.hpp>
#include <tools/diagnose_ex.h>
-//........................................................................
namespace dbaccess
{
-//........................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -46,10 +43,7 @@ namespace dbaccess
namespace ElementModes = ::com::sun::star::embed::ElementModes;
- //====================================================================
- //= StorageOutputStream
- //====================================================================
- //--------------------------------------------------------------------
+ // StorageOutputStream
StorageOutputStream::StorageOutputStream( const Reference<XComponentContext>& i_rContext,
const Reference< XStorage >& i_rParentStorage,
const OUString& i_rStreamName
@@ -63,12 +57,10 @@ namespace dbaccess
m_xOutputStream.set( xStream->getOutputStream(), UNO_SET_THROW );
}
- //--------------------------------------------------------------------
StorageOutputStream::~StorageOutputStream()
{
}
- //--------------------------------------------------------------------
void StorageOutputStream::close()
{
ENSURE_OR_RETURN_VOID( m_xOutputStream.is(), "already closed" );
@@ -79,10 +71,7 @@ namespace dbaccess
// (legitimately) do not call this method here.
}
- //====================================================================
- //= StorageInputStream
- //====================================================================
- //--------------------------------------------------------------------
+ // StorageInputStream
StorageInputStream::StorageInputStream( const Reference<XComponentContext>& i_rContext,
const Reference< XStorage >& i_rParentStorage,
const OUString& i_rStreamName
@@ -96,12 +85,10 @@ namespace dbaccess
m_xInputStream.set( xStream->getInputStream(), UNO_SET_THROW );
}
- //--------------------------------------------------------------------
StorageInputStream::~StorageInputStream()
{
}
- //--------------------------------------------------------------------
void StorageInputStream::close()
{
ENSURE_OR_RETURN_VOID( m_xInputStream.is(), "already closed" );
@@ -112,8 +99,6 @@ namespace dbaccess
// (legitimately) do not call this method here.
}
-//........................................................................
} // namespace dbaccess
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx
index cf227d118d89..64b051969df9 100644
--- a/dbaccess/source/core/recovery/storagestream.hxx
+++ b/dbaccess/source/core/recovery/storagestream.hxx
@@ -25,14 +25,10 @@
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-//........................................................................
namespace dbaccess
{
-//........................................................................
- //====================================================================
- //= StorageOutputStream
- //====================================================================
+ // StorageOutputStream
/** convenience wrapper around a stream living in a storage
*/
class DBACCESS_DLLPRIVATE StorageOutputStream
@@ -62,9 +58,7 @@ namespace dbaccess
m_xOutputStream;
};
- //====================================================================
- //= StorageInputStream
- //====================================================================
+ // StorageInputStream
/** convenience wrapper around a stream living in a storage
*/
class DBACCESS_DLLPRIVATE StorageInputStream
@@ -94,9 +88,7 @@ namespace dbaccess
m_xInputStream;
};
-//........................................................................
} // namespace dbaccess
-//........................................................................
#endif // STORAGESTREAM_HXX
diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx
index 241e336f2652..c835c2134977 100644
--- a/dbaccess/source/core/recovery/storagetextstream.cxx
+++ b/dbaccess/source/core/recovery/storagetextstream.cxx
@@ -17,17 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "storagetextstream.hxx"
#include <com/sun/star/io/TextOutputStream.hpp>
#include <tools/diagnose_ex.h>
-//......................................................................................................................
namespace dbaccess
{
-//......................................................................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -46,27 +43,21 @@ namespace dbaccess
using ::com::sun::star::io::XTextOutputStream2;
using ::com::sun::star::io::XActiveDataSource;
- //==================================================================================================================
- //= StorageTextOutputStream_Data
- //==================================================================================================================
+ // StorageTextOutputStream_Data
struct StorageTextOutputStream_Data
{
Reference< XTextOutputStream2 > xTextOutput;
};
- //==================================================================================================================
- //= helper
- //==================================================================================================================
+ // helper
namespace
{
- //--------------------------------------------------------------------------------------------------------------
static const OUString& lcl_getTextStreamEncodingName()
{
static const OUString s_sMapStreamEncodingName( "UTF-8" );
return s_sMapStreamEncodingName;
}
- //--------------------------------------------------------------------------------------------------------------
static const OUString& lcl_getLineFeed()
{
static const OUString s_sLineFeed( sal_Unicode( '\n' ) );
@@ -74,10 +65,7 @@ namespace dbaccess
}
}
- //==================================================================================================================
- //= StorageTextOutputStream
- //==================================================================================================================
- //------------------------------------------------------------------------------------------------------------------
+ // StorageTextOutputStream
StorageTextOutputStream::StorageTextOutputStream( const Reference<XComponentContext>& i_rContext,
const Reference< XStorage >& i_rParentStorage,
const OUString& i_rStreamName
@@ -90,26 +78,21 @@ namespace dbaccess
m_pData->xTextOutput->setOutputStream( getOutputStream() );
}
- //------------------------------------------------------------------------------------------------------------------
StorageTextOutputStream::~StorageTextOutputStream()
{
}
- //------------------------------------------------------------------------------------------------------------------
void StorageTextOutputStream::writeLine( const OUString& i_rLine )
{
m_pData->xTextOutput->writeString( i_rLine );
m_pData->xTextOutput->writeString( lcl_getLineFeed() );
}
- //------------------------------------------------------------------------------------------------------------------
void StorageTextOutputStream::writeLine()
{
m_pData->xTextOutput->writeString( lcl_getLineFeed() );
}
-//......................................................................................................................
} // namespace dbaccess
-//......................................................................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx
index 57c4599a05ba..289031cb20a8 100644
--- a/dbaccess/source/core/recovery/storagetextstream.hxx
+++ b/dbaccess/source/core/recovery/storagetextstream.hxx
@@ -24,14 +24,10 @@
#include <memory>
-//......................................................................................................................
namespace dbaccess
{
-//......................................................................................................................
- //==================================================================================================================
- //= StorageTextStream
- //==================================================================================================================
+ // StorageTextStream
struct StorageTextOutputStream_Data;
class DBACCESS_DLLPRIVATE StorageTextOutputStream : public StorageOutputStream
{
@@ -50,9 +46,7 @@ namespace dbaccess
::std::auto_ptr< StorageTextOutputStream_Data > m_pData;
};
-//......................................................................................................................
} // namespace dbaccess
-//......................................................................................................................
#endif // STORAGETEXTSTREAM_HXX
diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx
index 39a828ea589e..06ef1bdea858 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.cxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "storagexmlstream.hxx"
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
@@ -32,10 +31,8 @@
#include <stack>
-//......................................................................................................................
namespace dbaccess
{
-//......................................................................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -61,9 +58,7 @@ namespace dbaccess
using ::com::sun::star::xml::sax::XParser;
using ::com::sun::star::xml::sax::InputSource;
- //==================================================================================================================
- //= StorageXMLOutputStream_Data
- //==================================================================================================================
+ // StorageXMLOutputStream_Data
struct StorageXMLOutputStream_Data
{
Reference< XDocumentHandler > xHandler;
@@ -71,10 +66,7 @@ namespace dbaccess
::rtl::Reference< SvXMLAttributeList > xAttributes;
};
- //==================================================================================================================
- //= StorageXMLOutputStream
- //==================================================================================================================
- //------------------------------------------------------------------------------------------------------------------
+ // StorageXMLOutputStream
StorageXMLOutputStream::StorageXMLOutputStream( const Reference<XComponentContext>& i_rContext,
const Reference< XStorage >& i_rParentStorage,
const OUString& i_rStreamName )
@@ -90,12 +82,10 @@ namespace dbaccess
m_pData->xAttributes = new SvXMLAttributeList;
}
- //------------------------------------------------------------------------------------------------------------------
StorageXMLOutputStream::~StorageXMLOutputStream()
{
}
- //------------------------------------------------------------------------------------------------------------------
void StorageXMLOutputStream::close()
{
ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "illegal document handler" );
@@ -104,13 +94,11 @@ namespace dbaccess
// endDocument
}
- //------------------------------------------------------------------------------------------------------------------
void StorageXMLOutputStream::addAttribute( const OUString& i_rName, const OUString& i_rValue ) const
{
m_pData->xAttributes->AddAttribute( i_rName, i_rValue );
}
- //------------------------------------------------------------------------------------------------------------------
void StorageXMLOutputStream::startElement( const OUString& i_rElementName ) const
{
ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" );
@@ -120,7 +108,6 @@ namespace dbaccess
m_pData->aElements.push( i_rElementName );
}
- //------------------------------------------------------------------------------------------------------------------
void StorageXMLOutputStream::endElement() const
{
ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" );
@@ -131,7 +118,6 @@ namespace dbaccess
m_pData->aElements.pop();
}
- //------------------------------------------------------------------------------------------------------------------
void StorageXMLOutputStream::ignorableWhitespace( const OUString& i_rWhitespace ) const
{
ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" );
@@ -139,7 +125,6 @@ namespace dbaccess
m_pData->xHandler->ignorableWhitespace( i_rWhitespace );
}
- //------------------------------------------------------------------------------------------------------------------
void StorageXMLOutputStream::characters( const OUString& i_rCharacters ) const
{
ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" );
@@ -147,18 +132,13 @@ namespace dbaccess
m_pData->xHandler->characters( i_rCharacters );
}
- //==================================================================================================================
- //= StorageXMLInputStream_Data
- //==================================================================================================================
+ // StorageXMLInputStream_Data
struct StorageXMLInputStream_Data
{
Reference< XParser > xParser;
};
- //==================================================================================================================
- //= StorageXMLInputStream
- //==================================================================================================================
- //------------------------------------------------------------------------------------------------------------------
+ // StorageXMLInputStream
StorageXMLInputStream::StorageXMLInputStream( const Reference<XComponentContext>& i_rContext,
const Reference< XStorage >& i_rParentStorage,
const OUString& i_rStreamName )
@@ -168,7 +148,6 @@ namespace dbaccess
m_pData->xParser.set( Parser::create(i_rContext) );
}
- //------------------------------------------------------------------------------------------------------------------
void StorageXMLInputStream::import( const Reference< XDocumentHandler >& i_rHandler )
{
ENSURE_OR_THROW( i_rHandler.is(), "illegal document handler (NULL)" );
@@ -180,13 +159,10 @@ namespace dbaccess
m_pData->xParser->parseStream( aInputSource );
}
- //------------------------------------------------------------------------------------------------------------------
StorageXMLInputStream::~StorageXMLInputStream()
{
}
-//......................................................................................................................
} // namespace dbaccess
-//......................................................................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx
index 8fdb7305e274..435246a634f0 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.hxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.hxx
@@ -27,14 +27,10 @@
#include <memory>
-//........................................................................
namespace dbaccess
{
-//........................................................................
- //====================================================================
- //= StorageXMLOutputStream
- //====================================================================
+ // StorageXMLOutputStream
struct StorageXMLOutputStream_Data;
class DBACCESS_DLLPRIVATE StorageXMLOutputStream : public StorageOutputStream
{
@@ -66,9 +62,7 @@ namespace dbaccess
::std::auto_ptr< StorageXMLOutputStream_Data > m_pData;
};
- //====================================================================
- //= StorageXMLInputStream
- //====================================================================
+ // StorageXMLInputStream
struct StorageXMLInputStream_Data;
class DBACCESS_DLLPRIVATE StorageXMLInputStream : public StorageInputStream
{
@@ -93,9 +87,7 @@ namespace dbaccess
::std::auto_ptr< StorageXMLInputStream_Data > m_pData;
};
-//........................................................................
} // namespace dbaccess
-//........................................................................
#endif // STORAGEXMLSTREAM_HXX
diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx
index 5dd294daa6c2..25bf9d8f4bb2 100644
--- a/dbaccess/source/core/recovery/subcomponentloader.cxx
+++ b/dbaccess/source/core/recovery/subcomponentloader.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "subcomponentloader.hxx"
#include <com/sun/star/ucb/Command.hpp>
@@ -25,10 +24,8 @@
#include <tools/diagnose_ex.h>
-//........................................................................
namespace dbaccess
{
-//........................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -51,9 +48,7 @@ namespace dbaccess
using ::com::sun::star::frame::XController2;
using ::com::sun::star::lang::XComponent;
- //====================================================================
- //= SubComponentLoader
- //====================================================================
+ // SubComponentLoader
struct DBACCESS_DLLPRIVATE SubComponentLoader_Data
{
const Reference< XCommandProcessor > xDocDefCommands;
@@ -73,12 +68,9 @@ namespace dbaccess
}
};
- //====================================================================
- //= helper
- //====================================================================
+ // helper
namespace
{
- //................................................................
void lcl_onWindowShown_nothrow( const SubComponentLoader_Data& i_rData )
{
try
@@ -106,10 +98,7 @@ namespace dbaccess
}
}
- //====================================================================
- //= SubComponentLoader
- //====================================================================
- //--------------------------------------------------------------------
+ // SubComponentLoader
SubComponentLoader::SubComponentLoader( const Reference< XController >& i_rApplicationController,
const Reference< XCommandProcessor >& i_rSubDocumentDefinition )
:m_pData( new SubComponentLoader_Data( i_rSubDocumentDefinition ) )
@@ -125,7 +114,6 @@ namespace dbaccess
osl_atomic_decrement( &m_refCount );
}
- //--------------------------------------------------------------------
SubComponentLoader::SubComponentLoader( const Reference< XController >& i_rApplicationController,
const Reference< XComponent >& i_rNonDocumentComponent )
:m_pData( new SubComponentLoader_Data( i_rNonDocumentComponent ) )
@@ -141,27 +129,23 @@ namespace dbaccess
osl_atomic_decrement( &m_refCount );
}
- //--------------------------------------------------------------------
SubComponentLoader::~SubComponentLoader()
{
delete m_pData, m_pData = NULL;
}
- //--------------------------------------------------------------------
void SAL_CALL SubComponentLoader::windowResized( const WindowEvent& i_rEvent ) throw (RuntimeException)
{
// not interested in
(void)i_rEvent;
}
- //--------------------------------------------------------------------
void SAL_CALL SubComponentLoader::windowMoved( const WindowEvent& i_rEvent ) throw (RuntimeException)
{
// not interested in
(void)i_rEvent;
}
- //--------------------------------------------------------------------
void SAL_CALL SubComponentLoader::windowShown( const EventObject& i_rEvent ) throw (RuntimeException)
{
(void)i_rEvent;
@@ -170,22 +154,18 @@ namespace dbaccess
m_pData->xAppComponentWindow->removeWindowListener( this );
}
- //--------------------------------------------------------------------
void SAL_CALL SubComponentLoader::windowHidden( const EventObject& i_rEvent ) throw (RuntimeException)
{
// not interested in
(void)i_rEvent;
}
- //--------------------------------------------------------------------
void SAL_CALL SubComponentLoader::disposing( const EventObject& i_rEvent ) throw (RuntimeException)
{
// not interested in
(void)i_rEvent;
}
-//........................................................................
} // namespace dbaccess
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/subcomponentloader.hxx b/dbaccess/source/core/recovery/subcomponentloader.hxx
index decae4450f50..bbe02b9f1105 100644
--- a/dbaccess/source/core/recovery/subcomponentloader.hxx
+++ b/dbaccess/source/core/recovery/subcomponentloader.hxx
@@ -29,14 +29,10 @@
#include <cppuhelper/implbase1.hxx>
-//........................................................................
namespace dbaccess
{
-//........................................................................
- //====================================================================
- //= SubComponentLoader
- //====================================================================
+ // SubComponentLoader
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::awt::XWindowListener
> SubComponentLoader_Base;
struct SubComponentLoader_Data;
@@ -72,9 +68,7 @@ namespace dbaccess
SubComponentLoader_Data* m_pData;
};
-//........................................................................
} // namespace dbaccess
-//........................................................................
#endif // SUBCOMPONENTLOADER_HXX
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 09817873241a..c755d8458a75 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "subcomponentrecovery.hxx"
#include "sdbcoretools.hxx"
@@ -40,10 +39,8 @@
#include <xmloff/XMLSettingsExportContext.hxx>
#include <xmloff/SettingsExportHelper.hxx>
-//........................................................................
namespace dbaccess
{
-//........................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -80,13 +77,9 @@ namespace dbaccess
namespace ElementModes = ::com::sun::star::embed::ElementModes;
-
- //====================================================================
- //= helper
- //====================================================================
+ // helper
namespace
{
- // .........................................................................
static const OUString& lcl_getComponentStorageBaseName( const SubComponentType i_eType )
{
static const OUString s_sFormBaseName( "form" );
@@ -113,7 +106,6 @@ namespace dbaccess
return s_sFallback;
}
- // .........................................................................
static SubComponentType lcl_databaseObjectToSubComponentType( const sal_Int32 i_nObjectType )
{
switch ( i_nObjectType )
@@ -128,7 +120,6 @@ namespace dbaccess
return UNKNOWN;
}
- // .........................................................................
static bool lcl_determineReadOnly( const Reference< XComponent >& i_rComponent )
{
Reference< XModel > xDocument( i_rComponent, UNO_QUERY );
@@ -145,7 +136,6 @@ namespace dbaccess
return aDocArgs.getOrDefault( "ReadOnly", false );
}
- // .........................................................................
static Reference< XCommandProcessor > lcl_getSubComponentDef_nothrow( const Reference< XDatabaseDocumentUI >& i_rAppUI,
const SubComponentType i_eType, const OUString& i_rName )
{
@@ -188,9 +178,7 @@ namespace dbaccess
}
}
- //====================================================================
- //= SettingsExportContext
- //====================================================================
+ // SettingsExportContext
class DBACCESS_DLLPRIVATE SettingsExportContext : public ::xmloff::XMLSettingsExportContext
{
public:
@@ -227,19 +215,16 @@ namespace dbaccess
const OUStringBuffer m_aNamespace;
};
- //--------------------------------------------------------------------
void SettingsExportContext::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const OUString& i_rValue )
{
m_rDelegator.addAttribute( impl_prefix( i_eName ), i_rValue );
}
- //--------------------------------------------------------------------
void SettingsExportContext::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, enum ::xmloff::token::XMLTokenEnum i_eValue )
{
m_rDelegator.addAttribute( impl_prefix( i_eName ), ::xmloff::token::GetXMLToken( i_eValue ) );
}
- //--------------------------------------------------------------------
void SettingsExportContext::StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const sal_Bool i_bIgnoreWhitespace )
{
if ( i_bIgnoreWhitespace )
@@ -248,7 +233,6 @@ namespace dbaccess
m_rDelegator.startElement( impl_prefix( i_eName ) );
}
- //--------------------------------------------------------------------
void SettingsExportContext::EndElement( const sal_Bool i_bIgnoreWhitespace )
{
if ( i_bIgnoreWhitespace )
@@ -256,21 +240,17 @@ namespace dbaccess
m_rDelegator.endElement();
}
- //--------------------------------------------------------------------
void SettingsExportContext::Characters( const OUString& i_rCharacters )
{
m_rDelegator.characters( i_rCharacters );
}
- //--------------------------------------------------------------------
Reference< com::sun::star::uno::XComponentContext > SettingsExportContext::GetComponentContext() const
{
return m_rContext;
}
- //==================================================================================================================
- //= SettingsDocumentHandler
- //==================================================================================================================
+ // SettingsDocumentHandler
typedef ::cppu::WeakImplHelper1 < XDocumentHandler
> SettingsDocumentHandler_Base;
class DBACCESS_DLLPRIVATE SettingsDocumentHandler : public SettingsDocumentHandler_Base
@@ -303,17 +283,14 @@ namespace dbaccess
::comphelper::NamedValueCollection m_aSettings;
};
- //--------------------------------------------------------------------
void SAL_CALL SettingsDocumentHandler::startDocument( ) throw (SAXException, RuntimeException)
{
}
- //--------------------------------------------------------------------
void SAL_CALL SettingsDocumentHandler::endDocument( ) throw (SAXException, RuntimeException)
{
}
- //--------------------------------------------------------------------
void SAL_CALL SettingsDocumentHandler::startElement( const OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException)
{
::rtl::Reference< SettingsImport > pNewState;
@@ -345,7 +322,6 @@ namespace dbaccess
m_aStates.push( pNewState );
}
- //--------------------------------------------------------------------
void SAL_CALL SettingsDocumentHandler::endElement( const OUString& i_Name ) throw (SAXException, RuntimeException)
{
ENSURE_OR_THROW( !m_aStates.empty(), "no active element" );
@@ -356,7 +332,6 @@ namespace dbaccess
m_aStates.pop();
}
- //--------------------------------------------------------------------
void SAL_CALL SettingsDocumentHandler::characters( const OUString& i_Chars ) throw (SAXException, RuntimeException)
{
ENSURE_OR_THROW( !m_aStates.empty(), "no active element" );
@@ -365,14 +340,12 @@ namespace dbaccess
pCurrentState->characters( i_Chars );
}
- //--------------------------------------------------------------------
void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException)
{
// ignore them - that's why they're called "ignorable"
(void)aWhitespaces;
}
- //--------------------------------------------------------------------
void SAL_CALL SettingsDocumentHandler::processingInstruction( const OUString& i_Target, const OUString& i_Data ) throw (SAXException, RuntimeException)
{
OSL_FAIL( "SettingsDocumentHandler::processingInstruction: unexpected ..." );
@@ -380,16 +353,12 @@ namespace dbaccess
(void)i_Data;
}
- //--------------------------------------------------------------------
void SAL_CALL SettingsDocumentHandler::setDocumentLocator( const Reference< XLocator >& i_Locator ) throw (SAXException, RuntimeException)
{
(void)i_Locator;
}
- //====================================================================
- //= SubComponentRecovery
- //====================================================================
- //--------------------------------------------------------------------
+ // SubComponentRecovery
const OUString SubComponentRecovery::getComponentsStorageName( const SubComponentType i_eType )
{
static const OUString s_sFormsStorageName( "forms" );
@@ -419,7 +388,6 @@ namespace dbaccess
return s_sFallback;
}
- //--------------------------------------------------------------------
void SubComponentRecovery::saveToRecoveryStorage( const Reference< XStorage >& i_rRecoveryStorage,
MapCompTypeToCompDescs& io_mapCompDescs )
{
@@ -466,7 +434,6 @@ namespace dbaccess
rMapCompDescs[ sStorName ] = m_aCompDesc;
}
- //--------------------------------------------------------------------
void SubComponentRecovery::impl_identifyComponent_throw()
{
// ask the controller
@@ -518,7 +485,6 @@ namespace dbaccess
"SubComponentRecovery::impl_identifyComponent_throw: couldn't classify the component!" );
}
- //--------------------------------------------------------------------
void SubComponentRecovery::impl_saveQueryDesign_throw( const Reference< XStorage >& i_rObjectStorage )
{
ENSURE_OR_THROW( m_eType == QUERY, "illegal sub component type" );
@@ -547,7 +513,6 @@ namespace dbaccess
aDesignOutput.close();
}
- //--------------------------------------------------------------------
void SubComponentRecovery::impl_saveSubDocument_throw( const Reference< XStorage >& i_rObjectStorage )
{
ENSURE_OR_THROW( ( m_eType == FORM ) || ( m_eType == REPORT ), "illegal sub component type" );
@@ -558,7 +523,6 @@ namespace dbaccess
xStorageDocument->storeToStorage( i_rObjectStorage, Sequence< PropertyValue >() );
}
- //--------------------------------------------------------------------
Reference< XComponent > SubComponentRecovery::impl_recoverSubDocument_throw( const Reference< XStorage >& i_rRecoveryStorage,
const OUString& i_rComponentName, const bool i_bForEditing )
{
@@ -608,7 +572,6 @@ namespace dbaccess
return xSubComponent;
}
- //--------------------------------------------------------------------
Reference< XComponent > SubComponentRecovery::impl_recoverQueryDesign_throw( const Reference< XStorage >& i_rRecoveryStorage,
const OUString& i_rComponentName, const bool i_bForEditing )
{
@@ -662,7 +625,6 @@ namespace dbaccess
return xSubComponent;
}
- //--------------------------------------------------------------------
Reference< XComponent > SubComponentRecovery::recoverFromStorage( const Reference< XStorage >& i_rRecoveryStorage,
const OUString& i_rComponentName, const bool i_bForEditing )
{
@@ -683,8 +645,6 @@ namespace dbaccess
return xSubComponent;
}
-//........................................................................
} // namespace dbaccess
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.hxx b/dbaccess/source/core/recovery/subcomponentrecovery.hxx
index 6c4cac5f99f1..81146f7d5f04 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.hxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.hxx
@@ -26,14 +26,10 @@
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-//........................................................................
namespace dbaccess
{
-//........................................................................
- //====================================================================
- //= SubComponentRecovery
- //====================================================================
+ // SubComponentRecovery
class DBACCESS_DLLPRIVATE SubComponentRecovery
{
public:
@@ -114,10 +110,7 @@ namespace dbaccess
SubComponentDescriptor m_aCompDesc;
};
-
-//........................................................................
} // namespace dbaccess
-//........................................................................
#endif // SUBCOMPONENTRECOVERY_HXX
diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx
index fe9e9d8a3011..0afd22ceaf41 100644
--- a/dbaccess/source/core/recovery/subcomponents.hxx
+++ b/dbaccess/source/core/recovery/subcomponents.hxx
@@ -29,14 +29,11 @@
#include <boost/unordered_map.hpp>
#include <map>
-//........................................................................
namespace dbaccess
{
-//........................................................................
namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
- // -------------------------------------------------------------------
enum SubComponentType
{
TABLE = DatabaseObject::TABLE,
@@ -49,7 +46,6 @@ namespace dbaccess
UNKNOWN = 10001
};
- // -------------------------------------------------------------------
struct DBACCESS_DLLPRIVATE SubComponentDescriptor
{
OUString sName;
@@ -68,14 +64,10 @@ namespace dbaccess
}
};
- // -------------------------------------------------------------------
typedef ::boost::unordered_map< OUString, SubComponentDescriptor, OUStringHash > MapStringToCompDesc;
typedef ::std::map< SubComponentType, MapStringToCompDesc > MapCompTypeToCompDescs;
-
-//........................................................................
} // namespace dbaccess
-//........................................................................
#endif // SUBCOMPONENTS_HXX
diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx
index 01284eb516ec..66140cf7c948 100644
--- a/dbaccess/source/core/resource/core_resource.cxx
+++ b/dbaccess/source/core/resource/core_resource.cxx
@@ -17,24 +17,19 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "core_resource.hxx"
#include <tools/resmgr.hxx>
// ---- needed as long as we have no contexts for components ---
#include <vcl/svapp.hxx>
-//---------------------------------------------------
#include <rtl/instance.hxx>
#include <svl/solar.hrc>
-//.........................................................................
namespace dbaccess
{
- //==================================================================
- //= ResourceManager
- //==================================================================
+ // ResourceManager
namespace
{
// access safety
@@ -44,7 +39,6 @@ namespace dbaccess
sal_Int32 ResourceManager::s_nClients = 0;
ResMgr* ResourceManager::m_pImpl = NULL;
- //------------------------------------------------------------------
void ResourceManager::ensureImplExists()
{
if (m_pImpl)
@@ -53,7 +47,6 @@ namespace dbaccess
m_pImpl = ResMgr::CreateResMgr("dba", Application::GetSettings().GetUILanguageTag());
}
- //------------------------------------------------------------------
OUString ResourceManager::loadString(sal_uInt16 _nResId)
{
OUString sReturn;
@@ -65,14 +58,12 @@ namespace dbaccess
return sReturn;
}
- //------------------------------------------------------------------
OUString ResourceManager::loadString( sal_uInt16 _nResId, const sal_Char* _pPlaceholderAscii, const OUString& _rReplace )
{
OUString sString( loadString( _nResId ) );
return sString.replaceFirst( OUString::createFromAscii(_pPlaceholderAscii), _rReplace );
}
- //------------------------------------------------------------------
OUString ResourceManager::loadString( sal_uInt16 _nResId, const sal_Char* _pPlaceholderAscii1, const OUString& _rReplace1,
const sal_Char* _pPlaceholderAscii2, const OUString& _rReplace2 )
{
@@ -82,14 +73,12 @@ namespace dbaccess
return sString;
}
- //-------------------------------------------------------------------------
void ResourceManager::registerClient()
{
::osl::MutexGuard aGuard(theResourceManagerMutex::get());
++s_nClients;
}
- //-------------------------------------------------------------------------
void ResourceManager::revokeClient()
{
::osl::MutexGuard aGuard(theResourceManagerMutex::get());
@@ -99,8 +88,6 @@ namespace dbaccess
m_pImpl = NULL;
}
}
-//.........................................................................
}
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/dbmm_module.cxx b/dbaccess/source/ext/macromigration/dbmm_module.cxx
index 0dbda35fe84a..826e945ae167 100644
--- a/dbaccess/source/ext/macromigration/dbmm_module.cxx
+++ b/dbaccess/source/ext/macromigration/dbmm_module.cxx
@@ -17,20 +17,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dbmm_module.hxx"
#include <rtl/instance.hxx>
-//........................................................................
namespace dbmm
{
-//........................................................................
IMPLEMENT_MODULE( MacroMigrationModule, "dbmm" );
-//........................................................................
} // namespace dbmm
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/dbmm_module.hxx b/dbaccess/source/ext/macromigration/dbmm_module.hxx
index 1831c8175a45..bc725a09c8d4 100644
--- a/dbaccess/source/ext/macromigration/dbmm_module.hxx
+++ b/dbaccess/source/ext/macromigration/dbmm_module.hxx
@@ -22,16 +22,12 @@
#include <unotools/componentresmodule.hxx>
-//........................................................................
namespace dbmm
{
-//........................................................................
DEFINE_MODULE( MacroMigrationModule, MacroMigrationModuleClient, MacroMigrationResId )
-//........................................................................
} // namespace dbmm
-//........................................................................
#endif // DBACCESS_MACROMIGRATION_MODULE_HXX
diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx
index 42178799bbe3..e73b33451ca3 100644
--- a/dbaccess/source/ext/macromigration/dbmm_services.cxx
+++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx
@@ -17,15 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dbmm_module.hxx"
-//........................................................................
namespace dbmm
{
-//........................................................................
- //--------------------------------------------------------------------
extern void createRegistryInfo_MacroMigrationDialogService();
static void initializeModule()
@@ -34,9 +30,7 @@ namespace dbmm
createRegistryInfo_MacroMigrationDialogService();
}
-//........................................................................
} // namespace dbmm
-//........................................................................
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbmm_component_getFactory(
const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*,
diff --git a/dbaccess/source/ext/macromigration/dbmm_types.cxx b/dbaccess/source/ext/macromigration/dbmm_types.cxx
index e275de6e1552..87f7311ec952 100644
--- a/dbaccess/source/ext/macromigration/dbmm_types.cxx
+++ b/dbaccess/source/ext/macromigration/dbmm_types.cxx
@@ -17,21 +17,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dbmm_types.hxx"
#include "dbmm_global.hrc"
#include "dbmm_module.hxx"
-//........................................................................
namespace dbmm
{
-//........................................................................
- //====================================================================
- //= helper
- //====================================================================
- //--------------------------------------------------------------------
+ // helper
OUString getScriptTypeDisplayName( const ScriptType _eType )
{
sal_uInt16 nResId( 0 );
@@ -49,8 +43,6 @@ namespace dbmm
return nResId ? OUString( MacroMigrationResId( nResId ) ) : OUString();
}
-//........................................................................
} // namespace dbmm
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/dbmm_types.hxx b/dbaccess/source/ext/macromigration/dbmm_types.hxx
index a8d0027916f5..7ae52e987935 100644
--- a/dbaccess/source/ext/macromigration/dbmm_types.hxx
+++ b/dbaccess/source/ext/macromigration/dbmm_types.hxx
@@ -22,14 +22,10 @@
#include <tools/string.hxx>
-//........................................................................
namespace dbmm
{
-//........................................................................
- //====================================================================
- //= ScriptType
- //====================================================================
+ // ScriptType
enum ScriptType
{
eBasic,
@@ -40,23 +36,17 @@ namespace dbmm
eDialog
};
- //====================================================================
- //= SubDocumentType
- //====================================================================
+ // SubDocumentType
enum SubDocumentType
{
eForm,
eReport
};
- //====================================================================
- //= helper
- //====================================================================
+ // helper
OUString getScriptTypeDisplayName( const ScriptType _eType );
-//........................................................................
} // namespace dbmm
-//........................................................................
#endif // DBACCESS_DBMM_TYPES_HXX
diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx
index c811340f7df1..c5a9766999af 100644
--- a/dbaccess/source/ext/macromigration/docinteraction.cxx
+++ b/dbaccess/source/ext/macromigration/docinteraction.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "docinteraction.hxx"
#include <com/sun/star/frame/XModel.hpp>
@@ -29,10 +28,8 @@
#include <rtl/ref.hxx>
#include <tools/diagnose_ex.h>
-//........................................................................
namespace dbmm
{
-//........................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -51,9 +48,7 @@ namespace dbmm
using ::com::sun::star::task::PasswordRequestMode_PASSWORD_ENTER;
using ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER;
- //====================================================================
- //= InteractionHandler_Data
- //====================================================================
+ // InteractionHandler_Data
struct InteractionHandler_Data
{
Reference< XInteractionHandler > xHandler;
@@ -69,10 +64,7 @@ namespace dbmm
}
};
- //====================================================================
- //= InteractionHandler
- //====================================================================
- //--------------------------------------------------------------------
+ // InteractionHandler
InteractionHandler::InteractionHandler( const Reference<XComponentContext>& _rContext, const Reference< XModel >& _rxDocument )
:m_pData( new InteractionHandler_Data( _rContext ) )
{
@@ -81,12 +73,10 @@ namespace dbmm
m_pData->xHandler = aDocArgs.getOrDefault( "InteractionHandler", m_pData->xHandler );
}
- //--------------------------------------------------------------------
InteractionHandler::~InteractionHandler()
{
}
- //--------------------------------------------------------------------
bool InteractionHandler::requestDocumentPassword( const OUString& _rDocumentName, OUString& _io_rPassword )
{
// create request
@@ -114,7 +104,6 @@ namespace dbmm
return true;
}
- //--------------------------------------------------------------------
void InteractionHandler::reportError( const Any& _rError )
{
::rtl::Reference< ::comphelper::OInteractionRequest > pRequest( new ::comphelper::OInteractionRequest( _rError ) );
@@ -124,8 +113,6 @@ namespace dbmm
m_pData->xHandler->handle( pRequest.get() );
}
-//........................................................................
} // namespace dbmm
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/docinteraction.hxx b/dbaccess/source/ext/macromigration/docinteraction.hxx
index 895bf0e785de..b67d95676823 100644
--- a/dbaccess/source/ext/macromigration/docinteraction.hxx
+++ b/dbaccess/source/ext/macromigration/docinteraction.hxx
@@ -26,14 +26,10 @@
#include <memory>
-//........................................................................
namespace dbmm
{
-//........................................................................
- //====================================================================
- //= DocumentErrorHandling
- //====================================================================
+ // DocumentErrorHandling
struct InteractionHandler_Data;
/** wraps common operations with an interaction handler.
*/
@@ -77,9 +73,7 @@ namespace dbmm
::std::auto_ptr< InteractionHandler_Data > m_pData;
};
-//........................................................................
} // namespace dbmm
-//........................................................................
#endif // DBACCESS_DOCERRORHANDLING_HXX
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 93a1bdf8294c..e14f0baf7204 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dbmm_global.hrc"
#include "dbmm_module.hxx"
#include "docinteraction.hxx"
@@ -48,10 +47,8 @@
#include <list>
-//........................................................................
namespace dbmm
{
-//........................................................................
#define STATE_CLOSE_SUB_DOCS 0
#define STATE_BACKUP_DBDOC 1
@@ -92,10 +89,7 @@ namespace dbmm
using ::com::sun::star::ucb::XContent;
using ::com::sun::star::ucb::XContentIdentifier;
- //====================================================================
- //= helper
- //====================================================================
- //--------------------------------------------------------------------
+ // helper
static void lcl_getControllers_throw(const Reference< XModel2 >& _rxDocument,
::std::list< Reference< XController2 > >& _out_rControllers )
{
@@ -105,9 +99,7 @@ namespace dbmm
_out_rControllers.push_back( Reference< XController2 >( xControllerEnum->nextElement(), UNO_QUERY_THROW ) );
}
- //====================================================================
- //= MacroMigrationDialog_Data
- //====================================================================
+ // MacroMigrationDialog_Data
struct MacroMigrationDialog_Data
{
Reference<XComponentContext> aContext;
@@ -133,10 +125,7 @@ namespace dbmm
}
};
- //====================================================================
- //= MacroMigrationDialog
- //====================================================================
- //--------------------------------------------------------------------
+ // MacroMigrationDialog
MacroMigrationDialog::MacroMigrationDialog( Window* _pParent, const Reference<XComponentContext>& _rContext,
const Reference< XOfficeDatabaseDocument >& _rxDocument )
:MacroMigrationDialog_Base( _pParent, MacroMigrationResId( DLG_MACRO_MIGRATION ) )
@@ -166,24 +155,20 @@ namespace dbmm
OSL_PRECOND( m_pData->xDocumentModel.is(), "MacroMigrationDialog::MacroMigrationDialog: illegal document!" );
}
- //--------------------------------------------------------------------
MacroMigrationDialog::~MacroMigrationDialog()
{
}
- //--------------------------------------------------------------------
const Reference<XComponentContext>& MacroMigrationDialog::getComponentContext() const
{
return m_pData->aContext;
}
- //--------------------------------------------------------------------
const Reference< XOfficeDatabaseDocument >& MacroMigrationDialog::getDocument() const
{
return m_pData->xDocument;
}
- //--------------------------------------------------------------------
short MacroMigrationDialog::Execute()
{
short nResult = MacroMigrationDialog_Base::Execute();
@@ -198,7 +183,6 @@ namespace dbmm
return nResult;
}
- //--------------------------------------------------------------------
sal_Bool MacroMigrationDialog::Close()
{
if ( m_pData->bMigrationIsRunning )
@@ -206,7 +190,6 @@ namespace dbmm
return MacroMigrationDialog_Base::Close();
}
- //--------------------------------------------------------------------
void MacroMigrationDialog::enterState( WizardState _nState )
{
MacroMigrationDialog_Base::enterState( _nState );
@@ -260,7 +243,6 @@ namespace dbmm
}
}
- //--------------------------------------------------------------------
sal_Bool MacroMigrationDialog::prepareLeaveCurrentState( CommitPageReason _eReason )
{
if ( !MacroMigrationDialog_Base::prepareLeaveCurrentState( _eReason ) )
@@ -287,25 +269,21 @@ namespace dbmm
return sal_True;
}
- //--------------------------------------------------------------------
sal_Bool MacroMigrationDialog::leaveState( WizardState _nState )
{
return MacroMigrationDialog_Base::leaveState( _nState );
}
- //--------------------------------------------------------------------
MacroMigrationDialog::WizardState MacroMigrationDialog::determineNextState( WizardState _nCurrentState ) const
{
return MacroMigrationDialog_Base::determineNextState( _nCurrentState );
}
- //--------------------------------------------------------------------
sal_Bool MacroMigrationDialog::onFinish()
{
return MacroMigrationDialog_Base::onFinish();
}
- //--------------------------------------------------------------------
IMPL_LINK( MacroMigrationDialog, OnStartMigration, void*, /*_pNotInterestedIn*/ )
{
// prevent closing
@@ -340,7 +318,6 @@ namespace dbmm
return 0L;
}
- //--------------------------------------------------------------------
void MacroMigrationDialog::impl_showCloseDocsError( bool _bShow )
{
PreparationPage* pPreparationPage = dynamic_cast< PreparationPage* >( GetPage( STATE_CLOSE_SUB_DOCS ) );
@@ -349,7 +326,6 @@ namespace dbmm
pPreparationPage->showCloseDocsError( _bShow );
}
- //--------------------------------------------------------------------
bool MacroMigrationDialog::impl_closeSubDocs_nothrow()
{
OSL_PRECOND( m_pData->xDocument.is(), "MacroMigrationDialog::impl_closeSubDocs_nothrow: no document!" );
@@ -391,7 +367,6 @@ namespace dbmm
return bSuccess;
}
- //--------------------------------------------------------------------
namespace
{
bool lcl_equalURLs_nothrow(
@@ -422,7 +397,6 @@ namespace dbmm
}
}
- //--------------------------------------------------------------------
bool MacroMigrationDialog::impl_backupDocument_nothrow() const
{
if ( !m_pData->xDocumentModel.is() )
@@ -473,7 +447,6 @@ namespace dbmm
return false;
}
- //--------------------------------------------------------------------
void MacroMigrationDialog::impl_reloadDocument_nothrow( bool _bMigrationSuccess )
{
typedef ::std::pair< Reference< XFrame >, OUString > ViewDescriptor;
@@ -607,8 +580,6 @@ namespace dbmm
}
}
-//........................................................................
} // namespace dbmm
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
index 51e04e4204c2..b8090606d12c 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
@@ -26,14 +26,10 @@
#include <memory>
-//........................................................................
namespace dbmm
{
-//........................................................................
- //====================================================================
- //= MacroMigrationDialog
- //====================================================================
+ // MacroMigrationDialog
struct MacroMigrationDialog_Data;
typedef ::svt::RoadmapWizard MacroMigrationDialog_Base;
class MacroMigrationDialog : public MacroMigrationDialog_Base
@@ -76,9 +72,7 @@ namespace dbmm
::std::auto_ptr< MacroMigrationDialog_Data > m_pData;
};
-//........................................................................
} // namespace dbmm
-//........................................................................
#endif // DBACCESS_MACROMIGRATIONDIALOG_HXX
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index f95cdd7e7458..d76ade61dbcc 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dbaccess_helpid.hrc"
#include "dbmm_module.hxx"
#include "dbmm_global.hrc"
@@ -31,10 +30,8 @@
#include <tools/diagnose_ex.h>
#include <vcl/metric.hxx>
-//........................................................................
namespace dbmm
{
-//........................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -48,10 +45,7 @@ namespace dbmm
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::frame::XModel;
- //====================================================================
- //= MacroMigrationPage
- //====================================================================
- //--------------------------------------------------------------------
+ // MacroMigrationPage
MacroMigrationPage::MacroMigrationPage( MacroMigrationDialog& _rParentDialog, const ResId& _rRes )
:MacroMigrationPage_Base( &_rParentDialog, _rRes )
,m_aHeader( this, MacroMigrationResId( FT_HEADER ) )
@@ -61,27 +55,21 @@ namespace dbmm
m_aHeader.SetFont( aFont );
}
- //--------------------------------------------------------------------
MacroMigrationPage::~MacroMigrationPage()
{
}
- //--------------------------------------------------------------------
const MacroMigrationDialog& MacroMigrationPage::getDialog() const
{
return *dynamic_cast< const MacroMigrationDialog* >( GetParentDialog() );
}
- //--------------------------------------------------------------------
MacroMigrationDialog& MacroMigrationPage::getDialog()
{
return *dynamic_cast< MacroMigrationDialog* >( GetParentDialog() );
}
- //====================================================================
- //= PreparationPage
- //====================================================================
- //--------------------------------------------------------------------
+ // PreparationPage
PreparationPage::PreparationPage( MacroMigrationDialog& _rParentDialog )
:MacroMigrationPage( _rParentDialog, MacroMigrationResId( TP_PREPARE ) )
,m_aIntroduction ( this, MacroMigrationResId( FT_INTRODUCTION ) )
@@ -90,22 +78,17 @@ namespace dbmm
FreeResource();
}
- //--------------------------------------------------------------------
void PreparationPage::showCloseDocsError( bool _bShow )
{
m_aCloseDocError.Show( _bShow );
}
- //--------------------------------------------------------------------
TabPage* PreparationPage::Create( ::svt::RoadmapWizard& _rParentDialog )
{
return new PreparationPage( dynamic_cast< MacroMigrationDialog& >( _rParentDialog ) );
}
- //====================================================================
- //= SaveDBDocPage
- //====================================================================
- //--------------------------------------------------------------------
+ // SaveDBDocPage
SaveDBDocPage::SaveDBDocPage( MacroMigrationDialog& _rParentDialog )
:MacroMigrationPage( _rParentDialog, MacroMigrationResId( TP_SAVE_DBDOC_AS ) )
,m_aExplanation ( this, MacroMigrationResId( FT_EXPLANATION ) )
@@ -125,21 +108,18 @@ namespace dbmm
impl_updateLocationDependentItems();
}
- //--------------------------------------------------------------------
void SaveDBDocPage::impl_updateLocationDependentItems()
{
updateDialogTravelUI();
m_aStartMigration.Show( !m_aSaveAsLocation.GetText().isEmpty() );
}
- //--------------------------------------------------------------------
IMPL_LINK( SaveDBDocPage, OnLocationModified, Edit*, /**/ )
{
impl_updateLocationDependentItems();
return 0L;
}
- //--------------------------------------------------------------------
void SaveDBDocPage::initializePage()
{
OWizardPage::initializePage();
@@ -164,7 +144,6 @@ namespace dbmm
}
}
- //--------------------------------------------------------------------
bool SaveDBDocPage::canAdvance() const
{
if ( !MacroMigrationPage::canAdvance() )
@@ -173,7 +152,6 @@ namespace dbmm
return !m_aSaveAsLocation.GetText().isEmpty();
}
- //--------------------------------------------------------------------
sal_Bool SaveDBDocPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if ( !MacroMigrationPage::commitPage( _eReason ) )
@@ -188,16 +166,12 @@ namespace dbmm
return sal_True;
}
- //--------------------------------------------------------------------
TabPage* SaveDBDocPage::Create( ::svt::RoadmapWizard& _rParentDialog )
{
return new SaveDBDocPage( dynamic_cast< MacroMigrationDialog& >( _rParentDialog ) );
}
- //====================================================================
- //= ProgressPage
- //====================================================================
- //--------------------------------------------------------------------
+ // ProgressPage
ProgressPage::ProgressPage( MacroMigrationDialog& _rParentDialog )
:MacroMigrationPage( _rParentDialog, MacroMigrationResId( TP_MIGRATE ) )
,m_aObjectCount ( this, MacroMigrationResId( FT_OBJECT_COUNT ) )
@@ -214,13 +188,11 @@ namespace dbmm
FreeResource();
}
- //--------------------------------------------------------------------
TabPage* ProgressPage::Create( ::svt::RoadmapWizard& _rParentDialog )
{
return new ProgressPage( dynamic_cast< MacroMigrationDialog& >( _rParentDialog ) );
}
- //--------------------------------------------------------------------
void ProgressPage::setDocumentCounts( const sal_Int32 _nForms, const sal_Int32 _nReports )
{
OUString sText( m_aObjectCount.GetText() );
@@ -229,13 +201,11 @@ namespace dbmm
m_aObjectCount.SetText( sText );
}
- //--------------------------------------------------------------------
void ProgressPage::onFinishedSuccessfully()
{
m_aMigrationDone.Show();
}
- //--------------------------------------------------------------------
void ProgressPage::startObject( const OUString& _rObjectName, const OUString& _rCurrentAction, const sal_uInt32 _nRange )
{
m_aCurrentObject.SetText( _rObjectName );
@@ -250,7 +220,6 @@ namespace dbmm
Update();
}
- //--------------------------------------------------------------------
void ProgressPage::setObjectProgressText( const OUString& _rText )
{
m_aCurrentAction.SetText( _rText );
@@ -258,14 +227,12 @@ namespace dbmm
Update();
}
- //--------------------------------------------------------------------
void ProgressPage::setObjectProgressValue( const sal_uInt32 _nValue )
{
m_aCurrentProgress.SetValue( _nValue );
Update();
}
- //--------------------------------------------------------------------
void ProgressPage::endObject()
{
m_aCurrentAction.SetText( OUString() );
@@ -274,31 +241,25 @@ namespace dbmm
Update();
}
- //--------------------------------------------------------------------
void ProgressPage::start( const sal_uInt32 _nOverallRange )
{
m_aAllProgress.SetRange( _nOverallRange );
Update();
}
- //--------------------------------------------------------------------
void ProgressPage::setOverallProgressText( const OUString& _rText )
{
m_aAllProgressText.SetText( _rText );
Update();
}
- //--------------------------------------------------------------------
void ProgressPage::setOverallProgressValue( const sal_uInt32 _nValue )
{
m_aAllProgress.SetValue( _nValue );
Update();
}
- //====================================================================
- //= ResultPage
- //====================================================================
- //--------------------------------------------------------------------
+ // ResultPage
ResultPage::ResultPage( MacroMigrationDialog& _rParentDialog )
:MacroMigrationPage( _rParentDialog, MacroMigrationResId( TP_SUMMARY ) )
,m_aChangesLabel( this, MacroMigrationResId( FT_CHANGES_LABEL ) )
@@ -309,13 +270,11 @@ namespace dbmm
FreeResource();
}
- //--------------------------------------------------------------------
TabPage* ResultPage::Create( ::svt::RoadmapWizard& _rParentDialog )
{
return new ResultPage( dynamic_cast< MacroMigrationDialog& >( _rParentDialog ) );
}
- //--------------------------------------------------------------------
void ResultPage::displayMigrationLog( const bool _bSuccessful, const OUString& _rSummary )
{
m_aChangesLabel.SetText( _bSuccessful ? m_aSuccessful : m_aUnsuccessful );
@@ -342,8 +301,6 @@ namespace dbmm
m_aChanges.SetPosPixel( aChangesPos );
}
-//........................................................................
} // namespace dbmm
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index 0bb8c589ae12..082c49d733ad 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -35,16 +35,12 @@ namespace svt
class RoadmapWizard;
}
-//........................................................................
namespace dbmm
{
-//........................................................................
class MacroMigrationDialog;
- //====================================================================
- //= MacroMigrationPage
- //====================================================================
+ // MacroMigrationPage
typedef ::svt::OWizardPage MacroMigrationPage_Base;
class MacroMigrationPage : public MacroMigrationPage_Base
{
@@ -60,9 +56,7 @@ namespace dbmm
FixedText m_aHeader;
};
- //====================================================================
- //= PreparationPage
- //====================================================================
+ // PreparationPage
class PreparationPage : public MacroMigrationPage
{
public:
@@ -78,9 +72,7 @@ namespace dbmm
FixedText m_aCloseDocError;
};
- //====================================================================
- //= SaveDBDocPage
- //====================================================================
+ // SaveDBDocPage
class SaveDBDocPage : public MacroMigrationPage
{
public:
@@ -111,9 +103,7 @@ namespace dbmm
void impl_updateLocationDependentItems();
};
- //====================================================================
- //= ProgressPage
- //====================================================================
+ // ProgressPage
class ProgressPage : public MacroMigrationPage, public IMigrationProgress
{
public:
@@ -147,9 +137,7 @@ namespace dbmm
FixedText m_aMigrationDone;
};
- //====================================================================
- //= ResultPage
- //====================================================================
+ // ResultPage
class ResultPage : public MacroMigrationPage
{
public:
@@ -166,9 +154,7 @@ namespace dbmm
OUString m_aUnsuccessful;
};
-//........................................................................
} // namespace dbmm
-//........................................................................
#endif // DBACCESS_MACROMIGRATIONPAGES_HXX
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index 0485a1293f32..4c2212271779 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dbmm_module.hxx"
#include "dbmm_global.hrc"
#include "macromigrationdialog.hxx"
@@ -28,10 +27,8 @@
#include <svtools/genericunodialog.hxx>
-//........................................................................
namespace dbmm
{
-//........................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -51,9 +48,7 @@ namespace dbmm
using ::com::sun::star::lang::IllegalArgumentException;
using ::com::sun::star::frame::XStorable;
- //====================================================================
- //= MacroMigrationDialogService
- //====================================================================
+ // MacroMigrationDialogService
class MacroMigrationDialogService;
typedef ::svt::OGenericUnoDialog MacroMigrationDialogService_Base;
typedef ::comphelper::OPropertyArrayUsageHelper< MacroMigrationDialogService > MacroMigrationDialogService_PBase;
@@ -100,10 +95,7 @@ namespace dbmm
Reference< XOfficeDatabaseDocument > m_xDocument;
};
- //====================================================================
- //= MacroMigrationDialogService
- //====================================================================
- //--------------------------------------------------------------------
+ // MacroMigrationDialogService
MacroMigrationDialogService::MacroMigrationDialogService( const Reference< XComponentContext >& _rxContext )
:MacroMigrationDialogService_Base( _rxContext )
,m_aContext( _rxContext )
@@ -111,7 +103,6 @@ namespace dbmm
m_bNeedInitialization = true;
}
- //--------------------------------------------------------------------
MacroMigrationDialogService::~MacroMigrationDialogService()
{
// we do this here cause the base class' call to destroyDialog won't reach us anymore : we're within an dtor,
@@ -124,25 +115,21 @@ namespace dbmm
}
}
- //--------------------------------------------------------------------
Reference< XInterface > SAL_CALL MacroMigrationDialogService::Create( const Reference< XComponentContext >& _rxContext )
{
return *(new MacroMigrationDialogService( _rxContext ) );
}
- //--------------------------------------------------------------------
Dialog* MacroMigrationDialogService::createDialog( Window* _pParent )
{
return new MacroMigrationDialog( _pParent, m_aContext, m_xDocument );
}
- //--------------------------------------------------------------------
void MacroMigrationDialogService::destroyDialog()
{
MacroMigrationDialogService_Base::destroyDialog();
}
- //--------------------------------------------------------------------
Sequence< sal_Int8 > SAL_CALL MacroMigrationDialogService::getImplementationId() throw(RuntimeException)
{
static ::cppu::OImplementationId* pId = NULL;
@@ -158,13 +145,11 @@ namespace dbmm
return pId->getImplementationId();
}
- //--------------------------------------------------------------------
OUString SAL_CALL MacroMigrationDialogService::getImplementationName_static() throw(RuntimeException)
{
return OUString( "com.sun.star.comp.dbaccess.macromigration.MacroMigrationDialogService" );
}
- //--------------------------------------------------------------------
Sequence< OUString > SAL_CALL MacroMigrationDialogService::getSupportedServiceNames_static() throw(RuntimeException)
{
Sequence< OUString > aServices(1);
@@ -172,19 +157,16 @@ namespace dbmm
return aServices;
}
- //--------------------------------------------------------------------
OUString SAL_CALL MacroMigrationDialogService::getImplementationName() throw(RuntimeException)
{
return getImplementationName_static();
}
- //--------------------------------------------------------------------
Sequence< OUString > SAL_CALL MacroMigrationDialogService::getSupportedServiceNames() throw(RuntimeException)
{
return getSupportedServiceNames_static();
}
- //--------------------------------------------------------------------
void SAL_CALL MacroMigrationDialogService::initialize( const Sequence< Any >& _rArguments ) throw(Exception, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -217,19 +199,16 @@ namespace dbmm
m_bInitialized = true;
}
- //--------------------------------------------------------------------
Reference< XPropertySetInfo > SAL_CALL MacroMigrationDialogService::getPropertySetInfo() throw(RuntimeException)
{
return createPropertySetInfo( getInfoHelper() );
}
- //--------------------------------------------------------------------
::cppu::IPropertyArrayHelper& SAL_CALL MacroMigrationDialogService::getInfoHelper()
{
return *const_cast< MacroMigrationDialogService* >( this )->getArrayHelper();
}
- //--------------------------------------------------------------------
::cppu::IPropertyArrayHelper* MacroMigrationDialogService::createArrayHelper( ) const
{
Sequence< Property > aProps;
@@ -237,14 +216,11 @@ namespace dbmm
return new ::cppu::OPropertyArrayHelper( aProps );
}
- //--------------------------------------------------------------------
void createRegistryInfo_MacroMigrationDialogService()
{
static OAutoRegistration< MacroMigrationDialogService > aAutoRegistration;
}
-//........................................................................
} // namespace dbmm
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index b9a12d11362d..34040d6cc205 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dbmm_global.hrc"
#include "dbmm_module.hxx"
#include "dbmm_types.hxx"
@@ -75,10 +74,8 @@
#define DEFAULT_DOC_PROGRESS_RANGE 100000
-//........................................................................
namespace dbmm
{
-//........................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -144,9 +141,7 @@ namespace dbmm
#define PHASE_BASIC 5
#define PHASE_DIALOGS 6
- //====================================================================
- //= SubDocument
- //====================================================================
+ // SubDocument
struct SubDocument
{
Reference< XCommandProcessor > xCommandProcessor;
@@ -168,22 +163,17 @@ namespace dbmm
typedef ::std::vector< SubDocument > SubDocuments;
- //====================================================================
- //= helper
- //====================================================================
- //--------------------------------------------------------------------
+ // helper
typedef ::utl::SharedUNOComponent< XStorage > SharedStorage;
namespace
{
- //----------------------------------------------------------------
static const OUString& lcl_getScriptsStorageName()
{
static const OUString s_sScriptsStorageName( "Scripts" );
return s_sScriptsStorageName;
}
- //----------------------------------------------------------------
static const OUString& lcl_getScriptsSubStorageName( const ScriptType _eType )
{
static const OUString s_sBeanShell ( "beanshell" );
@@ -206,7 +196,6 @@ namespace dbmm
return s_sEmpty;
}
- //----------------------------------------------------------------
static bool lcl_getScriptTypeFromLanguage( const OUString& _rLanguage, ScriptType& _out_rScriptType )
{
struct LanguageMapping
@@ -240,7 +229,6 @@ namespace dbmm
return false;
}
- //----------------------------------------------------------------
OUString lcl_getSubDocumentDescription( const SubDocument& _rDocument )
{
OUString sObjectName(
@@ -250,7 +238,6 @@ namespace dbmm
return sObjectName;
}
- //----------------------------------------------------------------
static Any lcl_executeCommand_throw( const Reference< XCommandProcessor >& _rxCommandProc,
const sal_Char* _pAsciiCommand )
{
@@ -264,7 +251,6 @@ namespace dbmm
aCommand, _rxCommandProc->createCommandIdentifier(), NULL );
}
- //----------------------------------------------------------------
OUString lcl_getMimeType_nothrow( const Reference< XCommandProcessor >& _rxContent )
{
OUString sMimeType;
@@ -280,7 +266,6 @@ namespace dbmm
return sMimeType;
}
- //----------------------------------------------------------------
enum OpenDocResult
{
eOpenedDoc,
@@ -288,7 +273,6 @@ namespace dbmm
eFailure
};
- //----------------------------------------------------------------
static OpenDocResult lcl_loadSubDocument_nothrow( SubDocument& _rDocument,
const Reference< XStatusIndicator >& _rxProgress, MigrationLog& _rLogger )
{
@@ -343,7 +327,6 @@ namespace dbmm
return _rDocument.xDocument.is() ? eOpenedDoc : eFailure;
}
- //----------------------------------------------------------------
static bool lcl_unloadSubDocument_nothrow( SubDocument& _rDocument, MigrationLog& _rLogger )
{
bool bSuccess = false;
@@ -371,7 +354,6 @@ namespace dbmm
return bSuccess;
}
- //----------------------------------------------------------------
bool lcl_commitStorage_nothrow( const Reference< XStorage >& _rxStorage )
{
try
@@ -386,7 +368,6 @@ namespace dbmm
return true;
}
- //----------------------------------------------------------------
bool lcl_commitDocumentStorage_nothrow( const Reference< XModel >& _rxDocument, MigrationLog& _rLogger )
{
bool bSuccess = false;
@@ -414,7 +395,6 @@ namespace dbmm
return bSuccess;
}
- //----------------------------------------------------------------
bool lcl_storeDocument_nothrow( const Reference< XModel >& _rxDocument, MigrationLog& _rLogger )
{
bool bSuccess = false;
@@ -441,7 +421,6 @@ namespace dbmm
return bSuccess;
}
- //----------------------------------------------------------------
bool lcl_storeEmbeddedDocument_nothrow( const SubDocument& _rDocument )
{
try
@@ -457,9 +436,7 @@ namespace dbmm
}
}
- //====================================================================
- //= DrawPageIterator
- //====================================================================
+ // DrawPageIterator
class DrawPageIterator
{
public:
@@ -511,9 +488,7 @@ namespace dbmm
sal_Int32 m_nCurrentPage;
};
- //====================================================================
- //= FormComponentScripts
- //====================================================================
+ // FormComponentScripts
class FormComponentScripts
{
public:
@@ -549,9 +524,7 @@ namespace dbmm
const sal_Int32 m_nIndex;
};
- //====================================================================
- //= FormComponentIterator
- //====================================================================
+ // FormComponentIterator
class FormComponentIterator
{
public:
@@ -587,9 +560,7 @@ namespace dbmm
};
- //====================================================================
- //= ScriptsStorage - declaration
- //====================================================================
+ // ScriptsStorage - declaration
/** a helper class which encapsulates access to the storages for Java/Script, BeanShell, and Python scripts,
i.e. all script types which can be manipulated on storage level.
*/
@@ -646,17 +617,13 @@ namespace dbmm
SharedStorage m_xScriptsStorage;
};
- //====================================================================
- //= ScriptsStorage - implementation
- //====================================================================
- //--------------------------------------------------------------------
+ // ScriptsStorage - implementation
ScriptsStorage::ScriptsStorage( MigrationLog& _rLogger )
:m_rLogger( _rLogger )
,m_xScriptsStorage()
{
}
- //--------------------------------------------------------------------
ScriptsStorage::ScriptsStorage( const Reference< XModel >& _rxDocument, MigrationLog& _rLogger )
:m_rLogger( _rLogger )
,m_xScriptsStorage()
@@ -664,18 +631,15 @@ namespace dbmm
bind( _rxDocument );
}
- //--------------------------------------------------------------------
ScriptsStorage::~ScriptsStorage()
{
}
- //--------------------------------------------------------------------
bool ScriptsStorage::commit()
{
return lcl_commitStorage_nothrow( m_xScriptsStorage );
}
- //--------------------------------------------------------------------
void ScriptsStorage::bind( const Reference< XModel >& _rxDocument )
{
OSL_PRECOND( !isValid(), "ScriptsStorage:bind: did not bother, yet, to check whether this is allowed!" );
@@ -710,7 +674,6 @@ namespace dbmm
}
}
- //--------------------------------------------------------------------
bool ScriptsStorage::hasScripts( const ScriptType _eType ) const
{
OSL_PRECOND( isValid(), "ScriptsStorage::hasScripts: illegal call!" );
@@ -722,7 +685,6 @@ namespace dbmm
&& m_xScriptsStorage->isStorageElement( rSubStorageName );
}
- //--------------------------------------------------------------------
SharedStorage ScriptsStorage::getScriptsRoot( const ScriptType _eType ) const
{
SharedStorage xStorage;
@@ -735,7 +697,6 @@ namespace dbmm
return xStorage;
}
- //--------------------------------------------------------------------
::std::set< OUString > ScriptsStorage::getElementNames() const
{
Sequence< OUString > aElementNames;
@@ -751,7 +712,6 @@ namespace dbmm
return aNames;
}
- //--------------------------------------------------------------------
void ScriptsStorage::removeScriptTypeStorage( const ScriptType _eType ) const
{
OUString sSubStorageName( lcl_getScriptsSubStorageName( _eType ) );
@@ -759,7 +719,6 @@ namespace dbmm
m_xScriptsStorage->removeElement( sSubStorageName );
}
- //--------------------------------------------------------------------
bool ScriptsStorage::removeFromDocument( const Reference< XModel >& _rxDocument, MigrationLog& _rLogger )
{
try
@@ -780,9 +739,7 @@ namespace dbmm
return true;
}
- //====================================================================
- //= ProgressDelegator
- //====================================================================
+ // ProgressDelegator
class ProgressDelegator : public IProgressConsumer
{
public:
@@ -819,9 +776,7 @@ namespace dbmm
OUString m_sAction;
};
- //====================================================================
- //= PhaseGuard
- //====================================================================
+ // PhaseGuard
class PhaseGuard
{
public:
@@ -850,9 +805,7 @@ namespace dbmm
ProgressMixer& m_rMixer;
};
- //====================================================================
- //= MigrationEngine_Impl - declaration
- //====================================================================
+ // MigrationEngine_Impl - declaration
class MigrationEngine_Impl
{
public:
@@ -979,10 +932,7 @@ namespace dbmm
) const;
};
- //====================================================================
- //= MigrationEngine_Impl - implementation
- //====================================================================
- //--------------------------------------------------------------------
+ // MigrationEngine_Impl - implementation
MigrationEngine_Impl::MigrationEngine_Impl( const Reference<XComponentContext>& _rContext,
const Reference< XOfficeDatabaseDocument >& _rxDocument, IMigrationProgress& _rProgress, MigrationLog& _rLogger )
:m_aContext( _rContext )
@@ -998,12 +948,10 @@ namespace dbmm
OSL_VERIFY( impl_collectSubDocuments_nothrow() );
}
- //--------------------------------------------------------------------
MigrationEngine_Impl::~MigrationEngine_Impl()
{
}
- //--------------------------------------------------------------------
bool MigrationEngine_Impl::migrateAll()
{
if ( m_aSubDocs.empty() )
@@ -1053,7 +1001,6 @@ namespace dbmm
return true;
}
- //--------------------------------------------------------------------
namespace
{
void lcl_collectHierarchicalElementNames_throw(
@@ -1091,7 +1038,6 @@ namespace dbmm
}
}
- //--------------------------------------------------------------------
bool MigrationEngine_Impl::impl_collectSubDocuments_nothrow()
{
OSL_PRECOND( m_xDocument.is(), "MigrationEngine_Impl::impl_collectSubDocuments_nothrow: invalid document!" );
@@ -1119,7 +1065,6 @@ namespace dbmm
return true;
}
- //--------------------------------------------------------------------
bool MigrationEngine_Impl::impl_handleDocument_nothrow( const SubDocument& _rDocument ) const
{
OSL_ENSURE( m_nCurrentDocumentID == -1,
@@ -1130,7 +1075,6 @@ namespace dbmm
OUString sObjectName( lcl_getSubDocumentDescription( _rDocument ) );
m_rProgress.startObject( sObjectName, OUString(), DEFAULT_DOC_PROGRESS_RANGE );
- // -----------------
// load the document
Reference< ProgressCapture > pStatusIndicator( new ProgressCapture( sObjectName, m_rProgress ) );
SubDocument aSubDocument( _rDocument );
@@ -1144,7 +1088,6 @@ namespace dbmm
return ( eResult == eIgnoreDoc );
}
- // -----------------
// migrate the libraries
ProgressDelegator aDelegator(m_rProgress, sObjectName, MacroMigrationResId(STR_MIGRATING_LIBS).toString());
ProgressMixer aProgressMixer( aDelegator );
@@ -1181,7 +1124,6 @@ namespace dbmm
impl_adjustFormComponentEvents_nothrow( aSubDocument );
}
- // -----------------
// clean up
// store the sub document, including removal of the (now obsolete) "Scripts" sub folder
if ( m_rLogger.movedAnyLibrary( m_nCurrentDocumentID ) )
@@ -1206,7 +1148,6 @@ namespace dbmm
return bSuccess;
}
- //--------------------------------------------------------------------
namespace
{
static OUString lcl_createTargetLibName( const SubDocument& _rDocument,
@@ -1266,7 +1207,6 @@ namespace dbmm
}
}
- //--------------------------------------------------------------------
bool MigrationEngine_Impl::impl_checkScriptStorageStructure_nothrow( const SubDocument& _rDocument ) const
{
OSL_PRECOND( _rDocument.xDocument.is(), "MigrationEngine_Impl::impl_checkScriptStorageStructure_nothrow: invalid document!" );
@@ -1311,7 +1251,6 @@ namespace dbmm
return true;
}
- //--------------------------------------------------------------------
bool MigrationEngine_Impl::impl_migrateScriptStorage_nothrow( const SubDocument& _rDocument,
const ScriptType _eScriptType, ProgressMixer& _rProgress, const PhaseID _nPhaseID ) const
{
@@ -1441,7 +1380,6 @@ namespace dbmm
return bSuccess;
}
- //--------------------------------------------------------------------
bool MigrationEngine_Impl::impl_migrateContainerLibraries_nothrow( const SubDocument& _rDocument,
const ScriptType _eScriptType, ProgressMixer& _rProgress, const PhaseID _nPhaseID ) const
{
@@ -1603,7 +1541,6 @@ namespace dbmm
return bSuccess;
}
- //--------------------------------------------------------------------
bool MigrationEngine_Impl::impl_adjustScriptLibrary_nothrow( const OUString& _rScriptType,
OUString& _inout_rScriptCode ) const
{
@@ -1696,7 +1633,6 @@ namespace dbmm
return bSuccess;
}
- //--------------------------------------------------------------------
bool MigrationEngine_Impl::impl_adjustScriptLibrary_nothrow( ScriptEventDescriptor& _inout_rScriptEvent ) const
{
if ( !(_inout_rScriptEvent.ScriptType.isEmpty() || _inout_rScriptEvent.ScriptCode.isEmpty()) )
@@ -1704,7 +1640,6 @@ namespace dbmm
return false;
}
- //--------------------------------------------------------------------
bool MigrationEngine_Impl::impl_adjustScriptLibrary_nothrow( Any& _inout_rScriptDescriptor ) const
{
::comphelper::NamedValueCollection aScriptDesc( _inout_rScriptDescriptor );
@@ -1733,7 +1668,6 @@ namespace dbmm
return true;
}
- //--------------------------------------------------------------------
bool MigrationEngine_Impl::impl_adjustDocumentEvents_nothrow( const SubDocument& _rDocument ) const
{
try
@@ -1776,7 +1710,6 @@ namespace dbmm
return true;
}
- //--------------------------------------------------------------------
void MigrationEngine_Impl::impl_adjustDialogElementEvents_throw( const Reference< XInterface >& _rxElement ) const
{
Reference< XScriptEventsSupplier > xEventsSupplier( _rxElement, UNO_QUERY_THROW );
@@ -1798,7 +1731,6 @@ namespace dbmm
}
}
- //--------------------------------------------------------------------
bool MigrationEngine_Impl::impl_adjustDialogEvents_nothrow( Any& _inout_rDialogLibraryElement,
const OUString& _rDocName, const OUString& _rDialogLibName, const OUString& _rDialogName ) const
{
@@ -1841,7 +1773,6 @@ namespace dbmm
return true;
}
- //--------------------------------------------------------------------
void MigrationEngine_Impl::impl_adjustFormComponentEvents_throw( const Reference< XIndexAccess >& _rxComponentContainer ) const
{
FormComponentIterator aCompIter( _rxComponentContainer );
@@ -1873,7 +1804,6 @@ namespace dbmm
}
}
- //--------------------------------------------------------------------
bool MigrationEngine_Impl::impl_adjustFormComponentEvents_nothrow( const SubDocument& _rDocument ) const
{
try
@@ -1898,7 +1828,6 @@ namespace dbmm
return true;
}
- //--------------------------------------------------------------------
bool MigrationEngine_Impl::impl_unprotectPasswordLibrary_throw( const Reference< XLibraryContainerPassword >& _rxPasswordManager,
const ScriptType _eScriptType, const OUString& _rLibraryName ) const
{
@@ -1927,10 +1856,7 @@ namespace dbmm
}
- //====================================================================
- //= MigrationEngine
- //====================================================================
- //--------------------------------------------------------------------
+ // MigrationEngine
MigrationEngine::MigrationEngine( const Reference<XComponentContext>& _rContext,
const Reference< XOfficeDatabaseDocument >& _rxDocument, IMigrationProgress& _rProgress,
MigrationLog& _rLogger )
@@ -1938,31 +1864,25 @@ namespace dbmm
{
}
- //--------------------------------------------------------------------
MigrationEngine::~MigrationEngine()
{
}
- //--------------------------------------------------------------------
sal_Int32 MigrationEngine::getFormCount() const
{
return m_pImpl->getFormCount();
}
- //--------------------------------------------------------------------
sal_Int32 MigrationEngine::getReportCount() const
{
return m_pImpl->getReportCount();
}
- //--------------------------------------------------------------------
bool MigrationEngine::migrateAll()
{
return m_pImpl->migrateAll();
}
-//........................................................................
} // namespace dbmm
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/migrationengine.hxx b/dbaccess/source/ext/macromigration/migrationengine.hxx
index 01f1116b699a..c4428939a283 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.hxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.hxx
@@ -24,17 +24,13 @@
#include <memory>
-//........................................................................
namespace dbmm
{
-//........................................................................
class IMigrationProgress;
class MigrationLog;
- //====================================================================
- //= MigrationEngine
- //====================================================================
+ // MigrationEngine
class MigrationEngine_Impl;
class MigrationEngine
{
@@ -77,9 +73,7 @@ namespace dbmm
::std::auto_ptr< MigrationEngine_Impl > m_pImpl;
};
-//........................................................................
} // namespace dbmm
-//........................................................................
#endif // DBACCESS_MIGRATIONENGINE_HXX
diff --git a/dbaccess/source/ext/macromigration/migrationerror.hxx b/dbaccess/source/ext/macromigration/migrationerror.hxx
index 0feca29d89b6..1c5b175d2d5f 100644
--- a/dbaccess/source/ext/macromigration/migrationerror.hxx
+++ b/dbaccess/source/ext/macromigration/migrationerror.hxx
@@ -24,10 +24,8 @@
#include <vector>
-//........................................................................
namespace dbmm
{
-//........................................................................
enum MigrationErrorType
{
@@ -58,9 +56,7 @@ namespace dbmm
ERR_NEW_STYLE_REPORT
};
- //====================================================================
- //= MigrationError
- //====================================================================
+ // MigrationError
/** encapsulates information about an error which happened during the migration
*/
struct MigrationError
@@ -156,9 +152,7 @@ namespace dbmm
}
};
-//........................................................................
} // namespace dbmm
-//........................................................................
#endif // DBACCESS_MIGRATIONERROR_HXX
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx
index f4c1ac9068f5..6f45ad73d072 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -17,13 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dbmm_module.hxx"
#include "dbmm_global.hrc"
#include "migrationerror.hxx"
#include "migrationlog.hxx"
-
#include <comphelper/anytostring.hxx>
#include <tools/string.hxx>
#include <rtl/ustrbuf.hxx>
@@ -32,12 +30,9 @@
#include <map>
#include <list>
-//........................................................................
namespace dbmm
{
- //====================================================================
- //= LibraryEntry
- //====================================================================
+ // LibraryEntry
struct LibraryEntry
{
ScriptType eType;
@@ -59,9 +54,7 @@ namespace dbmm
}
};
- //====================================================================
- //= DocumentEntry
- //====================================================================
+ // DocumentEntry
struct DocumentEntry
{
SubDocumentType eType;
@@ -82,19 +75,13 @@ namespace dbmm
}
};
- //====================================================================
- //= DocumentLogs
- //====================================================================
+ // DocumentLogs
typedef ::std::map< DocumentID, DocumentEntry > DocumentLogs;
- //====================================================================
- //= ErrorLog
- //====================================================================
+ // ErrorLog
typedef ::std::list< MigrationError > ErrorLog;
- //====================================================================
- //= MigrationLog_Data
- //====================================================================
+ // MigrationLog_Data
struct MigrationLog_Data
{
OUString sBackupLocation;
@@ -103,45 +90,36 @@ namespace dbmm
ErrorLog aWarnings;
};
- //====================================================================
- //= MigrationLog
- //====================================================================
- //--------------------------------------------------------------------
+ // MigrationLog
MigrationLog::MigrationLog()
:m_pData( new MigrationLog_Data )
{
}
- //--------------------------------------------------------------------
MigrationLog::~MigrationLog()
{
}
- //--------------------------------------------------------------------
void MigrationLog::logFailure( const MigrationError& _rError )
{
m_pData->aFailures.push_back( _rError );
}
- //--------------------------------------------------------------------
void MigrationLog::logRecoverable( const MigrationError& _rError )
{
m_pData->aWarnings.push_back( _rError );
}
- //--------------------------------------------------------------------
bool MigrationLog::hadFailure() const
{
return !m_pData->aFailures.empty();
}
- //--------------------------------------------------------------------
void MigrationLog::backedUpDocument( const OUString& _rNewDocumentLocation )
{
m_pData->sBackupLocation = _rNewDocumentLocation;
}
- //--------------------------------------------------------------------
DocumentID MigrationLog::startedDocument( const SubDocumentType _eType, const OUString& _rName )
{
#if OSL_DEBUG_LEVEL > 0
@@ -165,7 +143,6 @@ namespace dbmm
return nID;
}
- //--------------------------------------------------------------------
void MigrationLog::movedLibrary( const DocumentID _nDocID, const ScriptType _eScriptType,
const OUString& _rOriginalLibName, const OUString& _rNewLibName )
{
@@ -176,7 +153,6 @@ namespace dbmm
rDocEntry.aMovedLibraries.push_back( LibraryEntry( _eScriptType, _rOriginalLibName, _rNewLibName ) );
}
- //--------------------------------------------------------------------
void MigrationLog::finishedDocument( const DocumentID _nDocID )
{
OSL_ENSURE( m_pData->aDocumentLogs.find( _nDocID ) != m_pData->aDocumentLogs.end(),
@@ -187,7 +163,6 @@ namespace dbmm
// nothing to do here
}
- //--------------------------------------------------------------------
const OUString& MigrationLog::getNewLibraryName( DocumentID _nDocID, ScriptType _eScriptType,
const OUString& _rOriginalLibName ) const
{
@@ -216,10 +191,8 @@ namespace dbmm
return s_sEmptyString;
}
- //--------------------------------------------------------------------
namespace
{
- //----------------------------------------------------------------
static void lcl_appendErrorDescription( OUStringBuffer& _inout_rBuffer, const MigrationError& _rError )
{
const sal_Char* pAsciiErrorDescription( NULL );
@@ -378,7 +351,6 @@ namespace dbmm
}
}
- //----------------------------------------------------------------
void lcl_describeErrors( OUStringBuffer& _rBuffer, const ErrorLog& _rErrors, const sal_uInt16 _nHeadingResId )
{
_rBuffer.appendAscii( "=== " );
@@ -408,7 +380,6 @@ namespace dbmm
}
}
- //--------------------------------------------------------------------
bool MigrationLog::movedAnyLibrary( const DocumentID _nDocID )
{
DocumentLogs::const_iterator docPos = m_pData->aDocumentLogs.find( _nDocID );
@@ -420,7 +391,6 @@ namespace dbmm
return !docPos->second.aMovedLibraries.empty();
}
- //--------------------------------------------------------------------
OUString MigrationLog::getCompleteLog() const
{
OUStringBuffer aBuffer;
@@ -483,8 +453,6 @@ namespace dbmm
return aBuffer.makeStringAndClear();
}
-//........................................................................
} // namespace dbmm
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/migrationlog.hxx b/dbaccess/source/ext/macromigration/migrationlog.hxx
index 5264505ffd1d..498739f2de6b 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.hxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.hxx
@@ -26,17 +26,13 @@
#include <memory>
-//........................................................................
namespace dbmm
{
-//........................................................................
typedef sal_Int16 DocumentID;
struct MigrationError;
- //====================================================================
- //= MigrationLog
- //====================================================================
+ // MigrationLog
struct MigrationLog_Data;
class MigrationLog
{
@@ -44,7 +40,6 @@ namespace dbmm
MigrationLog();
~MigrationLog();
- //----------------------------------------------------------------
//- event logging
/** logs an unrecoverable error during the migration process
@@ -80,7 +75,6 @@ namespace dbmm
*/
void finishedDocument( const DocumentID _nDocID );
- //----------------------------------------------------------------
//- information retrieval
/** retrieves the new name of a library
@@ -110,9 +104,7 @@ namespace dbmm
::std::auto_ptr< MigrationLog_Data > m_pData;
};
-//........................................................................
} // namespace dbmm
-//........................................................................
#endif // DBACCESS_MIGRATIONLOG_HXX
diff --git a/dbaccess/source/ext/macromigration/migrationprogress.hxx b/dbaccess/source/ext/macromigration/migrationprogress.hxx
index bf9943c7538a..804f2c24cb8d 100644
--- a/dbaccess/source/ext/macromigration/migrationprogress.hxx
+++ b/dbaccess/source/ext/macromigration/migrationprogress.hxx
@@ -20,14 +20,10 @@
#ifndef DBACCESS_MIGRATIONPROGRESS_HXX
#define DBACCESS_MIGRATIONPROGRESS_HXX
-//........................................................................
namespace dbmm
{
-//........................................................................
- //====================================================================
- //= IMigrationProgress
- //====================================================================
+ // IMigrationProgress
class SAL_NO_VTABLE IMigrationProgress
{
public:
@@ -43,9 +39,7 @@ namespace dbmm
~IMigrationProgress() {}
};
-//........................................................................
} // namespace dbmm
-//........................................................................
#endif // DBACCESS_MIGRATIONPROGRESS_HXX
diff --git a/dbaccess/source/ext/macromigration/progresscapture.cxx b/dbaccess/source/ext/macromigration/progresscapture.cxx
index efdb8af3c3d4..14cb911aeac7 100644
--- a/dbaccess/source/ext/macromigration/progresscapture.cxx
+++ b/dbaccess/source/ext/macromigration/progresscapture.cxx
@@ -23,10 +23,8 @@
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
-//........................................................................
namespace dbmm
{
-//........................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -38,9 +36,7 @@ namespace dbmm
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::makeAny;
- //====================================================================
- //= ProgressCapture_Data
- //====================================================================
+ // ProgressCapture_Data
struct ProgressCapture_Data
{
ProgressCapture_Data( const OUString& _rObjectName, IMigrationProgress& _rMasterProgress )
@@ -55,28 +51,22 @@ namespace dbmm
bool bDisposed;
};
- //====================================================================
- //= ProgressCapture
- //====================================================================
- //--------------------------------------------------------------------
+ // ProgressCapture
ProgressCapture::ProgressCapture( const OUString& _rObjectName, IMigrationProgress& _rMasterProgress )
:m_pData( new ProgressCapture_Data( _rObjectName, _rMasterProgress ) )
{
}
- //--------------------------------------------------------------------
ProgressCapture::~ProgressCapture()
{
}
- //--------------------------------------------------------------------
void ProgressCapture::dispose()
{
SolarMutexGuard aGuard;
m_pData->bDisposed = true;
}
- //--------------------------------------------------------------------
void SAL_CALL ProgressCapture::start( const OUString& _rText, ::sal_Int32 _nRange ) throw (RuntimeException)
{
SolarMutexGuard aGuard;
@@ -84,7 +74,6 @@ namespace dbmm
m_pData->rMasterProgress.startObject( m_pData->sObjectName, _rText, _nRange );
}
- //--------------------------------------------------------------------
void SAL_CALL ProgressCapture::end( ) throw (RuntimeException)
{
SolarMutexGuard aGuard;
@@ -92,7 +81,6 @@ namespace dbmm
m_pData->rMasterProgress.endObject();
}
- //--------------------------------------------------------------------
void SAL_CALL ProgressCapture::setText( const OUString& _rText ) throw (RuntimeException)
{
SolarMutexGuard aGuard;
@@ -100,7 +88,6 @@ namespace dbmm
m_pData->rMasterProgress.setObjectProgressText( _rText );
}
- //--------------------------------------------------------------------
void SAL_CALL ProgressCapture::setValue( ::sal_Int32 _nValue ) throw (RuntimeException)
{
SolarMutexGuard aGuard;
@@ -108,14 +95,11 @@ namespace dbmm
m_pData->rMasterProgress.setObjectProgressValue( _nValue );
}
- //--------------------------------------------------------------------
void SAL_CALL ProgressCapture::reset( ) throw (RuntimeException)
{
OSL_FAIL( "ProgressCapture::reset: not implemented!" );
}
-//........................................................................
} // namespace dbmm
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/progresscapture.hxx b/dbaccess/source/ext/macromigration/progresscapture.hxx
index c3a5b3a1b29a..f060d1147d59 100644
--- a/dbaccess/source/ext/macromigration/progresscapture.hxx
+++ b/dbaccess/source/ext/macromigration/progresscapture.hxx
@@ -26,16 +26,12 @@
#include <memory>
-//........................................................................
namespace dbmm
{
-//........................................................................
class IMigrationProgress;
- //====================================================================
- //= ProgressCapture
- //====================================================================
+ // ProgressCapture
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::task::XStatusIndicator
> ProgressCapture_Base;
@@ -62,9 +58,7 @@ namespace dbmm
::std::auto_ptr< ProgressCapture_Data > m_pData;
};
-//........................................................................
} // namespace dbmm
-//........................................................................
#endif // DBACCESS_PROGRESSCAPTURE_HXX
diff --git a/dbaccess/source/ext/macromigration/progressmixer.cxx b/dbaccess/source/ext/macromigration/progressmixer.cxx
index 5f883d38f7bb..87c7d84579d1 100644
--- a/dbaccess/source/ext/macromigration/progressmixer.cxx
+++ b/dbaccess/source/ext/macromigration/progressmixer.cxx
@@ -23,14 +23,11 @@
#include <map>
-//........................................................................
namespace dbmm
{
#define OVERALL_RANGE 100000
- //====================================================================
- //= misc types
- //====================================================================
+ // misc types
struct PhaseData
{
// the weight of the phase, relative to all other phases
@@ -63,9 +60,7 @@ namespace dbmm
typedef ::std::map< PhaseID, PhaseData > Phases;
- //====================================================================
- //= ProgressMixer_Data
- //====================================================================
+ // ProgressMixer_Data
struct ProgressMixer_Data
{
Phases aPhases;
@@ -84,17 +79,14 @@ namespace dbmm
}
};
- //--------------------------------------------------------------------
namespace
{
#if OSL_DEBUG_LEVEL > 0
- //----------------------------------------------------------------
bool lcl_isRunning( const ProgressMixer_Data& _rData )
{
return _rData.pCurrentPhase != _rData.aPhases.end();
}
#endif
- //----------------------------------------------------------------
void lcl_ensureInitialized( ProgressMixer_Data& _rData )
{
OSL_PRECOND( _rData.nWeightSum, "lcl_ensureInitialized: we have no phases, this will crash!" );
@@ -122,21 +114,16 @@ namespace dbmm
}
}
- //====================================================================
- //= ProgressMixer
- //====================================================================
- //--------------------------------------------------------------------
+ // ProgressMixer
ProgressMixer::ProgressMixer( IProgressConsumer& _rConsumer )
:m_pData( new ProgressMixer_Data( _rConsumer ) )
{
}
- //--------------------------------------------------------------------
ProgressMixer::~ProgressMixer()
{
}
- //--------------------------------------------------------------------
void ProgressMixer::registerPhase( const PhaseID _nID, const PhaseWeight _nWeight )
{
OSL_PRECOND( !lcl_isRunning( *m_pData ), "ProgressMixer::registerPhase: already running!" );
@@ -146,7 +133,6 @@ namespace dbmm
m_pData->nWeightSum += _nWeight;
}
- //--------------------------------------------------------------------
void ProgressMixer::startPhase( const PhaseID _nID, const sal_uInt32 _nPhaseRange )
{
OSL_ENSURE( m_pData->aPhases.find( _nID ) != m_pData->aPhases.end(),
@@ -156,7 +142,6 @@ namespace dbmm
m_pData->pCurrentPhase = m_pData->aPhases.find( _nID );
}
- //--------------------------------------------------------------------
void ProgressMixer::advancePhase( const sal_uInt32 _nPhaseProgress )
{
OSL_PRECOND( lcl_isRunning( *m_pData ), "ProgresMixer::advancePhase: not running!" );
@@ -174,7 +159,6 @@ namespace dbmm
m_pData->rConsumer.advance( nOverallProgress );
}
- //--------------------------------------------------------------------
void ProgressMixer::endPhase()
{
OSL_PRECOND( lcl_isRunning( *m_pData ), "ProgresMixer::endPhase: not running!" );
@@ -193,8 +177,6 @@ namespace dbmm
m_pData->rConsumer.end();
}
-//........................................................................
} // namespace dbmm
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/progressmixer.hxx b/dbaccess/source/ext/macromigration/progressmixer.hxx
index 39d6ccd32135..5155d06d8563 100644
--- a/dbaccess/source/ext/macromigration/progressmixer.hxx
+++ b/dbaccess/source/ext/macromigration/progressmixer.hxx
@@ -24,17 +24,13 @@
#include <memory>
-//........................................................................
namespace dbmm
{
-//........................................................................
typedef sal_uInt32 PhaseID;
typedef sal_uInt32 PhaseWeight;
- //====================================================================
- //= IProgressConsumer
- //====================================================================
+ // IProgressConsumer
class SAL_NO_VTABLE IProgressConsumer
{
public:
@@ -46,9 +42,7 @@ namespace dbmm
~IProgressConsumer() {}
};
- //====================================================================
- //= ProgressMixer
- //====================================================================
+ // ProgressMixer
struct ProgressMixer_Data;
/** a class which mixes (i.e. concatenates) progress values from different
sources/phases, with different weight
@@ -86,9 +80,7 @@ namespace dbmm
::std::auto_ptr< ProgressMixer_Data > m_pData;
};
-//........................................................................
} // namespace dbmm
-//........................................................................
#endif // DBACCESS_PROGRESSMIXER_HXX
diff --git a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
index de9341636718..5e5614a7f498 100644
--- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
+++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
@@ -22,14 +22,10 @@
#include <vcl/prgsbar.hxx>
-//........................................................................
namespace dbmm
{
-//........................................................................
- //====================================================================
- //= RangeProgressBar
- //====================================================================
+ // RangeProgressBar
/** a slight extension of the usual progress bar, which is able to remember a range
*/
class RangeProgressBar : public ProgressBar
@@ -59,7 +55,6 @@ namespace dbmm
using ProgressBar::GetValue;
};
- //--------------------------------------------------------------------
inline void RangeProgressBar::SetRange( sal_uInt32 _nRange )
{
m_nRange = _nRange;
@@ -67,28 +62,22 @@ namespace dbmm
m_nRange = 100;
}
- //--------------------------------------------------------------------
inline sal_uInt32 RangeProgressBar::GetRange() const
{
return m_nRange;
}
- //--------------------------------------------------------------------
inline void RangeProgressBar::SetValue( sal_uInt32 _nValue )
{
ProgressBar::SetValue( (sal_uInt16)( 100.0 * _nValue / m_nRange ) );
}
- //--------------------------------------------------------------------
inline sal_uInt32 RangeProgressBar::GetValue() const
{
return (sal_uInt32)( ProgressBar::GetValue() / 100.0 * m_nRange );
}
-
-//........................................................................
} // namespace dbmm
-//........................................................................
#endif // DBACCESS_RANGEPROGRESSBAR_HXX
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index ccd37872ff50..871b461c767a 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "flt_reghelper.hxx"
#include "xmlstrings.hrc"
@@ -89,7 +88,6 @@ using namespace ::com::sun::star::ui::dialogs;
using ::com::sun::star::awt::XWindow;
using ::com::sun::star::sdb::application::NamedDatabaseObject;
-// -------------------------------------------------------------------------
namespace dbaxml
{
@@ -116,12 +114,12 @@ public:
virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException);
};
-// -------------------------------------------------------------------------
+
DBTypeDetection::DBTypeDetection(const Reference< XComponentContext >& _rxContext)
:m_aContext( _rxContext )
{
}
-// -------------------------------------------------------------------------
+
OUString SAL_CALL DBTypeDetection::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException)
{
try
@@ -182,18 +180,17 @@ OUString SAL_CALL DBTypeDetection::detect( ::com::sun::star::uno::Sequence< ::co
} catch(Exception&){}
return OUString();
}
-// -------------------------------------------------------------------------
+
Reference< XInterface > SAL_CALL DBTypeDetection::Create( const Reference< XMultiServiceFactory > & rSMgr )
{
return *(new DBTypeDetection( comphelper::getComponentContext(rSMgr) ));
}
-// -------------------------------------------------------------------------
+
// XServiceInfo
OUString SAL_CALL DBTypeDetection::getImplementationName() throw( )
{
return getImplementationName_Static();
}
-// -------------------------------------------------------------------------
// XServiceInfo
sal_Bool SAL_CALL DBTypeDetection::supportsService(const OUString& ServiceName) throw( )
@@ -206,13 +203,13 @@ sal_Bool SAL_CALL DBTypeDetection::supportsService(const OUString& ServiceName)
return sal_True;
return sal_False;
}
-// -------------------------------------------------------------------------
+
// XServiceInfo
Sequence< OUString > SAL_CALL DBTypeDetection::getSupportedServiceNames(void) throw( )
{
return getSupportedServiceNames_Static();
}
-// -------------------------------------------------------------------------
+
// ORegistryServiceManager_Static
Sequence< OUString > DBTypeDetection::getSupportedServiceNames_Static(void) throw( )
{
@@ -220,12 +217,11 @@ Sequence< OUString > DBTypeDetection::getSupportedServiceNames_Static(void) thro
aSNS.getArray()[0] = OUString("com.sun.star.document.ExtendedTypeDetection");
return aSNS;
}
-// -------------------------------------------------------------------------
+
extern "C" void SAL_CALL createRegistryInfo_DBTypeDetection()
{
static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::DBTypeDetection > aAutoRegistration;
}
-// -----------------------------------------------------------------------------
class DBContentLoader : public ::cppu::WeakImplHelper2< XFrameLoader, XServiceInfo>
{
@@ -263,6 +259,7 @@ public:
private:
sal_Bool impl_executeNewDatabaseWizard( Reference< XModel >& _rxModel, sal_Bool& _bShouldStartTableWizard );
};
+
DBG_NAME(DBContentLoader)
DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxFactory)
@@ -272,27 +269,23 @@ DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxFactor
DBG_CTOR(DBContentLoader,NULL);
}
-// -------------------------------------------------------------------------
DBContentLoader::~DBContentLoader()
{
DBG_DTOR(DBContentLoader,NULL);
}
-// -------------------------------------------------------------------------
-// -------------------------------------------------------------------------
Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMultiServiceFactory > & rSMgr )
{
return *(new DBContentLoader( comphelper::getComponentContext(rSMgr) ));
}
-// -------------------------------------------------------------------------
+
// XServiceInfo
OUString SAL_CALL DBContentLoader::getImplementationName() throw( )
{
return getImplementationName_Static();
}
-// -------------------------------------------------------------------------
// XServiceInfo
sal_Bool SAL_CALL DBContentLoader::supportsService(const OUString& ServiceName) throw( )
@@ -305,13 +298,13 @@ sal_Bool SAL_CALL DBContentLoader::supportsService(const OUString& ServiceName)
return sal_True;
return sal_False;
}
-// -------------------------------------------------------------------------
+
// XServiceInfo
Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames(void) throw( )
{
return getSupportedServiceNames_Static();
}
-// -------------------------------------------------------------------------
+
// ORegistryServiceManager_Static
Sequence< OUString > DBContentLoader::getSupportedServiceNames_Static(void) throw( )
{
@@ -320,10 +313,8 @@ Sequence< OUString > DBContentLoader::getSupportedServiceNames_Static(void) thro
return aSNS;
}
-// -----------------------------------------------------------------------
namespace
{
- // ...................................................................
sal_Bool lcl_urlAllowsInteraction( const Reference<XComponentContext> & _rContext, const OUString& _rURL )
{
bool bDoesAllow = sal_False;
@@ -342,7 +333,6 @@ namespace
return bDoesAllow;
}
- // ...................................................................
Reference< XWindow > lcl_getTopMostWindow( const Reference<XComponentContext> & _rxContext )
{
Reference< XWindow > xWindow;
@@ -363,7 +353,6 @@ namespace
}
}
-// -----------------------------------------------------------------------
sal_Bool DBContentLoader::impl_executeNewDatabaseWizard( Reference< XModel >& _rxModel, sal_Bool& _bShouldStartTableWizard )
{
Sequence< Any > aWizardArgs(2);
@@ -393,7 +382,6 @@ sal_Bool DBContentLoader::impl_executeNewDatabaseWizard( Reference< XModel >& _r
return bSuccess;
}
-// -----------------------------------------------------------------------
void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OUString& _rURL,
const Sequence< PropertyValue >& rArgs,
const Reference< XLoadEventListener > & rListener) throw(::com::sun::star::uno::RuntimeException)
@@ -579,11 +567,10 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU
::comphelper::disposeComponent(xModel);
}
-// -----------------------------------------------------------------------
void DBContentLoader::cancel(void) throw()
{
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK( DBContentLoader, OnStartTableWizard, void*, /*NOTINTERESTEDIN*/ )
{
m_nStartWizard = 0;
@@ -607,13 +594,14 @@ IMPL_LINK( DBContentLoader, OnStartTableWizard, void*, /*NOTINTERESTEDIN*/ )
m_xMySelf = NULL;
return 0L;
}
+
}
-// -------------------------------------------------------------------------
+
extern "C" void SAL_CALL createRegistryInfo_DBContentLoader2()
{
static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::DBContentLoader > aAutoRegistration;
}
-// -------------------------------------------------------------------------
+
extern "C" void SAL_CALL writeDBLoaderInfo2(void* pRegistryKey)
{
Reference< XRegistryKey> xKey(reinterpret_cast< XRegistryKey*>(pRegistryKey));
@@ -629,6 +617,5 @@ extern "C" void SAL_CALL writeDBLoaderInfo2(void* pRegistryKey)
xNewKey = xLoaderKey->createKey( OUString("Pattern") );
xNewKey->setAsciiValue( OUString("private:factory/sdatabase") );
}
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.cxx b/dbaccess/source/filter/xml/xmlAutoStyle.cxx
index 98d4cd8273b7..c8faf141dd9d 100644
--- a/dbaccess/source/filter/xml/xmlAutoStyle.cxx
+++ b/dbaccess/source/filter/xml/xmlAutoStyle.cxx
@@ -67,8 +67,8 @@ void OXMLAutoStylePoolP::exportStyleAttributes(
}
}
}
+
DBG_NAME(OXMLAutoStylePoolP)
-// -----------------------------------------------------------------------------
OXMLAutoStylePoolP::OXMLAutoStylePoolP(ODBExport& rTempODBExport):
SvXMLAutoStylePoolP(rTempODBExport),
rODBExport(rTempODBExport)
@@ -76,16 +76,13 @@ OXMLAutoStylePoolP::OXMLAutoStylePoolP(ODBExport& rTempODBExport):
DBG_CTOR(OXMLAutoStylePoolP,NULL);
}
-// -----------------------------------------------------------------------------
+
OXMLAutoStylePoolP::~OXMLAutoStylePoolP()
{
DBG_DTOR(OXMLAutoStylePoolP,NULL);
}
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.hxx b/dbaccess/source/filter/xml/xmlAutoStyle.hxx
index 0082a46c33e2..f55a25f2de73 100644
--- a/dbaccess/source/filter/xml/xmlAutoStyle.hxx
+++ b/dbaccess/source/filter/xml/xmlAutoStyle.hxx
@@ -43,9 +43,7 @@ namespace dbaxml
OXMLAutoStylePoolP(ODBExport& rXMLExport);
virtual ~OXMLAutoStylePoolP();
};
-// -----------------------------------------------------------------------------
} // dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLAUTOSTYLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx
index c99b451751b2..b541b019ba32 100644
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@ -100,14 +100,13 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport
}
}
}
-// -----------------------------------------------------------------------------
OXMLColumn::~OXMLColumn()
{
DBG_DTOR(OXMLColumn,NULL);
}
-// -----------------------------------------------------------------------------
+
void OXMLColumn::EndElement()
{
Reference<XDataDescriptorFactory> xFac(m_xParentContainer,UNO_QUERY);
@@ -172,13 +171,12 @@ void OXMLColumn::EndElement()
}
}
}
-// -----------------------------------------------------------------------------
+
ODBFilter& OXMLColumn::GetOwnImport()
{
return static_cast<ODBFilter&>(GetImport());
}
-//----------------------------------------------------------------------------
+
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlColumn.hxx b/dbaccess/source/filter/xml/xmlColumn.hxx
index 95cd7266aa44..e19c8a5b6ef1 100644
--- a/dbaccess/source/filter/xml/xmlColumn.hxx
+++ b/dbaccess/source/filter/xml/xmlColumn.hxx
@@ -51,9 +51,7 @@ namespace dbaxml
virtual ~OXMLColumn();
virtual void EndElement();
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLCOLUMN_HXX
diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx
index e6626ff9d362..7bb13c554eb1 100644
--- a/dbaccess/source/filter/xml/xmlComponent.cxx
+++ b/dbaccess/source/filter/xml/xmlComponent.cxx
@@ -110,16 +110,13 @@ OXMLComponent::OXMLComponent( ODBFilter& rImport
}
}
}
-// -----------------------------------------------------------------------------
OXMLComponent::~OXMLComponent()
{
DBG_DTOR(OXMLComponent,NULL);
}
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
+
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlComponent.hxx b/dbaccess/source/filter/xml/xmlComponent.hxx
index 55c69d8178a9..a0cb924a8ae0 100644
--- a/dbaccess/source/filter/xml/xmlComponent.hxx
+++ b/dbaccess/source/filter/xml/xmlComponent.hxx
@@ -22,7 +22,6 @@
#include <xmloff/xmlictxt.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
-
namespace dbaxml
{
class ODBFilter;
@@ -45,9 +44,7 @@ namespace dbaxml
);
virtual ~OXMLComponent();
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLCOMPONENT_HXX
diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx
index cc8fbdba4791..8bd009670569 100644
--- a/dbaccess/source/filter/xml/xmlConnectionData.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx
@@ -45,14 +45,12 @@ OXMLConnectionData::OXMLConnectionData( ODBFilter& rImport,
rImport.setNewFormat(true);
DBG_CTOR(OXMLConnectionData,NULL);
}
-// -----------------------------------------------------------------------------
OXMLConnectionData::~OXMLConnectionData()
{
DBG_DTOR(OXMLConnectionData,NULL);
}
-// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLConnectionData::CreateChildContext(
sal_uInt16 nPrefix,
@@ -98,14 +96,12 @@ SvXMLImportContext* OXMLConnectionData::CreateChildContext(
return pContext;
}
-// -----------------------------------------------------------------------------
+
ODBFilter& OXMLConnectionData::GetOwnImport()
{
return static_cast<ODBFilter&>(GetImport());
}
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
+
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlConnectionData.hxx b/dbaccess/source/filter/xml/xmlConnectionData.hxx
index 8bd938d43503..4666cc442dd8 100644
--- a/dbaccess/source/filter/xml/xmlConnectionData.hxx
+++ b/dbaccess/source/filter/xml/xmlConnectionData.hxx
@@ -41,9 +41,7 @@ namespace dbaxml
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLCONNECTIONDATA_HXX_INCLUDED
diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.cxx b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
index 6eb80095828d..f2fb02a3d515 100644
--- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
@@ -89,16 +89,13 @@ OXMLConnectionResource::OXMLConnectionResource( ODBFilter& rImport,
}
}
}
-// -----------------------------------------------------------------------------
OXMLConnectionResource::~OXMLConnectionResource()
{
DBG_DTOR(OXMLConnectionResource,NULL);
}
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
+
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.hxx b/dbaccess/source/filter/xml/xmlConnectionResource.hxx
index b371a3e6d86f..6b3267068cb3 100644
--- a/dbaccess/source/filter/xml/xmlConnectionResource.hxx
+++ b/dbaccess/source/filter/xml/xmlConnectionResource.hxx
@@ -35,9 +35,7 @@ namespace dbaxml
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList);
virtual ~OXMLConnectionResource();
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLCONNECTIONRESOURCE_HXX_INCLUDED
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx
index 9b62d4d02beb..530b49e19136 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -199,14 +199,12 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
}
}
}
-// -----------------------------------------------------------------------------
OXMLDataSource::~OXMLDataSource()
{
DBG_DTOR(OXMLDataSource,NULL);
}
-// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLDataSource::CreateChildContext(
sal_uInt16 nPrefix,
@@ -259,15 +257,12 @@ SvXMLImportContext* OXMLDataSource::CreateChildContext(
return pContext;
}
-// -----------------------------------------------------------------------------
+
ODBFilter& OXMLDataSource::GetOwnImport()
{
return static_cast<ODBFilter&>(GetImport());
}
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlDataSource.hxx b/dbaccess/source/filter/xml/xmlDataSource.hxx
index d1a763cbf04a..715ef33199b8 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.hxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.hxx
@@ -47,9 +47,7 @@ namespace dbaxml
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLDATASOURCE_HXX
diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
index 1a0704b237c1..e59f26757499 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
@@ -130,16 +130,13 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport
}
}
}
-// -----------------------------------------------------------------------------
OXMLDataSourceInfo::~OXMLDataSourceInfo()
{
DBG_DTOR(OXMLDataSourceInfo,NULL);
}
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
+
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx
index b7bc57506574..875cc612af56 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx
@@ -35,9 +35,7 @@ namespace dbaxml
,const sal_uInt16 _nToken);
virtual ~OXMLDataSourceInfo();
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLDATASOURCEINFO_HXX
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index 031690515fae..8d9460ec9bd1 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -97,13 +97,12 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
}
}
-// -----------------------------------------------------------------------------
OXMLDataSourceSetting::~OXMLDataSourceSetting()
{
DBG_DTOR(OXMLDataSourceSetting,NULL);
}
-// -----------------------------------------------------------------------------
+
SvXMLImportContext* OXMLDataSourceSetting::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -129,7 +128,7 @@ SvXMLImportContext* OXMLDataSourceSetting::CreateChildContext(
return pContext;
}
-// -----------------------------------------------------------------------------
+
void OXMLDataSourceSetting::EndElement()
{
if ( !m_aSetting.Name.isEmpty() )
@@ -145,13 +144,13 @@ void OXMLDataSourceSetting::EndElement()
GetOwnImport().addInfo(m_aSetting);
}
}
-// -----------------------------------------------------------------------------
+
void OXMLDataSourceSetting::Characters( const OUString& rChars )
{
if ( m_pContainer )
m_pContainer->addValue(rChars);
}
-// -----------------------------------------------------------------------------
+
void OXMLDataSourceSetting::addValue(const OUString& _sValue)
{
Any aValue;
@@ -167,12 +166,12 @@ void OXMLDataSourceSetting::addValue(const OUString& _sValue)
m_aInfoSequence[nPos] = aValue;
}
}
-// -----------------------------------------------------------------------------
+
ODBFilter& OXMLDataSourceSetting::GetOwnImport()
{
return static_cast<ODBFilter&>(GetImport());
}
-// -----------------------------------------------------------------------------
+
Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters)
{
Any aReturn;
@@ -231,8 +230,6 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx
return aReturn;
}
-//----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx
index e0206fe67e51..3180ffb93e64 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx
@@ -52,16 +52,13 @@ namespace dbaxml
virtual void Characters( const OUString& rChars );
-
/** adds value to property
@param _sValue
The value to add.
*/
void addValue(const OUString& _sValue);
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLDATASOURCESETTING_HXX
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
index 4b15c4527662..573b30c5b7f0 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
@@ -44,14 +44,13 @@ OXMLDataSourceSettings::OXMLDataSourceSettings( ODBFilter& rImport
DBG_CTOR(OXMLDataSourceSettings,NULL);
}
-// -----------------------------------------------------------------------------
OXMLDataSourceSettings::~OXMLDataSourceSettings()
{
DBG_DTOR(OXMLDataSourceSettings,NULL);
}
-// -----------------------------------------------------------------------------
+
SvXMLImportContext* OXMLDataSourceSettings::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -73,14 +72,12 @@ SvXMLImportContext* OXMLDataSourceSettings::CreateChildContext(
return pContext;
}
-// -----------------------------------------------------------------------------
+
ODBFilter& OXMLDataSourceSettings::GetOwnImport()
{
return static_cast<ODBFilter&>(GetImport());
}
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
+
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx
index 35e8b45830d3..57b024ccbcf2 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx
@@ -36,9 +36,7 @@ namespace dbaxml
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLDATASOURCESETTINGS_HXX
diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx
index 26b727440ff8..34ba88501eb3 100644
--- a/dbaccess/source/filter/xml/xmlDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabase.cxx
@@ -47,14 +47,12 @@ OXMLDatabase::OXMLDatabase( ODBFilter& rImport,
DBG_CTOR(OXMLDatabase,NULL);
}
-// -----------------------------------------------------------------------------
OXMLDatabase::~OXMLDatabase()
{
DBG_DTOR(OXMLDatabase,NULL);
}
-// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLDatabase::CreateChildContext(
sal_uInt16 nPrefix,
@@ -129,22 +127,19 @@ SvXMLImportContext* OXMLDatabase::CreateChildContext(
if( !pContext )
pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-
return pContext;
}
-// -----------------------------------------------------------------------------
+
ODBFilter& OXMLDatabase::GetOwnImport()
{
return static_cast<ODBFilter&>(GetImport());
}
-// -----------------------------------------------------------------------------
+
void OXMLDatabase::EndElement()
{
GetOwnImport().setPropertyInfo();
}
-//----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlDatabase.hxx b/dbaccess/source/filter/xml/xmlDatabase.hxx
index 42d170094057..ed75204e8efa 100644
--- a/dbaccess/source/filter/xml/xmlDatabase.hxx
+++ b/dbaccess/source/filter/xml/xmlDatabase.hxx
@@ -39,9 +39,7 @@ namespace dbaxml
virtual void EndElement();
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLDATABASE_HXX
diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
index ceb3e3c3d2b8..b3102490bb93 100644
--- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
@@ -43,14 +43,12 @@ OXMLDatabaseDescription::OXMLDatabaseDescription( ODBFilter& rImport,
{
DBG_CTOR(OXMLDatabaseDescription,NULL);
}
-// -----------------------------------------------------------------------------
OXMLDatabaseDescription::~OXMLDatabaseDescription()
{
DBG_DTOR(OXMLDatabaseDescription,NULL);
}
-// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLDatabaseDescription::CreateChildContext(
sal_uInt16 nPrefix,
@@ -85,14 +83,12 @@ SvXMLImportContext* OXMLDatabaseDescription::CreateChildContext(
return pContext;
}
-// -----------------------------------------------------------------------------
+
ODBFilter& OXMLDatabaseDescription::GetOwnImport()
{
return static_cast<ODBFilter&>(GetImport());
}
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
+
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx
index a56d90dedb31..ca01556f2867 100644
--- a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx
+++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx
@@ -41,9 +41,7 @@ namespace dbaxml
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLDATABASEDESCRIPTION_HXX_INCLUDED
diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx
index ddbae3725845..696740b17feb 100644
--- a/dbaccess/source/filter/xml/xmlDocuments.cxx
+++ b/dbaccess/source/filter/xml/xmlDocuments.cxx
@@ -50,7 +50,7 @@ OXMLDocuments::OXMLDocuments( ODBFilter& rImport
DBG_CTOR(OXMLDocuments,NULL);
}
-// -----------------------------------------------------------------------------
+
OXMLDocuments::OXMLDocuments( ODBFilter& rImport
,sal_uInt16 nPrfx
, const OUString& rLName
@@ -63,14 +63,12 @@ OXMLDocuments::OXMLDocuments( ODBFilter& rImport
{
DBG_CTOR(OXMLDocuments,NULL);
}
-// -----------------------------------------------------------------------------
OXMLDocuments::~OXMLDocuments()
{
DBG_DTOR(OXMLDocuments,NULL);
}
-// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLDocuments::CreateChildContext(
sal_uInt16 nPrefix,
@@ -103,17 +101,14 @@ SvXMLImportContext* OXMLDocuments::CreateChildContext(
if( !pContext )
pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-
return pContext;
}
-// -----------------------------------------------------------------------------
+
ODBFilter& OXMLDocuments::GetOwnImport()
{
return static_cast<ODBFilter&>(GetImport());
}
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
+
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlDocuments.hxx b/dbaccess/source/filter/xml/xmlDocuments.hxx
index d1f3617a2002..f39a6e4e1b07 100644
--- a/dbaccess/source/filter/xml/xmlDocuments.hxx
+++ b/dbaccess/source/filter/xml/xmlDocuments.hxx
@@ -58,9 +58,7 @@ namespace dbaxml
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLDOCUMENTS_HXX
diff --git a/dbaccess/source/filter/xml/xmlEnums.hxx b/dbaccess/source/filter/xml/xmlEnums.hxx
index b18ba2ab6a4a..e9181a302813 100644
--- a/dbaccess/source/filter/xml/xmlEnums.hxx
+++ b/dbaccess/source/filter/xml/xmlEnums.hxx
@@ -158,9 +158,7 @@ namespace dbaxml
XML_TOK_COLUMN_VISIBLE,
XML_TOK_DEFAULT_CELL_STYLE_NAME
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLENUMS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 10cad9b7b4b0..4d1803b70d51 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "xmlExport.hxx"
#include "xmlAutoStyle.hxx"
#include "flt_reghelper.hxx"
@@ -76,22 +75,23 @@ namespace dbaxml
static Reference< XInterface > SAL_CALL Create(const Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
};
}
-// -----------------------------------------------------------------------------
+
extern "C" void SAL_CALL createRegistryInfo_ODBFilterExport( )
{
static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBExport > aAutoRegistration;
}
-//--------------------------------------------------------------------------
+
extern "C" void SAL_CALL createRegistryInfo_OSettingsExport( )
+
{
static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBExportHelper > aAutoRegistration;
}
-//--------------------------------------------------------------------------
+
extern "C" void SAL_CALL createRegistryInfo_OFullExport( )
{
static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBFullExportHelper > aAutoRegistration;
}
-//--------------------------------------------------------------------------
+
namespace dbaxml
{
using namespace comphelper;
@@ -99,17 +99,16 @@ namespace dbaxml
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::util;
- //---------------------------------------------------------------------
Reference< XInterface > SAL_CALL ODBExportHelper::Create(const Reference< XMultiServiceFactory >& _rxORB)
{
return static_cast< XServiceInfo* >(new ODBExport(comphelper::getComponentContext(_rxORB),EXPORT_SETTINGS | EXPORT_PRETTY ));
}
- //---------------------------------------------------------------------
+
OUString SAL_CALL ODBExportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
return OUString("com.sun.star.comp.sdb.XMLSettingsExporter");
}
- //---------------------------------------------------------------------
+
Sequence< OUString > SAL_CALL ODBExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
Sequence< OUString > aSupported(1);
@@ -117,18 +116,14 @@ namespace dbaxml
return aSupported;
}
-
- //---------------------------------------------------------------------
Reference< XInterface > SAL_CALL ODBFullExportHelper::Create(const Reference< XMultiServiceFactory >& _rxORB)
{
return static_cast< XServiceInfo* >(new ODBExport(comphelper::getComponentContext(_rxORB),EXPORT_ALL));
}
- //---------------------------------------------------------------------
OUString SAL_CALL ODBFullExportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
return OUString("com.sun.star.comp.sdb.XMLFullExporter");
}
- //---------------------------------------------------------------------
Sequence< OUString > SAL_CALL ODBFullExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
Sequence< OUString > aSupported(1);
@@ -136,7 +131,6 @@ namespace dbaxml
return aSupported;
}
- //---------------------------------------------------------------------
OUString lcl_implGetPropertyXMLType(const Type& _rType)
{
// possible types we can write (either because we recognize them directly or because we convert _rValue
@@ -192,7 +186,6 @@ namespace dbaxml
// nothing to do here
}
};
-// -----------------------------------------------------------------------------
ODBExport::ODBExport(const Reference< XComponentContext >& _rxContext,sal_uInt16 nExportFlag)
: SvXMLExport( util::MeasureUnit::MM_10TH, _rxContext, XML_DATABASE,
EXPORT_OASIS | nExportFlag)
@@ -258,7 +251,7 @@ ODBExport::ODBExport(const Reference< XComponentContext >& _rxContext,sal_uInt16
m_xRowExportHelper.get(),
OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX ));
}
-// -----------------------------------------------------------------------------
+
IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(ODBExport, "com.sun.star.comp.sdb.DBExportFilter")
IMPLEMENT_SERVICE_INFO_SUPPORTS(ODBExport)
IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(ODBExport, "com.sun.star.document.ExportFilter")
@@ -269,7 +262,6 @@ IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(ODBExport, "com.sun.star.document.Ex
return static_cast< XServiceInfo* >(new ODBExport( comphelper::getComponentContext(_rxORB)));
}
-// -----------------------------------------------------------------------------
void ODBExport::exportDataSource()
{
try
@@ -488,7 +480,7 @@ void ODBExport::exportDataSource()
DBG_UNHANDLED_EXCEPTION();
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportApplicationConnectionSettings(const TSettingsMap& _aSettings)
{
const ::xmloff::token::XMLTokenEnum pSettings[] = {
@@ -524,7 +516,7 @@ void ODBExport::exportApplicationConnectionSettings(const TSettingsMap& _aSettin
exportDataSourceSettings();
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportDriverSettings(const TSettingsMap& _aSettings)
{
const ::xmloff::token::XMLTokenEnum pSettings[] = {
@@ -545,7 +537,7 @@ void ODBExport::exportDriverSettings(const TSettingsMap& _aSettings)
exportDelimiter();
exportCharSet();
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportConnectionData()
{
SvXMLElementExport aConnData(*this,XML_NAMESPACE_DB, XML_CONNECTION_DATA, sal_True, sal_True);
@@ -668,7 +660,7 @@ void ODBExport::exportConnectionData()
exportLogin();
}
-// -----------------------------------------------------------------------------
+
template< typename T > void ODBExport::exportDataSourceSettingsSequence(
::std::vector< TypedPropertyValue >::iterator const & in)
{
@@ -755,7 +747,7 @@ void ODBExport::exportDataSourceSettings()
}
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportCharSet()
{
if ( !m_sCharSet.isEmpty() )
@@ -765,7 +757,7 @@ void ODBExport::exportCharSet()
SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_FONT_CHARSET, sal_True, sal_True);
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportDelimiter()
{
if ( m_aDelimiter.get() && m_aDelimiter->bUsed )
@@ -777,7 +769,7 @@ void ODBExport::exportDelimiter()
SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DELIMITER, sal_True, sal_True);
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportAutoIncrement()
{
if ( m_aAutoIncrement.get() )
@@ -787,7 +779,7 @@ void ODBExport::exportAutoIncrement()
SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_AUTO_INCREMENT, sal_True, sal_True);
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportSequence(const Sequence< OUString>& _aValue
,::xmloff::token::XMLTokenEnum _eTokenFilter
,::xmloff::token::XMLTokenEnum _eTokenType)
@@ -807,7 +799,7 @@ void ODBExport::exportSequence(const Sequence< OUString>& _aValue
}
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportLogin()
{
Reference<XPropertySet> xProp(getDataSource());
@@ -825,7 +817,7 @@ void ODBExport::exportLogin()
if ( bAddLogin )
SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_LOGIN, sal_True, sal_True);
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection
,enum ::xmloff::token::XMLTokenEnum _eComponents
,enum ::xmloff::token::XMLTokenEnum _eSubComponents
@@ -858,7 +850,7 @@ void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection
}
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportComponent(XPropertySet* _xProp)
{
OUString sValue;
@@ -876,7 +868,7 @@ void ODBExport::exportComponent(XPropertySet* _xProp)
AddAttribute(XML_NAMESPACE_DB, XML_AS_TEMPLATE,bAsTemplate ? XML_TRUE : XML_FALSE);
SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB, XML_COMPONENT, sal_True, sal_True);
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportQuery(XPropertySet* _xProp)
{
AddAttribute(XML_NAMESPACE_DB, XML_COMMAND,getString(_xProp->getPropertyValue(PROPERTY_COMMAND)));
@@ -900,7 +892,7 @@ void ODBExport::exportQuery(XPropertySet* _xProp)
exportFilter(_xProp,PROPERTY_ORDER,XML_ORDER_STATEMENT);
exportTableName(_xProp,sal_True);
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportTable(XPropertySet* _xProp)
{
exportTableName(_xProp,sal_False);
@@ -923,7 +915,7 @@ void ODBExport::exportTable(XPropertySet* _xProp)
exportFilter(_xProp,PROPERTY_FILTER,XML_FILTER_STATEMENT);
exportFilter(_xProp,PROPERTY_ORDER,XML_ORDER_STATEMENT);
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt)
{
Reference<XPropertySet> xFind(_xProp);
@@ -931,7 +923,7 @@ void ODBExport::exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt)
exportStyleName(XML_DEFAULT_CELL_STYLE_NAME,xFind,_rAtt,m_aCellAutoStyleNames);
exportStyleName(XML_DEFAULT_ROW_STYLE_NAME,xFind,_rAtt,m_aRowAutoStyleNames);
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportStyleName(const ::xmloff::token::XMLTokenEnum _eToken,const uno::Reference<beans::XPropertySet>& _xProp,SvXMLAttributeList& _rAtt,TPropertyStyleMap& _rMap)
{
TPropertyStyleMap::iterator aFind = _rMap.find(_xProp);
@@ -942,7 +934,7 @@ void ODBExport::exportStyleName(const ::xmloff::token::XMLTokenEnum _eToken,cons
_rMap.erase(aFind);
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportTableName(XPropertySet* _xProp,sal_Bool _bUpdate)
{
OUString sValue;
@@ -963,7 +955,7 @@ void ODBExport::exportTableName(XPropertySet* _xProp,sal_Bool _bUpdate)
}
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportFilter(XPropertySet* _xProp
,const OUString& _sProp
,enum ::xmloff::token::XMLTokenEnum _eStatementType)
@@ -978,7 +970,7 @@ void ODBExport::exportFilter(XPropertySet* _xProp
}
OSL_POSTCOND(!GetAttrList().getLength(),"Invalid attribute length!");
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportColumns(const Reference<XColumnsSupplier>& _xColSup)
{
OSL_PRECOND( _xColSup.is(), "ODBExport::exportColumns: invalid columns supplier!" );
@@ -1059,7 +1051,7 @@ void ODBExport::exportColumns(const Reference<XColumnsSupplier>& _xColSup)
DBG_UNHANDLED_EXCEPTION();
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportForms()
{
Any aValue;
@@ -1080,7 +1072,7 @@ void ODBExport::exportForms()
}
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportReports()
{
Any aValue;
@@ -1101,7 +1093,7 @@ void ODBExport::exportReports()
}
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportQueries(sal_Bool _bExportContext)
{
Any aValue;
@@ -1129,7 +1121,7 @@ void ODBExport::exportQueries(sal_Bool _bExportContext)
}
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportTables(sal_Bool _bExportContext)
{
Reference<XTablesSupplier> xSup(getDataSource(),UNO_QUERY);
@@ -1149,7 +1141,7 @@ void ODBExport::exportTables(sal_Bool _bExportContext)
}
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::exportAutoStyle(XPropertySet* _xProp)
{
typedef ::std::pair<TPropertyStyleMap*,sal_uInt16> TEnumMapperPair;
@@ -1247,7 +1239,7 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp)
}
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::_ExportContent()
{
exportDataSource();
@@ -1256,12 +1248,12 @@ void ODBExport::_ExportContent()
exportQueries(sal_True);
exportTables(sal_True);
}
-// -----------------------------------------------------------------------------
+
void ODBExport::_ExportMasterStyles()
{
GetPageExport()->exportMasterStyles( sal_True );
}
-// -----------------------------------------------------------------------------
+
void ODBExport::_ExportAutoStyles()
{
// there are no styles that require their own autostyles
@@ -1291,17 +1283,17 @@ void ODBExport::_ExportAutoStyles()
exportDataStyles();
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::_ExportStyles(sal_Bool bUsed)
{
SvXMLExport::_ExportStyles(bUsed);
}
-// -----------------------------------------------------------------------------
+
sal_uInt32 ODBExport::exportDoc(enum ::xmloff::token::XMLTokenEnum eClass)
{
return SvXMLExport::exportDoc( eClass );
}
-// -----------------------------------------------------------------------------
+
void ODBExport::GetViewSettings(Sequence<PropertyValue>& aProps)
{
Reference<XQueryDefinitionsSupplier> xSup(getDataSource(),UNO_QUERY);
@@ -1339,7 +1331,7 @@ void ODBExport::GetViewSettings(Sequence<PropertyValue>& aProps)
}
}
-// -----------------------------------------------------------------------------
+
void ODBExport::GetConfigurationSettings(Sequence<PropertyValue>& aProps)
{
Reference<XPropertySet> xProp(getDataSource());
@@ -1364,7 +1356,7 @@ void ODBExport::GetConfigurationSettings(Sequence<PropertyValue>& aProps)
}
}
}
-// -----------------------------------------------------------------------------
+
OUString ODBExport::implConvertAny(const Any& _rValue)
{
OUStringBuffer aBuffer;
@@ -1396,7 +1388,7 @@ OUString ODBExport::implConvertAny(const Any& _rValue)
return aBuffer.makeStringAndClear();
}
-// -----------------------------------------------------------------------------
+
UniReference < XMLPropertySetMapper > ODBExport::GetTableStylesPropertySetMapper() const
{
if ( !m_xTableStylesPropertySetMapper.is() )
@@ -1405,7 +1397,7 @@ UniReference < XMLPropertySetMapper > ODBExport::GetTableStylesPropertySetMapper
}
return m_xTableStylesPropertySetMapper;
}
-// -----------------------------------------------------------------------------
+
UniReference < XMLPropertySetMapper > ODBExport::GetCellStylesPropertySetMapper() const
{
if ( !m_xCellStylesPropertySetMapper.is() )
@@ -1414,7 +1406,7 @@ UniReference < XMLPropertySetMapper > ODBExport::GetCellStylesPropertySetMapper(
}
return m_xCellStylesPropertySetMapper;
}
-// -----------------------------------------------------------------------------
+
UniReference < XMLPropertySetMapper > ODBExport::GetColumnStylesPropertySetMapper() const
{
if ( !m_xColumnStylesPropertySetMapper.is() )
@@ -1423,12 +1415,12 @@ UniReference < XMLPropertySetMapper > ODBExport::GetColumnStylesPropertySetMappe
}
return m_xColumnStylesPropertySetMapper;
}
-// -----------------------------------------------------------------------------
+
SvXMLAutoStylePoolP* ODBExport::CreateAutoStylePool()
{
return new OXMLAutoStylePoolP(*this);
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL ODBExport::setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException)
{
Reference<XOfficeDatabaseDocument> xOfficeDoc(xDoc,UNO_QUERY_THROW);
@@ -1438,14 +1430,14 @@ void SAL_CALL ODBExport::setSourceDocument( const Reference< XComponent >& xDoc
SetNumberFormatsSupplier(xNum);
SvXMLExport::setSourceDocument(xDoc);
}
-// -----------------------------------------------------------------------------
+
void ODBExport::_ExportFontDecls()
{
GetFontAutoStylePool(); // make sure the pool is created
collectComponentStyles();
SvXMLExport::_ExportFontDecls();
}
-// -----------------------------------------------------------------------------
+
void ODBExport::collectComponentStyles()
{
if ( m_bAllreadyFilled )
@@ -1455,8 +1447,7 @@ void ODBExport::collectComponentStyles()
exportQueries(sal_False);
exportTables(sal_False);
}
-// -----------------------------------------------------------------------------
+
}// dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index e9a04e5367b5..9ece717ee050 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -57,9 +57,7 @@ using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::xml::sax;
-// -------------
// - ODBExport -
-// -------------
#define PROGRESS_BAR_STEP 20
class ODBExport : public SvXMLExport
@@ -189,9 +187,7 @@ public:
inline Reference<XPropertySet> getDataSource() const { return m_xDataSource; }
};
-// -----------------------------------------------------------------------------
} // dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLEXPORT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
index 5f24a9fb2bef..24f5795d9777 100644
--- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
@@ -113,16 +113,13 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport,
}
}
}
-// -----------------------------------------------------------------------------
OXMLFileBasedDatabase::~OXMLFileBasedDatabase()
{
DBG_DTOR(OXMLFileBasedDatabase,NULL);
}
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
+
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx
index 0a2626a9988d..85c270462115 100644
--- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx
+++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx
@@ -35,9 +35,7 @@ namespace dbaxml
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList);
virtual ~OXMLFileBasedDatabase();
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLFILEBASEDDATABASE_HXX_INCLUDED
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx
index 70570ab1e55f..2f735aedfa49 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -37,15 +37,14 @@ DBG_NAME(OPropertyHandlerFactory)
OPropertyHandlerFactory::OPropertyHandlerFactory()
{
DBG_CTOR(OPropertyHandlerFactory,NULL);
-
}
-// -----------------------------------------------------------------------------
+
OPropertyHandlerFactory::~OPropertyHandlerFactory()
{
DBG_DTOR(OPropertyHandlerFactory,NULL);
}
-// -----------------------------------------------------------------------------
+
const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 _nType) const
{
const XMLPropertyHandler* pHandler = NULL;
@@ -70,9 +69,8 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32
pHandler = OControlPropertyHandlerFactory::GetPropertyHandler(_nType);
return pHandler;
}
-// -----------------------------------------------------------------------------
+
#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFVER_010}
-// -----------------------------------------------------------------------------
UniReference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMapper()
{
static const XMLPropertyMapEntry s_aTableStylesProperties[] =
@@ -82,7 +80,7 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMappe
UniReference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory();
return new XMLPropertySetMapper((XMLPropertyMapEntry*)s_aTableStylesProperties, xFac);
}
-// -----------------------------------------------------------------------------
+
UniReference < XMLPropertySetMapper > OXMLHelper::GetColumnStylesPropertySetMapper()
{
#define MAP_CONST_COLUMN( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE_COLUMN, context, SvtSaveOptions::ODFVER_010 }
@@ -96,7 +94,7 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetColumnStylesPropertySetMapp
UniReference < XMLPropertyHandlerFactory> xFac = new OPropertyHandlerFactory();
return new XMLPropertySetMapper((XMLPropertyMapEntry*)s_aColumnStylesProperties, xFac);
}
-// -----------------------------------------------------------------------------
+
UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylesPropertySetMapper()
{
#define MAP_CONST_CELL( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 }
@@ -137,7 +135,7 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylesPropertySetMapper
UniReference < XMLPropertyHandlerFactory> xFac = new /*OPropertyHandlerFactory*/::xmloff::OControlPropertyHandlerFactory();
return new XMLPropertySetMapper((XMLPropertyMapEntry*)s_aCellStylesProperties, xFac);
}
-// -----------------------------------------------------------------------------
+
UniReference < XMLPropertySetMapper > OXMLHelper::GetRowStylesPropertySetMapper()
{
#define MAP_CONST_ROW( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE_ROW, context, SvtSaveOptions::ODFVER_010 }
@@ -149,7 +147,7 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetRowStylesPropertySetMapper(
UniReference < XMLPropertyHandlerFactory> xFac = new OPropertyHandlerFactory();
return new XMLPropertySetMapper((XMLPropertyMapEntry*)s_aStylesProperties, xFac);
}
-// -----------------------------------------------------------------------------
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx
index aa7a76e64e78..738d6ca2e734 100644
--- a/dbaccess/source/filter/xml/xmlHelper.hxx
+++ b/dbaccess/source/filter/xml/xmlHelper.hxx
@@ -55,9 +55,7 @@ namespace dbaxml
static UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper();
static UniReference < XMLPropertySetMapper > GetRowStylesPropertySetMapper();
};
-// -----------------------------------------------------------------------------
} // dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index 15e1254c50dd..30e8a8649c39 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <tools/debug.hxx>
-
namespace dbaxml
{
using namespace ::com::sun::star::uno;
@@ -102,7 +101,7 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
}
}
}
-// -----------------------------------------------------------------------------
+
OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
,sal_uInt16 nPrfx
,const OUString& _sLocalName
@@ -115,14 +114,13 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
{
DBG_CTOR(OXMLHierarchyCollection,NULL);
}
-// -----------------------------------------------------------------------------
OXMLHierarchyCollection::~OXMLHierarchyCollection()
{
DBG_DTOR(OXMLHierarchyCollection,NULL);
}
-// -----------------------------------------------------------------------------
+
SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -152,14 +150,12 @@ SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext(
return pContext;
}
-// -----------------------------------------------------------------------------
+
ODBFilter& OXMLHierarchyCollection::GetOwnImport()
{
return static_cast<ODBFilter&>(GetImport());
}
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
+
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx
index 7c59d0e57168..2fdb30a99ed1 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx
@@ -24,7 +24,6 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-
namespace dbaxml
{
class ODBFilter;
@@ -60,9 +59,7 @@ namespace dbaxml
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLHIERARCHYCOLLECTION_HXX
diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx
index eb0503ffbf79..bef6968de0cb 100644
--- a/dbaccess/source/filter/xml/xmlLogin.cxx
+++ b/dbaccess/source/filter/xml/xmlLogin.cxx
@@ -115,17 +115,13 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport,
}
}
}
-// -----------------------------------------------------------------------------
OXMLLogin::~OXMLLogin()
{
DBG_DTOR(OXMLLogin,NULL);
}
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlLogin.hxx b/dbaccess/source/filter/xml/xmlLogin.hxx
index 1059296a442c..4371f81e584f 100644
--- a/dbaccess/source/filter/xml/xmlLogin.hxx
+++ b/dbaccess/source/filter/xml/xmlLogin.hxx
@@ -35,9 +35,7 @@ namespace dbaxml
virtual ~OXMLLogin();
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLLOGIN_HXX
diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx
index e2a64751e99b..e77503b54169 100644
--- a/dbaccess/source/filter/xml/xmlQuery.cxx
+++ b/dbaccess/source/filter/xml/xmlQuery.cxx
@@ -72,14 +72,13 @@ OXMLQuery::OXMLQuery( ODBFilter& rImport
}
}
}
-// -----------------------------------------------------------------------------
OXMLQuery::~OXMLQuery()
{
DBG_DTOR(OXMLQuery,NULL);
}
-// -----------------------------------------------------------------------------
+
SvXMLImportContext* OXMLQuery::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -107,7 +106,7 @@ SvXMLImportContext* OXMLQuery::CreateChildContext(
return pContext;
}
-// -----------------------------------------------------------------------------
+
void OXMLQuery::setProperties(Reference< XPropertySet > & _xProp )
{
try
@@ -137,8 +136,7 @@ void OXMLQuery::setProperties(Reference< XPropertySet > & _xProp )
OSL_FAIL("OXMLTable::EndElement -> exception catched");
}
}
-//----------------------------------------------------------------------------
+
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlQuery.hxx b/dbaccess/source/filter/xml/xmlQuery.hxx
index e2aef52021c2..1ce7082522ac 100644
--- a/dbaccess/source/filter/xml/xmlQuery.hxx
+++ b/dbaccess/source/filter/xml/xmlQuery.hxx
@@ -22,7 +22,6 @@
#include <xmloff/xmlictxt.hxx>
#include "xmlTable.hxx"
-
namespace dbaxml
{
class ODBFilter;
@@ -47,9 +46,7 @@ namespace dbaxml
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLQUERY_HXX
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
index dec5d0e1ad8f..987e9f7d6ccd 100644
--- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
@@ -135,17 +135,13 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport,
}
}
}
-// -----------------------------------------------------------------------------
OXMLServerDatabase::~OXMLServerDatabase()
{
DBG_DTOR(OXMLServerDatabase,NULL);
}
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.hxx b/dbaccess/source/filter/xml/xmlServerDatabase.hxx
index 84c5272159fe..0162ad431481 100644
--- a/dbaccess/source/filter/xml/xmlServerDatabase.hxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.hxx
@@ -35,9 +35,7 @@ namespace dbaxml
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList);
virtual ~OXMLServerDatabase();
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLSERVERDATABASE_HXX_INCLUDED
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index 6d28d09d3bff..73b64e72354b 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.cxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "xmlStyleImport.hxx"
#include <xmloff/nmspmap.hxx>
@@ -47,7 +46,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace xmloff::token;
-// -----------------------------------------------------------------------------
TYPEINIT1( OTableStyleContext, XMLPropStyleContext );
TYPEINIT1( OTableStylesContext, SvXMLStylesContext );
DBG_NAME(OTableStyleContext)
@@ -64,14 +62,12 @@ OTableStyleContext::OTableStyleContext( ODBFilter& rImport,
DBG_CTOR(OTableStyleContext,NULL);
}
-// -----------------------------------------------------------------------------
OTableStyleContext::~OTableStyleContext()
{
DBG_DTOR(OTableStyleContext,NULL);
}
-// -----------------------------------------------------------------------------
void OTableStyleContext::FillPropertySet(
const Reference< XPropertySet > & rPropSet )
@@ -115,12 +111,10 @@ void OTableStyleContext::FillPropertySet(
}
XMLPropStyleContext::FillPropertySet(rPropSet);
}
-// -----------------------------------------------------------------------------
void OTableStyleContext::SetDefaults()
{
}
-// -----------------------------------------------------------------------------
void OTableStyleContext::AddProperty(const sal_Int16 nContextID, const uno::Any& rValue)
{
@@ -129,7 +123,7 @@ void OTableStyleContext::AddProperty(const sal_Int16 nContextID, const uno::Any&
XMLPropertyState aPropState(nIndex, rValue);
GetProperties().push_back(aPropState); // has to be insertes in a sort order later
}
-// -----------------------------------------------------------------------------
+
void OTableStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
const OUString& rLocalName,
const OUString& rValue )
@@ -142,12 +136,12 @@ void OTableStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
else
XMLPropStyleContext::SetAttribute( nPrefixKey, rLocalName, rValue );
}
-// -----------------------------------------------------------------------------
+
ODBFilter& OTableStyleContext::GetOwnImport()
{
return static_cast<ODBFilter&>(GetImport());
}
-// -----------------------------------------------------------------------------
+
DBG_NAME(OTableStylesContext)
OTableStylesContext::OTableStylesContext( SvXMLImport& rImport,
@@ -165,14 +159,12 @@ OTableStylesContext::OTableStylesContext( SvXMLImport& rImport,
DBG_CTOR(OTableStylesContext,NULL);
}
-// -----------------------------------------------------------------------------
OTableStylesContext::~OTableStylesContext()
{
DBG_DTOR(OTableStylesContext,NULL);
}
-// -----------------------------------------------------------------------------
void OTableStylesContext::EndElement()
{
@@ -182,7 +174,6 @@ void OTableStylesContext::EndElement()
else
GetImport().GetStyles()->CopyStylesToDoc(sal_True);
}
-// -----------------------------------------------------------------------------
UniReference < SvXMLImportPropertyMapper >
OTableStylesContext::GetImportPropertyMapper(
@@ -220,7 +211,7 @@ UniReference < SvXMLImportPropertyMapper >
return xMapper;
}
-// ----------------------------------------------------------------------------
+
SvXMLStyleContext *OTableStylesContext::CreateStyleStyleChildContext(
sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
@@ -243,14 +234,13 @@ SvXMLStyleContext *OTableStylesContext::CreateStyleStyleChildContext(
return pStyle;
}
-// -----------------------------------------------------------------------------
+
Reference < XNameContainer >
OTableStylesContext::GetStylesContainer( sal_uInt16 nFamily ) const
{
Reference < XNameContainer > xStyles = SvXMLStylesContext::GetStylesContainer(nFamily);
return xStyles;
}
-// -----------------------------------------------------------------------------
OUString OTableStylesContext::GetServiceName( sal_uInt16 nFamily ) const
{
@@ -273,7 +263,6 @@ OUString OTableStylesContext::GetServiceName( sal_uInt16 nFamily ) const
}
return sServiceName;
}
-// -----------------------------------------------------------------------------
sal_Int32 OTableStylesContext::GetIndex(const sal_Int16 nContextID)
{
@@ -294,13 +283,12 @@ sal_Int32 OTableStylesContext::GetIndex(const sal_Int16 nContextID)
else
return -1;
}
-// -----------------------------------------------------------------------------
+
ODBFilter& OTableStylesContext::GetOwnImport()
{
return static_cast<ODBFilter&>(GetImport());
}
-// -----------------------------------------------------------------------------
+
} // dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx
index 2d13149ff1e3..b56658c14882 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.hxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx
@@ -64,7 +64,6 @@ namespace dbaxml
virtual ~OTableStyleContext();
-
virtual void FillPropertySet(const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropSet );
@@ -120,9 +119,7 @@ namespace dbaxml
sal_Int32 GetIndex(const sal_Int16 nContextID);
};
-// -----------------------------------------------------------------------------
} // dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLSTYLEIMPORT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx
index bac9efbde09a..647d4c358f06 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -103,14 +103,13 @@ OXMLTable::OXMLTable( ODBFilter& _rImport
GetOwnImport().GetComponentContext()->getServiceManager()->createInstanceWithArgumentsAndContext(m_sServiceName,aArguments, GetOwnImport().GetComponentContext()),
UNO_QUERY);
}
-// -----------------------------------------------------------------------------
OXMLTable::~OXMLTable()
{
DBG_DTOR(OXMLTable,NULL);
}
-// -----------------------------------------------------------------------------
+
SvXMLImportContext* OXMLTable::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -155,12 +154,12 @@ SvXMLImportContext* OXMLTable::CreateChildContext(
return pContext;
}
-// -----------------------------------------------------------------------------
+
ODBFilter& OXMLTable::GetOwnImport()
{
return static_cast<ODBFilter&>(GetImport());
}
-// -----------------------------------------------------------------------------
+
void OXMLTable::setProperties(uno::Reference< XPropertySet > & _xProp )
{
try
@@ -180,7 +179,7 @@ void OXMLTable::setProperties(uno::Reference< XPropertySet > & _xProp )
OSL_FAIL("OXMLTable::EndElement -> exception catched");
}
}
-// -----------------------------------------------------------------------------
+
void OXMLTable::EndElement()
{
uno::Reference<XNameContainer> xNameContainer(m_xParentContainer,UNO_QUERY);
@@ -215,7 +214,7 @@ void OXMLTable::EndElement()
}
}
-// -----------------------------------------------------------------------------
+
void OXMLTable::fillAttributes(sal_uInt16 /*nPrfx*/
,const OUString& /*_sLocalName*/
,const uno::Reference< XAttributeList > & _xAttrList
@@ -254,8 +253,7 @@ void OXMLTable::fillAttributes(sal_uInt16 /*nPrfx*/
}
}
}
-//----------------------------------------------------------------------------
+
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlTable.hxx b/dbaccess/source/filter/xml/xmlTable.hxx
index 999c216459c3..6ece20cbe8c0 100644
--- a/dbaccess/source/filter/xml/xmlTable.hxx
+++ b/dbaccess/source/filter/xml/xmlTable.hxx
@@ -41,7 +41,6 @@ namespace dbaxml
sal_Bool m_bApplyFilter;
sal_Bool m_bApplyOrder;
-
ODBFilter& GetOwnImport();
void fillAttributes( sal_uInt16 nPrfx
@@ -70,9 +69,7 @@ namespace dbaxml
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
virtual void EndElement();
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLTABLE_HXX
diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
index de8e856ba182..70cca6b63454 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
@@ -43,13 +43,11 @@ OXMLTableFilterList::OXMLTableFilterList( SvXMLImport& rImport, sal_uInt16 nPrfx
DBG_CTOR(OXMLTableFilterList,NULL);
}
-// -----------------------------------------------------------------------------
OXMLTableFilterList::~OXMLTableFilterList()
{
DBG_DTOR(OXMLTableFilterList,NULL);
}
-// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLTableFilterList::CreateChildContext(
sal_uInt16 nPrefix,
@@ -74,13 +72,12 @@ SvXMLImportContext* OXMLTableFilterList::CreateChildContext(
return pContext;
}
-// -----------------------------------------------------------------------------
+
ODBFilter& OXMLTableFilterList::GetOwnImport()
{
return static_cast<ODBFilter&>(GetImport());
}
-// -----------------------------------------------------------------------------
void OXMLTableFilterList::EndElement()
{
Reference<XPropertySet> xDataSource(GetOwnImport().getDataSource());
@@ -92,8 +89,7 @@ void OXMLTableFilterList::EndElement()
xDataSource->setPropertyValue(PROPERTY_TABLETYPEFILTER,makeAny(Sequence< OUString>(&(*m_aTypes.begin()),m_aTypes.size())));
}
}
-//----------------------------------------------------------------------------
+
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx
index ea8e3d826a46..66ef7bc832b5 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterList.hxx
@@ -62,9 +62,7 @@ namespace dbaxml
m_aTypes.push_back(_sTypeFilter);
}
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLTABLEFILTERLIST_HXX
diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
index 2c8c0f6af2eb..c6dff59d343a 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
@@ -39,14 +39,13 @@ OXMLTableFilterPattern::OXMLTableFilterPattern( SvXMLImport& rImport,
DBG_CTOR(OXMLTableFilterPattern,NULL);
}
-// -----------------------------------------------------------------------------
OXMLTableFilterPattern::~OXMLTableFilterPattern()
{
DBG_DTOR(OXMLTableFilterPattern,NULL);
}
-// -----------------------------------------------------------------------------
+
void OXMLTableFilterPattern::Characters( const OUString& rChars )
{
if ( m_bNameFilter )
@@ -55,8 +54,6 @@ void OXMLTableFilterPattern::Characters( const OUString& rChars )
m_rParent.pushTableTypeFilter(rChars);
}
-//----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx
index 8402cc846a1e..1c7e90f53693 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx
@@ -39,9 +39,7 @@ namespace dbaxml
virtual void Characters( const OUString& rChars );
};
-// -----------------------------------------------------------------------------
} // namespace dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLTABLEFILTERPATTERN_HXX
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 915d597c7d47..8ead50880d46 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -18,7 +18,6 @@
*/
#include <config_features.h>
-
#include <com/sun/star/util/MeasureUnit.hpp>
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
@@ -77,7 +76,7 @@ extern "C" void SAL_CALL createRegistryInfo_ODBFilter( )
{
static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBFilter > aAutoRegistration;
}
-//--------------------------------------------------------------------------
+
namespace dbaxml
{
namespace
@@ -249,8 +248,6 @@ sal_Int32 ReadThroughComponent(
uno::Reference < XImporter > xImporter( _xFilter, UNO_QUERY );
xImporter->setTargetDocument( xModelComponent );
-
-
// finally, parser the stream
try
{
@@ -351,9 +348,7 @@ sal_Int32 ReadThroughComponent(
return 1;
}
-// -------------
// - ODBFilter -
-// -------------
DBG_NAME(ODBFilter)
ODBFilter::ODBFilter( const uno::Reference< XComponentContext >& _rxContext )
@@ -373,14 +368,12 @@ ODBFilter::ODBFilter( const uno::Reference< XComponentContext >& _rxContext )
XML_NAMESPACE_DB );
}
-// -----------------------------------------------------------------------------
-
ODBFilter::~ODBFilter() throw()
{
DBG_DTOR(ODBFilter,NULL);
}
-// -----------------------------------------------------------------------------
+
IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(ODBFilter, "com.sun.star.comp.sdb.DBFilter")
IMPLEMENT_SERVICE_INFO_SUPPORTS(ODBFilter)
IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(ODBFilter, "com.sun.star.document.ImportFilter")
@@ -391,7 +384,6 @@ IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(ODBFilter, "com.sun.star.document.Im
return static_cast< XServiceInfo* >(new ODBFilter( comphelper::getComponentContext(_rxORB)));
}
-// -----------------------------------------------------------------------------
sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescriptor )
throw (RuntimeException)
{
@@ -416,10 +408,9 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto
pFocusWindow->LeaveWait();
}
-
return bRet;
}
-// -----------------------------------------------------------------------------
+
sal_Bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
throw (RuntimeException)
{
@@ -505,7 +496,7 @@ sal_Bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
return bRet;
}
-// -----------------------------------------------------------------------------
+
SvXMLImportContext* ODBFilter::CreateContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
@@ -541,7 +532,7 @@ SvXMLImportContext* ODBFilter::CreateContext( sal_uInt16 nPrefix,
return pContext;
}
-// -----------------------------------------------------------------------------
+
void ODBFilter::SetViewSettings(const Sequence<PropertyValue>& aViewProps)
{
const PropertyValue *pIter = aViewProps.getConstArray();
@@ -558,7 +549,7 @@ void ODBFilter::SetViewSettings(const Sequence<PropertyValue>& aViewProps)
}
}
}
-// -----------------------------------------------------------------------------
+
void ODBFilter::SetConfigurationSettings(const Sequence<PropertyValue>& aConfigProps)
{
const PropertyValue *pIter = aConfigProps.getConstArray();
@@ -575,7 +566,7 @@ void ODBFilter::SetConfigurationSettings(const Sequence<PropertyValue>& aConfigP
}
}
}
-// -----------------------------------------------------------------------------
+
void ODBFilter::fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap)
{
Sequence<PropertyValue> aWindows;
@@ -590,7 +581,7 @@ void ODBFilter::fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap)
}
}
-// -----------------------------------------------------------------------------
+
const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const
{
if ( !m_pDocElemTokenMap.get() )
@@ -612,7 +603,7 @@ const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const
}
return *m_pDocElemTokenMap;
}
-// -----------------------------------------------------------------------------
+
const SvXMLTokenMap& ODBFilter::GetDatabaseElemTokenMap() const
{
if ( !m_pDatabaseElemTokenMap.get() )
@@ -632,7 +623,7 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseElemTokenMap() const
}
return *m_pDatabaseElemTokenMap;
}
-// -----------------------------------------------------------------------------
+
const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const
{
if ( !m_pDataSourceElemTokenMap.get() )
@@ -683,7 +674,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const
}
return *m_pDataSourceElemTokenMap;
}
-// -----------------------------------------------------------------------------
+
const SvXMLTokenMap& ODBFilter::GetLoginElemTokenMap() const
{
if ( !m_pLoginElemTokenMap.get() )
@@ -700,7 +691,7 @@ const SvXMLTokenMap& ODBFilter::GetLoginElemTokenMap() const
}
return *m_pLoginElemTokenMap;
}
-// -----------------------------------------------------------------------------
+
const SvXMLTokenMap& ODBFilter::GetDatabaseDescriptionElemTokenMap() const
{
if ( !m_pDatabaseDescriptionElemTokenMap.get() )
@@ -715,7 +706,7 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseDescriptionElemTokenMap() const
}
return *m_pDatabaseDescriptionElemTokenMap;
}
-// -----------------------------------------------------------------------------
+
const SvXMLTokenMap& ODBFilter::GetDataSourceInfoElemTokenMap() const
{
if ( !m_pDataSourceInfoElemTokenMap.get() )
@@ -741,7 +732,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceInfoElemTokenMap() const
}
return *m_pDataSourceInfoElemTokenMap;
}
-// -----------------------------------------------------------------------------
+
const SvXMLTokenMap& ODBFilter::GetDocumentsElemTokenMap() const
{
if ( !m_pDocumentsElemTokenMap.get() )
@@ -761,7 +752,7 @@ const SvXMLTokenMap& ODBFilter::GetDocumentsElemTokenMap() const
}
return *m_pDocumentsElemTokenMap;
}
-// -----------------------------------------------------------------------------
+
const SvXMLTokenMap& ODBFilter::GetComponentElemTokenMap() const
{
if ( !m_pComponentElemTokenMap.get() )
@@ -780,7 +771,7 @@ const SvXMLTokenMap& ODBFilter::GetComponentElemTokenMap() const
}
return *m_pComponentElemTokenMap;
}
-// -----------------------------------------------------------------------------
+
const SvXMLTokenMap& ODBFilter::GetQueryElemTokenMap() const
{
if ( !m_pQueryElemTokenMap.get() )
@@ -804,7 +795,7 @@ const SvXMLTokenMap& ODBFilter::GetQueryElemTokenMap() const
}
return *m_pQueryElemTokenMap;
}
-// -----------------------------------------------------------------------------
+
const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const
{
if ( !m_pColumnElemTokenMap.get() )
@@ -825,7 +816,7 @@ const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const
}
return *m_pColumnElemTokenMap;
}
-// -----------------------------------------------------------------------------
+
SvXMLImportContext* ODBFilter::CreateStylesContext(sal_uInt16 _nPrefix,const OUString& rLocalName,
const uno::Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle )
{
@@ -840,12 +831,12 @@ SvXMLImportContext* ODBFilter::CreateStylesContext(sal_uInt16 _nPrefix,const OUS
}
return pContext;
}
-// -----------------------------------------------------------------------------
+
SvXMLImportContext* ODBFilter::CreateScriptContext( const OUString& _rLocalName )
{
return new XMLScriptContext( *this, XML_NAMESPACE_OFFICE, _rLocalName, GetModel() );
}
-// -----------------------------------------------------------------------------
+
UniReference < XMLPropertySetMapper > ODBFilter::GetTableStylesPropertySetMapper() const
{
if ( !m_xTableStylesPropertySetMapper.is() )
@@ -854,7 +845,7 @@ UniReference < XMLPropertySetMapper > ODBFilter::GetTableStylesPropertySetMapper
}
return m_xTableStylesPropertySetMapper;
}
-// -----------------------------------------------------------------------------
+
UniReference < XMLPropertySetMapper > ODBFilter::GetColumnStylesPropertySetMapper() const
{
if ( !m_xColumnStylesPropertySetMapper.is() )
@@ -863,7 +854,7 @@ UniReference < XMLPropertySetMapper > ODBFilter::GetColumnStylesPropertySetMappe
}
return m_xColumnStylesPropertySetMapper;
}
-// -----------------------------------------------------------------------------
+
UniReference < XMLPropertySetMapper > ODBFilter::GetCellStylesPropertySetMapper() const
{
if ( !m_xCellStylesPropertySetMapper.is() )
@@ -872,7 +863,7 @@ UniReference < XMLPropertySetMapper > ODBFilter::GetCellStylesPropertySetMapper(
}
return m_xCellStylesPropertySetMapper;
}
-// -----------------------------------------------------------------------------
+
void ODBFilter::setPropertyInfo()
{
Reference<XPropertySet> xDataSource(getDataSource());
@@ -901,8 +892,7 @@ void ODBFilter::setPropertyInfo()
}
}
}
-// -----------------------------------------------------------------------------
+
}// dbaxml
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index d8c29c57fc44..0f125776bba5 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -54,9 +54,7 @@ using namespace ::com::sun::star::text;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::xml::sax;
-// -------------
// - ODBFilter -
-// -------------
class ODBFilter : public SvXMLImport
{
public:
@@ -90,7 +88,6 @@ private:
sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
-
/** fills the map with the Properties
@param _rValue
The Any where the sequence resists in.
@@ -160,9 +157,7 @@ public:
inline void setNewFormat(bool _bNewFormat) { m_bNewFormat = _bNewFormat; }
};
-// -----------------------------------------------------------------------------
} // dbaxml
-// -----------------------------------------------------------------------------
#endif // DBA_XMLFILTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx
index 613c9c9990a9..2ed308b0526f 100644
--- a/dbaccess/source/filter/xml/xmlservices.cxx
+++ b/dbaccess/source/filter/xml/xmlservices.cxx
@@ -17,12 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <cppuhelper/factory.hxx>
#include <osl/diagnose.h>
#include "flt_reghelper.hxx"
-
using namespace ::dbaxml;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -55,7 +53,6 @@ extern "C" void SAL_CALL createRegistryInfo_dbaxml()
}
}
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbaxml_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx
index 2228b36b5505..1b3ad7f0b11c 100644
--- a/dbaccess/source/inc/OAuthenticationContinuation.hxx
+++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx
@@ -29,11 +29,8 @@
#include <rtl/ustring.hxx>
#include <comphelper/interaction.hxx>
-
-//........................................................................
namespace dbaccess
{
-//........................................................................
class OOO_DLLPUBLIC_DBA OAuthenticationContinuation :
public comphelper::OInteraction< com::sun::star::ucb::XInteractionSupplyAuthentication >
@@ -66,9 +63,7 @@ public:
sal_Bool getRememberPassword() const { return m_bRemberPassword; }
};
-//........................................................................
} // namespace dbaccess
-//........................................................................
#endif // _DBACCESS_OAUTHENTICATIONCONTINUATION_HXX_
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index 70babe93a05d..dc41135a2d96 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -28,17 +28,13 @@
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/sequence.hxx>
-//==================================================================================
-//= various typedefs
-//==================================================================================
+// various typedefs
namespace {
DECLARE_STL_VECTOR(::com::sun::star::uno::WeakReferenceHelper, OWeakRefArray);
}
-//==================================================================================
-//= OSubComponent - a component which holds a hard ref to it's parent
-//= and is been hold itself (by the parent) with a weak ref
-//==================================================================================
+// OSubComponent - a component which holds a hard ref to it's parent
+// and is been hold itself (by the parent) with a weak ref
class OSubComponent : public ::cppu::OComponentHelper
{
protected:
@@ -64,10 +60,8 @@ public:
};
-//==================================================================================
-//= helper for implementing the XServiceInfo interface
+// helper for implementing the XServiceInfo interface
-//----------------------------------------------------------------------------------
// (internal - not to be used outside - usually)
#define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \
@@ -156,7 +150,6 @@ public:
return static_cast< XServiceInfo* >(new classname(_rxORB)); \
} \
-//----------------------------------------------------------------------------------
// declare service info methods
#define DECLARE_SERVICE_INFO() \
virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \
@@ -170,66 +163,54 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \
SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&) \
-//----------------------------------------------------------------------------------
#define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \
IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \
-//----------------------------------------------------------------------------------
#define IMPLEMENT_SERVICE_INFO1_STATIC(classname, implasciiname, serviceasciiname) \
IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \
IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \
-//----------------------------------------------------------------------------------
#define IMPLEMENT_SERVICE_INFO2(classname, implasciiname, serviceasciiname1, serviceasciiname2) \
IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2)
-//----------------------------------------------------------------------------------
#define IMPLEMENT_SERVICE_INFO2_STATIC(classname, implasciiname, serviceasciiname1, serviceasciiname2) \
IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1,serviceasciiname2) \
IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \
-//----------------------------------------------------------------------------------
#define IMPLEMENT_SERVICE_INFO3(classname, implasciiname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \
IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \
-//----------------------------------------------------------------------------------
#define IMPLEMENT_SERVICE_INFO1_ABSTRACT(classname, serviceasciiname) \
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \
-//----------------------------------------------------------------------------------
#define IMPLEMENT_SERVICE_INFO2_ABSTRACT(classname, serviceasciiname1, serviceasciiname2) \
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \
-//==================================================================================
-//= XTypeProvider helpers
+// XTypeProvider helpers
-//--------------------------------------------------------------------------
#define DECLARE_IMPLEMENTATION_ID( ) \
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); \
static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId() \
-//--------------------------------------------------------------------------
#define DECLARE_GETTYPES( ) \
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException);
-//--------------------------------------------------------------------------
#define DECLARE_TYPEPROVIDER( ) \
DECLARE_GETTYPES( ) \
DECLARE_IMPLEMENTATION_ID( )
-//--------------------------------------------------------------------------
#define IMPLEMENT_IMPLEMENTATION_ID( classname ) \
::com::sun::star::uno::Sequence< sal_Int8 > classname::getUnoTunnelImplementationId() \
{ \
@@ -250,7 +231,6 @@ public:
return classname::getUnoTunnelImplementationId(); \
}
-//--------------------------------------------------------------------------
#define IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 ) \
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \
{ \
@@ -260,7 +240,6 @@ public:
); \
}
-//--------------------------------------------------------------------------
#define IMPLEMENT_GETTYPES3( classname, baseclass1, baseclass2, baseclass3 ) \
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \
{ \
@@ -271,25 +250,20 @@ public:
); \
}
-//--------------------------------------------------------------------------
#define IMPLEMENT_TYPEPROVIDER2( classname, baseclass1, baseclass2 ) \
IMPLEMENT_IMPLEMENTATION_ID( classname) \
IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 )
-//--------------------------------------------------------------------------
#define IMPLEMENT_TYPEPROVIDER3( classname, baseclass1, baseclass2, baseclass3 ) \
IMPLEMENT_IMPLEMENTATION_ID( classname) \
IMPLEMENT_GETTYPES3(classname, baseclass1, baseclass2, baseclass3 )
-//==================================================================================
-//= helper for declaring/implementing classes based on the OPropertyContainer and an OPropertyArrayUsageHelper
-//----------------------------------------------------------------------------------
+// helper for declaring/implementing classes based on the OPropertyContainer and an OPropertyArrayUsageHelper
#define DECLARE_PROPERTYCONTAINER_DEFAULTS( ) \
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); \
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); \
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const
-//----------------------------------------------------------------------------------
#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2( classname , baseclass1) \
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL classname::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException) \
{ \
@@ -306,74 +280,61 @@ public:
describeProperties(aProps); \
return new ::cppu::OPropertyArrayHelper(aProps); \
}
-//----------------------------------------------------------------------------------
#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( classname ) \
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2( classname, classname )
-//==================================================================================
-//= helper for implementing the createArrayHelper
-//----------------------------------------------------------------------------------
+// helper for implementing the createArrayHelper
#define BEGIN_PROPERTY_SEQUENCE(count) \
::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> aDescriptor(count); \
::com::sun::star::beans::Property* pDesc = aDescriptor.getArray(); \
sal_Int32 nPos = 0; \
-//----------------------------------------------------------------------------------
#define BEGIN_PROPERTY_HELPER(count) \
BEGIN_PROPERTY_SEQUENCE(count)
-//----------------------------------------------------------------------------------
#define DECL_PROP_IMPL(varname, cpputype) \
pDesc[nPos++] = ::com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, cpputype,
-//----------------------------------------------------------------------------------
#define DECL_PROP0(varname, type) \
DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) 0)
-//----------------------------------------------------------------------------------
+
#define DECL_PROP0_BOOL(varname) \
DECL_PROP_IMPL(varname, ::getBooleanCppuType()) 0)
-//----------------------------------------------------------------------------------
+
#define DECL_PROP0_IFACE(varname, iface) \
DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) 0)
-//----------------------------------------------------------------------------------
#define DECL_PROP1(varname, type, attrib1) \
DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1)
-//----------------------------------------------------------------------------------
+
#define DECL_PROP1_BOOL(varname, attrib1) \
DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1)
-//----------------------------------------------------------------------------------
+
#define DECL_PROP1_IFACE(varname, iface, attrib1) \
DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) ::com::sun::star::beans::PropertyAttribute::attrib1)
-//----------------------------------------------------------------------------------
+
#define DECL_PROP2_IFACE(varname, iface, attrib1, attrib2) \
DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2)
-//----------------------------------------------------------------------------------
#define DECL_PROP2(varname, type, attrib1, attrib2) \
DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2)
-//----------------------------------------------------------------------------------
+
#define DECL_PROP2_BOOL(varname, attrib1, attrib2) \
DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2)
-//----------------------------------------------------------------------------------
#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3) \
DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3)
-//----------------------------------------------------------------------------------
+
#define DECL_PROP3_BOOL(varname, attrib1, attrib2, attrib3) \
DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3)
-
-//----------------------------------------------------------------------------------
#define END_PROPERTY_SEQUENCE() \
OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count ?"); \
-//----------------------------------------------------------------------------------
#define END_PROPERTY_HELPER() \
END_PROPERTY_SEQUENCE() \
return new ::cppu::OPropertyArrayHelper(aDescriptor);
-
#define NOTIFY_LISTERNERS(_rListeners,T,method) \
Sequence< Reference< XInterface > > aListenerSeq = _rListeners.getElements(); \
\
diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx
index 6802694b68c7..0395dc530240 100644
--- a/dbaccess/source/inc/dsntypes.hxx
+++ b/dbaccess/source/inc/dsntypes.hxx
@@ -25,14 +25,10 @@
#include <tools/string.hxx>
#include <connectivity/DriversConfig.hxx>
-//.........................................................................
namespace dbaccess
{
-//.........................................................................
-//=========================================================================
-//= DATASOURCE_TYPE
-//=========================================================================
+// DATASOURCE_TYPE
/// known datasource types
enum DATASOURCE_TYPE
{
@@ -75,7 +71,6 @@ enum DATASOURCE_TYPE
DST_USERDEFINE9,
DST_USERDEFINE10,
-
DST_UNKNOWN /// unrecognized type
};
@@ -99,10 +94,7 @@ enum DATASOURCE_TYPE
#define PAGE_DBSETUPWIZARD_USERDEFINED 17
#define PAGE_DBSETUPWIZARD_MYSQL_NATIVE 18
-
-//=========================================================================
-//= ODsnTypeCollection
-//=========================================================================
+// ODsnTypeCollection
class OOO_DLLPUBLIC_DBA ODsnTypeCollection
{
protected:
@@ -190,9 +182,7 @@ public:
OUString getType(const OUString& _sURL) const;
};
-//-------------------------------------------------------------------------
//- ODsnTypeCollection::TypeIterator
-//-------------------------------------------------------------------------
class OOO_DLLPUBLIC_DBA ODsnTypeCollection::TypeIterator
{
friend class ODsnTypeCollection;
@@ -225,9 +215,7 @@ protected:
TypeIterator(const ODsnTypeCollection* _pContainer, sal_Int32 _nInitialPos = 0);
};
-//.........................................................................
} // namespace dbaccess
-//.........................................................................
#endif // _DBACCESS_DSNTYPES_HXX_
diff --git a/dbaccess/source/inc/registrationhelper.hxx b/dbaccess/source/inc/registrationhelper.hxx
index 0f482b651710..cef8c004fe5e 100644
--- a/dbaccess/source/inc/registrationhelper.hxx
+++ b/dbaccess/source/inc/registrationhelper.hxx
@@ -30,7 +30,6 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
rtl_ModuleCount*
);
-//==========================================================================
class OModuleRegistration
{
static ::com::sun::star::uno::Sequence< OUString >*
@@ -76,7 +75,6 @@ public:
);
};
-//==========================================================================
template <class TYPE>
class OMultiInstanceAutoRegistration
{
@@ -112,7 +110,6 @@ OMultiInstanceAutoRegistration<TYPE>::~OMultiInstanceAutoRegistration()
OModuleRegistration::revokeComponent(TYPE::getImplementationName_Static());
}
-//==========================================================================
template <class TYPE>
class OOneInstanceAutoRegistration
{
diff --git a/dbaccess/source/sdbtools/connection/connectiondependent.hxx b/dbaccess/source/sdbtools/connection/connectiondependent.hxx
index 4533520095d4..668b61c23933 100644
--- a/dbaccess/source/sdbtools/connection/connectiondependent.hxx
+++ b/dbaccess/source/sdbtools/connection/connectiondependent.hxx
@@ -27,14 +27,10 @@
#include <cppuhelper/weakref.hxx>
#include <osl/mutex.hxx>
-//........................................................................
namespace sdbtools
{
-//........................................................................
- //====================================================================
- //= ConnectionDependentComponent
- //====================================================================
+ // ConnectionDependentComponent
class ConnectionDependentComponent
{
private:
@@ -103,9 +99,7 @@ namespace sdbtools
}
};
- //====================================================================
- //= ConnectionDependentComponent::EntryGuard
- //====================================================================
+ // ConnectionDependentComponent::EntryGuard
/** a class for guarding methods of a connection-dependent component
This class serves multiple purposes:
@@ -137,10 +131,7 @@ namespace sdbtools
}
};
-
-//........................................................................
} // namespace sdbtools
-//........................................................................
#endif // DBACCESS_CONNECTION_DEPENDENT_HXX
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx
index 868ee3c8b375..cc89afb70436 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.cxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx
@@ -33,10 +33,8 @@ extern "C" void SAL_CALL createRegistryInfo_ConnectionTools()
::sdbtools::OAutoRegistration< ::sdbtools::ConnectionTools > aRegistration;
}
-//........................................................................
namespace sdbtools
{
-//........................................................................
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -53,41 +51,33 @@ namespace sdbtools
using ::com::sun::star::lang::IllegalArgumentException;
using ::com::sun::star::uno::XComponentContext;
- //====================================================================
- //= ConnectionTools
- //====================================================================
- //--------------------------------------------------------------------
+ // ConnectionTools
ConnectionTools::ConnectionTools( const Reference<XComponentContext>& _rContext )
:ConnectionDependentComponent( _rContext )
{
}
- //--------------------------------------------------------------------
ConnectionTools::~ConnectionTools()
{
}
- //--------------------------------------------------------------------
Reference< XTableName > SAL_CALL ConnectionTools::createTableName() throw (RuntimeException)
{
EntryGuard aGuard( *this );
return new TableName( getContext(), getConnection() );
}
- //--------------------------------------------------------------------
Reference< XObjectNames > SAL_CALL ConnectionTools::getObjectNames() throw (RuntimeException)
{
EntryGuard aGuard( *this );
return new ObjectNames( getContext(), getConnection() );
}
- //--------------------------------------------------------------------
Reference< XDataSourceMetaData > SAL_CALL ConnectionTools::getDataSourceMetaData() throw (RuntimeException)
{
EntryGuard aGuard( *this );
return new DataSourceMetaData( getContext(), getConnection() );
}
- //--------------------------------------------------------------------
Reference< container::XNameAccess > SAL_CALL ConnectionTools::getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, Reference< lang::XComponent >& keepFieldsAlive ) throw (sdbc::SQLException, RuntimeException)
{
EntryGuard aGuard( *this );
@@ -97,7 +87,6 @@ namespace sdbtools
aErrorInfo.doThrow();
return xRet;
}
- //--------------------------------------------------------------------
Reference< sdb::XSingleSelectQueryComposer > SAL_CALL ConnectionTools::getComposer( ::sal_Int32 commandType, const OUString& command ) throw (::com::sun::star::uno::RuntimeException)
{
EntryGuard aGuard( *this );
@@ -106,13 +95,11 @@ namespace sdbtools
return aComposer.getComposer();
}
- //--------------------------------------------------------------------
OUString SAL_CALL ConnectionTools::getImplementationName() throw (RuntimeException)
{
return getImplementationName_static();
}
- //--------------------------------------------------------------------
::sal_Bool SAL_CALL ConnectionTools::supportsService(const OUString & _ServiceName) throw (RuntimeException)
{
Sequence< OUString > aSupported( getSupportedServiceNames() );
@@ -121,19 +108,16 @@ namespace sdbtools
return ::std::find( begin, end, _ServiceName ) != end;
}
- //--------------------------------------------------------------------
Sequence< OUString > SAL_CALL ConnectionTools::getSupportedServiceNames() throw (RuntimeException)
{
return getSupportedServiceNames_static();
}
- //--------------------------------------------------------------------
OUString SAL_CALL ConnectionTools::getImplementationName_static()
{
return OUString( "com.sun.star.comp.dbaccess.ConnectionTools" );
}
- //--------------------------------------------------------------------
Sequence< OUString > SAL_CALL ConnectionTools::getSupportedServiceNames_static()
{
Sequence< OUString > aSupported( 1 );
@@ -141,13 +125,11 @@ namespace sdbtools
return aSupported;
}
- //--------------------------------------------------------------------
Reference< XInterface > SAL_CALL ConnectionTools::Create(const Reference< XComponentContext >& _rxContext )
{
return *( new ConnectionTools( Reference<XComponentContext>( _rxContext ) ) );
}
- //--------------------------------------------------------------------
void SAL_CALL ConnectionTools::initialize(const Sequence< Any > & _rArguments) throw (RuntimeException, Exception)
{
::osl::MutexGuard aGuard( getMutex() );
@@ -167,9 +149,6 @@ namespace sdbtools
setWeakConnection( xConnection );
}
-
-//........................................................................
} // namespace sdbtools
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx
index 08d9a82db32b..7d8250e80d25 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.hxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.hxx
@@ -31,14 +31,10 @@
#include <cppuhelper/implbase3.hxx>
-//........................................................................
namespace sdbtools
{
-//........................................................................
- //====================================================================
- //= ConnectionTools
- //====================================================================
+ // ConnectionTools
typedef ::cppu::WeakImplHelper3 < ::com::sun::star::sdb::tools::XConnectionTools
, ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::lang::XInitialization
@@ -89,9 +85,7 @@ namespace sdbtools
ConnectionTools& operator=( const ConnectionTools& ); // never implemented
};
-//........................................................................
} // namespace sdbtools
-//........................................................................
#endif // DBACCESS_CONNECTIONTOOLS_HXX
diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
index 2a68e485a510..b8e1d8a4f8b8 100644
--- a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
+++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
@@ -17,17 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "datasourcemetadata.hxx"
#include <com/sun/star/lang/NullPointerException.hpp>
#include <connectivity/dbmetadata.hxx>
-//........................................................................
namespace sdbtools
{
-//........................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::sdbc::XConnection;
@@ -35,17 +32,12 @@ namespace sdbtools
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::uno::XComponentContext;
- //====================================================================
- //= DataSourceMetaData_Impl
- //====================================================================
+ // DataSourceMetaData_Impl
struct DataSourceMetaData_Impl
{
};
- //====================================================================
- //= DataSourceMetaData
- //====================================================================
- //--------------------------------------------------------------------
+ // DataSourceMetaData
DataSourceMetaData::DataSourceMetaData( const Reference<XComponentContext>& _rContext, const Reference< XConnection >& _rxConnection )
:ConnectionDependentComponent( _rContext )
,m_pImpl( new DataSourceMetaData_Impl )
@@ -55,12 +47,10 @@ namespace sdbtools
setWeakConnection( _rxConnection );
}
- //--------------------------------------------------------------------
DataSourceMetaData::~DataSourceMetaData()
{
}
- //--------------------------------------------------------------------
::sal_Bool SAL_CALL DataSourceMetaData::supportsQueriesInFrom( ) throw (RuntimeException)
{
EntryGuard aGuard( *this );
@@ -68,8 +58,6 @@ namespace sdbtools
return aMeta.supportsSubqueriesInFrom();
}
-//........................................................................
} // namespace sdbtools
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
index fda74aa478b1..53fb07e0da93 100644
--- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
+++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
@@ -28,14 +28,10 @@
#include <memory>
-//........................................................................
namespace sdbtools
{
-//........................................................................
- //====================================================================
- //= DataSourceMetaData
- //====================================================================
+ // DataSourceMetaData
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::sdb::tools::XDataSourceMetaData
> DataSourceMetaData_Base;
struct DataSourceMetaData_Impl;
@@ -73,10 +69,7 @@ namespace sdbtools
DataSourceMetaData& operator=( const DataSourceMetaData& ); // never implemented
};
-
-//........................................................................
} // namespace sdbtools
-//........................................................................
#endif // DBACCESS_DATASOURCEMETADATA_HXX
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index 2f3318c3903d..39f4ffa5dc88 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "objectnames.hxx"
#include "module_sdbt.hxx"
@@ -38,10 +37,8 @@
#include <boost/shared_ptr.hpp>
-//........................................................................
namespace sdbtools
{
-//........................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::sdbc::XConnection;
@@ -63,9 +60,7 @@ namespace sdbtools
namespace CommandType = ::com::sun::star::sdb::CommandType;
namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition;
- //====================================================================
- //= INameValidation
- //====================================================================
+ // INameValidation
class INameValidation
{
public:
@@ -76,9 +71,7 @@ namespace sdbtools
};
typedef ::boost::shared_ptr< INameValidation > PNameValidation;
- //====================================================================
- //= PlainExistenceCheck
- //====================================================================
+ // PlainExistenceCheck
class PlainExistenceCheck : public INameValidation
{
private:
@@ -120,9 +113,7 @@ namespace sdbtools
}
};
- //====================================================================
- //= TableValidityCheck
- //====================================================================
+ // TableValidityCheck
class TableValidityCheck : public INameValidation
{
const Reference<XComponentContext> m_aContext;
@@ -165,9 +156,7 @@ namespace sdbtools
}
};
- //====================================================================
- //= QueryValidityCheck
- //====================================================================
+ // QueryValidityCheck
class QueryValidityCheck : public INameValidation
{
const Reference<XComponentContext> m_aContext;
@@ -215,9 +204,7 @@ namespace sdbtools
}
};
- //====================================================================
- //= CombinedNameCheck
- //====================================================================
+ // CombinedNameCheck
class CombinedNameCheck : public INameValidation
{
private:
@@ -245,9 +232,7 @@ namespace sdbtools
}
};
- //====================================================================
- //= NameCheckFactory
- //====================================================================
+ // NameCheckFactory
class NameCheckFactory
{
public:
@@ -304,7 +289,6 @@ namespace sdbtools
static void verifyCommandType( sal_Int32 _nCommandType );
};
- //--------------------------------------------------------------------
void NameCheckFactory::verifyCommandType( sal_Int32 _nCommandType )
{
if ( ( _nCommandType != CommandType::TABLE )
@@ -317,7 +301,6 @@ namespace sdbtools
);
}
- //--------------------------------------------------------------------
PNameValidation NameCheckFactory::createExistenceCheck( const Reference<XComponentContext>& _rContext, sal_Int32 _nCommandType, const Reference< XConnection >& _rxConnection )
{
verifyCommandType( _nCommandType );
@@ -354,7 +337,6 @@ namespace sdbtools
return pReturn;
}
- //--------------------------------------------------------------------
PNameValidation NameCheckFactory::createValidityCheck( const Reference<XComponentContext>& _rContext, sal_Int32 _nCommandType, const Reference< XConnection >& _rxConnection )
{
verifyCommandType( _nCommandType );
@@ -378,18 +360,13 @@ namespace sdbtools
return PNameValidation( new QueryValidityCheck( _rContext, _rxConnection ) );
}
- //====================================================================
- //= ObjectNames_Impl
- //====================================================================
+ // ObjectNames_Impl
struct ObjectNames_Impl
{
SdbtClient m_aModuleClient; // keep the module alive as long as this instance lives
};
- //====================================================================
- //= ObjectNames
- //====================================================================
- //--------------------------------------------------------------------
+ // ObjectNames
ObjectNames::ObjectNames( const Reference<XComponentContext>& _rContext, const Reference< XConnection >& _rxConnection )
:ConnectionDependentComponent( _rContext )
,m_pImpl( new ObjectNames_Impl )
@@ -399,12 +376,10 @@ namespace sdbtools
setWeakConnection( _rxConnection );
}
- //--------------------------------------------------------------------
ObjectNames::~ObjectNames()
{
}
- //--------------------------------------------------------------------
OUString SAL_CALL ObjectNames::suggestName( ::sal_Int32 _CommandType, const OUString& _BaseName ) throw (IllegalArgumentException, RuntimeException)
{
EntryGuard aGuard( *this );
@@ -434,7 +409,6 @@ namespace sdbtools
return sName;
}
- //--------------------------------------------------------------------
OUString SAL_CALL ObjectNames::convertToSQLName( const OUString& Name ) throw (RuntimeException)
{
EntryGuard aGuard( *this );
@@ -442,7 +416,6 @@ namespace sdbtools
return ::dbtools::convertName2SQLName( Name, xMeta->getExtraNameCharacters() );
}
- //--------------------------------------------------------------------
::sal_Bool SAL_CALL ObjectNames::isNameUsed( ::sal_Int32 _CommandType, const OUString& _Name ) throw (IllegalArgumentException, RuntimeException)
{
EntryGuard aGuard( *this );
@@ -451,7 +424,6 @@ namespace sdbtools
return !pNameCheck->validateName( _Name );
}
- //--------------------------------------------------------------------
::sal_Bool SAL_CALL ObjectNames::isNameValid( ::sal_Int32 _CommandType, const OUString& _Name ) throw (IllegalArgumentException, RuntimeException)
{
EntryGuard aGuard( *this );
@@ -460,7 +432,6 @@ namespace sdbtools
return pNameCheck->validateName( _Name );
}
- //--------------------------------------------------------------------
void SAL_CALL ObjectNames::checkNameForCreate( ::sal_Int32 _CommandType, const OUString& _Name ) throw (SQLException, RuntimeException)
{
EntryGuard aGuard( *this );
@@ -472,8 +443,6 @@ namespace sdbtools
pNameCheck->validateName_throw( _Name );
}
-//........................................................................
} // namespace sdbtools
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx
index f05a417d796e..a696ba467090 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.hxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.hxx
@@ -28,14 +28,10 @@
#include <memory>
-//........................................................................
namespace sdbtools
{
-//........................................................................
- //====================================================================
- //= ObjectNames
- //====================================================================
+ // ObjectNames
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::sdb::tools::XObjectNames
> ObjectNames_Base;
struct ObjectNames_Impl;
@@ -79,9 +75,7 @@ namespace sdbtools
ObjectNames& operator=( const ObjectNames& ); // never implemented
};
-//........................................................................
} // namespace sdbtools
-//........................................................................
#endif // DBACCESS_SOURCE_SDBTOOLS_INC_OBJECTNAMES_HXX
diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx
index 1b640cb2e18a..96ca135c4404 100644
--- a/dbaccess/source/sdbtools/connection/tablename.cxx
+++ b/dbaccess/source/sdbtools/connection/tablename.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "tablename.hxx"
#include "sdbt_resource.hrc"
#include "module_sdbt.hxx"
@@ -31,10 +30,8 @@
#include <tools/diagnose_ex.h>
#include <tools/string.hxx>
-//........................................................................
namespace sdbtools
{
-//........................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::sdbc::XConnection;
@@ -56,9 +53,7 @@ namespace sdbtools
using namespace ::dbtools;
- //====================================================================
- //= TableName
- //====================================================================
+ // TableName
struct TableName_Impl
{
SdbtClient m_aModuleClient; // keep the module alive as long as this instance lives
@@ -68,10 +63,7 @@ namespace sdbtools
OUString sName;
};
- //====================================================================
- //= TableName
- //====================================================================
- //--------------------------------------------------------------------
+ // TableName
TableName::TableName( const Reference<XComponentContext>& _rContext, const Reference< XConnection >& _rxConnection )
:ConnectionDependentComponent( _rContext )
,m_pImpl( new TableName_Impl )
@@ -82,61 +74,52 @@ namespace sdbtools
setWeakConnection( _rxConnection );
}
- //--------------------------------------------------------------------
TableName::~TableName()
{
}
- //--------------------------------------------------------------------
OUString SAL_CALL TableName::getCatalogName() throw (RuntimeException)
{
EntryGuard aGuard( *this );
return m_pImpl->sCatalog;
}
- //--------------------------------------------------------------------
void SAL_CALL TableName::setCatalogName( const OUString& _catalogName ) throw (RuntimeException)
{
EntryGuard aGuard( *this );
m_pImpl->sCatalog = _catalogName;
}
- //--------------------------------------------------------------------
OUString SAL_CALL TableName::getSchemaName() throw (RuntimeException)
{
EntryGuard aGuard( *this );
return m_pImpl->sSchema;
}
- //--------------------------------------------------------------------
void SAL_CALL TableName::setSchemaName( const OUString& _schemaName ) throw (RuntimeException)
{
EntryGuard aGuard( *this );
m_pImpl->sSchema = _schemaName;
}
- //--------------------------------------------------------------------
OUString SAL_CALL TableName::getTableName() throw (RuntimeException)
{
EntryGuard aGuard( *this );
return m_pImpl->sName;
}
- //--------------------------------------------------------------------
void SAL_CALL TableName::setTableName( const OUString& _tableName ) throw (RuntimeException)
{
EntryGuard aGuard( *this );
m_pImpl->sName = _tableName;
}
- //--------------------------------------------------------------------
OUString SAL_CALL TableName::getNameForSelect() throw (RuntimeException)
{
EntryGuard aGuard( *this );
return composeTableNameForSelect( getConnection(), m_pImpl->sCatalog, m_pImpl->sSchema, m_pImpl->sName );
}
- //--------------------------------------------------------------------
Reference< XPropertySet > SAL_CALL TableName::getTable() throw (NoSuchElementException, RuntimeException)
{
EntryGuard aGuard( *this );
@@ -164,7 +147,6 @@ namespace sdbtools
return xTable;
}
- //--------------------------------------------------------------------
void SAL_CALL TableName::setTable( const Reference< XPropertySet >& _table ) throw (IllegalArgumentException, RuntimeException)
{
EntryGuard aGuard( *this );
@@ -194,7 +176,6 @@ namespace sdbtools
}
}
- //--------------------------------------------------------------------
namespace
{
/** translates a CompositionType into a EComposeRule
@@ -233,7 +214,6 @@ namespace sdbtools
}
}
- //--------------------------------------------------------------------
OUString SAL_CALL TableName::getComposedName( ::sal_Int32 _Type, ::sal_Bool _Quote ) throw (IllegalArgumentException, RuntimeException)
{
EntryGuard aGuard( *this );
@@ -244,7 +224,6 @@ namespace sdbtools
lcl_translateCompositionType_throw( _Type ) );
}
- //--------------------------------------------------------------------
void SAL_CALL TableName::setComposedName( const OUString& _ComposedName, ::sal_Int32 _Type ) throw (RuntimeException)
{
EntryGuard aGuard( *this );
@@ -256,8 +235,6 @@ namespace sdbtools
lcl_translateCompositionType_throw( _Type ) );
}
-//........................................................................
} // namespace sdbtools
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx
index 653d176b573d..73412de8bf1b 100644
--- a/dbaccess/source/sdbtools/connection/tablename.hxx
+++ b/dbaccess/source/sdbtools/connection/tablename.hxx
@@ -28,14 +28,10 @@
#include <memory>
-//........................................................................
namespace sdbtools
{
-//........................................................................
- //====================================================================
- //= TableName
- //====================================================================
+ // TableName
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::sdb::tools::XTableName
> TableName_Base;
struct TableName_Impl;
@@ -85,9 +81,7 @@ namespace sdbtools
TableName& operator=( const TableName& ); // never implemented
};
-//........................................................................
} // namespace sdbtools
-//........................................................................
#endif // DBACCESS_SOURCE_SDBTOOLS_CONNECTION_TABLENAME_HXX
diff --git a/dbaccess/source/sdbtools/inc/module_sdbt.hxx b/dbaccess/source/sdbtools/inc/module_sdbt.hxx
index 26b1672d5624..8d242032771a 100644
--- a/dbaccess/source/sdbtools/inc/module_sdbt.hxx
+++ b/dbaccess/source/sdbtools/inc/module_sdbt.hxx
@@ -22,16 +22,12 @@
#include <unotools/componentresmodule.hxx>
-//........................................................................
namespace sdbtools
{
-//........................................................................
DEFINE_MODULE( SdbtModule, SdbtClient, SdbtRes )
-//........................................................................
} // namespace sdbtools
-//........................................................................
#endif // DBACCESS_MODULE_SDBT_HXX
diff --git a/dbaccess/source/sdbtools/misc/module_sdbt.cxx b/dbaccess/source/sdbtools/misc/module_sdbt.cxx
index 237a2a92618c..d40ef6b96aff 100644
--- a/dbaccess/source/sdbtools/misc/module_sdbt.cxx
+++ b/dbaccess/source/sdbtools/misc/module_sdbt.cxx
@@ -17,18 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "module_sdbt.hxx"
-//........................................................................
namespace sdbtools
{
-//........................................................................
IMPLEMENT_MODULE( SdbtModule, "sdbt" )
-//........................................................................
} // namespace sdbtools
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
index 60230f39a445..03eba5f12ac6 100644
--- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx
+++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "module_sdbt.hxx"
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -28,8 +27,6 @@ using ::com::sun::star::uno::XInterface;
extern "C" void SAL_CALL createRegistryInfo_ConnectionTools();
-//---------------------------------------------------------------------------------------
-
extern "C" void SAL_CALL sdbt_initializeModule()
{
static sal_Bool s_bInit = sal_False;
@@ -40,7 +37,6 @@ extern "C" void SAL_CALL sdbt_initializeModule()
}
}
-//-------------------------------------------