summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui
diff options
context:
space:
mode:
authorJelle van der Waa <jelle@vdwaa.nl>2013-08-17 23:43:14 +0200
committerPetr Mladek <pmladek@suse.cz>2013-08-27 16:11:09 +0000
commit2ec606730bc95b58390a609df0a88958869a4066 (patch)
tree9c530b3f6b200305ba224dda2d02c9bf5aca2233 /dbaccess/source/ui
parent434f3c8e7fac0644cfe1d7a15f97f0c267bac048 (diff)
fdo#62475 removed pointless comments
Conflicts: dbaccess/source/filter/xml/xmlfilter.cxx dbaccess/source/ui/dlg/ConnectionPage.cxx dbaccess/source/ui/dlg/detailpages.cxx dbaccess/source/ui/dlg/odbcconfig.cxx dbaccess/source/ui/querydesign/querycontroller.cxx Change-Id: I3a05649efa3a43dd8d8fb069fc1bce14ca0a6338 Reviewed-on: https://gerrit.libreoffice.org/5484 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'dbaccess/source/ui')
-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
315 files changed, 1567 insertions, 6140 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 15d80947b54d..8ab54d24b068 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "AppController.hxx"
#include "dbustrings.hrc"
#include "advancedsettingsdlg.hxx"
@@ -133,10 +132,9 @@ extern "C" void SAL_CALL createRegistryInfo_ODBApplication()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OApplicationController > aAutoRegistration;
}
-//........................................................................
+
namespace dbaui
{
-//........................................................................
using namespace ::dbtools;
using namespace ::svx;
using namespace ::com::sun::star;
@@ -162,35 +160,32 @@ using ::com::sun::star::sdb::application::NamedDatabaseObject;
namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer;
-//------------------------------------------------------------------------------
OUString SAL_CALL OApplicationController::getImplementationName() throw( RuntimeException )
{
return getImplementationName_Static();
}
-//------------------------------------------------------------------------------
OUString OApplicationController::getImplementationName_Static() throw( RuntimeException )
{
return OUString(SERVICE_SDB_APPLICATIONCONTROLLER);
}
-//------------------------------------------------------------------------------
+
Sequence< OUString> OApplicationController::getSupportedServiceNames_Static(void) throw( RuntimeException )
{
Sequence< OUString> aSupported(1);
aSupported.getArray()[0] = OUString("com.sun.star.sdb.application.DefaultViewController");
return aSupported;
}
-//-------------------------------------------------------------------------
+
Sequence< OUString> SAL_CALL OApplicationController::getSupportedServiceNames() throw(RuntimeException)
{
return getSupportedServiceNames_Static();
}
-// -------------------------------------------------------------------------
+
Reference< XInterface > SAL_CALL OApplicationController::Create(const Reference<XMultiServiceFactory >& _rxFactory)
{
return *(new OApplicationController( comphelper::getComponentContext(_rxFactory)));
}
-// -----------------------------------------------------------------------------
struct XContainerFunctor : public ::std::unary_function< OApplicationController::TContainerVector::value_type , bool>
{
@@ -206,9 +201,7 @@ struct XContainerFunctor : public ::std::unary_function< OApplicationController:
}
};
-//====================================================================
-//= OApplicationController
-//====================================================================
+// OApplicationController
class SelectionNotifier : public ::boost::noncopyable
{
private:
@@ -291,11 +284,8 @@ private:
SelectionNotifier& m_rNotifier;
};
-//====================================================================
-//= OApplicationController
-//====================================================================
+// OApplicationController
DBG_NAME(OApplicationController)
-//--------------------------------------------------------------------
OApplicationController::OApplicationController(const Reference< XComponentContext >& _rxORB)
:OApplicationController_CBASE( _rxORB )
,m_aContextMenuInterceptors( getMutex() )
@@ -313,7 +303,7 @@ OApplicationController::OApplicationController(const Reference< XComponentContex
{
DBG_CTOR(OApplicationController,NULL);
}
-//------------------------------------------------------------------------------
+
OApplicationController::~OApplicationController()
{
if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
@@ -330,10 +320,9 @@ OApplicationController::~OApplicationController()
DBG_DTOR(OApplicationController,NULL);
}
-//--------------------------------------------------------------------
+
IMPLEMENT_FORWARD_XTYPEPROVIDER2(OApplicationController,OApplicationController_CBASE,OApplicationController_Base)
IMPLEMENT_FORWARD_XINTERFACE2(OApplicationController,OApplicationController_CBASE,OApplicationController_Base)
-// -----------------------------------------------------------------------------
void OApplicationController::disconnect()
{
if ( m_xDataSourceConnection.is() )
@@ -357,7 +346,6 @@ void OApplicationController::disconnect()
InvalidateAll();
}
-//--------------------------------------------------------------------
void SAL_CALL OApplicationController::disposing()
{
::std::for_each(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),XContainerFunctor(this));
@@ -437,7 +425,6 @@ void SAL_CALL OApplicationController::disposing()
OApplicationController_CBASE::disposing(); // here the m_refCount must be equal 5
}
-//--------------------------------------------------------------------
sal_Bool OApplicationController::Construct(Window* _pParent)
{
setView( * new OApplicationView( _pParent, getORB(), *this, m_ePreviewMode ) );
@@ -481,7 +468,6 @@ sal_Bool OApplicationController::Construct(Window* _pParent)
return sal_True;
}
-//--------------------------------------------------------------------
void SAL_CALL OApplicationController::disposing(const EventObject& _rSource) throw( RuntimeException )
{
::osl::MutexGuard aGuard( getMutex() );
@@ -519,7 +505,7 @@ void SAL_CALL OApplicationController::disposing(const EventObject& _rSource) thr
OApplicationController_CBASE::disposing( _rSource );
}
}
-//--------------------------------------------------------------------
+
sal_Bool SAL_CALL OApplicationController::suspend(sal_Bool bSuspend) throw( RuntimeException )
{
// notify the OnPrepareViewClosing event (before locking any mutex)
@@ -577,7 +563,7 @@ sal_Bool SAL_CALL OApplicationController::suspend(sal_Bool bSuspend) throw( Runt
return bCanSuspend;
}
-// -----------------------------------------------------------------------------
+
FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
{
FeatureState aReturn;
@@ -968,7 +954,6 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
return aReturn;
}
-// -----------------------------------------------------------------------------
namespace
{
bool lcl_handleException_nothrow( const Reference< XModel >& _rxDocument, const Any& _rException )
@@ -999,7 +984,6 @@ namespace
}
}
-// -----------------------------------------------------------------------------
void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& aArgs)
{
SolarMutexGuard aSolarGuard;
@@ -1425,7 +1409,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
}
InvalidateFeature(_nId);
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::describeSupportedFeatures()
{
OApplicationController_CBASE::describeSupportedFeatures();
@@ -1532,13 +1516,12 @@ void OApplicationController::describeSupportedFeatures()
implDescribeSupportedFeature( ".uno:DBStatusUserName", SID_DB_APP_STATUS_USERNAME, CommandGroup::INTERNAL);
implDescribeSupportedFeature( ".uno:DBStatusHostName", SID_DB_APP_STATUS_HOSTNAME, CommandGroup::INTERNAL);
}
-// -----------------------------------------------------------------------------
+
OApplicationView* OApplicationController::getContainer() const
{
return static_cast< OApplicationView* >( getView() );
}
-// -----------------------------------------------------------------------------
// ::com::sun::star::container::XContainerListener
void SAL_CALL OApplicationController::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException)
{
@@ -1575,7 +1558,7 @@ void SAL_CALL OApplicationController::elementInserted( const ContainerEvent& _rE
}
}
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL OApplicationController::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException)
{
SolarMutexGuard aSolarGuard;
@@ -1609,7 +1592,7 @@ void SAL_CALL OApplicationController::elementRemoved( const ContainerEvent& _rEv
getContainer()->elementRemoved(eType,sName);
}
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL OApplicationController::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException)
{
SolarMutexGuard aSolarGuard;
@@ -1658,6 +1641,7 @@ void SAL_CALL OApplicationController::elementReplaced( const ContainerEvent& _rE
}
}
}
+
namespace
{
OUString lcl_getToolBarResource(ElementType _eType)
@@ -1686,7 +1670,7 @@ namespace
return sToolbar;
}
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationController::onContainerSelect(ElementType _eType)
{
OSL_ENSURE(getContainer(),"View is NULL! -> GPF");
@@ -1757,7 +1741,7 @@ sal_Bool OApplicationController::onContainerSelect(ElementType _eType)
return sal_True;
}
-// -----------------------------------------------------------------------------
+
bool OApplicationController::onEntryDoubleClick( SvTreeListBox& _rTree )
{
if ( getContainer() && getContainer()->isLeaf( _rTree.GetHdlEntry() ) )
@@ -1778,7 +1762,7 @@ bool OApplicationController::onEntryDoubleClick( SvTreeListBox& _rTree )
}
return false; // not handled
}
-// -----------------------------------------------------------------------------
+
bool OApplicationController::impl_isAlterableView_nothrow( const OUString& _rTableOrViewName ) const
{
OSL_PRECOND( m_xDataSourceConnection.is(), "OApplicationController::impl_isAlterableView_nothrow: no connection!" );
@@ -1804,14 +1788,12 @@ bool OApplicationController::impl_isAlterableView_nothrow( const OUString& _rTab
return bIsAlterableView;
}
-// -----------------------------------------------------------------------------
Reference< XComponent > OApplicationController::openElement(const OUString& _sName, ElementType _eType,
ElementOpenMode _eOpenMode, sal_uInt16 _nInstigatorCommand )
{
return openElementWithArguments( _sName, _eType, _eOpenMode, _nInstigatorCommand, ::comphelper::NamedValueCollection() );
}
-// -----------------------------------------------------------------------------
Reference< XComponent > OApplicationController::openElementWithArguments( const OUString& _sName, ElementType _eType,
ElementOpenMode _eOpenMode, sal_uInt16 _nInstigatorCommand, const ::comphelper::NamedValueCollection& _rAdditionalArguments )
{
@@ -1923,7 +1905,7 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const
}
return xRet;
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK( OApplicationController, OnSelectContainer, void*, _pType )
{
ElementType eType = (ElementType)reinterpret_cast< sal_IntPtr >( _pType );
@@ -1931,7 +1913,7 @@ IMPL_LINK( OApplicationController, OnSelectContainer, void*, _pType )
getContainer()->selectContainer(eType);
return 0L;
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK( OApplicationController, OnCreateWithPilot, void*, _pType )
{
ElementType eType = (ElementType)reinterpret_cast< sal_IntPtr >( _pType );
@@ -1939,7 +1921,6 @@ IMPL_LINK( OApplicationController, OnCreateWithPilot, void*, _pType )
return 0L;
}
-// -----------------------------------------------------------------------------
void OApplicationController::newElementWithPilot( ElementType _eType )
{
utl::CloseVeto aKeepDoc( getFrame() );
@@ -1989,7 +1970,6 @@ void OApplicationController::newElementWithPilot( ElementType _eType )
// XDatabaseDocumentUI::loadComponent method.
}
-// -----------------------------------------------------------------------------
Reference< XComponent > OApplicationController::newElement( ElementType _eType, const ::comphelper::NamedValueCollection& i_rAdditionalArguments,
Reference< XComponent >& o_rDocumentDefinition )
{
@@ -2048,7 +2028,6 @@ Reference< XComponent > OApplicationController::newElement( ElementType _eType,
return xComponent;
}
-// -----------------------------------------------------------------------------
void OApplicationController::addContainerListener(const Reference<XNameAccess>& _xCollection)
{
try
@@ -2070,7 +2049,7 @@ void OApplicationController::addContainerListener(const Reference<XNameAccess>&
DBG_UNHANDLED_EXCEPTION();
}
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::renameEntry()
{
SolarMutexGuard aSolarGuard;
@@ -2224,7 +2203,6 @@ void OApplicationController::renameEntry()
}
}
-// -----------------------------------------------------------------------------
void OApplicationController::onSelectionChanged()
{
InvalidateAll();
@@ -2245,7 +2223,7 @@ void OApplicationController::onSelectionChanged()
}
}
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::showPreviewFor(const ElementType _eType,const OUString& _sName)
{
if ( m_ePreviewMode == E_PREVIEWNONE )
@@ -2292,13 +2270,12 @@ void OApplicationController::showPreviewFor(const ElementType _eType,const OUStr
}
}
-//------------------------------------------------------------------------------
IMPL_LINK_NOARG(OApplicationController, OnClipboardChanged)
{
OnInvalidateClipboard();
return 0L;
}
-//------------------------------------------------------------------------------
+
void OApplicationController::OnInvalidateClipboard()
{
InvalidateFeature(ID_BROWSER_CUT);
@@ -2306,21 +2283,21 @@ void OApplicationController::OnInvalidateClipboard()
InvalidateFeature(ID_BROWSER_PASTE);
InvalidateFeature(SID_DB_APP_PASTE_SPECIAL);
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::onCutEntry()
{
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::onCopyEntry()
{
Execute(ID_BROWSER_COPY,Sequence<PropertyValue>());
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::onPasteEntry()
{
Execute(ID_BROWSER_PASTE,Sequence<PropertyValue>());
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::onDeleteEntry()
{
ElementType eType = getContainer()->getElementType();
@@ -2346,85 +2323,71 @@ void OApplicationController::onDeleteEntry()
executeChecked(nId,Sequence<PropertyValue>());
}
-// -----------------------------------------------------------------------------
void OApplicationController::executeUnChecked(const URL& _rCommand, const Sequence< PropertyValue>& aArgs)
{
OApplicationController_CBASE::executeUnChecked( _rCommand, aArgs );
}
-// -----------------------------------------------------------------------------
void OApplicationController::executeChecked(const URL& _rCommand, const Sequence< PropertyValue>& aArgs)
{
OApplicationController_CBASE::executeChecked( _rCommand, aArgs );
}
-// -----------------------------------------------------------------------------
void OApplicationController::executeUnChecked(sal_uInt16 _nCommandId, const Sequence< PropertyValue>& aArgs)
{
OApplicationController_CBASE::executeUnChecked( _nCommandId, aArgs );
}
-// -----------------------------------------------------------------------------
void OApplicationController::executeChecked(sal_uInt16 _nCommandId, const Sequence< PropertyValue>& aArgs)
{
OApplicationController_CBASE::executeChecked( _nCommandId, aArgs );
}
-// -----------------------------------------------------------------------------
sal_Bool OApplicationController::isCommandEnabled(sal_uInt16 _nCommandId) const
{
return OApplicationController_CBASE::isCommandEnabled( _nCommandId );
}
-// -----------------------------------------------------------------------------
sal_Bool OApplicationController::isCommandEnabled( const OUString& _rCompleteCommandURL ) const
{
return OApplicationController_CBASE::isCommandEnabled( _rCompleteCommandURL );
}
-// -----------------------------------------------------------------------------
sal_uInt16 OApplicationController::registerCommandURL( const OUString& _rCompleteCommandURL )
{
return OApplicationController_CBASE::registerCommandURL( _rCompleteCommandURL );
}
-// -----------------------------------------------------------------------------
void OApplicationController::notifyHiContrastChanged()
{
OApplicationController_CBASE::notifyHiContrastChanged();
}
-// -----------------------------------------------------------------------------
Reference< XController > OApplicationController::getXController() throw( RuntimeException )
{
return OApplicationController_CBASE::getXController();
}
-// -----------------------------------------------------------------------------
bool OApplicationController::interceptUserInput( const NotifyEvent& _rEvent )
{
return OApplicationController_CBASE::interceptUserInput( _rEvent );
}
-// -----------------------------------------------------------------------------
PopupMenu* OApplicationController::getContextMenu( Control& /*_rControl*/ ) const
{
return new PopupMenu( ModuleRes( RID_MENU_APP_EDIT ) );
}
-// -----------------------------------------------------------------------------
IController& OApplicationController::getCommandController()
{
return *static_cast< IApplicationController* >( this );
}
-// -----------------------------------------------------------------------------
::cppu::OInterfaceContainerHelper* OApplicationController::getContextMenuInterceptors()
{
return &m_aContextMenuInterceptors;
}
-// -----------------------------------------------------------------------------
Any OApplicationController::getCurrentSelection( Control& _rControl ) const
{
Sequence< NamedDatabaseObject > aSelection;
@@ -2432,13 +2395,11 @@ Any OApplicationController::getCurrentSelection( Control& _rControl ) const
return makeAny( aSelection );
}
-// -----------------------------------------------------------------------------
sal_Bool OApplicationController::requestQuickHelp( const SvTreeListEntry* /*_pEntry*/, OUString& /*_rText*/ ) const
{
return sal_False;
}
-// -----------------------------------------------------------------------------
sal_Bool OApplicationController::requestDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*/ )
{
TransferableHelper* pTransfer = NULL;
@@ -2463,7 +2424,7 @@ sal_Bool OApplicationController::requestDrag( sal_Int8 /*_nAction*/, const Point
return NULL != pTransfer;
}
-// -----------------------------------------------------------------------------
+
sal_Int8 OApplicationController::queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors )
{
sal_Int8 nActionAskedFor = _rEvt.mnAction;
@@ -2508,7 +2469,7 @@ sal_Int8 OApplicationController::queryDrop( const AcceptDropEvent& _rEvt, const
return DND_ACTION_NONE;
}
-// -----------------------------------------------------------------------------
+
sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt )
{
OApplicationView* pView = getContainer();
@@ -2522,12 +2483,10 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt )
// a TransferableDataHelper for accessing the dropped data
TransferableDataHelper aDroppedData(_rEvt.maDropEvent.Transferable);
-
// reset the data of the previous async drop (if any)
if ( m_nAsyncDrop )
Application::RemoveUserEvent(m_nAsyncDrop);
-
m_nAsyncDrop = 0;
m_aAsyncDrop.aDroppedData.clear();
m_aAsyncDrop.nType = pView->getElementType();
@@ -2536,7 +2495,6 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt )
m_aAsyncDrop.bHtml = sal_False;
m_aAsyncDrop.aUrl = OUString();
-
// loop through the available formats and see what we can do ...
// first we have to check if it is our own format, if not we have to copy the stream :-(
if ( ODataAccessObjectTransferable::canExtractObjectDescriptor(aDroppedData.GetDataFlavorExVector()) )
@@ -2611,13 +2569,12 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt )
return DND_ACTION_NONE;
}
-// -----------------------------------------------------------------------------
+
Reference< XModel > SAL_CALL OApplicationController::getModel(void) throw( RuntimeException )
{
return m_xModel;
}
-// -----------------------------------------------------------------------------
void OApplicationController::onAttachedFrame()
{
sal_Int32 nConnectedControllers( 0 );
@@ -2644,7 +2601,6 @@ void OApplicationController::onAttachedFrame()
OnFirstControllerConnected();
}
-// -----------------------------------------------------------------------------
void OApplicationController::OnFirstControllerConnected()
{
if ( !m_xModel.is() )
@@ -2693,7 +2649,6 @@ void OApplicationController::OnFirstControllerConnected()
return;
}
-// -----------------------------------------------------------------------------
void SAL_CALL OApplicationController::attachFrame( const Reference< XFrame > & i_rxFrame ) throw( RuntimeException )
{
::osl::MutexGuard aGuard( getMutex() );
@@ -2703,7 +2658,6 @@ void SAL_CALL OApplicationController::attachFrame( const Reference< XFrame > & i
onAttachedFrame();
}
-// -----------------------------------------------------------------------------
sal_Bool SAL_CALL OApplicationController::attachModel(const Reference< XModel > & _rxModel) throw( RuntimeException )
{
::osl::MutexGuard aGuard( getMutex() );
@@ -2794,7 +2748,7 @@ sal_Bool SAL_CALL OApplicationController::attachModel(const Reference< XModel >
return sal_True;
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::containerFound( const Reference< XContainer >& _xContainer)
{
try
@@ -2810,13 +2764,12 @@ void OApplicationController::containerFound( const Reference< XContainer >& _xCo
DBG_UNHANDLED_EXCEPTION();
}
}
-// -----------------------------------------------------------------------------
+
OUString OApplicationController::getCurrentlySelectedName(sal_Int32& _rnCommandType) const
{
_rnCommandType = ( (getContainer()->getElementType() == E_QUERY)
? CommandType::QUERY : ( (getContainer()->getElementType() == E_TABLE) ? CommandType::TABLE : -1 ));
-
OUString sName;
if ( _rnCommandType != -1 )
{
@@ -2833,19 +2786,16 @@ OUString OApplicationController::getCurrentlySelectedName(sal_Int32& _rnCommandT
return sName;
}
-// -----------------------------------------------------------------------------
void SAL_CALL OApplicationController::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& _Listener ) throw (RuntimeException)
{
m_pSelectionNotifier->addListener( _Listener );
}
-// -----------------------------------------------------------------------------
void SAL_CALL OApplicationController::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& _Listener ) throw (RuntimeException)
{
m_pSelectionNotifier->removeListener( _Listener );
}
-// -----------------------------------------------------------------------------
::sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection ) throw (IllegalArgumentException, RuntimeException)
{
SolarMutexGuard aSolarGuard;
@@ -2857,7 +2807,6 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
return sal_True;
}
- // --------------------------------------------------------------
// BEGIN compatibility
Sequence< NamedValue > aCurrentSelection;
if ( (_aSelection >>= aCurrentSelection) && aCurrentSelection.getLength() )
@@ -2885,7 +2834,6 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
return sal_True;
}
// END compatibility
- // --------------------------------------------------------------
Sequence< NamedDatabaseObject > aSelectedObjects;
if ( !( _aSelection >>= aSelectedObjects ) )
@@ -2970,7 +2918,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
return sal_True;
}
-// -----------------------------------------------------------------------------
+
Any SAL_CALL OApplicationController::getSelection( ) throw (RuntimeException)
{
SolarMutexGuard aSolarGuard;
@@ -3000,7 +2948,7 @@ Any SAL_CALL OApplicationController::getSelection( ) throw (RuntimeException)
}
return makeAny( aCurrentSelection );
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::impl_migrateScripts_nothrow()
{
try
@@ -3014,8 +2962,6 @@ void OApplicationController::impl_migrateScripts_nothrow()
}
}
-//........................................................................
} // namespace dbaui
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index e9e282040599..f56f039f4781 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -62,16 +62,12 @@ namespace com { namespace sun { namespace star {
}
}}}
-//........................................................................
namespace dbaui
{
-//........................................................................
class SubComponentManager;
- //====================================================================
- //= OApplicationController
- //====================================================================
+ // OApplicationController
class OApplicationController;
class OApplicationView;
class OLinkedDocumentsAccess;
@@ -137,7 +133,6 @@ namespace dbaui
OApplicationView* getContainer() const;
-
/** returns the database name
@return
the database name
@@ -400,7 +395,6 @@ namespace dbaui
void impl_validateObjectTypeAndName_throw( const sal_Int32 _nObjectType, const ::boost::optional< OUString >& i_rObjectName );
protected:
- // ----------------------------------------------------------------
// initalizing members
/** forces usage of a connection which we do not own
<p>To be used from within XInitialization::initialize only.</p>
@@ -564,9 +558,7 @@ namespace dbaui
virtual void SAL_CALL disposing();
};
-//........................................................................
} // namespace dbaui
-//........................................................................
#endif // DBAUI_APPCONTROLLER_HXX
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 8ac9711a2cfe..195c52a3424f 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "AppController.hxx"
#include <comphelper/sequence.hxx>
#include <comphelper/property.hxx>
@@ -82,10 +81,8 @@
#include <osl/mutex.hxx>
#include "subcomponentmanager.hxx"
-//........................................................................
namespace dbaui
{
-//........................................................................
using namespace ::dbtools;
using namespace ::svx;
using namespace ::svtools;
@@ -101,7 +98,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::util;
-// -----------------------------------------------------------------------------
void OApplicationController::deleteTables(const ::std::vector< OUString>& _rList)
{
SharedConnection xConnection( ensureConnection() );
@@ -185,7 +181,7 @@ void OApplicationController::deleteTables(const ::std::vector< OUString>& _rList
}
}
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::deleteObjects( ElementType _eType, const ::std::vector< OUString>& _rList, bool _bConfirm )
{
Reference< XNameContainer > xNames( getElements( _eType ), UNO_QUERY );
@@ -296,7 +292,7 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec
}
}
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::deleteEntries()
{
SolarMutexGuard aSolarGuard;
@@ -326,7 +322,7 @@ void OApplicationController::deleteEntries()
}
}
}
-// -----------------------------------------------------------------------------
+
// DO NOT CALL with getMutex() held!!
const SharedConnection& OApplicationController::ensureConnection( ::dbtools::SQLExceptionInfo* _pErrorInfo )
{
@@ -414,13 +410,13 @@ const SharedConnection& OApplicationController::ensureConnection( ::dbtools::SQL
return m_xDataSourceConnection;
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationController::isDataSourceReadOnly() const
{
Reference<XStorable> xStore(m_xModel,UNO_QUERY);
return !xStore.is() || xStore->isReadonly();
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationController::isConnectionReadOnly() const
{
sal_Bool bIsConnectionReadOnly = sal_True;
@@ -438,7 +434,7 @@ sal_Bool OApplicationController::isConnectionReadOnly() const
// TODO check configuration
return bIsConnectionReadOnly;
}
-// -----------------------------------------------------------------------------
+
Reference< XNameAccess > OApplicationController::getElements( ElementType _eType )
{
Reference< XNameAccess > xElements;
@@ -487,7 +483,7 @@ Reference< XNameAccess > OApplicationController::getElements( ElementType _eType
return xElements;
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::getSelectionElementNames(::std::vector< OUString>& _rNames) const
{
SolarMutexGuard aSolarGuard;
@@ -498,7 +494,6 @@ void OApplicationController::getSelectionElementNames(::std::vector< OUString>&
getContainer()->getSelectionElementNames( _rNames );
}
-// -----------------------------------------------------------------------------
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< OLinkedDocumentsAccess > OApplicationController::getDocumentsAccess( ElementType _eType )
{
@@ -519,9 +514,9 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
) );
return pDocuments;
}
+
SAL_WNODEPRECATED_DECLARATIONS_POP
-// -----------------------------------------------------------------------------
TransferableHelper* OApplicationController::copyObject()
{
try
@@ -587,7 +582,7 @@ TransferableHelper* OApplicationController::copyObject()
}
return NULL;
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAccessDescriptor& _rPasteData,const OUString& _sParentFolder ,sal_Bool _bMove)
{
try
@@ -675,7 +670,6 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc
}
}
-
Reference< XNameContainer > xDestQueries(getQueryDefintions(), UNO_QUERY);
Reference< XSingleServiceFactory > xQueryFactory(xDestQueries, UNO_QUERY);
if (!xQueryFactory.is())
@@ -772,7 +766,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc
}
return sal_False;
}
-// -----------------------------------------------------------------------------
+
Reference<XNameContainer> OApplicationController::getQueryDefintions() const
{
Reference<XQueryDefinitionsSupplier> xSet(m_xDataSource,UNO_QUERY);
@@ -783,7 +777,7 @@ Reference<XNameContainer> OApplicationController::getQueryDefintions() const
}
return xNames;
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::getSupportedFormats(ElementType _eType,::std::vector<SotFormatStringId>& _rFormatIds) const
{
switch( _eType )
@@ -800,19 +794,18 @@ void OApplicationController::getSupportedFormats(ElementType _eType,::std::vecto
break;
}
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationController::isTableFormat() const
{
return m_aTableCopyHelper.isTableFormat(getViewClipboard());
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK( OApplicationController, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ )
{
m_nAsyncDrop = 0;
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( getMutex() );
-
if ( m_aAsyncDrop.nType == E_TABLE )
{
SharedConnection xConnection( ensureConnection() );
@@ -842,9 +835,7 @@ IMPL_LINK( OApplicationController, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ )
return 0L;
}
-//........................................................................
-} // namespace dbaui
-//........................................................................
+} // namespace dbaui
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index ce9ad063044f..202071992a60 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "AppController.hxx"
#include "AppDetailView.hxx"
#include "AppView.hxx"
@@ -67,7 +66,6 @@
#include <vcl/waitobj.hxx>
#include <osl/mutex.hxx>
-//........................................................................
namespace dbaui
{
using namespace ::dbtools;
@@ -93,9 +91,6 @@ using ::com::sun::star::ui::XContextMenuInterceptor;
namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition;
-//........................................................................
-// -----------------------------------------------------------------------------
-
class CloseChecker : public ::cppu::WeakImplHelper1< com::sun::star::lang::XEventListener >
{
bool m_bClosed;
@@ -122,7 +117,7 @@ public:
}
};
-// -----------------------------------------------------------------------------
+
void OApplicationController::convertToView(const OUString& _sName)
{
try
@@ -165,7 +160,7 @@ void OApplicationController::convertToView(const OUString& _sName)
DBG_UNHANDLED_EXCEPTION();
}
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::pasteFormat(sal_uInt32 _nFormatId)
{
if ( _nFormatId )
@@ -188,13 +183,12 @@ void OApplicationController::pasteFormat(sal_uInt32 _nFormatId)
}
}
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::openDataSourceAdminDialog()
{
openDialog( OUString( "com.sun.star.sdb.DatasourceAdministrationDialog" ) );
}
-// -----------------------------------------------------------------------------
void OApplicationController::openDialog( const OUString& _sServiceName )
{
try
@@ -254,13 +248,12 @@ void OApplicationController::openDialog( const OUString& _sServiceName )
DBG_UNHANDLED_EXCEPTION();
}
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::openTableFilterDialog()
{
openDialog( OUString( "com.sun.star.sdb.TableFilterDialog" ) );
}
-// -----------------------------------------------------------------------------
void OApplicationController::refreshTables()
{
if ( getContainer() && getContainer()->getDetailView() )
@@ -282,12 +275,12 @@ void OApplicationController::refreshTables()
getContainer()->getDetailView()->createTablesPage( ensureConnection() );
}
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::openDirectSQLDialog()
{
openDialog( SERVICE_SDB_DIRECTSQLDIALOG );
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL OApplicationController::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException)
{
SolarMutexGuard aSolarGuard;
@@ -336,7 +329,6 @@ void SAL_CALL OApplicationController::propertyChange( const PropertyChangeEvent&
modified(aEvt);
}
-// -----------------------------------------------------------------------------
Reference< XDataSource > SAL_CALL OApplicationController::getDataSource() throw (RuntimeException)
{
::osl::MutexGuard aGuard( getMutex() );
@@ -344,7 +336,6 @@ Reference< XDataSource > SAL_CALL OApplicationController::getDataSource() throw
return xDataSource;
}
-// -----------------------------------------------------------------------------
Reference< XWindow > SAL_CALL OApplicationController::getApplicationMainWindow() throw (RuntimeException)
{
::osl::MutexGuard aGuard( getMutex() );
@@ -353,28 +344,24 @@ Reference< XWindow > SAL_CALL OApplicationController::getApplicationMainWindow()
return xWindow;
}
-// -----------------------------------------------------------------------------
Sequence< Reference< XComponent > > SAL_CALL OApplicationController::getSubComponents() throw (RuntimeException)
{
::osl::MutexGuard aGuard( getMutex() );
return m_pSubComponentManager->getSubComponents();
}
-// -----------------------------------------------------------------------------
Reference< XConnection > SAL_CALL OApplicationController::getActiveConnection() throw (RuntimeException)
{
::osl::MutexGuard aGuard( getMutex() );
return m_xDataSourceConnection.getTyped();
}
-// -----------------------------------------------------------------------------
::sal_Bool SAL_CALL OApplicationController::isConnected( ) throw (RuntimeException)
{
::osl::MutexGuard aGuard( getMutex() );
return m_xDataSourceConnection.is();
}
-// -----------------------------------------------------------------------------
void SAL_CALL OApplicationController::connect( ) throw (SQLException, RuntimeException)
{
SQLExceptionInfo aError;
@@ -390,7 +377,6 @@ void SAL_CALL OApplicationController::connect( ) throw (SQLException, RuntimeEx
}
}
-// -----------------------------------------------------------------------------
beans::Pair< ::sal_Int32, OUString > SAL_CALL OApplicationController::identifySubComponent( const Reference< XComponent >& i_rSubComponent ) throw (IllegalArgumentException, RuntimeException)
{
::osl::MutexGuard aGuard( getMutex() );
@@ -409,7 +395,6 @@ beans::Pair< ::sal_Int32, OUString > SAL_CALL OApplicationController::identifySu
return beans::Pair< ::sal_Int32, OUString >( nType, sName );
}
-// -----------------------------------------------------------------------------
::sal_Bool SAL_CALL OApplicationController::closeSubComponents( ) throw (RuntimeException)
{
SolarMutexGuard aSolarGuard;
@@ -417,8 +402,6 @@ beans::Pair< ::sal_Int32, OUString > SAL_CALL OApplicationController::identifySu
return m_pSubComponentManager->closeSubComponents();
}
-
-// -----------------------------------------------------------------------------
namespace
{
ElementType lcl_objectType2ElementType( const sal_Int32 _nObjectType )
@@ -438,7 +421,6 @@ namespace
}
}
-// -----------------------------------------------------------------------------
void OApplicationController::impl_validateObjectTypeAndName_throw( const sal_Int32 _nObjectType, const ::boost::optional< OUString >& i_rObjectName )
{
// ensure we're connected
@@ -486,14 +468,12 @@ void OApplicationController::impl_validateObjectTypeAndName_throw( const sal_Int
throw NoSuchElementException( *i_rObjectName, *this );
}
-// -----------------------------------------------------------------------------
Reference< XComponent > SAL_CALL OApplicationController::loadComponent( ::sal_Int32 _ObjectType,
const OUString& _ObjectName, ::sal_Bool _ForEditing ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException)
{
return loadComponentWithArguments( _ObjectType, _ObjectName, _ForEditing, Sequence< PropertyValue >() );
}
-// -----------------------------------------------------------------------------
Reference< XComponent > SAL_CALL OApplicationController::loadComponentWithArguments( ::sal_Int32 _ObjectType,
const OUString& _ObjectName, ::sal_Bool _ForEditing, const Sequence< PropertyValue >& _Arguments ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException)
{
@@ -513,13 +493,11 @@ Reference< XComponent > SAL_CALL OApplicationController::loadComponentWithArgume
return xComponent;
}
-// -----------------------------------------------------------------------------
Reference< XComponent > SAL_CALL OApplicationController::createComponent( ::sal_Int32 i_nObjectType, Reference< XComponent >& o_DocumentDefinition ) throw (IllegalArgumentException, SQLException, RuntimeException)
{
return createComponentWithArguments( i_nObjectType, Sequence< PropertyValue >(), o_DocumentDefinition );
}
-// -----------------------------------------------------------------------------
Reference< XComponent > SAL_CALL OApplicationController::createComponentWithArguments( ::sal_Int32 i_nObjectType, const Sequence< PropertyValue >& i_rArguments, Reference< XComponent >& o_DocumentDefinition ) throw (IllegalArgumentException, SQLException, RuntimeException)
{
SolarMutexGuard aSolarGuard;
@@ -536,20 +514,17 @@ Reference< XComponent > SAL_CALL OApplicationController::createComponentWithArgu
return xComponent;
}
-// -----------------------------------------------------------------------------
void SAL_CALL OApplicationController::registerContextMenuInterceptor( const Reference< XContextMenuInterceptor >& _Interceptor ) throw (RuntimeException)
{
if ( _Interceptor.is() )
m_aContextMenuInterceptors.addInterface( _Interceptor );
}
-// -----------------------------------------------------------------------------
void SAL_CALL OApplicationController::releaseContextMenuInterceptor( const Reference< XContextMenuInterceptor >& _Interceptor ) throw (RuntimeException)
{
m_aContextMenuInterceptors.removeInterface( _Interceptor );
}
-// -----------------------------------------------------------------------------
void OApplicationController::previewChanged( sal_Int32 _nMode )
{
SolarMutexGuard aSolarGuard;
@@ -576,7 +551,7 @@ void OApplicationController::previewChanged( sal_Int32 _nMode )
InvalidateFeature(SID_DB_APP_VIEW_DOCINFO_PREVIEW);
InvalidateFeature(SID_DB_APP_VIEW_DOC_PREVIEW);
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::askToReconnect()
{
if ( m_bNeedToReconnect )
@@ -608,7 +583,6 @@ void OApplicationController::askToReconnect()
}
}
-// -----------------------------------------------------------------------------
OUString OApplicationController::getDatabaseName() const
{
OUString sDatabaseName;
@@ -626,14 +600,12 @@ OUString OApplicationController::getDatabaseName() const
return sDatabaseName;
}
-// -----------------------------------------------------------------------------
OUString OApplicationController::getStrippedDatabaseName() const
{
OUString sDatabaseName;
return ::dbaui::getStrippedDatabaseName( m_xDataSource, sDatabaseName );
}
-// -----------------------------------------------------------------------------
void OApplicationController::onDocumentOpened( const OUString& _rName, const sal_Int32 _nType,
const ElementOpenMode _eMode, const Reference< XComponent >& _xDocument, const Reference< XComponent >& _rxDefinition )
{
@@ -657,7 +629,7 @@ void OApplicationController::onDocumentOpened( const OUString& _rName, const sal
DBG_UNHANDLED_EXCEPTION();
}
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationController::insertHierachyElement(ElementType _eType,const OUString& _sParentFolder,sal_Bool _bCollection,const Reference<XContent>& _xContent,sal_Bool _bMove)
{
Reference<XHierarchicalNameContainer> xNames(getElements(_eType), UNO_QUERY);
@@ -670,7 +642,7 @@ sal_Bool OApplicationController::insertHierachyElement(ElementType _eType,const
,_xContent
,_bMove);
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationController::isRenameDeleteAllowed(ElementType _eType,sal_Bool _bDelete) const
{
ElementType eType = getContainer()->getElementType();
@@ -710,7 +682,7 @@ sal_Bool OApplicationController::isRenameDeleteAllowed(ElementType _eType,sal_Bo
}
return bEnabled;
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::onLoadedMenu(const Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager)
{
@@ -743,7 +715,7 @@ void OApplicationController::onLoadedMenu(const Reference< ::com::sun::star::fra
InvalidateAll();
}
}
-// -----------------------------------------------------------------------------
+
void OApplicationController::doAction(sal_uInt16 _nId ,ElementOpenMode _eOpenMode)
{
::std::vector< OUString> aList;
@@ -798,7 +770,7 @@ void OApplicationController::doAction(sal_uInt16 _nId ,ElementOpenMode _eOpenMod
aSendMail.Send( getFrame() );
}
}
-// -----------------------------------------------------------------------------
+
ElementType OApplicationController::getElementType(const Reference< XContainer >& _xContainer) const
{
ElementType eRet = E_NONE;
@@ -817,8 +789,6 @@ ElementType OApplicationController::getElementType(const Reference< XContainer >
return eRet;
}
-//........................................................................
} // namespace dbaui
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 79a0afff37ee..148d469d68ca 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -66,7 +66,6 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
-
using namespace ::dbaui;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::uno;
@@ -122,9 +121,7 @@ namespace
OUString sErase = _rName.getToken(0,'/',nIndex); // we don't want to have the "private:forms" part
return (nIndex != -1 ? lcl_findEntry_impl(rTree,_rName.copy(sErase.getLength() + 1),_pFirst) : NULL);
}
- //==================================================================
// class OPreviewWindow
- //==================================================================
class OTablePreviewWindow : public Window
{
DECL_LINK(OnDisableInput, void*);
@@ -135,12 +132,10 @@ namespace
OTablePreviewWindow( Window* pParent, WinBits nStyle = 0 );
virtual long Notify( NotifyEvent& rNEvt );
};
- // -----------------------------------------------------------------------------
OTablePreviewWindow::OTablePreviewWindow(Window* pParent, WinBits nStyle) : Window( pParent, nStyle)
{
ImplInitSettings( sal_True, sal_True, sal_True );
}
- // -----------------------------------------------------------------------------
long OTablePreviewWindow::Notify( NotifyEvent& rNEvt )
{
long nRet = Window::Notify( rNEvt );
@@ -148,13 +143,11 @@ namespace
PostUserEvent( LINK( this, OTablePreviewWindow, OnDisableInput) );
return nRet;
}
- // -----------------------------------------------------------------------------
IMPL_LINK_NOARG(OTablePreviewWindow, OnDisableInput)
{
EnableInput(sal_False);
return 0L;
}
- // -----------------------------------------------------------------------------
void OTablePreviewWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -166,7 +159,6 @@ namespace
Invalidate();
}
}
- // -----------------------------------------------------------------------------
void OTablePreviewWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -189,10 +181,9 @@ namespace
}
}
-//==================================================================
+
// class OAppDetailPageHelper
DBG_NAME(OAppDetailPageHelper)
-//==================================================================
OAppDetailPageHelper::OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL)
,m_rBorderWin(_rBorderWin)
,m_aFL(this,WB_VERT)
@@ -232,7 +223,7 @@ OAppDetailPageHelper::OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _r
m_pLists[i] = NULL;
ImplInitSettings();
}
-// -----------------------------------------------------------------------------
+
OAppDetailPageHelper::~OAppDetailPageHelper()
{
try
@@ -263,7 +254,7 @@ OAppDetailPageHelper::~OAppDetailPageHelper()
DBG_DTOR(OAppDetailPageHelper,NULL);
}
-// -----------------------------------------------------------------------------
+
int OAppDetailPageHelper::getVisibleControlIndex() const
{
int i = 0;
@@ -274,7 +265,7 @@ int OAppDetailPageHelper::getVisibleControlIndex() const
}
return i;
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::selectAll()
{
int nPos = getVisibleControlIndex();
@@ -283,7 +274,7 @@ void OAppDetailPageHelper::selectAll()
m_pLists[nPos]->SelectAll(sal_True);
}
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::sort(int _nPos,SvSortMode _eSortMode )
{
OSL_ENSURE(m_pLists[_nPos],"List can not be NULL! ->GPF");
@@ -293,7 +284,7 @@ void OAppDetailPageHelper::sort(int _nPos,SvSortMode _eSortMode )
if ( eOldSortMode != _eSortMode )
pModel->Resort();
}
-// -----------------------------------------------------------------------------
+
sal_Bool OAppDetailPageHelper::isSortUp() const
{
SvSortMode eSortMode = SortNone;
@@ -305,21 +296,21 @@ sal_Bool OAppDetailPageHelper::isSortUp() const
}
return eSortMode == SortAscending;
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::sortDown()
{
int nPos = getVisibleControlIndex();
if ( nPos < E_ELEMENT_TYPE_COUNT )
sort(nPos,SortDescending);
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::sortUp()
{
int nPos = getVisibleControlIndex();
if ( nPos < E_ELEMENT_TYPE_COUNT )
sort(nPos,SortAscending);
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::getSelectionElementNames( ::std::vector< OUString>& _rNames ) const
{
int nPos = getVisibleControlIndex();
@@ -353,7 +344,6 @@ void OAppDetailPageHelper::getSelectionElementNames( ::std::vector< OUString>& _
}
}
-// -----------------------------------------------------------------------------
void OAppDetailPageHelper::describeCurrentSelectionForControl( const Control& _rControl, Sequence< NamedDatabaseObject >& _out_rSelectedObjects )
{
enum ElementType eType = E_TABLE;
@@ -368,7 +358,6 @@ void OAppDetailPageHelper::describeCurrentSelectionForControl( const Control& _r
OSL_FAIL( "OAppDetailPageHelper::describeCurrentSelectionForControl: invalid control!" );
}
-// -----------------------------------------------------------------------------
void OAppDetailPageHelper::describeCurrentSelectionForType( const ElementType _eType, Sequence< NamedDatabaseObject >& _out_rSelectedObjects )
{
OSL_ENSURE( _eType < E_ELEMENT_TYPE_COUNT, "OAppDetailPageHelper::describeCurrentSelectionForType: invalid type!" );
@@ -437,7 +426,6 @@ void OAppDetailPageHelper::describeCurrentSelectionForType( const ElementType _e
::std::copy( aSelected.begin(), aSelected.end(), _out_rSelectedObjects.getArray() );
}
-// -----------------------------------------------------------------------------
void OAppDetailPageHelper::selectElements(const Sequence< OUString>& _aNames)
{
int nPos = getVisibleControlIndex();
@@ -455,7 +443,7 @@ void OAppDetailPageHelper::selectElements(const Sequence< OUString>& _aNames)
}
}
}
-// -----------------------------------------------------------------------------
+
OUString OAppDetailPageHelper::getQualifiedName( SvTreeListEntry* _pEntry ) const
{
int nPos = getVisibleControlIndex();
@@ -492,13 +480,13 @@ OUString OAppDetailPageHelper::getQualifiedName( SvTreeListEntry* _pEntry ) cons
return sComposedName;
}
-// -----------------------------------------------------------------------------
+
ElementType OAppDetailPageHelper::getElementType() const
{
int nPos = getVisibleControlIndex();
return static_cast<ElementType>(nPos);
}
-// -----------------------------------------------------------------------------
+
sal_Int32 OAppDetailPageHelper::getSelectionCount()
{
sal_Int32 nCount = 0;
@@ -515,7 +503,7 @@ sal_Int32 OAppDetailPageHelper::getSelectionCount()
}
return nCount;
}
-// -----------------------------------------------------------------------------
+
sal_Int32 OAppDetailPageHelper::getElementCount()
{
sal_Int32 nCount = 0;
@@ -526,34 +514,34 @@ sal_Int32 OAppDetailPageHelper::getElementCount()
}
return nCount;
}
-// -----------------------------------------------------------------------------
+
sal_Bool OAppDetailPageHelper::isCutAllowed()
{
return sal_False;
}
-// -----------------------------------------------------------------------------
+
sal_Bool OAppDetailPageHelper::isCopyAllowed()
{
return sal_True;
}
-// -----------------------------------------------------------------------------
+
sal_Bool OAppDetailPageHelper::isPasteAllowed()
{
return sal_True;
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::copy()
{
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::cut()
{
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::paste()
{
}
-// -----------------------------------------------------------------------------
+
bool OAppDetailPageHelper::isLeaf(SvTreeListEntry* _pEntry) const
{
if ( !_pEntry )
@@ -570,7 +558,6 @@ bool OAppDetailPageHelper::isLeaf(SvTreeListEntry* _pEntry) const
return true;
}
-// -----------------------------------------------------------------------------
sal_Bool OAppDetailPageHelper::isALeafSelected() const
{
int nPos = getVisibleControlIndex();
@@ -587,7 +574,7 @@ sal_Bool OAppDetailPageHelper::isALeafSelected() const
}
return bLeafSelected;
}
-// -----------------------------------------------------------------------------
+
SvTreeListEntry* OAppDetailPageHelper::getEntry( const Point& _aPosPixel) const
{
SvTreeListEntry* pReturn = NULL;
@@ -596,7 +583,7 @@ SvTreeListEntry* OAppDetailPageHelper::getEntry( const Point& _aPosPixel) const
pReturn = m_pLists[nPos]->GetEntry( _aPosPixel,sal_True );
return pReturn;
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xConnection)
{
OSL_ENSURE(_xConnection.is(),"Connection is NULL! -> GPF");
@@ -630,7 +617,6 @@ void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xCon
setDetailPage(m_pLists[E_TABLE]);
}
-// -----------------------------------------------------------------------------
void OAppDetailPageHelper::getElementIcons( ElementType _eType, sal_uInt16& _rImageId)
{
ImageProvider aImageProvider;
@@ -649,7 +635,6 @@ void OAppDetailPageHelper::getElementIcons( ElementType _eType, sal_uInt16& _rIm
_rImageId = aImageProvider.getDefaultImageResourceID( nDatabaseObjectType );
}
-// -----------------------------------------------------------------------------
void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameAccess >& _xContainer)
{
OSL_ENSURE(E_TABLE != _eType,"E_TABLE isn't allowed.");
@@ -693,7 +678,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
setDetailPage(m_pLists[_eType]);
}
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::setDetailPage(Window* _pWindow)
{
OSL_ENSURE(_pWindow,"OAppDetailPageHelper::setDetailPage: Window is NULL!");
@@ -717,7 +702,6 @@ void OAppDetailPageHelper::setDetailPage(Window* _pWindow)
Resize();
}
-// -----------------------------------------------------------------------------
namespace
{
namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
@@ -732,7 +716,6 @@ namespace
}
}
-// -----------------------------------------------------------------------------
void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContainer, const ElementType _eType,
const sal_uInt16 _nImageId, SvTreeListEntry* _pParent )
{
@@ -772,7 +755,7 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine
}
}
}
-// -----------------------------------------------------------------------------
+
DBTreeListBox* OAppDetailPageHelper::createSimpleTree( const OString& _sHelpId, const Image& _rImage)
{
DBTreeListBox* pTreeView = new DBTreeListBox(this,
@@ -781,7 +764,6 @@ DBTreeListBox* OAppDetailPageHelper::createSimpleTree( const OString& _sHelpId,
return createTree( pTreeView, _rImage );
}
-// -----------------------------------------------------------------------------
DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, const Image& _rImage )
{
WaitObject aWaitCursor(this);
@@ -808,7 +790,7 @@ DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, cons
return _pTreeView;
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::clearPages()
{
showPreview(NULL);
@@ -818,7 +800,7 @@ void OAppDetailPageHelper::clearPages()
m_pLists[i]->Clear();
}
}
-// -----------------------------------------------------------------------------
+
sal_Bool OAppDetailPageHelper::isFilled() const
{
size_t i = 0;
@@ -826,7 +808,7 @@ sal_Bool OAppDetailPageHelper::isFilled() const
;
return i != E_ELEMENT_TYPE_COUNT;
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::elementReplaced(ElementType _eType
,const OUString& _rOldName
,const OUString& _rNewName )
@@ -860,7 +842,7 @@ void OAppDetailPageHelper::elementReplaced(ElementType _eType
}
}
}
-// -----------------------------------------------------------------------------
+
SvTreeListEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const OUString& _rName, const Any& _rObject )
{
SvTreeListEntry* pRet = NULL;
@@ -904,7 +886,7 @@ SvTreeListEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const OUS
}
return pRet;
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::elementRemoved( ElementType _eType,const OUString& _rName )
{
DBTreeListBox* pTreeView = getCurrentView();
@@ -942,44 +924,44 @@ void OAppDetailPageHelper::elementRemoved( ElementType _eType,const OUString& _r
showPreview(NULL);
}
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree)
{
OSL_ENSURE( _pTree, "OAppDetailPageHelper, OnEntryDoubleClick: invalid callback!" );
bool bHandled = ( _pTree != NULL ) && getBorderWin().getView()->getAppController().onEntryDoubleClick( *_pTree );
return bHandled ? 1L : 0L;
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK(OAppDetailPageHelper, OnEntrySelChange, void*, /*NOINTERESTEDIN*/)
{
getBorderWin().getView()->getAppController().onSelectionChanged();
return 1L;
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK( OAppDetailPageHelper, OnCutEntry, void*, /*NOINTERESTEDIN*/ )
{
getBorderWin().getView()->getAppController().onCutEntry();
return 1L;
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK( OAppDetailPageHelper, OnCopyEntry, void*, /*NOINTERESTEDIN*/ )
{
getBorderWin().getView()->getAppController().onCopyEntry();
return 1L;
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK( OAppDetailPageHelper, OnPasteEntry, void*, /*NOINTERESTEDIN*/ )
{
getBorderWin().getView()->getAppController().onPasteEntry();
return 1L;
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK( OAppDetailPageHelper, OnDeleteEntry, void*, /*NOINTERESTEDIN*/ )
{
getBorderWin().getView()->getAppController().onDeleteEntry();
return 1L;
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::Resize()
{
// parent window dimension
@@ -1009,17 +991,17 @@ void OAppDetailPageHelper::Resize()
m_pTablePreview->SetPosSizePixel(Point(0,0),m_aBorder.GetSizePixel() );
}
}
-// -----------------------------------------------------------------------------
+
PreviewMode OAppDetailPageHelper::getPreviewMode()
{
return m_ePreviewMode;
}
-// -----------------------------------------------------------------------------
+
sal_Bool OAppDetailPageHelper::isPreviewEnabled()
{
return m_ePreviewMode != E_PREVIEWNONE;
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::switchPreview(PreviewMode _eMode,sal_Bool _bForce)
{
if ( m_ePreviewMode != _eMode || _bForce )
@@ -1065,7 +1047,7 @@ void OAppDetailPageHelper::switchPreview(PreviewMode _eMode,sal_Bool _bForce)
}
}
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::showPreview(const Reference< XContent >& _xContent)
{
if ( isPreviewEnabled() )
@@ -1126,7 +1108,7 @@ void OAppDetailPageHelper::showPreview(const Reference< XContent >& _xContent)
}
}
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::showPreview( const OUString& _sDataSourceName,
const OUString& _sName,
sal_Bool _bTable)
@@ -1194,7 +1176,7 @@ void OAppDetailPageHelper::showPreview( const OUString& _sDataSourceName,
showPreview(NULL);
}
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, /*pToolBox*/)
{
m_aTBPreview.EndSelection();
@@ -1242,7 +1224,6 @@ IMPL_LINK(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, /*pToolBox*/)
return 0L;
}
-// -----------------------------------------------------------------------------
void OAppDetailPageHelper::KeyInput( const KeyEvent& rKEvt )
{
SvTreeListBox* pCurrentView = getCurrentView();
@@ -1259,7 +1240,6 @@ void OAppDetailPageHelper::KeyInput( const KeyEvent& rKEvt )
Window::KeyInput(rKEvt);
}
-// -----------------------------------------------------------------------------
void OAppDetailPageHelper::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -1281,7 +1261,7 @@ void OAppDetailPageHelper::DataChanged( const DataChangedEvent& rDCEvt )
}
}
}
-// -----------------------------------------------------------------------------
+
void OAppDetailPageHelper::ImplInitSettings()
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -1305,13 +1285,13 @@ void OAppDetailPageHelper::ImplInitSettings()
m_aTBPreview.SetBackground( rStyleSettings.GetFieldColor() );
m_pTablePreview->SetBackground( rStyleSettings.GetFieldColor() );
}
-// -----------------------------------------------------------------------------
+
OPreviewWindow::OPreviewWindow(Window* _pParent)
: Window(_pParent)
{
ImplInitSettings( sal_True, sal_True, sal_True );
}
-// -----------------------------------------------------------------------------
+
sal_Bool OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const
{
const Size aWinSize( GetOutputSizePixel() );
@@ -1345,8 +1325,6 @@ sal_Bool OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rect
return bRet;
}
-// ------------------------------------------------------------------------
-
void OPreviewWindow::Paint( const Rectangle& rRect )
{
Window::Paint( rRect );
@@ -1362,7 +1340,7 @@ void OPreviewWindow::Paint( const Rectangle& rRect )
m_aGraphicObj.Draw( this, aPos, aSize );
}
}
-// -----------------------------------------------------------------------------
+
void OPreviewWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -1374,7 +1352,7 @@ void OPreviewWindow::DataChanged( const DataChangedEvent& rDCEvt )
Invalidate();
}
}
-// -----------------------------------------------------------------------------
+
void OPreviewWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -1395,7 +1373,5 @@ void OPreviewWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal
if( bBackground )
SetBackground( rStyleSettings.GetFieldColor() );
}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 92202ecadcd3..40d6426eb416 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -73,10 +73,8 @@ namespace dbaui
void setGraphic(const Graphic& _rGraphic ) { m_aGraphicObj.SetGraphic(_rGraphic); }
};
- //==================================================================
// A helper class for the controls in the detail page.
// Combines general functionality.
- //==================================================================
class OAppDetailPageHelper : public Window
{
DBTreeListBox* m_pLists[ELEMENT_COUNT];
@@ -322,7 +320,6 @@ namespace dbaui
void elementRemoved(ElementType _eType
,const OUString& _rName );
-
/// returns the preview mode
PreviewMode getPreviewMode();
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 9652e33e0f09..08d657ad654d 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -62,7 +62,6 @@ using ::com::sun::star::sdb::application::NamedDatabaseObject;
#define SPACEBETWEENENTRIES 4
-// -----------------------------------------------------------------------------
TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sal_uInt16 _nTitleResourceID, bool _bHideWhenDisabled )
:sUNOCommand( OUString::createFromAscii( _pAsciiUNOCommand ) )
,nHelpID( _nHelpID )
@@ -71,7 +70,6 @@ TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sa
{
}
-// -----------------------------------------------------------------------------
OCreationList::OCreationList( OTasksWindow& _rParent )
:SvTreeListBox( &_rParent, WB_TABSTOP | WB_HASBUTTONSATROOT | WB_HASBUTTONS )
,m_rTaskWindow( _rParent )
@@ -85,7 +83,7 @@ OCreationList::OCreationList( OTasksWindow& _rParent )
SetNodeDefaultImages( );
EnableEntryMnemonics();
}
-// -----------------------------------------------------------------------------
+
void OCreationList::Paint( const Rectangle& _rRect )
{
if ( m_pMouseDownEntry )
@@ -99,7 +97,6 @@ void OCreationList::Paint( const Rectangle& _rRect )
Control::SetFont( m_aOriginalFont );
}
-// -----------------------------------------------------------------------------
void OCreationList::PreparePaint( SvTreeListEntry* _pEntry )
{
Wallpaper aEntryBackground( m_aOriginalBackgroundColor );
@@ -127,7 +124,6 @@ void OCreationList::PreparePaint( SvTreeListEntry* _pEntry )
SetBackground( aEntryBackground );
}
-// -----------------------------------------------------------------------------
void OCreationList::SelectSearchEntry( const void* _pEntry )
{
SvTreeListEntry* pEntry = const_cast< SvTreeListEntry* >( static_cast< const SvTreeListEntry* >( _pEntry ) );
@@ -140,7 +136,6 @@ void OCreationList::SelectSearchEntry( const void* _pEntry )
GrabFocus();
}
-// -----------------------------------------------------------------------------
void OCreationList::ExecuteSearchEntry( const void* _pEntry ) const
{
SvTreeListEntry* pEntry = const_cast< SvTreeListEntry* >( static_cast< const SvTreeListEntry* >( _pEntry ) );
@@ -151,7 +146,6 @@ void OCreationList::ExecuteSearchEntry( const void* _pEntry ) const
onSelected( pEntry );
}
-// -----------------------------------------------------------------------------
Rectangle OCreationList::GetFocusRect( SvTreeListEntry* _pEntry, long _nLine )
{
Rectangle aRect = SvTreeListBox::GetFocusRect( _pEntry, _nLine );
@@ -171,7 +165,7 @@ Rectangle OCreationList::GetFocusRect( SvTreeListEntry* _pEntry, long _nLine )
return aRect;
}
-// -----------------------------------------------------------------------------
+
void OCreationList::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*/ )
{
// don't give this to the base class, it does a ReleaseMouse as very first action
@@ -179,28 +173,28 @@ void OCreationList::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*
// something with the drag-event), I hesitate to fix it in the current state,
// since I don't overlook the consequences, and we're close to 2.0 ...)
}
-// -----------------------------------------------------------------------------
+
void OCreationList::ModelHasCleared()
{
SvTreeListBox::ModelHasCleared();
m_pLastActiveEntry = NULL;
m_pMouseDownEntry = NULL;
}
-// -----------------------------------------------------------------------------
+
void OCreationList::GetFocus()
{
SvTreeListBox::GetFocus();
if ( !GetCurEntry() )
setCurrentEntryInvalidate( m_pLastActiveEntry ? m_pLastActiveEntry : GetFirstEntryInView() );
}
-// -----------------------------------------------------------------------------
+
void OCreationList::LoseFocus()
{
SvTreeListBox::LoseFocus();
m_pLastActiveEntry = GetCurEntry();
setCurrentEntryInvalidate( NULL );
}
-// -----------------------------------------------------------------------------
+
void OCreationList::MouseButtonDown( const MouseEvent& rMEvt )
{
SvTreeListBox::MouseButtonDown( rMEvt );
@@ -213,7 +207,7 @@ void OCreationList::MouseButtonDown( const MouseEvent& rMEvt )
CaptureMouse();
}
}
-// -----------------------------------------------------------------------------
+
void OCreationList::MouseMove( const MouseEvent& rMEvt )
{
if ( rMEvt.IsLeaveWindow() )
@@ -252,7 +246,7 @@ void OCreationList::MouseMove( const MouseEvent& rMEvt )
SvTreeListBox::MouseMove(rMEvt);
}
-// -----------------------------------------------------------------------------
+
void OCreationList::MouseButtonUp( const MouseEvent& rMEvt )
{
SvTreeListEntry* pEntry = GetEntry( rMEvt.GetPosPixel() );
@@ -279,7 +273,7 @@ void OCreationList::MouseButtonUp( const MouseEvent& rMEvt )
if ( bExecute )
onSelected( pEntry );
}
-// -----------------------------------------------------------------------------
+
bool OCreationList::setCurrentEntryInvalidate( SvTreeListEntry* _pEntry )
{
if ( GetCurEntry() != _pEntry )
@@ -297,7 +291,7 @@ bool OCreationList::setCurrentEntryInvalidate( SvTreeListEntry* _pEntry )
}
return false;
}
-// -----------------------------------------------------------------------------
+
void OCreationList::updateHelpText()
{
sal_uInt16 nHelpTextId = 0;
@@ -305,7 +299,7 @@ void OCreationList::updateHelpText()
nHelpTextId = reinterpret_cast< TaskEntry* >( GetCurEntry()->GetUserData() )->nHelpID;
m_rTaskWindow.setHelpText( nHelpTextId );
}
-// -----------------------------------------------------------------------------
+
void OCreationList::onSelected( SvTreeListEntry* _pEntry ) const
{
OSL_ENSURE( _pEntry, "OCreationList::onSelected: invalid entry!" );
@@ -313,7 +307,7 @@ void OCreationList::onSelected( SvTreeListEntry* _pEntry ) const
aCommand.Complete = reinterpret_cast< TaskEntry* >( _pEntry->GetUserData() )->sUNOCommand;
m_rTaskWindow.getDetailView()->getBorderWin().getView()->getAppController().executeChecked( aCommand, Sequence< PropertyValue >() );
}
-// -----------------------------------------------------------------------------
+
void OCreationList::KeyInput( const KeyEvent& rKEvt )
{
const KeyCode& rCode = rKEvt.GetKeyCode();
@@ -343,8 +337,9 @@ void OCreationList::KeyInput( const KeyEvent& rKEvt )
updateHelpText();
}
}
-// -----------------------------------------------------------------------------
+
DBG_NAME(OTasksWindow)
+
OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView)
: Window(_pParent,WB_DIALOGCONTROL )
,m_aCreation(*this)
@@ -368,13 +363,13 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView
ImplInitSettings(sal_True,sal_True,sal_True);
}
-// -----------------------------------------------------------------------------
+
OTasksWindow::~OTasksWindow()
{
DBG_DTOR(OTasksWindow,NULL);
Clear();
}
-// -----------------------------------------------------------------------
+
void OTasksWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
DBG_CHKTHIS(OTasksWindow,NULL);
@@ -387,7 +382,7 @@ void OTasksWindow::DataChanged( const DataChangedEvent& rDCEvt )
Invalidate();
}
}
-// -----------------------------------------------------------------------------
+
void OTasksWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
{
DBG_CHKTHIS(OTasksWindow,NULL);
@@ -422,7 +417,7 @@ void OTasksWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B
aFont.SetWeight(WEIGHT_BOLD);
m_aDescription.SetControlFont(aFont);
}
-// -----------------------------------------------------------------------------
+
void OTasksWindow::setHelpText(sal_uInt16 _nId)
{
DBG_CHKTHIS(OTasksWindow,NULL);
@@ -436,8 +431,9 @@ void OTasksWindow::setHelpText(sal_uInt16 _nId)
{
m_aHelpText.SetText(OUString());
}
+
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, /*_pTreeBox*/)
{
DBG_CHKTHIS(OTasksWindow,NULL);
@@ -446,7 +442,7 @@ IMPL_LINK(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, /*_pTreeBox*/)
m_aHelpText.SetText( ModuleRes( reinterpret_cast< TaskEntry* >( pEntry->GetUserData() )->nHelpID ) );
return 1L;
}
-// -----------------------------------------------------------------------------
+
void OTasksWindow::Resize()
{
DBG_CHKTHIS(OTasksWindow,NULL);
@@ -469,7 +465,7 @@ void OTasksWindow::Resize()
m_aFL.SetPosSizePixel( Point(nHalfOutputWidth , 0), Size(aFLSize.Width(), nOutputHeight ) );
}
-// -----------------------------------------------------------------------------
+
void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
{
DBG_CHKTHIS(OTasksWindow,NULL);
@@ -520,7 +516,7 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
m_aCreation.updateHelpText();
Enable(!_rList.empty());
}
-// -----------------------------------------------------------------------------
+
void OTasksWindow::Clear()
{
DBG_CHKTHIS(OTasksWindow,NULL);
@@ -533,10 +529,11 @@ void OTasksWindow::Clear()
}
m_aCreation.Clear();
}
-//==================================================================
+
// class OApplicationDetailView
-//==================================================================
+
DBG_NAME(OApplicationDetailView)
+
OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode) : OSplitterView(&_rParent,sal_False )
,m_aHorzSplitter(this)
,m_aTasks(this,STR_TASKS,WB_BORDER | WB_DIALOGCONTROL )
@@ -570,7 +567,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe
m_aHorzSplitter.SetUniqueId(UID_APP_VIEW_HORZ_SPLIT);
setSplitter(&m_aHorzSplitter);
}
-// -----------------------------------------------------------------------------
+
OApplicationDetailView::~OApplicationDetailView()
{
DBG_DTOR(OApplicationDetailView,NULL);
@@ -578,7 +575,7 @@ OApplicationDetailView::~OApplicationDetailView()
setSplitter(NULL);
m_pControlHelper = NULL;
}
-// -----------------------------------------------------------------------------
+
void OApplicationDetailView::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
@@ -604,7 +601,7 @@ void OApplicationDetailView::ImplInitSettings( sal_Bool bFont, sal_Bool bForegro
m_aHorzSplitter.SetFillColor( rStyleSettings.GetDialogColor() );
m_aHorzSplitter.SetTextFillColor(rStyleSettings.GetDialogColor() );
}
-// -----------------------------------------------------------------------
+
void OApplicationDetailView::DataChanged( const DataChangedEvent& rDCEvt )
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
@@ -620,20 +617,18 @@ void OApplicationDetailView::DataChanged( const DataChangedEvent& rDCEvt )
Invalidate();
}
}
-// -----------------------------------------------------------------------------
+
void OApplicationDetailView::GetFocus()
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
OSplitterView::GetFocus();
}
-// -----------------------------------------------------------------------------
void OApplicationDetailView::setTaskExternalMnemonics( MnemonicGenerator& _rMnemonics )
{
m_aExternalMnemonics = _rMnemonics;
}
-// -----------------------------------------------------------------------------
bool OApplicationDetailView::interceptKeyInput( const KeyEvent& _rEvent )
{
const KeyCode& rKeyCode = _rEvent.GetKeyCode();
@@ -644,19 +639,16 @@ bool OApplicationDetailView::interceptKeyInput( const KeyEvent& _rEvent )
return false;
}
-// -----------------------------------------------------------------------------
void OApplicationDetailView::createTablesPage(const Reference< XConnection >& _xConnection )
{
impl_createPage( E_TABLE, _xConnection, NULL );
}
-// -----------------------------------------------------------------------------
void OApplicationDetailView::createPage( ElementType _eType,const Reference< XNameAccess >& _xContainer )
{
impl_createPage( _eType, NULL, _xContainer );
}
-// -----------------------------------------------------------------------------
void OApplicationDetailView::impl_createPage( ElementType _eType, const Reference< XConnection >& _rxConnection,
const Reference< XNameAccess >& _rxNonTableElements )
{
@@ -684,7 +676,6 @@ void OApplicationDetailView::impl_createPage( ElementType _eType, const Referenc
Resize();
}
-// -----------------------------------------------------------------------------
const TaskPaneData& OApplicationDetailView::impl_getTaskPaneData( ElementType _eType )
{
if ( m_aTaskPaneData.empty() )
@@ -698,7 +689,6 @@ const TaskPaneData& OApplicationDetailView::impl_getTaskPaneData( ElementType _e
return rData;
}
-// -----------------------------------------------------------------------------
void OApplicationDetailView::impl_fillTaskPaneData( ElementType _eType, TaskPaneData& _rData ) const
{
TaskEntryList& rList( _rData.aTasks );
@@ -765,55 +755,54 @@ void OApplicationDetailView::impl_fillTaskPaneData( ElementType _eType, TaskPane
}
}
-// -----------------------------------------------------------------------------
OUString OApplicationDetailView::getQualifiedName( SvTreeListEntry* _pEntry ) const
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->getQualifiedName( _pEntry );
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationDetailView::isLeaf(SvTreeListEntry* _pEntry) const
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->isLeaf(_pEntry);
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationDetailView::isALeafSelected() const
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->isALeafSelected();
}
-// -----------------------------------------------------------------------------
+
void OApplicationDetailView::selectAll()
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->selectAll();
}
-// -----------------------------------------------------------------------------
+
void OApplicationDetailView::sortDown()
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->sortDown();
}
-// -----------------------------------------------------------------------------
+
void OApplicationDetailView::sortUp()
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->sortUp();
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationDetailView::isFilled() const
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->isFilled();
}
-// -----------------------------------------------------------------------------
+
ElementType OApplicationDetailView::getElementType() const
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->getElementType();
}
-// -----------------------------------------------------------------------------
+
void OApplicationDetailView::clearPages(sal_Bool _bTaskAlso)
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
@@ -821,81 +810,85 @@ void OApplicationDetailView::clearPages(sal_Bool _bTaskAlso)
getTasksWindow().Clear();
m_pControlHelper->clearPages();
}
-// -----------------------------------------------------------------------------
+
sal_Int32 OApplicationDetailView::getSelectionCount()
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->getSelectionCount();
}
-// -----------------------------------------------------------------------------
+
sal_Int32 OApplicationDetailView::getElementCount()
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->getElementCount();
}
-// -----------------------------------------------------------------------------
void OApplicationDetailView::getSelectionElementNames( ::std::vector< OUString>& _rNames ) const
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->getSelectionElementNames( _rNames );
}
-// -----------------------------------------------------------------------------
+
void OApplicationDetailView::describeCurrentSelectionForControl( const Control& _rControl, Sequence< NamedDatabaseObject >& _out_rSelectedObjects )
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->describeCurrentSelectionForControl( _rControl, _out_rSelectedObjects );
}
-// -----------------------------------------------------------------------------
+
void OApplicationDetailView::describeCurrentSelectionForType( const ElementType _eType, Sequence< NamedDatabaseObject >& _out_rSelectedObjects )
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->describeCurrentSelectionForType( _eType, _out_rSelectedObjects );
}
-// -----------------------------------------------------------------------------
+
void OApplicationDetailView::selectElements(const Sequence< OUString>& _aNames)
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->selectElements( _aNames );
}
-// -----------------------------------------------------------------------------
+
SvTreeListEntry* OApplicationDetailView::getEntry( const Point& _aPoint ) const
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->getEntry(_aPoint);
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationDetailView::isCutAllowed()
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->isCutAllowed();
}
+
sal_Bool OApplicationDetailView::isCopyAllowed()
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->isCopyAllowed();
}
+
sal_Bool OApplicationDetailView::isPasteAllowed() { DBG_CHKTHIS(OApplicationDetailView,NULL);return m_pControlHelper->isPasteAllowed(); }
+
void OApplicationDetailView::copy() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->copy(); }
+
void OApplicationDetailView::cut() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->cut(); }
+
void OApplicationDetailView::paste()
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->paste();
}
-// -----------------------------------------------------------------------------
+
SvTreeListEntry* OApplicationDetailView::elementAdded(ElementType _eType,const OUString& _rName, const Any& _rObject )
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->elementAdded(_eType,_rName, _rObject );
}
-// -----------------------------------------------------------------------------
+
void OApplicationDetailView::elementRemoved(ElementType _eType,const OUString& _rName )
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->elementRemoved(_eType,_rName );
}
-// -----------------------------------------------------------------------------
+
void OApplicationDetailView::elementReplaced(ElementType _eType
,const OUString& _rOldName
,const OUString& _rNewName )
@@ -903,31 +896,31 @@ void OApplicationDetailView::elementReplaced(ElementType _eType
DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->elementReplaced( _eType, _rOldName, _rNewName );
}
-// -----------------------------------------------------------------------------
+
PreviewMode OApplicationDetailView::getPreviewMode()
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->getPreviewMode();
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationDetailView::isPreviewEnabled()
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->isPreviewEnabled();
}
-// -----------------------------------------------------------------------------
+
void OApplicationDetailView::switchPreview(PreviewMode _eMode)
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->switchPreview(_eMode);
}
-// -----------------------------------------------------------------------------
+
void OApplicationDetailView::showPreview(const Reference< XContent >& _xContent)
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->showPreview(_xContent);
}
-// -----------------------------------------------------------------------------
+
void OApplicationDetailView::showPreview( const OUString& _sDataSourceName,
const OUString& _sName,
sal_Bool _bTable)
@@ -935,13 +928,13 @@ void OApplicationDetailView::showPreview( const OUString& _sDataSourceName,
DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->showPreview(_sDataSourceName,_sName,_bTable);
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationDetailView::isSortUp() const
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->isSortUp();
}
-// -----------------------------------------------------------------------------
+
Window* OApplicationDetailView::getTreeWindow() const
{
return m_pControlHelper->getCurrentView();
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 67c9b57e9f96..d8813dddecdc 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -141,7 +141,6 @@ namespace dbaui
void Clear();
void setHelpText(sal_uInt16 _nId);
};
- //==================================================================
class OApplicationDetailView : public OSplitterView
, public IClipboardTest
{
@@ -326,7 +325,6 @@ namespace dbaui
/// <TRUE/> if the preview is enabled
sal_Bool isPreviewEnabled();
-
/** switches to the given preview mode
@param _eMode
the mode to set for the preview
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 0dc9d966ea85..2cfccd12bcad 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -28,10 +28,8 @@
#include <memory>
using namespace ::dbaui;
-//==================================================================
// class OApplicationIconControl
DBG_NAME(OApplicationIconControl)
-//==================================================================
OApplicationIconControl::OApplicationIconControl(Window* _pParent)
: SvtIconChoiceCtrl(_pParent,WB_ICON | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /*!WB_NOSELECTION |*/
WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | WB_SMART_ARRANGE | WB_NOHSCROLL | WB_CENTER)
@@ -63,7 +61,7 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent)
SetChoiceWithCursor( sal_True );
SetSelectionMode(SINGLE_SELECTION);
}
-// -----------------------------------------------------------------------------
+
OApplicationIconControl::~OApplicationIconControl()
{
sal_uLong nCount = GetEntryCount();
@@ -79,7 +77,7 @@ OApplicationIconControl::~OApplicationIconControl()
DBG_DTOR(OApplicationIconControl,NULL);
}
-// -----------------------------------------------------------------------------
+
sal_Int8 OApplicationIconControl::AcceptDrop( const AcceptDropEvent& _rEvt )
{
sal_Int8 nDropOption = DND_ACTION_NONE;
@@ -97,7 +95,7 @@ sal_Int8 OApplicationIconControl::AcceptDrop( const AcceptDropEvent& _rEvt )
return nDropOption;
}
-// -----------------------------------------------------------------------------
+
sal_Int8 OApplicationIconControl::ExecuteDrop( const ExecuteDropEvent& _rEvt )
{
if ( m_pActionListener )
diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx
index 1c057f52c37a..1ca4b4dae1d7 100644
--- a/dbaccess/source/ui/app/AppIconControl.hxx
+++ b/dbaccess/source/ui/app/AppIconControl.hxx
@@ -22,11 +22,9 @@
#include <svtools/ivctrl.hxx>
#include <svtools/transfer.hxx>
-
namespace dbaui
{
class IControlActionListener;
- //==================================================================
class OApplicationIconControl :public SvtIconChoiceCtrl
,public DropTargetHelper
{
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 2eba13004c3b..97f6cc0259ba 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -36,10 +36,8 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
-//==================================================================
// class OApplicationSwapWindow
DBG_NAME(OApplicationSwapWindow)
-//==================================================================
OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWindow& _rBorderWindow )
:Window(_pParent,WB_DIALOGCONTROL )
,m_aIconControl(this)
@@ -55,13 +53,13 @@ OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWind
m_aIconControl.SetHelpId(HID_APP_SWAP_ICONCONTROL);
m_aIconControl.Show();
}
-// -----------------------------------------------------------------------------
+
OApplicationSwapWindow::~OApplicationSwapWindow()
{
DBG_DTOR(OApplicationSwapWindow,NULL);
}
-// -----------------------------------------------------------------------------
+
void OApplicationSwapWindow::Resize()
{
Size aFLSize = LogicToPixel( Size( 8, 0 ), MAP_APPFONT );
@@ -74,7 +72,7 @@ void OApplicationSwapWindow::Resize()
m_aIconControl.SetPosSizePixel( Point(static_cast<long>((aOutputSize.Width() - nX)*0.5), 0) ,Size(nX,aOutputSize.Height()));
m_aIconControl.ArrangeIcons();
}
-// -----------------------------------------------------------------------------
+
void OApplicationSwapWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -95,7 +93,7 @@ void OApplicationSwapWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForegro
if( bBackground )
SetBackground( rStyleSettings.GetFieldColor() );
}
-// -----------------------------------------------------------------------
+
void OApplicationSwapWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -109,7 +107,7 @@ void OApplicationSwapWindow::DataChanged( const DataChangedEvent& rDCEvt )
Invalidate();
}
}
-// -----------------------------------------------------------------------------
+
void OApplicationSwapWindow::clearSelection()
{
m_aIconControl.SetNoSelection();
@@ -120,13 +118,11 @@ void OApplicationSwapWindow::clearSelection()
m_aIconControl.GetClickHdl().Call(&m_aIconControl);
}
-// -----------------------------------------------------------------------------
void OApplicationSwapWindow::createIconAutoMnemonics( MnemonicGenerator& _rMnemonics )
{
m_aIconControl.CreateAutoMnemonics( _rMnemonics );
}
-// -----------------------------------------------------------------------------
bool OApplicationSwapWindow::interceptKeyInput( const KeyEvent& _rEvent )
{
const KeyCode& rKeyCode = _rEvent.GetKeyCode();
@@ -137,7 +133,6 @@ bool OApplicationSwapWindow::interceptKeyInput( const KeyEvent& _rEvent )
return false;
}
-// -----------------------------------------------------------------------------
ElementType OApplicationSwapWindow::getElementType() const
{
sal_uLong nPos = 0;
@@ -145,7 +140,6 @@ ElementType OApplicationSwapWindow::getElementType() const
return ( pEntry ) ? *static_cast<ElementType*>(pEntry->GetUserData()) : E_NONE;
}
-// -----------------------------------------------------------------------------
bool OApplicationSwapWindow::onContainerSelected( ElementType _eType )
{
if ( m_eLastType == _eType )
@@ -162,7 +156,6 @@ bool OApplicationSwapWindow::onContainerSelected( ElementType _eType )
return false;
}
-// -----------------------------------------------------------------------------
IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pControl)
{
sal_uLong nPos = 0;
@@ -176,13 +169,13 @@ IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pCo
return 1L;
}
-//------------------------------------------------------------------------------
+
IMPL_LINK_NOARG(OApplicationSwapWindow, ChangeToLastSelected)
{
selectContainer(m_eLastType);
return 0L;
}
-// -----------------------------------------------------------------------------
+
void OApplicationSwapWindow::selectContainer(ElementType _eType)
{
sal_uLong nCount = m_aIconControl.GetEntryCount();
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx
index e0a806677309..1e8dd8849eb8 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -27,7 +27,6 @@
namespace dbaui
{
class OAppBorderWindow;
- //==================================================================
class OApplicationSwapWindow : public Window,
public IClipboardTest
{
@@ -47,7 +46,6 @@ namespace dbaui
// window overloads
virtual void Resize();
-
inline sal_Bool isCutAllowed() { return sal_False; }
inline sal_Bool isCopyAllowed() { return sal_False; }
inline sal_Bool isPasteAllowed() { return sal_False; }
@@ -75,7 +73,6 @@ namespace dbaui
/// return the element of currently select entry
ElementType getElementType() const;
-
/** clears the selection in the icon choice control and calls the handler
*/
void clearSelection();
@@ -89,9 +86,7 @@ namespace dbaui
private:
bool onContainerSelected( ElementType _eType );
};
-// .............................................................
} // namespace dbaui
-// .............................................................
#endif // DBAUI_APPSWAPWINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index a75d6e5604dc..384ed8eaf067 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -45,7 +45,7 @@ OTitleWindow::OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,
for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i)
pWindows[i]->Show();
}
-// -----------------------------------------------------------------------------
+
OTitleWindow::~OTitleWindow()
{
if ( m_pChild )
@@ -57,13 +57,13 @@ OTitleWindow::~OTitleWindow()
DBG_DTOR(OTitleWindow,NULL);
}
-// -----------------------------------------------------------------------------
+
void OTitleWindow::setChildWindow(Window* _pChild)
{
m_pChild = _pChild;
}
+
#define SPACE_BORDER 1
-// -----------------------------------------------------------------------------
void OTitleWindow::Resize()
{
// parent window dimension
@@ -88,7 +88,7 @@ void OTitleWindow::Resize()
Size(nOutputWidth - ( m_bShift ? (2*nXOffset - 2*SPACE_BORDER) : sal_Int32(SPACE_BORDER) ), nOutputHeight - nHeight - 2*nXOffset - 2*SPACE_BORDER) );
}
}
-// -----------------------------------------------------------------------------
+
void OTitleWindow::setTitle(sal_uInt16 _nTitleId)
{
if ( _nTitleId != 0 )
@@ -96,14 +96,14 @@ void OTitleWindow::setTitle(sal_uInt16 _nTitleId)
m_aTitle.SetText(ModuleRes(_nTitleId));
}
}
-// -----------------------------------------------------------------------------
+
void OTitleWindow::GetFocus()
{
Window::GetFocus();
if ( m_pChild )
m_pChild->GrabFocus();
}
-// -----------------------------------------------------------------------------
+
long OTitleWindow::GetWidthPixel() const
{
Size aTextSize = LogicToPixel( Size( 12, 0 ), MAP_APPFONT );
@@ -111,7 +111,7 @@ long OTitleWindow::GetWidthPixel() const
return nWidth;
}
-// -----------------------------------------------------------------------
+
void OTitleWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -126,7 +126,7 @@ void OTitleWindow::DataChanged( const DataChangedEvent& rDCEvt )
Invalidate();
}
}
-//-----------------------------------------------------------------------------
+
void OTitleWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
{
AllSettings aAllSettings = GetSettings();
@@ -153,7 +153,6 @@ void OTitleWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B
if( bBackground )
SetBackground( rStyleSettings.GetFieldColor() );
-
Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle};
for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i)
{
@@ -164,8 +163,7 @@ void OTitleWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B
pWindows[i]->SetBackground( Wallpaper( aStyle.GetShadowColor() ) );
}
}
-// .............................................................
+
} // namespace dbaui
-// .............................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx
index f4c64310a2db..7213b27f0f5a 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.hxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.hxx
@@ -60,7 +60,6 @@ namespace dbaui
*/
void setTitle(sal_uInt16 _nTitleId);
-
/** Gets the min Width in Pixel which is needed to display the whole
@return
@@ -68,9 +67,7 @@ namespace dbaui
*/
long GetWidthPixel() const;
};
-// .............................................................
} // namespace dbaui
-// .............................................................
#endif // DBAUI_TITLE_WINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 871e29cf8662..f9dac6a931ab 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -57,10 +57,8 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::container;
using ::com::sun::star::sdb::application::NamedDatabaseObject;
-//==================================================================
// class OAppBorderWindow
DBG_NAME(OAppBorderWindow)
-//==================================================================
OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL)
,m_pPanel(NULL)
,m_pDetailView(NULL)
@@ -85,7 +83,7 @@ OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePrev
ImplInitSettings();
}
-// -----------------------------------------------------------------------------
+
OAppBorderWindow::~OAppBorderWindow()
{
// destroy children
@@ -108,13 +106,13 @@ OAppBorderWindow::~OAppBorderWindow()
DBG_DTOR(OAppBorderWindow,NULL);
}
-// -----------------------------------------------------------------------------
+
void OAppBorderWindow::GetFocus()
{
if ( m_pPanel )
m_pPanel->GrabFocus();
}
-// -----------------------------------------------------------------------------
+
void OAppBorderWindow::Resize()
{
// parent window dimension
@@ -139,7 +137,7 @@ void OAppBorderWindow::Resize()
if ( m_pDetailView )
m_pDetailView->SetPosSizePixel(Point(nX + aFLSize.Width(),0),Size(nOutputWidth - nX - aFLSize.Width(),nOutputHeight));
}
-// -----------------------------------------------------------------------------
+
void OAppBorderWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -154,7 +152,7 @@ void OAppBorderWindow::DataChanged( const DataChangedEvent& rDCEvt )
Invalidate();
}
}
-// -----------------------------------------------------------------------------
+
void OAppBorderWindow::ImplInitSettings()
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -175,29 +173,24 @@ void OAppBorderWindow::ImplInitSettings()
if( true )
SetBackground( rStyleSettings.GetDialogColor() );
}
-// -----------------------------------------------------------------------------
+
OApplicationView* OAppBorderWindow::getView() const
{
return m_pView;
}
-// -----------------------------------------------------------------------------
OApplicationSwapWindow* OAppBorderWindow::getPanel() const
{
return static_cast< OApplicationSwapWindow* >( m_pPanel->getChildWindow() );
}
-// -----------------------------------------------------------------------------
OApplicationDetailView* OAppBorderWindow::getDetailView() const
{
return m_pDetailView;
}
-//==================================================================
// class OApplicationView
-//==================================================================
DBG_NAME(OApplicationView);
-//------------------------------------------------------------------------------
OApplicationView::OApplicationView( Window* pParent
,const Reference< XComponentContext >& _rxOrb
,IApplicationController& _rAppController
@@ -224,7 +217,6 @@ OApplicationView::OApplicationView( Window* pParent
ImplInitSettings();
}
-//------------------------------------------------------------------------------
OApplicationView::~OApplicationView()
{
DBG_DTOR(OApplicationView,NULL);
@@ -238,21 +230,19 @@ OApplicationView::~OApplicationView()
m_pWin = NULL;
}
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::createIconAutoMnemonics( MnemonicGenerator& _rMnemonics )
{
if ( m_pWin && m_pWin->getPanel() )
m_pWin->getPanel()->createIconAutoMnemonics( _rMnemonics );
}
-// -----------------------------------------------------------------------------
void OApplicationView::setTaskExternalMnemonics( MnemonicGenerator& _rMnemonics )
{
if ( m_pWin && m_pWin->getDetailView() )
m_pWin->getDetailView()->setTaskExternalMnemonics( _rMnemonics );
}
-// -----------------------------------------------------------------------------
void OApplicationView::DataChanged( const DataChangedEvent& rDCEvt )
{
ODataView::DataChanged( rDCEvt );
@@ -267,7 +257,7 @@ void OApplicationView::DataChanged( const DataChangedEvent& rDCEvt )
Invalidate();
}
}
-//------------------------------------------------------------------------------
+
void OApplicationView::resizeDocumentView(Rectangle& _rPlayground)
{
if ( m_pWin && !_rPlayground.IsEmpty() )
@@ -283,7 +273,7 @@ void OApplicationView::resizeDocumentView(Rectangle& _rPlayground)
_rPlayground.SetPos( _rPlayground.BottomRight() );
_rPlayground.SetSize( Size( 0, 0 ) );
}
-//------------------------------------------------------------------------------
+
long OApplicationView::PreNotify( NotifyEvent& rNEvt )
{
switch(rNEvt.GetType())
@@ -313,7 +303,7 @@ long OApplicationView::PreNotify( NotifyEvent& rNEvt )
return ODataView::PreNotify(rNEvt);
}
-// -----------------------------------------------------------------------------
+
IClipboardTest* OApplicationView::getActiveChild() const
{
IClipboardTest* pTest = NULL;
@@ -321,148 +311,148 @@ IClipboardTest* OApplicationView::getActiveChild() const
pTest = getDetailView();
return pTest;
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationView::isCopyAllowed()
{
IClipboardTest* pTest = getActiveChild();
return pTest && pTest->isCopyAllowed();
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationView::isCutAllowed()
{
IClipboardTest* pTest = getActiveChild();
return pTest && pTest->isCutAllowed();
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationView::isPasteAllowed()
{
IClipboardTest* pTest = getActiveChild();
return pTest && pTest->isPasteAllowed();
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::copy()
{
IClipboardTest* pTest = getActiveChild();
if ( pTest )
pTest->copy();
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::cut()
{
IClipboardTest* pTest = getActiveChild();
if ( pTest )
pTest->cut();
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::paste()
{
IClipboardTest* pTest = getActiveChild();
if ( pTest )
pTest->paste();
}
-// -----------------------------------------------------------------------------
+
OUString OApplicationView::getQualifiedName( SvTreeListEntry* _pEntry ) const
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
return getDetailView()->getQualifiedName( _pEntry );
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationView::isLeaf(SvTreeListEntry* _pEntry) const
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
return getDetailView()->isLeaf(_pEntry);
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationView::isALeafSelected() const
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
return getDetailView()->isALeafSelected();
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::selectAll()
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
getDetailView()->selectAll();
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationView::isSortUp() const
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
return getDetailView()->isSortUp();
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::sortDown()
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
getDetailView()->sortDown();
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::sortUp()
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
getDetailView()->sortUp();
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationView::isFilled() const
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
return getDetailView()->isFilled();
}
-// -----------------------------------------------------------------------------
+
ElementType OApplicationView::getElementType() const
{
OSL_ENSURE(m_pWin && getDetailView() && getPanel(),"Detail view is NULL! -> GPF");
return getDetailView()->HasChildPathFocus() ? getDetailView()->getElementType() : getPanel()->getElementType();
}
-// -----------------------------------------------------------------------------
+
sal_Int32 OApplicationView::getSelectionCount()
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
return getDetailView()->getSelectionCount();
}
-// -----------------------------------------------------------------------------
+
sal_Int32 OApplicationView::getElementCount()
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
return getDetailView()->getElementCount();
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::getSelectionElementNames( ::std::vector< OUString>& _rNames ) const
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
getDetailView()->getSelectionElementNames( _rNames );
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::describeCurrentSelectionForControl( const Control& _rControl, Sequence< NamedDatabaseObject >& _out_rSelectedObjects )
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
getDetailView()->describeCurrentSelectionForControl( _rControl, _out_rSelectedObjects );
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::describeCurrentSelectionForType( const ElementType _eType, Sequence< NamedDatabaseObject >& _out_rSelectedObjects )
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
getDetailView()->describeCurrentSelectionForType( _eType, _out_rSelectedObjects );
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::selectElements(const Sequence< OUString>& _aNames)
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
getDetailView()->selectElements( _aNames );
}
-// -----------------------------------------------------------------------------
+
SvTreeListEntry* OApplicationView::elementAdded(ElementType eType,const OUString& _rName, const Any& _rObject )
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
return getDetailView()->elementAdded(eType,_rName,_rObject);
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::elementRemoved(ElementType eType,const OUString& _rName )
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
getDetailView()->elementRemoved(eType,_rName);
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::elementReplaced(ElementType _eType
,const OUString& _rOldName
,const OUString& _rNewName )
@@ -470,45 +460,45 @@ void OApplicationView::elementReplaced(ElementType _eType
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
getDetailView()->elementReplaced(_eType, _rOldName, _rNewName );
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::clearPages(sal_Bool _bTaskAlso)
{
OSL_ENSURE(m_pWin && getDetailView() && getPanel(),"Detail view is NULL! -> GPF");
getPanel()->clearSelection();
getDetailView()->clearPages(_bTaskAlso);
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::selectContainer(ElementType _eType)
{
OSL_ENSURE(m_pWin && getPanel(),"Detail view is NULL! -> GPF");
WaitObject aWO(this);
getPanel()->selectContainer(_eType);
}
-// -----------------------------------------------------------------------------
+
SvTreeListEntry* OApplicationView::getEntry( const Point& _aPosPixel ) const
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
return getDetailView()->getEntry(_aPosPixel);
}
-// -----------------------------------------------------------------------------
+
PreviewMode OApplicationView::getPreviewMode()
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
return getDetailView()->getPreviewMode();
}
-// -----------------------------------------------------------------------------
+
sal_Bool OApplicationView::isPreviewEnabled()
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
return getDetailView()->isPreviewEnabled();
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::switchPreview(PreviewMode _eMode)
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
getDetailView()->switchPreview(_eMode);
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::showPreview(const Reference< XContent >& _xContent)
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
@@ -516,7 +506,7 @@ void OApplicationView::showPreview(const Reference< XContent >& _xContent)
m_xObject = NULL;
getDetailView()->showPreview(_xContent);
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::showPreview( const OUString& _sDataSourceName,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
const OUString& _sName,
@@ -554,7 +544,7 @@ void OApplicationView::showPreview( const OUString& _sDataSourceName,
getDetailView()->showPreview(_sDataSourceName,_sName,_bTable);
}
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::GetFocus()
{
if ( m_eChildFocus == NONE && m_pWin )
@@ -562,13 +552,13 @@ void OApplicationView::GetFocus()
m_pWin->GrabFocus();
}
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::_disposing( const ::com::sun::star::lang::EventObject& /*_rSource*/ )
{
if ( m_pWin && getDetailView() )
showPreview(NULL);
}
-// -----------------------------------------------------------------------------
+
void OApplicationView::ImplInitSettings()
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -589,6 +579,5 @@ void OApplicationView::ImplInitSettings()
if( true )
SetBackground( rStyleSettings.GetFieldColor() );
}
-//-----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx
index 7c50466b5b33..3f0da9dc6a38 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.hxx
@@ -42,7 +42,6 @@ namespace dbaui
class OApplicationDetailView;
class OApplicationSwapWindow;
class OTitleWindow;
- //==================================================================
class OAppBorderWindow : public Window
{
OTitleWindow* m_pPanel;
@@ -66,7 +65,6 @@ namespace dbaui
OApplicationDetailView* getDetailView() const;
};
- //==================================================================
class OApplicationView : public ODataView
,public IClipboardTest
,public ::utl::OEventListenerAdapter
@@ -90,7 +88,6 @@ namespace dbaui
void ImplInitSettings();
protected:
-
// return the Rectangle where I can paint myself
virtual void resizeDocumentView(Rectangle& rRect);
@@ -255,7 +252,6 @@ namespace dbaui
void elementRemoved(ElementType _eType
,const OUString& _rName );
-
/** changes the container which should be displayed. The select handler will also be called.
@param _eType
Which container to show.
diff --git a/dbaccess/source/ui/app/IApplicationController.hxx b/dbaccess/source/ui/app/IApplicationController.hxx
index fbcc6583ea98..8789b7437dac 100644
--- a/dbaccess/source/ui/app/IApplicationController.hxx
+++ b/dbaccess/source/ui/app/IApplicationController.hxx
@@ -26,10 +26,8 @@
class SvTreeListBox;
-//........................................................................
namespace dbaui
{
-//........................................................................
class SAL_NO_VTABLE IApplicationController :public IController
,public IControlActionListener
@@ -85,9 +83,7 @@ namespace dbaui
~IApplicationController() {}
};
-//........................................................................
} // namespace dbaui
-//........................................................................
#endif // DBA30D_IAPPLICATIONCONTROLLER_HXX
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx
index 727da5ad59ab..1dcbe7cdefb0 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.cxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.cxx
@@ -38,10 +38,8 @@
#include <algorithm>
#include <functional>
-//......................................................................................................................
namespace dbaui
{
-//......................................................................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -70,12 +68,9 @@ namespace dbaui
using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::beans::PropertyChangeEvent;
- //==================================================================================================================
- //= helper structs
- //==================================================================================================================
+ // helper structs
namespace
{
- //..............................................................................................................
struct SubComponentDescriptor
{
/// the name of the sub component, empty if it is yet unsaved
@@ -164,7 +159,6 @@ namespace dbaui
}
};
- //..............................................................................................................
struct SelectSubComponent : public ::std::unary_function< SubComponentDescriptor, Reference< XComponent > >
{
Reference< XComponent > operator()( const SubComponentDescriptor &_desc ) const
@@ -176,10 +170,8 @@ namespace dbaui
}
};
- //..............................................................................................................
typedef ::std::vector< SubComponentDescriptor > SubComponents;
- //..............................................................................................................
struct SubComponentMatch : public ::std::unary_function< SubComponentDescriptor, bool >
{
public:
@@ -204,9 +196,7 @@ namespace dbaui
};
}
- //==================================================================================================================
- //= SubComponentManager_Data
- //==================================================================================================================
+ // SubComponentManager_Data
struct SubComponentManager_Data
{
SubComponentManager_Data( OApplicationController& _rController, const ::comphelper::SharedMutex& _rMutex )
@@ -222,31 +212,24 @@ namespace dbaui
::osl::Mutex& getMutex() const { return m_aMutex; }
};
- //==================================================================================================================
- //= SubComponentManager
- //==================================================================================================================
- //------------------------------------------------------------------------------------------------------------------
+ // SubComponentManager
SubComponentManager::SubComponentManager( OApplicationController& _rController, const ::comphelper::SharedMutex& _rMutex )
:m_pData( new SubComponentManager_Data( _rController, _rMutex ) )
{
}
- //------------------------------------------------------------------------------------------------------------------
SubComponentManager::~SubComponentManager()
{
}
- //------------------------------------------------------------------------------------------------------------------
void SubComponentManager::disposing()
{
::osl::MutexGuard aGuard( m_pData->getMutex() );
m_pData->m_aComponents.clear();
}
- //------------------------------------------------------------------------------------------------------------------
namespace
{
- //..............................................................................................................
bool lcl_fallbackToAnotherController( SubComponentDescriptor& _rCompDesc )
{
Reference< XController > xFallback;
@@ -284,7 +267,6 @@ namespace dbaui
return false;
}
- //..............................................................................................................
bool lcl_closeComponent( const Reference< XCommandProcessor >& _rxCommandProcessor )
{
bool bSuccess = false;
@@ -304,7 +286,6 @@ namespace dbaui
return bSuccess;
}
- //..............................................................................................................
bool lcl_closeComponent( const SubComponentDescriptor& _rComponent )
{
if ( _rComponent.xComponentCommandProcessor.is() )
@@ -332,7 +313,6 @@ namespace dbaui
return bSuccess;
}
- //..............................................................................................................
void lcl_notifySubComponentEvent( const SubComponentManager_Data& _rData, const sal_Char* _pAsciiEventName,
const SubComponentDescriptor& _rComponent )
{
@@ -352,7 +332,6 @@ namespace dbaui
}
}
- //------------------------------------------------------------------------------------------------------------------
void SAL_CALL SubComponentManager::propertyChange( const PropertyChangeEvent& i_rEvent ) throw (RuntimeException)
{
if ( i_rEvent.PropertyName != PROPERTY_NAME )
@@ -383,7 +362,6 @@ namespace dbaui
}
}
- //------------------------------------------------------------------------------------------------------------------
void SAL_CALL SubComponentManager::disposing( const EventObject& _rSource ) throw (RuntimeException)
{
::osl::ClearableMutexGuard aGuard( m_pData->getMutex() );
@@ -432,7 +410,6 @@ namespace dbaui
}
}
- //------------------------------------------------------------------------------------------------------------------
Sequence< Reference< XComponent> > SubComponentManager::getSubComponents() const
{
::osl::MutexGuard aGuard( m_pData->getMutex() );
@@ -447,7 +424,6 @@ namespace dbaui
return aComponents;
}
- //------------------------------------------------------------------------------------------------------------------
sal_Bool SubComponentManager::closeSubComponents()
{
SolarMutexGuard aSolarGuard;
@@ -472,14 +448,12 @@ namespace dbaui
return empty();
}
- //------------------------------------------------------------------------------------------------------------------
bool SubComponentManager::empty() const
{
::osl::MutexGuard aGuard( m_pData->getMutex() );
return m_pData->m_aComponents.empty();
}
- //------------------------------------------------------------------------------------------------------------------
void SubComponentManager::onSubComponentOpened( const OUString& _rName, const sal_Int32 _nComponentType,
const ElementOpenMode _eOpenMode, const Reference< XComponent >& _rxComponent )
{
@@ -515,7 +489,6 @@ namespace dbaui
lcl_notifySubComponentEvent( *m_pData, "OnSubComponentOpened", aElement );
}
- //------------------------------------------------------------------------------------------------------------------
bool SubComponentManager::activateSubFrame( const OUString& _rName, const sal_Int32 _nComponentType,
const ElementOpenMode _eOpenMode, Reference< XComponent >& o_rComponent ) const
{
@@ -544,7 +517,6 @@ namespace dbaui
return true;
}
- //------------------------------------------------------------------------------------------------------------------
bool SubComponentManager::closeSubFrames( const OUString& i_rName, const sal_Int32 _nComponentType )
{
::osl::MutexGuard aGuard( m_pData->getMutex() );
@@ -566,7 +538,6 @@ namespace dbaui
return true;
}
- //------------------------------------------------------------------------------------------------------------------
bool SubComponentManager::lookupSubComponent( const Reference< XComponent >& i_rComponent,
OUString& o_rName, sal_Int32& o_rComponentType )
{
@@ -594,8 +565,6 @@ namespace dbaui
return false;
}
-//......................................................................................................................
} // namespace dbaui
-//......................................................................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx
index 15a3def5f7ac..f7c3df9a77b4 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.hxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.hxx
@@ -30,17 +30,13 @@
#include <memory>
-//........................................................................
namespace dbaui
{
-//........................................................................
struct SubComponentManager_Data;
class OApplicationController;
- //====================================================================
- //= SubComponentManager
- //====================================================================
+ // SubComponentManager
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::beans::XPropertyChangeListener
> SubComponentManager_Base;
class SubComponentManager : public SubComponentManager_Base
@@ -120,9 +116,7 @@ namespace dbaui
::std::auto_ptr< SubComponentManager_Data > m_pData;
};
-//........................................................................
} // namespace dbaui
-//........................................................................
#endif // DBACCESS_SUBCOMPONENTMANAGER_HXX
diff --git a/dbaccess/source/ui/browser/AsyncronousLink.cxx b/dbaccess/source/ui/browser/AsyncronousLink.cxx
index a2c89691458f..68b554eda569 100644
--- a/dbaccess/source/ui/browser/AsyncronousLink.cxx
+++ b/dbaccess/source/ui/browser/AsyncronousLink.cxx
@@ -21,12 +21,9 @@
#include <vcl/svapp.hxx>
#include <tools/debug.hxx>
-//==================================================================
-//= OAsyncronousLink
-//==================================================================
+// OAsyncronousLink
using namespace dbaui;
DBG_NAME(OAsyncronousLink)
-//------------------------------------------------------------------
OAsyncronousLink::OAsyncronousLink( const Link& _rHandler )
:m_aHandler(_rHandler)
,m_aEventSafety()
@@ -36,7 +33,6 @@ OAsyncronousLink::OAsyncronousLink( const Link& _rHandler )
DBG_CTOR(OAsyncronousLink,NULL);
}
-//------------------------------------------------------------------
OAsyncronousLink::~OAsyncronousLink()
{
{
@@ -56,8 +52,6 @@ OAsyncronousLink::~OAsyncronousLink()
DBG_DTOR(OAsyncronousLink,NULL);
}
-
-//------------------------------------------------------------------
void OAsyncronousLink::Call( void* _pArgument )
{
::osl::MutexGuard aEventGuard( m_aEventSafety );
@@ -66,7 +60,6 @@ void OAsyncronousLink::Call( void* _pArgument )
m_nEventId = Application::PostUserEvent( LINK( this, OAsyncronousLink, OnAsyncCall ), _pArgument );
}
-//------------------------------------------------------------------
void OAsyncronousLink::CancelCall()
{
::osl::MutexGuard aEventGuard( m_aEventSafety );
@@ -75,7 +68,6 @@ void OAsyncronousLink::CancelCall()
m_nEventId = 0;
}
-//------------------------------------------------------------------
IMPL_LINK(OAsyncronousLink, OnAsyncCall, void*, _pArg)
{
{
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 74112417c478..249d0d1ae14d 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -122,14 +122,10 @@ using namespace ::svt;
#define DO_SAFE( action, message ) try { action; } catch(Exception&) { SAL_WARN("dbaccess.ui",message); } ;
-//..................................................................
namespace dbaui
{
-//..................................................................
-//==================================================================
// OParameterContinuation
-//==================================================================
class OParameterContinuation : public OInteraction< XInteractionSupplyParameters >
{
Sequence< PropertyValue > m_aValues;
@@ -143,14 +139,11 @@ public:
virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException);
};
-//------------------------------------------------------------------
void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException)
{
m_aValues = _rValues;
}
-
-//==============================================================================
// a helper class implementing a runtime::XFormController, will be aggregated by SbaXDataBrowserController
// (we can't derive from XFormController as it's base class is XTabController and the XTabController::getModel collides
// with the XController::getModel implemented in our base class SbaXDataBrowserController)
@@ -247,9 +240,7 @@ protected:
~FormControllerImpl();
};
-
DBG_NAME(FormControllerImpl)
-//------------------------------------------------------------------
SbaXDataBrowserController::FormControllerImpl::FormControllerImpl(SbaXDataBrowserController* _pOwner)
:m_aActivateListeners(_pOwner->getMutex())
,m_pOwner(_pOwner)
@@ -259,221 +250,186 @@ SbaXDataBrowserController::FormControllerImpl::FormControllerImpl(SbaXDataBrowse
OSL_ENSURE(m_pOwner, "SbaXDataBrowserController::FormControllerImpl::FormControllerImpl : invalid Owner !");
}
-//------------------------------------------------------------------
SbaXDataBrowserController::FormControllerImpl::~FormControllerImpl()
{
DBG_DTOR(FormControllerImpl,NULL);
}
-//------------------------------------------------------------------
Reference< runtime::XFormOperations > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getFormOperations() throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::getFormOperations: not supported!" );
return NULL;
}
-//------------------------------------------------------------------
Reference< ::com::sun::star::awt::XControl > SbaXDataBrowserController::FormControllerImpl::getCurrentControl(void) throw( RuntimeException )
{
return m_pOwner->getBrowserView() ? m_pOwner->getBrowserView()->getGridControl() : Reference< ::com::sun::star::awt::XControl > ();
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addActivateListener(const Reference< ::com::sun::star::form::XFormControllerListener > & l) throw( RuntimeException )
{
m_aActivateListeners.addInterface(l);
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeActivateListener(const Reference< ::com::sun::star::form::XFormControllerListener > & l) throw( RuntimeException )
{
m_aActivateListeners.removeInterface(l);
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addChildController( const Reference< runtime::XFormController >& /*_ChildController*/ ) throw( RuntimeException, IllegalArgumentException )
{
// not supported
throw IllegalArgumentException( OUString(), *this, 1 );
}
-//------------------------------------------------------------------
Reference< runtime::XFormControllerContext > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getContext() throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::getContext: no support!!" );
return NULL;
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContext( const Reference< runtime::XFormControllerContext >& /*_context*/ ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::setContext: no support!!" );
}
-//------------------------------------------------------------------
Reference< XInteractionHandler > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getInteractionHandler() throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::getInteractionHandler: no support!!" );
return NULL;
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setInteractionHandler( const Reference< XInteractionHandler >& /*_interactionHandler*/ ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::setInteractionHandler: no support!!" );
}
-//------------------------------------------------------------------
Reference< XInterface > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getParent( ) throw (RuntimeException)
{
// don't have any parent form controllers
return NULL;
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setParent( const Reference< XInterface >& /*Parent*/ ) throw (NoSupportException, RuntimeException)
{
throw NoSupportException( OUString(), *this );
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::dispose( ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::dispose: no, you do *not* want to do this!" );
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addEventListener( const Reference< XEventListener >& /*xListener*/ ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addEventListener: no support!!" );
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeEventListener( const Reference< XEventListener >& /*aListener*/ ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeEventListener: no support!!" );
}
-//------------------------------------------------------------------
::sal_Int32 SAL_CALL SbaXDataBrowserController::FormControllerImpl::getCount( ) throw (RuntimeException)
{
// no sub controllers, never
return 0;
}
-//------------------------------------------------------------------
Any SAL_CALL SbaXDataBrowserController::FormControllerImpl::getByIndex( ::sal_Int32 /*Index*/ ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
{
// no sub controllers, never
throw IndexOutOfBoundsException( OUString(), *this );
}
-//------------------------------------------------------------------
Type SAL_CALL SbaXDataBrowserController::FormControllerImpl::getElementType( ) throw (RuntimeException)
{
return ::cppu::UnoType< runtime::XFormController >::get();
}
-//------------------------------------------------------------------
::sal_Bool SAL_CALL SbaXDataBrowserController::FormControllerImpl::hasElements( ) throw (RuntimeException)
{
// no sub controllers, never
return false;
}
-//------------------------------------------------------------------
Reference< XEnumeration > SAL_CALL SbaXDataBrowserController::FormControllerImpl::createEnumeration( ) throw (RuntimeException)
{
return new ::comphelper::OEnumerationByIndex( this );
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addModifyListener( const Reference< XModifyListener >& /*_Listener*/ ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addModifyListener: no support!" );
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeModifyListener( const Reference< XModifyListener >& /*_Listener*/ ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeModifyListener: no support!" );
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addConfirmDeleteListener( const Reference< XConfirmDeleteListener >& /*_Listener*/ ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addConfirmDeleteListener: no support!" );
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeConfirmDeleteListener( const Reference< XConfirmDeleteListener >& /*_Listener*/ ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeConfirmDeleteListener: no support!" );
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addSQLErrorListener( const Reference< XSQLErrorListener >& /*_Listener*/ ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addSQLErrorListener: no support!" );
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeSQLErrorListener( const Reference< XSQLErrorListener >& /*_Listener*/ ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeSQLErrorListener: no support!" );
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addRowSetApproveListener( const Reference< XRowSetApproveListener >& /*_Listener*/ ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addRowSetApproveListener: no support!" );
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeRowSetApproveListener( const Reference< XRowSetApproveListener >& /*_Listener*/ ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeRowSetApproveListener: no support!" );
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addDatabaseParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addDatabaseParameterListener: no support!" );
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeDatabaseParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeDatabaseParameterListener: no support!" );
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addParameterListener: no support!" );
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException)
{
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeParameterListener: no support!" );
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setMode( const OUString& _rMode ) throw (NoSupportException, RuntimeException)
{
if ( !supportsMode( _rMode ) )
throw NoSupportException();
}
-//------------------------------------------------------------------
OUString SAL_CALL SbaXDataBrowserController::FormControllerImpl::getMode( ) throw (RuntimeException)
{
return OUString( "DataMode" );
}
-//------------------------------------------------------------------
Sequence< OUString > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getSupportedModes( ) throw (RuntimeException)
{
Sequence< OUString > aModes(1);
@@ -481,31 +437,26 @@ Sequence< OUString > SAL_CALL SbaXDataBrowserController::FormControllerImpl::get
return aModes;
}
-//------------------------------------------------------------------
::sal_Bool SAL_CALL SbaXDataBrowserController::FormControllerImpl::supportsMode( const OUString& aMode ) throw (RuntimeException)
{
return aMode.compareToAscii( "DataMode" ) == 0;
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setModel(const Reference< ::com::sun::star::awt::XTabControllerModel > & /*Model*/) throw( RuntimeException )
{
SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::setModel : invalid call, can't change my model !");
}
-//------------------------------------------------------------------
Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getModel(void) throw( RuntimeException )
{
return Reference< XTabControllerModel >(m_pOwner->getRowSet(), UNO_QUERY);
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContainer(const Reference< ::com::sun::star::awt::XControlContainer > & /*_Container*/) throw( RuntimeException )
{
SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::setContainer : invalid call, can't change my container !");
}
-//------------------------------------------------------------------
Reference< ::com::sun::star::awt::XControlContainer > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getContainer(void) throw( RuntimeException )
{
if (m_pOwner->getBrowserView())
@@ -513,7 +464,6 @@ Reference< ::com::sun::star::awt::XControlContainer > SAL_CALL SbaXDataBrowserC
return Reference< ::com::sun::star::awt::XControlContainer > ();
}
-//------------------------------------------------------------------
Sequence< Reference< ::com::sun::star::awt::XControl > > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getControls(void) throw( RuntimeException )
{
if (m_pOwner->getBrowserView())
@@ -524,48 +474,39 @@ Sequence< Reference< ::com::sun::star::awt::XControl > > SAL_CALL SbaXDataBrowse
return Sequence< Reference< ::com::sun::star::awt::XControl > >();
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::autoTabOrder(void) throw( RuntimeException )
{
SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::autoTabOrder : nothing to do (always have only one control) !");
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateTabOrder(void) throw( RuntimeException )
{
SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::activateTabOrder : nothing to do (always have only one control) !");
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateFirst(void) throw( RuntimeException )
{
if (m_pOwner->getBrowserView())
m_pOwner->getBrowserView()->getVclControl()->ActivateCell();
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateLast(void) throw( RuntimeException )
{
if (m_pOwner->getBrowserView())
m_pOwner->getBrowserView()->getVclControl()->ActivateCell();
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::frameAction(const ::com::sun::star::frame::FrameActionEvent& /*aEvent*/) throw( RuntimeException )
{
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::FormControllerImpl::disposing(const ::com::sun::star::lang::EventObject& /*Source*/) throw( RuntimeException )
{
// nothing to do
// we don't add ourself as listener to any broadcasters, so we are not resposible for removing us
}
-//==================================================================
-//= SbaXDataBrowserController
-//==================================================================
-//------------------------------------------------------------------
+// SbaXDataBrowserController
Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes( ) throw (RuntimeException)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::getTypes" );
@@ -575,7 +516,6 @@ Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes( ) throw (Runtime
);
}
-//------------------------------------------------------------------
Sequence< sal_Int8 > SAL_CALL SbaXDataBrowserController::getImplementationId( ) throw (RuntimeException)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::getImplementationId" );
@@ -592,7 +532,6 @@ Sequence< sal_Int8 > SAL_CALL SbaXDataBrowserController::getImplementationId( )
return pId->getImplementationId();
}
-//------------------------------------------------------------------
Any SAL_CALL SbaXDataBrowserController::queryInterface(const Type& _rType) throw (RuntimeException)
{
// check for our additional interfaces
@@ -607,7 +546,6 @@ Any SAL_CALL SbaXDataBrowserController::queryInterface(const Type& _rType) throw
}
DBG_NAME(SbaXDataBrowserController)
-//------------------------------------------------------------------------------
SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun::star::uno::XComponentContext >& _rM)
:SbaXDataBrowserController_Base(_rM)
,m_nRowSetPrivileges(0)
@@ -638,7 +576,6 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun
m_aInvalidateClipboard.SetTimeout(300);
}
-//------------------------------------------------------------------------------
SbaXDataBrowserController::~SbaXDataBrowserController()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::~SbaXDataBrowserController" );
@@ -653,7 +590,6 @@ SbaXDataBrowserController::~SbaXDataBrowserController()
DBG_DTOR(SbaXDataBrowserController,NULL);
}
-// -----------------------------------------------------------------------
void SbaXDataBrowserController::startFrameListening( const Reference< XFrame >& _rxFrame )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::startFrameListening" );
@@ -667,7 +603,6 @@ void SbaXDataBrowserController::startFrameListening( const Reference< XFrame >&
_rxFrame->addFrameActionListener( xAggListener );
}
-// -----------------------------------------------------------------------
void SbaXDataBrowserController::stopFrameListening( const Reference< XFrame >& _rxFrame )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::stopFrameListening" );
@@ -681,7 +616,6 @@ void SbaXDataBrowserController::stopFrameListening( const Reference< XFrame >& _
_rxFrame->removeFrameActionListener( xAggListener );
}
-// -----------------------------------------------------------------------------
void SbaXDataBrowserController::onStartLoading( const Reference< XLoadable >& _rxLoadable )
{
m_bLoadCanceled = sal_False;
@@ -692,7 +626,6 @@ void SbaXDataBrowserController::onStartLoading( const Reference< XLoadable >& _r
xWarnings->clearWarnings();
}
-// -----------------------------------------------------------------------------
void SbaXDataBrowserController::impl_checkForCannotSelectUnfiltered( const SQLExceptionInfo& _rError )
{
::connectivity::SQLError aError( getORB() );
@@ -704,7 +637,6 @@ void SbaXDataBrowserController::impl_checkForCannotSelectUnfiltered( const SQLEx
}
}
-// -----------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::reloadForm( const Reference< XLoadable >& _rxLoadable )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::reloadForm" );
@@ -765,11 +697,9 @@ sal_Bool SbaXDataBrowserController::reloadForm( const Reference< XLoadable >& _r
return _rxLoadable->isLoaded();
}
-// -----------------------------------------------------------------------------
void SbaXDataBrowserController::initFormatter()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::initFormatter" );
- // ---------------------------------------------------------------
// create a formatter working with the connections format supplier
Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier(::dbtools::getNumberFormats(::dbtools::getConnection(m_xRowSet), sal_True, getORB()));
@@ -783,7 +713,7 @@ void SbaXDataBrowserController::initFormatter()
else // clear the formatter
m_xFormatter = NULL;
}
-// -----------------------------------------------------------------------------
+
void SbaXDataBrowserController::describeSupportedFeatures()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::describeSupportedFeatures" );
@@ -807,11 +737,10 @@ void SbaXDataBrowserController::describeSupportedFeatures()
implDescribeSupportedFeature( ".uno:FormSlots/deleteRecord", SID_FM_DELETEROWS, CommandGroup::EDIT );
implDescribeSupportedFeature( ".uno:FormSlots/insertRecord", ID_BROWSER_INSERT_ROW, CommandGroup::INSERT );
}
-//------------------------------------------------------------------------------
+
sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::Construct" );
- // ---------------------------------------------
// create/initialize the form and the grid model
m_xRowSet = CreateForm();
if (!m_xRowSet.is())
@@ -830,7 +759,6 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
// set the formatter if available
initFormatter();
- // ---------------------------------------------------------------
// we want to have a grid with a "flat" border
Reference< XPropertySet > xGridSet(m_xGridModel, UNO_QUERY);
@@ -845,7 +773,6 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
xNameCont->insertByName(OUString(sText), makeAny(m_xGridModel));
}
- // ---------------
// create the view
setView( * new UnoDataBrowserView( pParent, *this, getORB() ) );
if (!getBrowserView())
@@ -890,7 +817,6 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
OSL_ENSURE(pVclGrid, "SbaXDataBrowserController::Construct : have no VCL control !");
pVclGrid->SetMasterListener(this);
- // --------------------------
// add listeners ...
// ... to the form model
@@ -920,31 +846,28 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
addModelListeners(getControlModel());
addControlListeners(getBrowserView()->getGridControl());
- // -------------
// load the form
return LoadForm();
}
-//------------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::LoadForm()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::LoadForm" );
reloadForm( m_xLoadable );
return sal_True;
}
-//------------------------------------------------------------------------------
+
void SbaXDataBrowserController::AddColumnListener(const Reference< XPropertySet > & /*xCol*/)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::AddColumnListener" );
// we're not interested in any column properties ...
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::RemoveColumnListener(const Reference< XPropertySet > & /*xCol*/)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::RemoveColumnListener" );
}
-//------------------------------------------------------------------------------
+
Reference< XRowSet > SbaXDataBrowserController::CreateForm()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CreateForm" );
@@ -953,7 +876,6 @@ Reference< XRowSet > SbaXDataBrowserController::CreateForm()
UNO_QUERY);
}
-//------------------------------------------------------------------------------
Reference< ::com::sun::star::form::XFormComponent > SbaXDataBrowserController::CreateGridModel()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CreateGridModel" );
@@ -962,7 +884,6 @@ Reference< ::com::sun::star::form::XFormComponent > SbaXDataBrowserController::
UNO_QUERY);
}
-// -------------------------------------------------------------------------
void SbaXDataBrowserController::addModelListeners(const Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::addModelListeners" );
@@ -979,7 +900,6 @@ void SbaXDataBrowserController::addModelListeners(const Reference< ::com::sun::s
xReset->addResetListener((::com::sun::star::form::XResetListener*)this);
}
-// -------------------------------------------------------------------------
void SbaXDataBrowserController::removeModelListeners(const Reference< XControlModel > & _xGridControlModel)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::removeModelListeners" );
@@ -1004,7 +924,6 @@ void SbaXDataBrowserController::removeModelListeners(const Reference< XControlMo
xReset->removeResetListener( this );
}
-// -------------------------------------------------------------------------
void SbaXDataBrowserController::addControlListeners(const Reference< ::com::sun::star::awt::XControl > & _xGridControl)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::addControlListeners" );
@@ -1024,7 +943,6 @@ void SbaXDataBrowserController::addControlListeners(const Reference< ::com::sun:
xWindow->addFocusListener(this);
}
-// -------------------------------------------------------------------------
void SbaXDataBrowserController::removeControlListeners(const Reference< ::com::sun::star::awt::XControl > & _xGridControl)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::removeControlListeners" );
@@ -1041,7 +959,6 @@ void SbaXDataBrowserController::removeControlListeners(const Reference< ::com::s
xWindow->removeFocusListener(this);
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::focusGained(const FocusEvent& /*e*/) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::focusGained" );
@@ -1052,7 +969,6 @@ void SAL_CALL SbaXDataBrowserController::focusGained(const FocusEvent& /*e*/) th
static_cast<XFormControllerListener*>(aIter.next())->formActivated(aEvt);
}
-//------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::focusLost(const FocusEvent& e) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::focusLost" );
@@ -1087,21 +1003,18 @@ void SAL_CALL SbaXDataBrowserController::focusLost(const FocusEvent& e) throw( R
SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::focusLost : why is my control not commitable ?");
}
-// -------------------------------------------------------------------------
void SbaXDataBrowserController::disposingGridControl(const ::com::sun::star::lang::EventObject& /*Source*/)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposingGridControl" );
removeControlListeners(getBrowserView()->getGridControl());
}
-// -------------------------------------------------------------------------
void SbaXDataBrowserController::disposingGridModel(const ::com::sun::star::lang::EventObject& /*Source*/)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposingGridModel" );
removeModelListeners(getControlModel());
}
-// -------------------------------------------------------------------------
void SbaXDataBrowserController::disposingFormModel(const ::com::sun::star::lang::EventObject& Source)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposingFormModel" );
@@ -1130,14 +1043,12 @@ void SbaXDataBrowserController::disposingFormModel(const ::com::sun::star::lang:
xFormParameter->removeParameterListener((::com::sun::star::form::XDatabaseParameterListener*)this);
}
-// -------------------------------------------------------------------------
void SbaXDataBrowserController::disposingColumnModel(const ::com::sun::star::lang::EventObject& Source)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposingColumnModel" );
RemoveColumnListener(Reference< XPropertySet > (Source.Source, UNO_QUERY));
}
-// -------------------------------------------------------------------------
void SbaXDataBrowserController::disposing(const EventObject& Source) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposing" );
@@ -1178,7 +1089,6 @@ void SbaXDataBrowserController::disposing(const EventObject& Source) throw( Runt
SbaXDataBrowserController_Base::OGenericUnoController::disposing( Source );
}
-// -----------------------------------------------------------------------
void SAL_CALL SbaXDataBrowserController::setIdentifier( const OUString& _Identifier ) throw (RuntimeException)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::setIdentifier" );
@@ -1186,7 +1096,6 @@ void SAL_CALL SbaXDataBrowserController::setIdentifier( const OUString& _Identif
m_sModuleIdentifier = _Identifier;
}
-// -----------------------------------------------------------------------
OUString SAL_CALL SbaXDataBrowserController::getIdentifier( ) throw (RuntimeException)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::getIdentifier" );
@@ -1194,7 +1103,6 @@ OUString SAL_CALL SbaXDataBrowserController::getIdentifier( ) throw (RuntimeExc
return m_sModuleIdentifier;
}
-// -----------------------------------------------------------------------
void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) throw ( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::propertyChange" );
@@ -1222,7 +1130,6 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t
InvalidateAll();
}
-
if (evt.PropertyName.equals(PROPERTY_FILTER))
{
InvalidateFeature(ID_BROWSER_REMOVEFILTER);
@@ -1247,14 +1154,12 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t
}
}
-//------------------------------------------------------------------------
void SbaXDataBrowserController::modified(const ::com::sun::star::lang::EventObject& /*aEvent*/) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::modified" );
setCurrentModified( sal_True );
}
-// -----------------------------------------------------------------------
void SbaXDataBrowserController::elementInserted(const ::com::sun::star::container::ContainerEvent& evt) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::elementInserted" );
@@ -1265,7 +1170,6 @@ void SbaXDataBrowserController::elementInserted(const ::com::sun::star::containe
AddColumnListener(xNewColumn);
}
-// -----------------------------------------------------------------------
void SbaXDataBrowserController::elementRemoved(const ::com::sun::star::container::ContainerEvent& evt) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::elementRemoved" );
@@ -1276,7 +1180,6 @@ void SbaXDataBrowserController::elementRemoved(const ::com::sun::star::container
RemoveColumnListener(xOldColumn);
}
-// -----------------------------------------------------------------------
void SbaXDataBrowserController::elementReplaced(const ::com::sun::star::container::ContainerEvent& evt) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::elementReplaced" );
@@ -1291,7 +1194,6 @@ void SbaXDataBrowserController::elementReplaced(const ::com::sun::star::containe
AddColumnListener(xNewColumn);
}
-// -----------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::suspend(sal_Bool /*bSuspend*/) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::suspend" );
@@ -1303,7 +1205,7 @@ sal_Bool SbaXDataBrowserController::suspend(sal_Bool /*bSuspend*/) throw( Runtim
sal_Bool bSuccess = SaveModified();
return bSuccess;
}
-// -----------------------------------------------------------------------
+
void SbaXDataBrowserController::disposing()
{
// the base class
@@ -1370,7 +1272,7 @@ void SbaXDataBrowserController::disposing()
m_xParser.clear();
// don't dispose, just reset - it's owned by the RowSet
}
-//------------------------------------------------------------------------------
+
void SbaXDataBrowserController::frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::frameAction" );
@@ -1408,7 +1310,6 @@ void SbaXDataBrowserController::frameAction(const ::com::sun::star::frame::Frame
}
}
-//------------------------------------------------------------------------------
IMPL_LINK( SbaXDataBrowserController, OnAsyncDisplayError, void*, /* _pNotInterestedIn */ )
{
if ( m_aCurrentError.isValid() )
@@ -1419,7 +1320,6 @@ IMPL_LINK( SbaXDataBrowserController, OnAsyncDisplayError, void*, /* _pNotIntere
return 0L;
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::errorOccurred" );
@@ -1441,7 +1341,6 @@ void SbaXDataBrowserController::errorOccured(const ::com::sun::star::sdb::SQLErr
}
}
-//------------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::form::DatabaseParameterEvent& aEvent) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::approveParameter" );
@@ -1518,15 +1417,12 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for
return sal_True;
}
-
-//------------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::approveReset(const ::com::sun::star::lang::EventObject& /*rEvent*/) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::approveReset" );
return sal_True;
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::resetted(const ::com::sun::star::lang::EventObject& rEvent) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::resetted" );
@@ -1535,7 +1431,6 @@ void SbaXDataBrowserController::resetted(const ::com::sun::star::lang::EventObje
setCurrentModified( sal_False );
}
-//------------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::confirmDelete(const ::com::sun::star::sdb::RowChangeEvent& /*aEvent*/) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::confirmDelete" );
@@ -1544,7 +1439,7 @@ sal_Bool SbaXDataBrowserController::confirmDelete(const ::com::sun::star::sdb::R
return sal_True;
}
-//------------------------------------------------------------------------------
+
FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::GetState" );
@@ -1771,7 +1666,6 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
return aReturn;
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::applyParserOrder(const OUString& _rOldOrder,const Reference< XSingleSelectQueryComposer >& _xParser)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::applyParserOrder" );
@@ -1813,7 +1707,6 @@ void SbaXDataBrowserController::applyParserOrder(const OUString& _rOldOrder,cons
setCurrentColumnPosition(nPos);
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::applyParserFilter(const OUString& _rOldFilter, sal_Bool _bOldFilterApplied,const ::OUString& _sOldHaving,const Reference< XSingleSelectQueryComposer >& _xParser)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::applyParserFilter" );
@@ -1862,7 +1755,6 @@ void SbaXDataBrowserController::applyParserFilter(const OUString& _rOldFilter, s
setCurrentColumnPosition(nPos);
}
-//------------------------------------------------------------------------------
Reference< XSingleSelectQueryComposer > SbaXDataBrowserController::createParser_nothrow()
{
Reference< XSingleSelectQueryComposer > xComposer;
@@ -1906,7 +1798,7 @@ Reference< XSingleSelectQueryComposer > SbaXDataBrowserController::createParser_
}
return xComposer;
}
-//------------------------------------------------------------------------------
+
void SbaXDataBrowserController::ExecuteFilterSortCrit(sal_Bool bFilter)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::ExecuteFilterSortCrit" );
@@ -1970,7 +1862,6 @@ void SbaXDataBrowserController::ExecuteFilterSortCrit(sal_Bool bFilter)
::comphelper::disposeComponent(xParser);
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::ExecuteSearch()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::ExecuteSearch" );
@@ -2029,7 +1920,6 @@ void SbaXDataBrowserController::ExecuteSearch()
xModelSet->setPropertyValue("CursorColor", Any());
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< PropertyValue >& _rArgs)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::Execute" );
@@ -2330,7 +2220,6 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
}
}
-//------------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::SaveModified(sal_Bool bAskFor)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::SaveModified" );
@@ -2381,7 +2270,6 @@ sal_Bool SbaXDataBrowserController::SaveModified(sal_Bool bAskFor)
return bResult;
}
-//------------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::CommitCurrent()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CommitCurrent" );
@@ -2403,7 +2291,6 @@ sal_Bool SbaXDataBrowserController::CommitCurrent()
return sal_True;
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::setCurrentModified( sal_Bool _bSet )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::setCurrentModified" );
@@ -2412,14 +2299,12 @@ void SbaXDataBrowserController::setCurrentModified( sal_Bool _bSet )
InvalidateFeature( ID_BROWSER_UNDORECORD );
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::RowChanged()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::RowChanged" );
setCurrentModified( sal_False );
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::ColumnChanged()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::ColumnChanged" );
@@ -2433,14 +2318,12 @@ void SbaXDataBrowserController::ColumnChanged()
setCurrentModified( sal_False );
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::SelectionChanged()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::SelectionChanged" );
// not interested in
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::CellActivated()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CellActivated" );
@@ -2448,7 +2331,6 @@ void SbaXDataBrowserController::CellActivated()
OnInvalidateClipboard( NULL );
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::CellDeactivated()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CellDeactivated" );
@@ -2456,14 +2338,12 @@ void SbaXDataBrowserController::CellDeactivated()
OnInvalidateClipboard( NULL );
}
-//------------------------------------------------------------------------------
IMPL_LINK_NOARG(SbaXDataBrowserController, OnClipboardChanged)
{
SolarMutexGuard aGuard;
return OnInvalidateClipboard( NULL );
}
-//------------------------------------------------------------------------------
IMPL_LINK(SbaXDataBrowserController, OnInvalidateClipboard, AutoTimer*, _pTimer)
{
InvalidateFeature(ID_BROWSER_CUT);
@@ -2480,7 +2360,6 @@ IMPL_LINK(SbaXDataBrowserController, OnInvalidateClipboard, AutoTimer*, _pTimer)
return 0L;
}
-// -------------------------------------------------------------------------
Reference< XPropertySet > SbaXDataBrowserController::getBoundField(sal_uInt16 nViewPos) const
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::SaveData" );
@@ -2508,7 +2387,6 @@ Reference< XPropertySet > SbaXDataBrowserController::getBoundField(sal_uInt16 n
return xEmptyReturn;
}
-//------------------------------------------------------------------------------
IMPL_LINK(SbaXDataBrowserController, OnSearchContextRequest, FmSearchContext*, pContext)
{
Reference< ::com::sun::star::container::XIndexAccess > xPeerContainer(getBrowserView()->getGridControl(), UNO_QUERY);
@@ -2555,7 +2433,6 @@ IMPL_LINK(SbaXDataBrowserController, OnSearchContextRequest, FmSearchContext*, p
return pContext->arrFields.size();
}
-//------------------------------------------------------------------------------
IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pInfo)
{
Reference< ::com::sun::star::sdbcx::XRowLocate > xCursor(getRowSet(), UNO_QUERY);
@@ -2593,7 +2470,6 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn
return 0;
}
-//------------------------------------------------------------------------------
IMPL_LINK(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInformation*, pInfo)
{
Reference< ::com::sun::star::sdbcx::XRowLocate > xCursor(getRowSet(), UNO_QUERY);
@@ -2626,7 +2502,6 @@ IMPL_LINK(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInformatio
return 0L;
}
-//------------------------------------------------------------------------------
IMPL_LINK_NOARG(SbaXDataBrowserController, OnAsyncGetCellFocus)
{
SbaGridControl* pVclGrid = getBrowserView() ? getBrowserView()->getVclControl() : NULL;
@@ -2643,7 +2518,6 @@ IMPL_LINK_NOARG(SbaXDataBrowserController, OnAsyncGetCellFocus)
return 0L;
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::criticalFail()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::criticalFail" );
@@ -2651,7 +2525,6 @@ void SbaXDataBrowserController::criticalFail()
m_nRowSetPrivileges = 0;
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::LoadFinished" );
@@ -2670,26 +2543,22 @@ void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/)
DBG_UNHANDLED_EXCEPTION();
}
- // --------------------------------
// switch the control to alive mode
getBrowserView()->getGridControl()->setDesignMode(sal_False);
- // -------------------------------
initializeParser();
- // -------------------------------
InvalidateAll();
m_aAsyncGetCellFocus.Call();
}
}
-// -----------------------------------------------------------------------------
+
void SbaXDataBrowserController::initializeParser() const
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::initializeParser" );
if ( !m_xParser.is() )
{
- // ----------------------------------------------
// create a parser (needed for filtering/sorting)
try
{
@@ -2708,7 +2577,7 @@ void SbaXDataBrowserController::initializeParser() const
}
}
}
-//------------------------------------------------------------------------------
+
void SbaXDataBrowserController::loaded(const EventObject& /*aEvent*/) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::loaded" );
@@ -2716,14 +2585,12 @@ void SbaXDataBrowserController::loaded(const EventObject& /*aEvent*/) throw( Run
// we're loading within an separate thread and have a handling for it's "finished event"
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::unloading(const EventObject& /*aEvent*/) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::unloading" );
// not interested in
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::unloaded(const EventObject& /*aEvent*/) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::unloaded" );
@@ -2736,14 +2603,12 @@ void SbaXDataBrowserController::unloaded(const EventObject& /*aEvent*/) throw( R
// bound-field-dependent slots ....
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::reloading(const EventObject& /*aEvent*/) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::reloading" );
// not interested in
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::reloaded(const EventObject& /*aEvent*/) throw( RuntimeException )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::reloaded" );
@@ -2754,7 +2619,7 @@ void SbaXDataBrowserController::reloaded(const EventObject& /*aEvent*/) throw( R
// the one we're interested in) we give them time to do what they want to before invalidating our
// bound-field-dependent slots ....
}
-//------------------------------------------------------------------------------
+
void SbaXDataBrowserController::enterFormAction()
{
if ( !m_nFormActionNestingLevel )
@@ -2764,7 +2629,6 @@ void SbaXDataBrowserController::enterFormAction()
++m_nFormActionNestingLevel;
}
-//------------------------------------------------------------------------------
void SbaXDataBrowserController::leaveFormAction()
{
OSL_ENSURE( m_nFormActionNestingLevel > 0, "SbaXDataBrowserController::leaveFormAction : invalid call !" );
@@ -2777,14 +2641,12 @@ void SbaXDataBrowserController::leaveFormAction()
m_aAsyncDisplayError.Call();
}
-// -------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::isLoaded() const
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::isLoaded" );
return m_xLoadable.is() && m_xLoadable->isLoaded();
}
-// -------------------------------------------------------------------------
sal_Bool SbaXDataBrowserController::isValidCursor() const
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::isValidCursor" );
@@ -2807,7 +2669,6 @@ sal_Bool SbaXDataBrowserController::isValidCursor() const
return bIsValid;
}
-// -----------------------------------------------------------------------------
sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::getCurrentColumnPosition" );
@@ -2821,7 +2682,7 @@ sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition()
catch(Exception&) {}
return nViewPos;
}
-// -----------------------------------------------------------------------------
+
void SbaXDataBrowserController::setCurrentColumnPosition( sal_Int16 _nPos )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::setCurrentColumnPosition" );
@@ -2833,7 +2694,7 @@ void SbaXDataBrowserController::setCurrentColumnPosition( sal_Int16 _nPos )
}
catch(Exception&) {}
}
-// -----------------------------------------------------------------------------
+
void SbaXDataBrowserController::BeforeDrop()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::BeforeDrop" );
@@ -2841,7 +2702,7 @@ void SbaXDataBrowserController::BeforeDrop()
if (xFormError.is())
xFormError->removeSQLErrorListener((::com::sun::star::sdb::XSQLErrorListener*)this);
}
-// -----------------------------------------------------------------------------
+
void SbaXDataBrowserController::AfterDrop()
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::AfterDrop" );
@@ -2849,7 +2710,7 @@ void SbaXDataBrowserController::AfterDrop()
if (xFormError.is())
xFormError->addSQLErrorListener((::com::sun::star::sdb::XSQLErrorListener*)this);
}
-// -----------------------------------------------------------------------------
+
void SbaXDataBrowserController::addColumnListeners(const Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::addColumnListeners" );
@@ -2865,14 +2726,13 @@ void SbaXDataBrowserController::addColumnListeners(const Reference< ::com::sun::
}
}
}
-// -----------------------------------------------------------------------------
+
sal_Bool SbaXDataBrowserController::InitializeGridModel(const Reference< ::com::sun::star::form::XFormComponent > & /*xGrid*/)
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::InitializeGridModel" );
return sal_True;
}
-//..................................................................
+
} // namespace dbaui
-//..................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index fa47c37ba7e5..488142c4f2ef 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "brwctrlr.hxx"
#include "brwview.hxx"
#include "sbagrid.hxx"
@@ -32,7 +31,6 @@
#include "UITools.hxx"
#include <osl/diagnose.h>
-
using namespace dbaui;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdb;
@@ -41,7 +39,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-
namespace
{
sal_Bool isGrabVclControlFocusAllowed(const UnoDataBrowserView* _pView)
@@ -64,12 +61,10 @@ namespace
return bGrabFocus;
}
}
-//==================================================================
-//= UnoDataBrowserView
-//==================================================================
+
+// UnoDataBrowserView
DBG_NAME(UnoDataBrowserView)
-// -------------------------------------------------------------------------
UnoDataBrowserView::UnoDataBrowserView( Window* pParent,
IController& _rController,
const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext)
@@ -82,7 +77,7 @@ UnoDataBrowserView::UnoDataBrowserView( Window* pParent,
DBG_CTOR(UnoDataBrowserView,NULL);
}
-// -------------------------------------------------------------------------
+
void UnoDataBrowserView::Construct(const Reference< ::com::sun::star::awt::XControlModel >& xModel)
{
try
@@ -120,7 +115,7 @@ void UnoDataBrowserView::Construct(const Reference< ::com::sun::star::awt::XCont
throw;
}
}
-// -------------------------------------------------------------------------
+
UnoDataBrowserView::~UnoDataBrowserView()
{
{
@@ -145,7 +140,7 @@ UnoDataBrowserView::~UnoDataBrowserView()
DBG_DTOR(UnoDataBrowserView,NULL);
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK( UnoDataBrowserView, SplitHdl, void*, /*NOINTERESTEDIN*/ )
{
long nYPos = m_pSplitter->GetPosPixel().Y();
@@ -154,14 +149,14 @@ IMPL_LINK( UnoDataBrowserView, SplitHdl, void*, /*NOINTERESTEDIN*/ )
return 0L;
}
-// -------------------------------------------------------------------------
+
void UnoDataBrowserView::setSplitter(Splitter* _pSplitter)
{
m_pSplitter = _pSplitter;
m_pSplitter->SetSplitHdl( LINK( this, UnoDataBrowserView, SplitHdl ) );
LINK( this, UnoDataBrowserView, SplitHdl ).Call(m_pSplitter);
}
-// -------------------------------------------------------------------------
+
void UnoDataBrowserView::setTreeView(DBTreeView* _pTreeView)
{
if (m_pTreeView != _pTreeView)
@@ -174,7 +169,7 @@ void UnoDataBrowserView::setTreeView(DBTreeView* _pTreeView)
m_pTreeView = _pTreeView;
}
}
-// -------------------------------------------------------------------------
+
void UnoDataBrowserView::showStatus( const OUString& _rStatus )
{
if (_rStatus.isEmpty())
@@ -190,7 +185,6 @@ void UnoDataBrowserView::showStatus( const OUString& _rStatus )
}
}
-// -------------------------------------------------------------------------
void UnoDataBrowserView::hideStatus()
{
if (!m_pStatus || !m_pStatus->IsVisible())
@@ -201,7 +195,6 @@ void UnoDataBrowserView::hideStatus()
Update();
}
-// -------------------------------------------------------------------------
void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground)
{
Point aSplitPos;
@@ -258,13 +251,11 @@ void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground)
_rPlayground.SetSize( Size( 0, 0 ) );
}
-//------------------------------------------------------------------
sal_uInt16 UnoDataBrowserView::View2ModelPos(sal_uInt16 nPos) const
{
return m_pVclControl ? m_pVclControl->GetModelColumnPos(m_pVclControl->GetColumnIdFromViewPos(nPos)) : -1;
}
-// -----------------------------------------------------------------------------
SbaGridControl* UnoDataBrowserView::getVclControl() const
{
if ( !m_pVclControl )
@@ -287,7 +278,7 @@ SbaGridControl* UnoDataBrowserView::getVclControl() const
}
return m_pVclControl;
}
-// -----------------------------------------------------------------------------
+
void UnoDataBrowserView::GetFocus()
{
ODataView::GetFocus();
@@ -306,13 +297,13 @@ void UnoDataBrowserView::GetFocus()
m_pTreeView->GrabFocus();
}
}
-// -----------------------------------------------------------------------------
+
void UnoDataBrowserView::_disposing( const ::com::sun::star::lang::EventObject& /*_rSource*/ )
{
stopComponentListening(Reference<XComponent>(VCLUnoHelper::GetInterface(m_pVclControl),UNO_QUERY));
m_pVclControl = NULL;
}
-// -------------------------------------------------------------------------
+
long UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt )
{
long nDone = 0L;
@@ -340,7 +331,6 @@ long UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt )
}
DBG_NAME(BrowserViewStatusDisplay)
-// -----------------------------------------------------------------------------
BrowserViewStatusDisplay::BrowserViewStatusDisplay( UnoDataBrowserView* _pView, const OUString& _rStatus )
:m_pView(_pView)
{
@@ -350,7 +340,6 @@ BrowserViewStatusDisplay::BrowserViewStatusDisplay( UnoDataBrowserView* _pView,
m_pView->showStatus(_rStatus);
}
-// -----------------------------------------------------------------------------
BrowserViewStatusDisplay::~BrowserViewStatusDisplay( )
{
if (m_pView)
@@ -358,6 +347,5 @@ BrowserViewStatusDisplay::~BrowserViewStatusDisplay( )
DBG_DTOR(BrowserViewStatusDisplay,NULL);
}
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index 90ee541463b0..45340ecb014e 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <dbaccess/dataview.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/types.hxx>
@@ -30,19 +29,15 @@
#include <svtools/imgdef.hxx>
#include <tools/diagnose_ex.h>
-//.........................................................................
namespace dbaui
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::frame;
- //=====================================================================
- //= ColorChanger
- //=====================================================================
+ // ColorChanger
class ColorChanger
{
protected:
@@ -64,7 +59,6 @@ namespace dbaui
};
DBG_NAME(ODataView)
- // -------------------------------------------------------------------------
ODataView::ODataView( Window* pParent,
IController& _rController,
const Reference< XComponentContext >& _rxContext,
@@ -80,12 +74,10 @@ namespace dbaui
m_aSeparator.Show();
}
- // -------------------------------------------------------------------------
void ODataView::Construct()
{
}
- // -------------------------------------------------------------------------
ODataView::~ODataView()
{
DBG_DTOR(ODataView,NULL);
@@ -93,15 +85,12 @@ namespace dbaui
m_rController.release();
}
- // -------------------------------------------------------------------------
void ODataView::resizeDocumentView( Rectangle& /*_rPlayground*/ )
{
}
- // -------------------------------------------------------------------------
void ODataView::Paint( const Rectangle& _rRect )
{
- //.................................................................
// draw the background
{
ColorChanger aColors( this, COL_TRANSPARENT, GetSettings().GetStyleSettings().GetFaceColor() );
@@ -112,7 +101,6 @@ namespace dbaui
Window::Paint( _rRect );
}
- // -------------------------------------------------------------------------
void ODataView::resizeAll( const Rectangle& _rPlayground )
{
Rectangle aPlayground( _rPlayground );
@@ -126,13 +114,11 @@ namespace dbaui
resizeDocumentView( aPlayground );
}
- // -------------------------------------------------------------------------
void ODataView::Resize()
{
Window::Resize();
resizeAll( Rectangle( Point( 0, 0), GetSizePixel() ) );
}
- // -----------------------------------------------------------------------------
long ODataView::PreNotify( NotifyEvent& _rNEvt )
{
bool bHandled = false;
@@ -155,7 +141,6 @@ namespace dbaui
}
return bHandled ? 1L : Window::PreNotify( _rNEvt );
}
- // -----------------------------------------------------------------------------
void ODataView::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
@@ -187,7 +172,6 @@ namespace dbaui
}
}
}
- // -----------------------------------------------------------------------------
void ODataView::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -202,14 +186,12 @@ namespace dbaui
m_rController.notifyHiContrastChanged();
}
}
- // -----------------------------------------------------------------------------
void ODataView::attachFrame(const Reference< XFrame >& _xFrame)
{
m_pAccel->init(m_xContext, _xFrame);
}
-//.........................................................................
}
+
// namespace dbaui
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx
index 16f966ba3225..32c05ce9608f 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dbexchange.hxx"
#include <sot/formats.hxx>
#include <sot/storage.hxx>
@@ -31,7 +30,6 @@
#include "UITools.hxx"
#include <comphelper/processfactory.hxx>
-
namespace dbaui
{
using namespace ::com::sun::star::uno;
@@ -59,7 +57,6 @@ namespace dbaui
}
}
- // -----------------------------------------------------------------------------
ODataClipboard::ODataClipboard(
const OUString& _rDatasource,
const sal_Int32 _nCommandType,
@@ -80,7 +77,6 @@ namespace dbaui
osl_atomic_decrement( &m_refCount );
}
- // -----------------------------------------------------------------------------
ODataClipboard::ODataClipboard(
const OUString& _rDatasource,
const sal_Int32 _nCommandType,
@@ -95,7 +91,6 @@ namespace dbaui
m_pRtf.set( new ORTFImportExport( getDescriptor(),_rxORB, _rxFormatter ) );
}
- // -----------------------------------------------------------------------------
ODataClipboard::ODataClipboard( const Reference< XPropertySet >& i_rAliveForm,
const Sequence< Any >& i_rSelectedRows,
const sal_Bool i_bBookmarkSelection,
@@ -139,7 +134,6 @@ namespace dbaui
osl_atomic_decrement( &m_refCount );
}
- // -----------------------------------------------------------------------------
sal_Bool ODataClipboard::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ )
{
if (nUserObjectId == SOT_FORMAT_RTF || nUserObjectId == SOT_FORMATSTR_ID_HTML )
@@ -154,7 +148,6 @@ namespace dbaui
return sal_False;
}
- // -----------------------------------------------------------------------------
void ODataClipboard::AddSupportedFormats()
{
if ( m_pRtf.is() )
@@ -166,7 +159,6 @@ namespace dbaui
ODataAccessObjectTransferable::AddSupportedFormats();
}
- // -----------------------------------------------------------------------------
sal_Bool ODataClipboard::GetData( const DataFlavor& rFlavor )
{
const sal_uLong nFormat = SotExchange::GetFormat(rFlavor);
@@ -186,7 +178,6 @@ namespace dbaui
return ODataAccessObjectTransferable::GetData( rFlavor );
}
- // -----------------------------------------------------------------------------
void ODataClipboard::ObjectReleased()
{
if ( m_pHtml.is() )
@@ -216,7 +207,6 @@ namespace dbaui
ODataAccessObjectTransferable::ObjectReleased( );
}
- // -----------------------------------------------------------------------------
void SAL_CALL ODataClipboard::disposing( const ::com::sun::star::lang::EventObject& i_rSource ) throw (::com::sun::star::uno::RuntimeException)
{
ODataAccessDescriptor& rDescriptor( getDescriptor() );
@@ -250,5 +240,4 @@ namespace dbaui
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 23845e080f71..4983681d79fb 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dbu_reghelper.hxx"
#include "dbustrings.hrc"
#include "UITools.hxx"
@@ -92,6 +91,7 @@ public:
const Reference< XLoadEventListener > & _rListener) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL cancel(void) throw();
};
+
DBG_NAME(DBContentLoader)
DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxContext)
@@ -100,31 +100,28 @@ DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxContex
DBG_CTOR(DBContentLoader,NULL);
}
-// -------------------------------------------------------------------------
DBContentLoader::~DBContentLoader()
{
DBG_DTOR(DBContentLoader,NULL);
}
-// -------------------------------------------------------------------------
-// -------------------------------------------------------------------------
+
extern "C" void SAL_CALL createRegistryInfo_DBContentLoader()
{
static ::dbaui::OMultiInstanceAutoRegistration< DBContentLoader > aAutoRegistration;
}
-// -------------------------------------------------------------------------
+
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( )
@@ -137,13 +134,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( )
{
@@ -152,7 +149,7 @@ Sequence< OUString > DBContentLoader::getSupportedServiceNames_Static(void) thro
aSNS.getArray()[1] = OUString("com.sun.star.sdb.ContentLoader");
return aSNS;
}
-// -------------------------------------------------------------------------
+
extern "C" void SAL_CALL writeDBLoaderInfo(void* pRegistryKey)
{
Reference< XRegistryKey> xKey(reinterpret_cast< XRegistryKey*>(pRegistryKey));
@@ -171,7 +168,6 @@ extern "C" void SAL_CALL writeDBLoaderInfo(void* pRegistryKey)
xNewKey->setAsciiValue( OUString(".component:DB*") );
}
-// -----------------------------------------------------------------------
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)
@@ -335,7 +331,6 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU
rListener->loadCancelled( this );
}
-// -----------------------------------------------------------------------
void DBContentLoader::cancel(void) throw()
{
}
diff --git a/dbaccess/source/ui/browser/dbtreemodel.cxx b/dbaccess/source/ui/browser/dbtreemodel.cxx
index 617af275375e..a321c068f62d 100644
--- a/dbaccess/source/ui/browser/dbtreemodel.cxx
+++ b/dbaccess/source/ui/browser/dbtreemodel.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dbtreemodel.hxx"
#include "dbu_resource.hrc"
#include <osl/diagnose.h>
@@ -25,13 +24,11 @@
namespace dbaui
{
DBG_NAME(DBTreeListUserData)
- //------------------------------------------------------------------------
DBTreeListUserData::DBTreeListUserData()
:eType(SbaTableQueryBrowser::etQuery)
{
DBG_CTOR(DBTreeListUserData,NULL);
}
- //------------------------------------------------------------------------
DBTreeListUserData::~DBTreeListUserData()
{
DBG_DTOR(DBTreeListUserData,NULL);
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index 895fd3db50c9..0914360af0a8 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -17,25 +17,20 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dbtreeview.hxx"
#include <svtools/treelistbox.hxx>
#include "dbtreelistbox.hxx"
#include "dbtreemodel.hxx"
#include "dbaccess_helpid.hrc"
-// .........................................................................
namespace dbaui
{
-// .........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
DBG_NAME(DBTreeView)
-//========================================================================
// class DBTreeView
-//========================================================================
DBTreeView::DBTreeView( Window* pParent, WinBits nBits)
: Window( pParent, nBits )
, m_pTreeListBox(NULL)
@@ -50,8 +45,6 @@ DBTreeView::DBTreeView( Window* pParent, WinBits nBits)
m_pTreeListBox->Show();
}
-// -----------------------------------------------------------------------------
-
DBTreeView::~DBTreeView()
{
DBG_DTOR(DBTreeView,NULL);
@@ -67,24 +60,22 @@ DBTreeView::~DBTreeView()
}
}
-// -----------------------------------------------------------------------------
void DBTreeView::SetPreExpandHandler(const Link& _rHdl)
{
m_pTreeListBox->SetPreExpandHandler(_rHdl);
}
-// -----------------------------------------------------------------------------
void DBTreeView::setCopyHandler(const Link& _rHdl)
{
m_pTreeListBox->setCopyHandler(_rHdl);
}
-// -----------------------------------------------------------------------------
+
void DBTreeView::Resize()
{
Window::Resize();
m_pTreeListBox->SetPosSizePixel(Point(0,0),GetOutputSizePixel());
}
-// -------------------------------------------------------------------------
+
void DBTreeView::setModel(SvTreeList* _pTreeModel)
{
if (_pTreeModel)
@@ -92,12 +83,11 @@ void DBTreeView::setModel(SvTreeList* _pTreeModel)
m_pTreeListBox->SetModel(_pTreeModel);
}
-// -------------------------------------------------------------------------
void DBTreeView::setSelChangeHdl( const Link& _rHdl )
{
m_pTreeListBox->SetSelChangeHdl( _rHdl );
}
-// -----------------------------------------------------------------------------
+
void DBTreeView::GetFocus()
{
Window::GetFocus();
@@ -105,10 +95,6 @@ void DBTreeView::GetFocus()
m_pTreeListBox->GrabFocus();
}
-
-// .........................................................................
} // namespace dbaui
-// .........................................................................
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx
index 3232f6f16013..3e4649e178fd 100644
--- a/dbaccess/source/ui/browser/dbtreeview.hxx
+++ b/dbaccess/source/ui/browser/dbtreeview.hxx
@@ -26,9 +26,7 @@ class SvTreeList;
namespace dbaui
{
class DBTreeListBox;
- // ------------------
// - DBTreeView -
- // ------------------
class DBTreeView : public Window
{
@@ -52,7 +50,6 @@ namespace dbaui
void setCopyHandler(const Link& _rHdl);
-
void setModel(SvTreeList* _pTreeModel);
void setSelChangeHdl(const Link& _rHdl);
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index b7014655590e..6fe80d83f8c6 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "unodatbr.hxx"
#include "browserids.hxx"
#include "listviewitems.hxx"
@@ -33,11 +32,8 @@ using namespace ::com::sun::star::frame;
using namespace ::dbtools;
using namespace ::svx;
-// .........................................................................
namespace dbaui
{
-// .........................................................................
-// -----------------------------------------------------------------------------
SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getChildType( SvTreeListEntry* _pEntry ) const
{
OSL_ENSURE(isContainer(_pEntry), "SbaTableQueryBrowser::getChildType: invalid entry!");
@@ -53,13 +49,11 @@ SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getChildType( SvTreeListEn
return etUnknown;
}
-// -----------------------------------------------------------------------------
OUString SbaTableQueryBrowser::GetEntryText( SvTreeListEntry* _pEntry ) const
{
return m_pTreeView->getListBox().GetEntryText(_pEntry);
}
-// -----------------------------------------------------------------------------
SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getEntryType( const SvTreeListEntry* _pEntry ) const
{
if (!_pEntry)
@@ -105,7 +99,7 @@ SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getEntryType( const SvTree
return etQueryContainer;
}
-//------------------------------------------------------------------------------
+
void SbaTableQueryBrowser::select(SvTreeListEntry* _pEntry, sal_Bool _bSelect)
{
SvLBoxItem* pTextItem = _pEntry ? _pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING) : NULL;
@@ -119,7 +113,6 @@ void SbaTableQueryBrowser::select(SvTreeListEntry* _pEntry, sal_Bool _bSelect)
}
}
-//------------------------------------------------------------------------------
void SbaTableQueryBrowser::selectPath(SvTreeListEntry* _pEntry, sal_Bool _bSelect)
{
while (_pEntry)
@@ -128,7 +121,7 @@ void SbaTableQueryBrowser::selectPath(SvTreeListEntry* _pEntry, sal_Bool _bSelec
_pEntry = m_pTreeModel->GetParent(_pEntry);
}
}
-//------------------------------------------------------------------------------
+
sal_Bool SbaTableQueryBrowser::isSelected(SvTreeListEntry* _pEntry) const
{
SvLBoxItem* pTextItem = _pEntry ? _pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING) : NULL;
@@ -139,7 +132,7 @@ sal_Bool SbaTableQueryBrowser::isSelected(SvTreeListEntry* _pEntry) const
}
return sal_False;
}
-//------------------------------------------------------------------------------
+
void SbaTableQueryBrowser::SelectionChanged()
{
if ( !m_bShowMenu )
@@ -151,7 +144,7 @@ void SbaTableQueryBrowser::SelectionChanged()
InvalidateFeature(ID_BROWSER_COPY);
InvalidateFeature(ID_BROWSER_CUT);
}
-//------------------------------------------------------------------------------
+
void SbaTableQueryBrowser::describeSupportedFeatures()
{
SbaXDataBrowserController::describeSupportedFeatures();
@@ -176,7 +169,6 @@ void SbaTableQueryBrowser::describeSupportedFeatures()
implDescribeSupportedFeature( ".uno:DBRebuildData", ID_BROWSER_REFRESH_REBUILD, CommandGroup::DATA );
}
-// -----------------------------------------------------------------------------
sal_Int32 SbaTableQueryBrowser::getDatabaseObjectType( EntryType _eType )
{
switch ( _eType )
@@ -194,7 +186,6 @@ sal_Int32 SbaTableQueryBrowser::getDatabaseObjectType( EntryType _eType )
return DatabaseObject::TABLE;
}
-// -----------------------------------------------------------------------------
void SbaTableQueryBrowser::notifyHiContrastChanged()
{
if ( m_pTreeView )
@@ -251,9 +242,7 @@ void SbaTableQueryBrowser::notifyHiContrastChanged()
}
}
}
-// -----------------------------------------------------------------------------
-// .........................................................................
+
} // namespace dbaui
-// .........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index 9f3f2985aa81..e4d02c99bd6a 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dbexchange.hxx"
#include "dbtreelistbox.hxx"
#include "dbtreemodel.hxx"
@@ -41,10 +40,8 @@
#include "svtools/treelistentry.hxx"
#include <functional>
-// .........................................................................
namespace dbaui
{
-// .........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdb;
@@ -63,7 +60,6 @@ namespace dbaui
using namespace ::dbtools;
using namespace ::svx;
- // -----------------------------------------------------------------------------
TransferableHelper* SbaTableQueryBrowser::implCopyObject( SvTreeListEntry* _pApplyTo, sal_Int32 _nCommandType, sal_Bool _bAllowConnection )
{
try
@@ -95,7 +91,6 @@ namespace dbaui
}
return NULL;
}
- // -----------------------------------------------------------------------------
sal_Int8 SbaTableQueryBrowser::queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors )
{
// check if we're a table or query container
@@ -119,7 +114,6 @@ namespace dbaui
return DND_ACTION_NONE;
}
- // -----------------------------------------------------------------------------
sal_Int8 SbaTableQueryBrowser::executeDrop( const ExecuteDropEvent& _rEvt )
{
SvTreeListEntry* pHitEntry = m_pTreeView->getListBox().GetEntry( _rEvt.maPosPixel );
@@ -133,12 +127,10 @@ namespace dbaui
// a TransferableDataHelper for accessing the dropped data
TransferableDataHelper aDroppedData(_rEvt.maDropEvent.Transferable);
-
// reset the data of the previous async drop (if any)
if ( m_nAsyncDrop )
Application::RemoveUserEvent(m_nAsyncDrop);
-
m_nAsyncDrop = 0;
m_aAsyncDrop.aDroppedData.clear();
m_aAsyncDrop.nType = E_TABLE;
@@ -148,7 +140,6 @@ namespace dbaui
m_aAsyncDrop.pDroppedAt = NULL;
m_aAsyncDrop.aUrl = OUString();
-
// loop through the available formats and see what we can do ...
// first we have to check if it is our own format, if not we have to copy the stream :-(
if ( ODataAccessObjectTransferable::canExtractObjectDescriptor(aDroppedData.GetDataFlavorExVector()) )
@@ -179,7 +170,6 @@ namespace dbaui
return DND_ACTION_NONE;
}
- // -----------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::requestDrag( sal_Int8 /*_nAction*/, const Point& _rPosPixel )
{
// get the affected list entry
@@ -202,7 +192,6 @@ namespace dbaui
return NULL != pTransfer;
}
- // -----------------------------------------------------------------------------
IMPL_LINK(SbaTableQueryBrowser, OnCopyEntry, void*, /*NOTINTERESIN*/)
{
SvTreeListEntry* pSelected = m_pTreeView->getListBox().FirstSelected();
@@ -210,13 +199,11 @@ namespace dbaui
copyEntry( pSelected );
return 0;
}
- // -----------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::isEntryCopyAllowed(SvTreeListEntry* _pEntry) const
{
EntryType eType = getEntryType(_pEntry);
return ( eType == etTableOrView || eType == etQuery );
}
- // -----------------------------------------------------------------------------
void SbaTableQueryBrowser::copyEntry(SvTreeListEntry* _pEntry)
{
TransferableHelper* pTransfer = NULL;
@@ -227,7 +214,6 @@ namespace dbaui
if (pTransfer)
pTransfer->CopyToClipboard(getView());
}
- // -----------------------------------------------------------------------------
IMPL_LINK( SbaTableQueryBrowser, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ )
{
m_nAsyncDrop = 0;
@@ -248,7 +234,6 @@ namespace dbaui
return 0L;
}
- // -----------------------------------------------------------------------------
void SbaTableQueryBrowser::clearTreeModel()
{
if (m_pTreeModel)
@@ -279,8 +264,6 @@ namespace dbaui
}
m_pCurrentlyDisplayed = NULL;
}
-// .........................................................................
} // namespace dbaui
-// .........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index b45555b18fb7..42c6fccebeb8 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "exsrcbrw.hxx"
#include <com/sun/star/form/FormComponentType.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
@@ -42,14 +41,12 @@ using namespace ::com::sun::star::form;
using namespace ::com::sun::star::frame;
using namespace dbaui;
-//==============================================================================
-//= SbaExternalSourceBrowser
-//==============================================================================
+// SbaExternalSourceBrowser
extern "C" void SAL_CALL createRegistryInfo_OFormGridView()
{
static OMultiInstanceAutoRegistration< SbaExternalSourceBrowser > aAutoRegistration;
}
-//------------------------------------------------------------------------------
+
Any SAL_CALL SbaExternalSourceBrowser::queryInterface(const Type& _rType) throw (RuntimeException)
{
Any aRet = SbaXDataBrowserController::queryInterface(_rType);
@@ -60,8 +57,8 @@ Any SAL_CALL SbaExternalSourceBrowser::queryInterface(const Type& _rType) throw
return aRet;
}
+
DBG_NAME(SbaExternalSourceBrowser)
-//------------------------------------------------------------------------------
SbaExternalSourceBrowser::SbaExternalSourceBrowser(const Reference< ::com::sun::star::uno::XComponentContext >& _rM)
:SbaXDataBrowserController(_rM)
,m_aModifyListeners(getMutex())
@@ -72,54 +69,50 @@ SbaExternalSourceBrowser::SbaExternalSourceBrowser(const Reference< ::com::sun::
}
-//------------------------------------------------------------------------------
SbaExternalSourceBrowser::~SbaExternalSourceBrowser()
{
DBG_DTOR(SbaExternalSourceBrowser,NULL);
}
-//-------------------------------------------------------------------------
::comphelper::StringSequence SAL_CALL SbaExternalSourceBrowser::getSupportedServiceNames() throw(RuntimeException)
{
return getSupportedServiceNames_Static();
}
-// -------------------------------------------------------------------------
+
OUString SbaExternalSourceBrowser::getImplementationName_Static() throw(RuntimeException)
{
return OUString("org.openoffice.comp.dbu.OFormGridView");
}
-//-------------------------------------------------------------------------
+
::comphelper::StringSequence SbaExternalSourceBrowser::getSupportedServiceNames_Static() throw(RuntimeException)
{
::comphelper::StringSequence aSupported(1);
aSupported.getArray()[0] = OUString("com.sun.star.sdb.FormGridView");
return aSupported;
}
-//-------------------------------------------------------------------------
+
Reference< XInterface > SAL_CALL SbaExternalSourceBrowser::Create(const Reference<XMultiServiceFactory >& _rxFactory)
{
return *(new SbaExternalSourceBrowser( comphelper::getComponentContext(_rxFactory)));
}
-//-------------------------------------------------------------------------
+
OUString SAL_CALL SbaExternalSourceBrowser::getImplementationName() throw(RuntimeException)
{
return getImplementationName_Static();
}
-//------------------------------------------------------------------------------
+
Reference< XRowSet > SbaExternalSourceBrowser::CreateForm()
{
m_pDataSourceImpl = new SbaXFormAdapter();
return m_pDataSourceImpl;
}
-//------------------------------------------------------------------------------
sal_Bool SbaExternalSourceBrowser::InitializeForm(const Reference< XPropertySet > & /*i_formProperties*/)
{
return sal_True;
}
-//------------------------------------------------------------------
sal_Bool SbaExternalSourceBrowser::LoadForm()
{
// as we don't have a main form (yet), we have nothing to do
@@ -127,8 +120,6 @@ sal_Bool SbaExternalSourceBrowser::LoadForm()
return sal_True;
}
-
-//------------------------------------------------------------------
void SbaExternalSourceBrowser::modified(const ::com::sun::star::lang::EventObject& aEvent) throw( RuntimeException )
{
SbaXDataBrowserController::modified(aEvent);
@@ -140,7 +131,6 @@ void SbaExternalSourceBrowser::modified(const ::com::sun::star::lang::EventObjec
((::com::sun::star::util::XModifyListener*)aIt.next())->modified(aEvt);
}
-//------------------------------------------------------------------
void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::URL& aURL, const Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) throw(::com::sun::star::uno::RuntimeException)
{
const ::com::sun::star::beans::PropertyValue* pArguments = aArgs.getConstArray();
@@ -250,7 +240,6 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U
SbaXDataBrowserController::dispatch(aURL, aArgs);
}
-//------------------------------------------------------------------
Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaExternalSourceBrowser::queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException )
{
Reference< ::com::sun::star::frame::XDispatch > xReturn;
@@ -304,7 +293,6 @@ Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaExternalSourceBrows
return xReturn;
}
-//------------------------------------------------------------------
void SAL_CALL SbaExternalSourceBrowser::disposing()
{
// say our modify listeners goodbye
@@ -317,19 +305,16 @@ void SAL_CALL SbaExternalSourceBrowser::disposing()
SbaXDataBrowserController::disposing();
}
-//------------------------------------------------------------------
void SAL_CALL SbaExternalSourceBrowser::addModifyListener(const Reference< ::com::sun::star::util::XModifyListener > & aListener) throw( RuntimeException )
{
m_aModifyListeners.addInterface(aListener);
}
-//------------------------------------------------------------------
void SAL_CALL SbaExternalSourceBrowser::removeModifyListener(const Reference< ::com::sun::star::util::XModifyListener > & aListener) throw( RuntimeException )
{
m_aModifyListeners.removeInterface(aListener);
}
-//------------------------------------------------------------------
void SAL_CALL SbaExternalSourceBrowser::unloading(const ::com::sun::star::lang::EventObject& aEvent) throw( RuntimeException )
{
if (m_pDataSourceImpl && (m_pDataSourceImpl->getAttachedForm() == aEvent.Source))
@@ -340,7 +325,6 @@ void SAL_CALL SbaExternalSourceBrowser::unloading(const ::com::sun::star::lang::
SbaXDataBrowserController::unloading(aEvent);
}
-//------------------------------------------------------------------
void SbaExternalSourceBrowser::Attach(const Reference< XRowSet > & xMaster)
{
Any aOldPos;
@@ -414,20 +398,17 @@ void SbaExternalSourceBrowser::Attach(const Reference< XRowSet > & xMaster)
}
}
-//------------------------------------------------------------------
void SbaExternalSourceBrowser::ClearView()
{
// set a new (empty) datasource
Attach(Reference< XRowSet > ());
-
// clear all cols in the grid
Reference< ::com::sun::star::container::XIndexContainer > xColContainer(getControlModel(), UNO_QUERY);
while (xColContainer->getCount() > 0)
xColContainer->removeByIndex(0);
}
-//------------------------------------------------------------------
void SAL_CALL SbaExternalSourceBrowser::disposing(const ::com::sun::star::lang::EventObject& Source) throw( RuntimeException )
{
if (m_pDataSourceImpl && (m_pDataSourceImpl->getAttachedForm() == Source.Source))
@@ -438,7 +419,6 @@ void SAL_CALL SbaExternalSourceBrowser::disposing(const ::com::sun::star::lang::
SbaXDataBrowserController::disposing(Source);
}
-//------------------------------------------------------------------
void SbaExternalSourceBrowser::startListening()
{
if (m_pDataSourceImpl && m_pDataSourceImpl->getAttachedForm().is())
@@ -448,7 +428,6 @@ void SbaExternalSourceBrowser::startListening()
}
}
-//------------------------------------------------------------------
void SbaExternalSourceBrowser::stopListening()
{
if (m_pDataSourceImpl && m_pDataSourceImpl->getAttachedForm().is())
@@ -458,7 +437,4 @@ void SbaExternalSourceBrowser::stopListening()
}
}
-//==================================================================
-//==================================================================
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index 913287396e10..cb8a74a4c8cd 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "formadapter.hxx"
#include <tools/debug.hxx>
#include <osl/diagnose.h>
@@ -36,12 +35,9 @@ using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
-//==================================================================
// SbaXFormAdapter
-//==================================================================
DBG_NAME(SbaXFormAdapter)
-// -------------------------------------------------------------------------
SbaXFormAdapter::SbaXFormAdapter()
:m_aLoadListeners(*this, m_aMutex)
,m_aRowSetListeners(*this, m_aMutex)
@@ -61,14 +57,12 @@ SbaXFormAdapter::SbaXFormAdapter()
}
-// -------------------------------------------------------------------------
SbaXFormAdapter::~SbaXFormAdapter()
{
DBG_DTOR(SbaXFormAdapter,NULL);
}
-// -------------------------------------------------------------------------
Sequence< Type > SAL_CALL SbaXFormAdapter::getTypes( ) throw (RuntimeException)
{
return ::comphelper::concatSequences(
@@ -78,7 +72,6 @@ Sequence< Type > SAL_CALL SbaXFormAdapter::getTypes( ) throw (RuntimeException)
);
}
-// -------------------------------------------------------------------------
Sequence< sal_Int8 > SAL_CALL SbaXFormAdapter::getImplementationId( ) throw (RuntimeException)
{
static ::cppu::OImplementationId * pId = 0;
@@ -94,7 +87,6 @@ Sequence< sal_Int8 > SAL_CALL SbaXFormAdapter::getImplementationId( ) throw (Ru
return pId->getImplementationId();
}
-// -------------------------------------------------------------------------
Any SAL_CALL SbaXFormAdapter::queryInterface(const Type& _rType) throw (RuntimeException)
{
Any aReturn = SbaXFormAdapter_BASE1::queryInterface( _rType );
@@ -108,7 +100,6 @@ Any SAL_CALL SbaXFormAdapter::queryInterface(const Type& _rType) throw (RuntimeE
return aReturn;
}
-// -------------------------------------------------------------------------
void SbaXFormAdapter::StopListening()
{
// log off all our multiplexers
@@ -141,7 +132,6 @@ void SbaXFormAdapter::StopListening()
xComp->removeEventListener((::com::sun::star::lang::XEventListener*)(::com::sun::star::beans::XPropertyChangeListener*)this);
}
-// -------------------------------------------------------------------------
void SbaXFormAdapter::StartListening()
{
// log off all our multiplexers
@@ -175,7 +165,6 @@ void SbaXFormAdapter::StartListening()
xComp->addEventListener((::com::sun::star::lang::XEventListener*)(::com::sun::star::beans::XPropertyChangeListener*)this);
}
-// -------------------------------------------------------------------------
void SbaXFormAdapter::AttachForm(const Reference< ::com::sun::star::sdbc::XRowSet >& xNewMaster)
{
if (xNewMaster == m_xMainForm)
@@ -220,7 +209,6 @@ void SbaXFormAdapter::AttachForm(const Reference< ::com::sun::star::sdbc::XRowSe
}
// ::com::sun::star::sdbc::XCloseable
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::close() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XCloseable > xIface(m_xMainForm, UNO_QUERY);
@@ -229,7 +217,6 @@ void SAL_CALL SbaXFormAdapter::close() throw( ::com::sun::star::sdbc::SQLExcepti
}
// ::com::sun::star::sdbc::XResultSetMetaDataSupplier
-// -------------------------------------------------------------------------
Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL SbaXFormAdapter::getMetaData() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XResultSetMetaDataSupplier > xIface(m_xMainForm, UNO_QUERY);
@@ -239,7 +226,6 @@ Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL SbaXFormAdapter
}
// ::com::sun::star::sdbc::XColumnLocate
-// -------------------------------------------------------------------------
sal_Int32 SAL_CALL SbaXFormAdapter::findColumn(const OUString& columnName) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XColumnLocate > xIface(m_xMainForm, UNO_QUERY);
@@ -249,7 +235,6 @@ sal_Int32 SAL_CALL SbaXFormAdapter::findColumn(const OUString& columnName) throw
}
// ::com::sun::star::sdbcx::XColumnsSupplier
-// -------------------------------------------------------------------------
Reference< ::com::sun::star::container::XNameAccess > SAL_CALL SbaXFormAdapter::getColumns() throw( RuntimeException )
{
Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xIface(m_xMainForm, UNO_QUERY);
@@ -259,7 +244,6 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL SbaXFormAdapter::
}
// ::com::sun::star::sdbc::XRow
-// -------------------------------------------------------------------------
sal_Bool SAL_CALL SbaXFormAdapter::wasNull() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -267,7 +251,7 @@ sal_Bool SAL_CALL SbaXFormAdapter::wasNull() throw( ::com::sun::star::sdbc::SQLE
return xIface->wasNull();
return sal_True;
}
-// -------------------------------------------------------------------------
+
OUString SAL_CALL SbaXFormAdapter::getString(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -275,7 +259,7 @@ OUString SAL_CALL SbaXFormAdapter::getString(sal_Int32 columnIndex) throw( ::com
return xIface->getString(columnIndex);
return OUString();
}
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL SbaXFormAdapter::getBoolean(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -283,15 +267,16 @@ sal_Bool SAL_CALL SbaXFormAdapter::getBoolean(sal_Int32 columnIndex) throw( ::co
return xIface->getBoolean(columnIndex);
return sal_False;
}
-// -------------------------------------------------------------------------
+
sal_Int8 SAL_CALL SbaXFormAdapter::getByte(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
+
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
return xIface->getByte(columnIndex);
return 0;
}
-// -------------------------------------------------------------------------
+
sal_Int16 SAL_CALL SbaXFormAdapter::getShort(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -299,7 +284,7 @@ sal_Int16 SAL_CALL SbaXFormAdapter::getShort(sal_Int32 columnIndex) throw( ::com
return xIface->getShort(columnIndex);
return 0;
}
-// -------------------------------------------------------------------------
+
sal_Int32 SAL_CALL SbaXFormAdapter::getInt(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -307,7 +292,7 @@ sal_Int32 SAL_CALL SbaXFormAdapter::getInt(sal_Int32 columnIndex) throw( ::com::
return xIface->getInt(columnIndex);
return 0;
}
-// -------------------------------------------------------------------------
+
sal_Int64 SAL_CALL SbaXFormAdapter::getLong(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -315,7 +300,7 @@ sal_Int64 SAL_CALL SbaXFormAdapter::getLong(sal_Int32 columnIndex) throw( ::com:
return xIface->getLong(columnIndex);
return 0;
}
-// -------------------------------------------------------------------------
+
float SAL_CALL SbaXFormAdapter::getFloat(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -323,7 +308,7 @@ float SAL_CALL SbaXFormAdapter::getFloat(sal_Int32 columnIndex) throw( ::com::su
return xIface->getFloat(columnIndex);
return 0.0;
}
-// -------------------------------------------------------------------------
+
double SAL_CALL SbaXFormAdapter::getDouble(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -331,7 +316,7 @@ double SAL_CALL SbaXFormAdapter::getDouble(sal_Int32 columnIndex) throw( ::com::
return xIface->getDouble(columnIndex);
return 0.0;
}
-// -------------------------------------------------------------------------
+
Sequence< sal_Int8 > SAL_CALL SbaXFormAdapter::getBytes(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -339,7 +324,7 @@ Sequence< sal_Int8 > SAL_CALL SbaXFormAdapter::getBytes(sal_Int32 columnIndex) t
return xIface->getBytes(columnIndex);
return Sequence <sal_Int8> ();
}
-// -------------------------------------------------------------------------
+
::com::sun::star::util::Date SAL_CALL SbaXFormAdapter::getDate(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -347,7 +332,7 @@ Sequence< sal_Int8 > SAL_CALL SbaXFormAdapter::getBytes(sal_Int32 columnIndex) t
return xIface->getDate(columnIndex);
return ::com::sun::star::util::Date();
}
-// -------------------------------------------------------------------------
+
::com::sun::star::util::Time SAL_CALL SbaXFormAdapter::getTime(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -355,7 +340,7 @@ Sequence< sal_Int8 > SAL_CALL SbaXFormAdapter::getBytes(sal_Int32 columnIndex) t
return xIface->getTime(columnIndex);
return ::com::sun::star::util::Time();
}
-// -------------------------------------------------------------------------
+
::com::sun::star::util::DateTime SAL_CALL SbaXFormAdapter::getTimestamp(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -363,7 +348,7 @@ Sequence< sal_Int8 > SAL_CALL SbaXFormAdapter::getBytes(sal_Int32 columnIndex) t
return xIface->getTimestamp(columnIndex);
return ::com::sun::star::util::DateTime();
}
-// -------------------------------------------------------------------------
+
Reference< ::com::sun::star::io::XInputStream > SAL_CALL SbaXFormAdapter::getBinaryStream(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -371,7 +356,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL SbaXFormAdapter::getBin
return xIface->getBinaryStream(columnIndex);
return Reference< ::com::sun::star::io::XInputStream > ();
}
-// -------------------------------------------------------------------------
+
Reference< ::com::sun::star::io::XInputStream > SAL_CALL SbaXFormAdapter::getCharacterStream(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -379,7 +364,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL SbaXFormAdapter::getCha
return xIface->getCharacterStream(columnIndex);
return Reference< ::com::sun::star::io::XInputStream > ();
}
-// -------------------------------------------------------------------------
+
Any SAL_CALL SbaXFormAdapter::getObject(sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -387,7 +372,7 @@ Any SAL_CALL SbaXFormAdapter::getObject(sal_Int32 columnIndex, const Reference<
return xIface->getObject(columnIndex, typeMap);
return Any();
}
-// -------------------------------------------------------------------------
+
Reference< ::com::sun::star::sdbc::XRef > SAL_CALL SbaXFormAdapter::getRef(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -395,7 +380,7 @@ Reference< ::com::sun::star::sdbc::XRef > SAL_CALL SbaXFormAdapter::getRef(sal_I
return xIface->getRef(columnIndex);
return Reference< ::com::sun::star::sdbc::XRef > ();
}
-// -------------------------------------------------------------------------
+
Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL SbaXFormAdapter::getBlob(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -403,7 +388,7 @@ Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL SbaXFormAdapter::getBlob(sal
return xIface->getBlob(columnIndex);
return Reference< ::com::sun::star::sdbc::XBlob > ();
}
-// -------------------------------------------------------------------------
+
Reference< ::com::sun::star::sdbc::XClob > SAL_CALL SbaXFormAdapter::getClob(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -411,7 +396,7 @@ Reference< ::com::sun::star::sdbc::XClob > SAL_CALL SbaXFormAdapter::getClob(sal
return xIface->getClob(columnIndex);
return Reference< ::com::sun::star::sdbc::XClob > ();
}
-// -------------------------------------------------------------------------
+
Reference< ::com::sun::star::sdbc::XArray > SAL_CALL SbaXFormAdapter::getArray(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY);
@@ -421,7 +406,6 @@ Reference< ::com::sun::star::sdbc::XArray > SAL_CALL SbaXFormAdapter::getArray(s
}
// ::com::sun::star::sdbcx::XRowLocate
-// -------------------------------------------------------------------------
Any SAL_CALL SbaXFormAdapter::getBookmark() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY);
@@ -429,7 +413,7 @@ Any SAL_CALL SbaXFormAdapter::getBookmark() throw( ::com::sun::star::sdbc::SQLEx
return xIface->getBookmark();
return Any();
}
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL SbaXFormAdapter::moveToBookmark(const Any& bookmark) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY);
@@ -437,7 +421,7 @@ sal_Bool SAL_CALL SbaXFormAdapter::moveToBookmark(const Any& bookmark) throw( ::
return xIface->moveToBookmark(bookmark);
return sal_False;
}
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL SbaXFormAdapter::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY);
@@ -445,7 +429,7 @@ sal_Bool SAL_CALL SbaXFormAdapter::moveRelativeToBookmark(const Any& bookmark, s
return xIface->moveRelativeToBookmark(bookmark,rows);
return sal_False;
}
-// -------------------------------------------------------------------------
+
sal_Int32 SAL_CALL SbaXFormAdapter::compareBookmarks(const Any& _first, const Any& _second) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY);
@@ -454,7 +438,6 @@ sal_Int32 SAL_CALL SbaXFormAdapter::compareBookmarks(const Any& _first, const An
return 0;
}
-// -------------------------------------------------------------------------
sal_Bool SAL_CALL SbaXFormAdapter::hasOrderedBookmarks() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY);
@@ -463,7 +446,6 @@ sal_Bool SAL_CALL SbaXFormAdapter::hasOrderedBookmarks() throw( ::com::sun::star
return sal_False;
}
-// -------------------------------------------------------------------------
sal_Int32 SAL_CALL SbaXFormAdapter::hashBookmark(const Any& bookmark) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY);
@@ -473,119 +455,118 @@ sal_Int32 SAL_CALL SbaXFormAdapter::hashBookmark(const Any& bookmark) throw( ::c
}
// ::com::sun::star::sdbc::XRowUpdate
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::updateNull(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateNull(columnIndex);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateBoolean(columnIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateByte(sal_Int32 columnIndex, sal_Int8 x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateByte(columnIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateShort(sal_Int32 columnIndex, sal_Int16 x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateShort(columnIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateInt(sal_Int32 columnIndex, sal_Int32 x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateInt(columnIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateLong(sal_Int32 columnIndex, sal_Int64 x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateLong(columnIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateFloat(sal_Int32 columnIndex, float x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateFloat(columnIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateDouble(sal_Int32 columnIndex, double x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateDouble(columnIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateString(sal_Int32 columnIndex, const OUString& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateString(columnIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateBytes(columnIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateDate(sal_Int32 columnIndex, const ::com::sun::star::util::Date& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateDate(columnIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateTime(sal_Int32 columnIndex, const ::com::sun::star::util::Time& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateTime(columnIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateTimestamp(sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateTimestamp(columnIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateBinaryStream(sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateBinaryStream(columnIndex, x, length);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateCharacterStream(sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateCharacterStream(columnIndex, x, length);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateObject(sal_Int32 columnIndex, const Any& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateObject(columnIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_Int32 scale) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY);
@@ -594,124 +575,122 @@ void SAL_CALL SbaXFormAdapter::updateNumericObject(sal_Int32 columnIndex, const
}
// ::com::sun::star::sdbc::XResultSet
-// -------------------------------------------------------------------------
sal_Bool SAL_CALL SbaXFormAdapter::next() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
return m_xMainForm->next();
return sal_False;
}
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL SbaXFormAdapter::isBeforeFirst() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
return m_xMainForm->isBeforeFirst();
return sal_False;
}
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL SbaXFormAdapter::isAfterLast() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
return m_xMainForm->isAfterLast();
return sal_False;
}
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL SbaXFormAdapter::isFirst() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
return m_xMainForm->isFirst();
return sal_False;
}
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL SbaXFormAdapter::isLast() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
return m_xMainForm->isLast();
return sal_False;
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::beforeFirst() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
m_xMainForm->beforeFirst();
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::afterLast() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
m_xMainForm->afterLast();
}
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL SbaXFormAdapter::first() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
return m_xMainForm->first();
return sal_False;
}
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL SbaXFormAdapter::last() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
return m_xMainForm->last();
return sal_False;
}
-// -------------------------------------------------------------------------
+
sal_Int32 SAL_CALL SbaXFormAdapter::getRow() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
return m_xMainForm->getRow();
return sal_False;
}
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL SbaXFormAdapter::absolute(sal_Int32 row) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
return m_xMainForm->absolute(row);
return sal_False;
}
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL SbaXFormAdapter::relative(sal_Int32 rows) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
return m_xMainForm->relative(rows);
return sal_False;
}
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL SbaXFormAdapter::previous() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
return m_xMainForm->previous();
return sal_False;
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::refreshRow() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
m_xMainForm->refreshRow();
}
-// -------------------------------------------------------------------------
sal_Bool SAL_CALL SbaXFormAdapter::rowUpdated() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
return m_xMainForm->rowUpdated();
return sal_False;
}
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL SbaXFormAdapter::rowInserted() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
return m_xMainForm->rowInserted();
return sal_False;
}
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL SbaXFormAdapter::rowDeleted() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
return m_xMainForm->rowDeleted();
return sal_False;
}
-// -------------------------------------------------------------------------
+
Reference< XInterface > SAL_CALL SbaXFormAdapter::getStatement() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
@@ -720,42 +699,41 @@ Reference< XInterface > SAL_CALL SbaXFormAdapter::getStatement() throw( ::com::s
}
// ::com::sun::star::sdbc::XResultSetUpdate
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::insertRow() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->insertRow();
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::updateRow() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->updateRow();
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::deleteRow() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->deleteRow();
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::cancelRowUpdates() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->cancelRowUpdates();
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::moveToInsertRow() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->moveToInsertRow();
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::moveToCurrentRow() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY);
@@ -764,17 +742,15 @@ void SAL_CALL SbaXFormAdapter::moveToCurrentRow() throw( ::com::sun::star::sdbc:
}
// ::com::sun::star::sdbc::XRowSet
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::execute() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
if (m_xMainForm.is())
m_xMainForm->execute();
}
-// -------------------------------------------------------------------------
+
IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, sdbc, RowSetListener, m_aRowSetListeners, ::com::sun::star::sdbc::XRowSet, m_xMainForm)
// ::com::sun::star::sdbcx::XDeleteRows
-// -------------------------------------------------------------------------
Sequence<sal_Int32> SAL_CALL SbaXFormAdapter::deleteRows(const Sequence< Any >& rows) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbcx::XDeleteRows > xIface(m_xMainForm, UNO_QUERY);
@@ -784,7 +760,6 @@ Sequence<sal_Int32> SAL_CALL SbaXFormAdapter::deleteRows(const Sequence< Any >&
}
// ::com::sun::star::sdbc::XWarningsSupplier
-// -------------------------------------------------------------------------
Any SAL_CALL SbaXFormAdapter::getWarnings() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XWarningsSupplier > xIface(m_xMainForm, UNO_QUERY);
@@ -792,7 +767,7 @@ Any SAL_CALL SbaXFormAdapter::getWarnings() throw( ::com::sun::star::sdbc::SQLEx
return xIface->getWarnings();
return Any();
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::clearWarnings() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XWarningsSupplier > xIface(m_xMainForm, UNO_QUERY);
@@ -801,15 +776,12 @@ void SAL_CALL SbaXFormAdapter::clearWarnings() throw( ::com::sun::star::sdbc::SQ
}
// ::com::sun::star::sdb::XRowSetApproveBroadcaster
-// -------------------------------------------------------------------------
IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, sdb, RowSetApproveListener, m_aRowSetApproveListeners, ::com::sun::star::sdb::XRowSetApproveBroadcaster, m_xMainForm)
// com::sun::star::sdbc::XSQLErrorBroadcaster
-// -------------------------------------------------------------------------
IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, sdb, SQLErrorListener, m_aErrorListeners, ::com::sun::star::sdb::XSQLErrorBroadcaster, m_xMainForm)
// ::com::sun::star::sdb::XResultSetAccess
-// -------------------------------------------------------------------------
Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL SbaXFormAdapter::createResultSet() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdb::XResultSetAccess > xIface(m_xMainForm, UNO_QUERY);
@@ -819,28 +791,27 @@ Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL SbaXFormAdapter::create
}
// com::sun::star::form::XLoadable
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::load() throw( RuntimeException )
{
Reference< ::com::sun::star::form::XLoadable > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->load();
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::unload() throw( RuntimeException )
{
Reference< ::com::sun::star::form::XLoadable > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->unload();
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::reload() throw( RuntimeException )
{
Reference< ::com::sun::star::form::XLoadable > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->reload();
}
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL SbaXFormAdapter::isLoaded() throw( RuntimeException )
{
Reference< ::com::sun::star::form::XLoadable > xIface(m_xMainForm, UNO_QUERY);
@@ -848,165 +819,164 @@ sal_Bool SAL_CALL SbaXFormAdapter::isLoaded() throw( RuntimeException )
return xIface->isLoaded();
return sal_False;
}
-// -------------------------------------------------------------------------
+
IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, form, LoadListener, m_aLoadListeners, ::com::sun::star::form::XLoadable, m_xMainForm)
// ::com::sun::star::sdbc::XParameters
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setNull(parameterIndex, sqlType);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setObjectNull(parameterIndex, sqlType, typeName);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setBoolean(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setByte(sal_Int32 parameterIndex, sal_Int8 x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setByte(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setShort(sal_Int32 parameterIndex, sal_Int16 x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setShort(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setInt(sal_Int32 parameterIndex, sal_Int32 x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setInt(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setLong(sal_Int32 parameterIndex, sal_Int64 x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setLong(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setFloat(sal_Int32 parameterIndex, float x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setFloat(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setDouble(sal_Int32 parameterIndex, double x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setDouble(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setString(sal_Int32 parameterIndex, const OUString& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setString(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setBytes(sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setBytes(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setDate(sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setDate(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setTime(sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setTime(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setTimestamp(sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setTimestamp(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setBinaryStream(sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setBinaryStream(parameterIndex, x, length);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setCharacterStream(sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setCharacterStream(parameterIndex, x, length);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setObject(sal_Int32 parameterIndex, const Any& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setObject(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setObjectWithInfo(sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setObjectWithInfo(parameterIndex, x, targetSqlType, scale);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setRef(sal_Int32 parameterIndex, const Reference< ::com::sun::star::sdbc::XRef >& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setRef(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setBlob(sal_Int32 parameterIndex, const Reference< ::com::sun::star::sdbc::XBlob >& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setBlob(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setClob(sal_Int32 parameterIndex, const Reference< ::com::sun::star::sdbc::XClob >& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setClob(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::setArray(sal_Int32 parameterIndex, const Reference< ::com::sun::star::sdbc::XArray >& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
if (xIface.is())
xIface->setArray(parameterIndex, x);
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaXFormAdapter::clearParameters() throw( ::com::sun::star::sdbc::SQLException, RuntimeException )
{
Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY);
@@ -1015,7 +985,6 @@ void SAL_CALL SbaXFormAdapter::clearParameters() throw( ::com::sun::star::sdbc::
}
// ::com::sun::star::form::XDatabaseParameterBroadcaster
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::addParameterListener(const Reference< ::com::sun::star::form::XDatabaseParameterListener >& aListener) throw( RuntimeException )
{
m_aParameterListeners.addInterface(aListener);
@@ -1027,7 +996,6 @@ void SAL_CALL SbaXFormAdapter::addParameterListener(const Reference< ::com::sun:
}
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::removeParameterListener(const Reference< ::com::sun::star::form::XDatabaseParameterListener >& aListener) throw( RuntimeException )
{
if (m_aParameterListeners.getLength() == 1)
@@ -1040,20 +1008,17 @@ void SAL_CALL SbaXFormAdapter::removeParameterListener(const Reference< ::com::s
}
// ::com::sun::star::container::XChild
-// -------------------------------------------------------------------------
Reference< XInterface > SAL_CALL SbaXFormAdapter::getParent() throw( RuntimeException )
{
return m_xParent;
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::setParent(const Reference< XInterface >& Parent) throw( ::com::sun::star::lang::NoSupportException, RuntimeException )
{
m_xParent = Parent;
}
// ::com::sun::star::form::XSubmit
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::submit(const Reference< ::com::sun::star::awt::XControl >& aControl, const ::com::sun::star::awt::MouseEvent& aMouseEvt) throw( RuntimeException )
{
Reference< ::com::sun::star::form::XSubmit > xSubmit(m_xMainForm, UNO_QUERY);
@@ -1064,59 +1029,50 @@ void SAL_CALL SbaXFormAdapter::submit(const Reference< ::com::sun::star::awt::XC
IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, form, SubmitListener, m_aSubmitListeners, ::com::sun::star::form::XSubmit, m_xMainForm)
// ::com::sun::star::awt::XTabControllerModel
-// -------------------------------------------------------------------------
sal_Bool SAL_CALL SbaXFormAdapter::getGroupControl() throw( RuntimeException )
{
OSL_FAIL("SAL_CALL SbaXFormAdapter::getGroupControl : not supported !");
return sal_False;
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::setGroupControl(sal_Bool /*GroupControl*/) throw( RuntimeException )
{
OSL_FAIL("SAL_CALL SbaXFormAdapter::setGroupControl : not supported !");
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::setControlModels(const Sequence< Reference< ::com::sun::star::awt::XControlModel > >& /*Controls*/) throw( RuntimeException )
{
OSL_FAIL("SAL_CALL SbaXFormAdapter::setControlModels : not supported !");
}
-// -------------------------------------------------------------------------
Sequence< Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL SbaXFormAdapter::getControlModels() throw( RuntimeException )
{
OSL_FAIL("SAL_CALL SbaXFormAdapter::getControlModels : not supported !");
return Sequence< Reference< ::com::sun::star::awt::XControlModel > >();
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::setGroup(const Sequence< Reference< ::com::sun::star::awt::XControlModel > >& /*_rGroup*/, const OUString& /*GroupName*/) throw( RuntimeException )
{
OSL_FAIL("SAL_CALL SbaXFormAdapter::setGroup : not supported !");
}
-// -------------------------------------------------------------------------
sal_Int32 SAL_CALL SbaXFormAdapter::getGroupCount() throw( RuntimeException )
{
OSL_FAIL("SAL_CALL SbaXFormAdapter::getGroupCount : not supported !");
return 0;
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< ::com::sun::star::awt::XControlModel > >& /*_rGroup*/, OUString& /*Name*/) throw( RuntimeException )
{
OSL_FAIL("SAL_CALL SbaXFormAdapter::getGroup : not supported !");
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::getGroupByName(const OUString& /*Name*/, Sequence< Reference< ::com::sun::star::awt::XControlModel > >& /*_rGroup*/) throw( RuntimeException )
{
OSL_FAIL("SAL_CALL SbaXFormAdapter::getGroupByName : not supported !");
}
// ::com::sun::star::lang::XComponent
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::dispose() throw( RuntimeException )
{
// log off all multiplexers
@@ -1160,20 +1116,17 @@ void SAL_CALL SbaXFormAdapter::dispose() throw( RuntimeException )
m_aChildren.clear();
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::addEventListener(const Reference< ::com::sun::star::lang::XEventListener >& xListener) throw( RuntimeException )
{
m_aDisposeListeners.addInterface(xListener);
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::removeEventListener(const Reference< ::com::sun::star::lang::XEventListener >& aListener) throw( RuntimeException )
{
m_aDisposeListeners.removeInterface(aListener);
}
// ::com::sun::star::beans::XFastPropertySet
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::setFastPropertyValue(sal_Int32 nHandle, const Any& aValue) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException )
{
Reference< ::com::sun::star::beans::XFastPropertySet > xSet(m_xMainForm, UNO_QUERY);
@@ -1206,7 +1159,6 @@ void SAL_CALL SbaXFormAdapter::setFastPropertyValue(sal_Int32 nHandle, const Any
xSet->setFastPropertyValue(nHandle, aValue);
}
-// -------------------------------------------------------------------------
Any SAL_CALL SbaXFormAdapter::getFastPropertyValue(sal_Int32 nHandle) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, RuntimeException )
{
Reference< ::com::sun::star::beans::XFastPropertySet > xSet(m_xMainForm, UNO_QUERY);
@@ -1219,20 +1171,17 @@ Any SAL_CALL SbaXFormAdapter::getFastPropertyValue(sal_Int32 nHandle) throw( ::c
}
// ::com::sun::star::container::XNamed
-// -------------------------------------------------------------------------
OUString SAL_CALL SbaXFormAdapter::getName() throw( RuntimeException )
{
return ::comphelper::getString(getPropertyValue(PROPERTY_NAME));
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::setName(const OUString& aName) throw( RuntimeException )
{
setPropertyValue(PROPERTY_NAME, makeAny(aName));
}
// ::com::sun::star::io::XPersistObject
-// -------------------------------------------------------------------------
OUString SAL_CALL SbaXFormAdapter::getServiceName() throw( RuntimeException )
{
Reference< ::com::sun::star::io::XPersistObject > xPersist(m_xMainForm, UNO_QUERY);
@@ -1241,7 +1190,6 @@ OUString SAL_CALL SbaXFormAdapter::getServiceName() throw( RuntimeException )
return OUString();
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::write(const Reference< ::com::sun::star::io::XObjectOutputStream >& _rxOutStream) throw( ::com::sun::star::io::IOException, RuntimeException )
{
Reference< ::com::sun::star::io::XPersistObject > xPersist(m_xMainForm, UNO_QUERY);
@@ -1249,7 +1197,6 @@ void SAL_CALL SbaXFormAdapter::write(const Reference< ::com::sun::star::io::XObj
xPersist->write(_rxOutStream);
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::read(const Reference< ::com::sun::star::io::XObjectInputStream >& _rxInStream) throw( ::com::sun::star::io::IOException, RuntimeException )
{
Reference< ::com::sun::star::io::XPersistObject > xPersist(m_xMainForm, UNO_QUERY);
@@ -1258,7 +1205,6 @@ void SAL_CALL SbaXFormAdapter::read(const Reference< ::com::sun::star::io::XObje
}
// ::com::sun::star::beans::XMultiPropertySet
-// -------------------------------------------------------------------------
Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL SbaXFormAdapter::getPropertySetInfo() throw( RuntimeException )
{
Reference< ::com::sun::star::beans::XMultiPropertySet > xSet(m_xMainForm, UNO_QUERY);
@@ -1284,7 +1230,6 @@ Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL SbaXFormAdapter:
return xReturn;
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::setPropertyValues(const Sequence< OUString >& PropertyNames, const Sequence< Any >& Values) throw( ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException )
{
Reference< ::com::sun::star::beans::XMultiPropertySet > xSet(m_xMainForm, UNO_QUERY);
@@ -1292,7 +1237,6 @@ void SAL_CALL SbaXFormAdapter::setPropertyValues(const Sequence< OUString >& Pro
xSet->setPropertyValues(PropertyNames, Values);
}
-// -------------------------------------------------------------------------
Sequence< Any > SAL_CALL SbaXFormAdapter::getPropertyValues(const Sequence< OUString >& aPropertyNames) throw( RuntimeException )
{
Reference< ::com::sun::star::beans::XMultiPropertySet > xSet(m_xMainForm, UNO_QUERY);
@@ -1315,7 +1259,6 @@ Sequence< Any > SAL_CALL SbaXFormAdapter::getPropertyValues(const Sequence< OUSt
return aReturn;
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::addPropertiesChangeListener(const Sequence< OUString>& /*aPropertyNames*/, const Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw( RuntimeException )
{
// we completely ignore the property names, _all_ changes of _all_ properties will be forwarded to _all_ listeners
@@ -1329,7 +1272,6 @@ void SAL_CALL SbaXFormAdapter::addPropertiesChangeListener(const Sequence< OUStr
}
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::removePropertiesChangeListener(const Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener) throw( RuntimeException )
{
if (m_aPropertiesChangeListeners.getLength() == 1)
@@ -1341,7 +1283,6 @@ void SAL_CALL SbaXFormAdapter::removePropertiesChangeListener(const Reference< :
m_aPropertiesChangeListeners.removeInterface(Listener);
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::firePropertiesChangeEvent(const Sequence< OUString >& aPropertyNames, const Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw( RuntimeException )
{
Reference< ::com::sun::star::beans::XMultiPropertySet > xSet(m_xMainForm, UNO_QUERY);
@@ -1349,9 +1290,7 @@ void SAL_CALL SbaXFormAdapter::firePropertiesChangeEvent(const Sequence< OUStrin
xSet->firePropertiesChangeEvent(aPropertyNames, xListener);
}
-
// ::com::sun::star::beans::XPropertySet
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::setPropertyValue(const OUString& aPropertyName, const Any& aValue) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException )
{
Reference< ::com::sun::star::beans::XPropertySet > xSet(m_xMainForm, UNO_QUERY);
@@ -1365,7 +1304,6 @@ void SAL_CALL SbaXFormAdapter::setPropertyValue(const OUString& aPropertyName, c
xSet->setPropertyValue(aPropertyName, aValue);
}
-// -------------------------------------------------------------------------
Any SAL_CALL SbaXFormAdapter::getPropertyValue(const OUString& PropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, RuntimeException )
{
Reference< ::com::sun::star::beans::XPropertySet > xSet(m_xMainForm, UNO_QUERY);
@@ -1383,7 +1321,6 @@ IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(SbaXFormAdapter, PropertyChangeListen
IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(SbaXFormAdapter, VetoableChangeListener, m_aVetoablePropertyChangeListeners, ::com::sun::star::beans::XPropertySet, m_xMainForm);
// ::com::sun::star::util::XCancellable
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::cancel() throw( RuntimeException )
{
Reference< ::com::sun::star::util::XCancellable > xCancel(m_xMainForm, UNO_QUERY);
@@ -1393,7 +1330,6 @@ void SAL_CALL SbaXFormAdapter::cancel() throw( RuntimeException )
}
// ::com::sun::star::beans::XPropertyState
-// -------------------------------------------------------------------------
::com::sun::star::beans::PropertyState SAL_CALL SbaXFormAdapter::getPropertyState(const OUString& PropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, RuntimeException )
{
Reference< ::com::sun::star::beans::XPropertyState > xState(m_xMainForm, UNO_QUERY);
@@ -1402,7 +1338,6 @@ void SAL_CALL SbaXFormAdapter::cancel() throw( RuntimeException )
return ::com::sun::star::beans::PropertyState_DEFAULT_VALUE;
}
-// -------------------------------------------------------------------------
Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL SbaXFormAdapter::getPropertyStates(const Sequence< OUString >& aPropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, RuntimeException )
{
Reference< ::com::sun::star::beans::XPropertyState > xState(m_xMainForm, UNO_QUERY);
@@ -1417,7 +1352,6 @@ Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL SbaXFormAdapter::getP
return aReturn;
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::setPropertyToDefault(const OUString& PropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, RuntimeException )
{
Reference< ::com::sun::star::beans::XPropertyState > xState(m_xMainForm, UNO_QUERY);
@@ -1425,7 +1359,6 @@ void SAL_CALL SbaXFormAdapter::setPropertyToDefault(const OUString& PropertyName
xState->setPropertyToDefault(PropertyName);
}
-// -------------------------------------------------------------------------
Any SAL_CALL SbaXFormAdapter::getPropertyDefault(const OUString& aPropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, RuntimeException )
{
Reference< ::com::sun::star::beans::XPropertyState > xState(m_xMainForm, UNO_QUERY);
@@ -1435,7 +1368,6 @@ Any SAL_CALL SbaXFormAdapter::getPropertyDefault(const OUString& aPropertyName)
}
// ::com::sun::star::form::XReset
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::reset() throw( RuntimeException )
{
Reference< ::com::sun::star::form::XReset > xReset(m_xMainForm, UNO_QUERY);
@@ -1446,7 +1378,6 @@ void SAL_CALL SbaXFormAdapter::reset() throw( RuntimeException )
IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, form, ResetListener, m_aResetListeners, ::com::sun::star::form::XReset, m_xMainForm)
// ::com::sun::star::container::XNameContainer
-// -------------------------------------------------------------------------
void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const OUString* pNewElName) throw( ::com::sun::star::lang::IllegalArgumentException )
{
// extract the form component
@@ -1506,7 +1437,6 @@ void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const OU
((::com::sun::star::container::XContainerListener*)aIt.next())->elementInserted(aEvt);
}
-// -------------------------------------------------------------------------
sal_Int32 SbaXFormAdapter::implGetPos(const OUString& rName)
{
::std::vector< OUString>::iterator aIter = ::std::find_if( m_aChildNames.begin(),
@@ -1519,13 +1449,11 @@ sal_Int32 SbaXFormAdapter::implGetPos(const OUString& rName)
return -1;
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::insertByName(const OUString& aName, const Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, RuntimeException )
{
implInsert(aElement, m_aChildren.size(), &aName);
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::removeByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, RuntimeException )
{
sal_Int32 nPos = implGetPos(Name);
@@ -1537,7 +1465,6 @@ void SAL_CALL SbaXFormAdapter::removeByName(const OUString& Name) throw( ::com::
}
// ::com::sun::star::container::XNameReplace
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::replaceByName(const OUString& aName, const Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, RuntimeException )
{
sal_Int32 nPos = implGetPos(aName);
@@ -1549,7 +1476,6 @@ void SAL_CALL SbaXFormAdapter::replaceByName(const OUString& aName, const Any& a
}
// ::com::sun::star::container::XNameAccess
-// -------------------------------------------------------------------------
Any SAL_CALL SbaXFormAdapter::getByName(const OUString& aName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, RuntimeException )
{
sal_Int32 nPos = implGetPos(aName);
@@ -1560,36 +1486,30 @@ Any SAL_CALL SbaXFormAdapter::getByName(const OUString& aName) throw( ::com::sun
return makeAny(m_aChildren[nPos]);
}
-// -------------------------------------------------------------------------
Sequence< OUString > SAL_CALL SbaXFormAdapter::getElementNames() throw( RuntimeException )
{
OUString *pChildNames = m_aChildNames.empty() ? 0 : &m_aChildNames[0];
return Sequence< OUString >(pChildNames, m_aChildNames.size());
}
-// -------------------------------------------------------------------------
sal_Bool SAL_CALL SbaXFormAdapter::hasByName(const OUString& aName) throw( RuntimeException )
{
return (-1 != implGetPos(aName));
}
// ::com::sun::star::container::XElementAccess
-// -------------------------------------------------------------------------
Type SAL_CALL SbaXFormAdapter::getElementType() throw(RuntimeException)
{
return ::getCppuType(
static_cast< Reference< ::com::sun::star::form::XFormComponent >* >(NULL));
}
-// -------------------------------------------------------------------------
sal_Bool SAL_CALL SbaXFormAdapter::hasElements() throw(RuntimeException)
{
return m_aChildren.size() > 0;
}
-
// ::com::sun::star::container::XIndexContainer
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::insertByIndex(sal_Int32 _rIndex, const Any& Element) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, RuntimeException )
{
if ( ( _rIndex < 0 ) || ( (size_t)_rIndex >= m_aChildren.size() ) )
@@ -1597,7 +1517,6 @@ void SAL_CALL SbaXFormAdapter::insertByIndex(sal_Int32 _rIndex, const Any& Eleme
implInsert(Element, _rIndex);
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::removeByIndex(sal_Int32 _rIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, RuntimeException )
{
if ( ( _rIndex < 0 ) || ( (size_t)_rIndex >= m_aChildren.size() ) )
@@ -1627,7 +1546,6 @@ void SAL_CALL SbaXFormAdapter::removeByIndex(sal_Int32 _rIndex) throw( ::com::su
}
// ::com::sun::star::container::XIndexReplace
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::replaceByIndex(sal_Int32 _rIndex, const Any& Element) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, RuntimeException )
{
if ( ( _rIndex < 0 ) || ( (size_t)_rIndex >= m_aChildren.size() ) )
@@ -1690,13 +1608,11 @@ void SAL_CALL SbaXFormAdapter::replaceByIndex(sal_Int32 _rIndex, const Any& Elem
}
// ::com::sun::star::container::XIndexAccess
-// -------------------------------------------------------------------------
sal_Int32 SAL_CALL SbaXFormAdapter::getCount() throw( RuntimeException )
{
return m_aChildren.size();
}
-// -------------------------------------------------------------------------
Any SAL_CALL SbaXFormAdapter::getByIndex(sal_Int32 _rIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, RuntimeException )
{
if ( ( _rIndex < 0 ) || ( (size_t)_rIndex >= m_aChildren.size() ) )
@@ -1707,27 +1623,23 @@ Any SAL_CALL SbaXFormAdapter::getByIndex(sal_Int32 _rIndex) throw( ::com::sun::s
}
// ::com::sun::star::container::XContainer
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::addContainerListener(const Reference< ::com::sun::star::container::XContainerListener >& xListener) throw( RuntimeException )
{
m_aContainerListeners.addInterface(xListener);
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::removeContainerListener(const Reference< ::com::sun::star::container::XContainerListener >& xListener) throw( RuntimeException )
{
m_aContainerListeners.removeInterface(xListener);
}
// ::com::sun::star::container::XEnumerationAccess
-// -------------------------------------------------------------------------
Reference< ::com::sun::star::container::XEnumeration > SAL_CALL SbaXFormAdapter::createEnumeration() throw( RuntimeException )
{
return new ::comphelper::OEnumerationByName(this);
}
// ::com::sun::star::beans::XPropertyChangeListener
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw( RuntimeException )
{
if (evt.PropertyName.equals(PROPERTY_NAME))
@@ -1746,7 +1658,6 @@ void SAL_CALL SbaXFormAdapter::propertyChange(const ::com::sun::star::beans::Pro
}
// ::com::sun::star::lang::XEventListener
-// -------------------------------------------------------------------------
void SAL_CALL SbaXFormAdapter::disposing(const ::com::sun::star::lang::EventObject& Source) throw( RuntimeException )
{
// was it our main form ?
@@ -1759,7 +1670,5 @@ void SAL_CALL SbaXFormAdapter::disposing(const ::com::sun::star::lang::EventObje
if(aIter != m_aChildren.end())
removeByIndex(aIter - m_aChildren.begin());
}
-// -----------------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 2b2a9f77dbb0..8a604022f7aa 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -73,17 +73,13 @@ using namespace ::com::sun::star::awt;
using namespace ::dbtools;
using namespace ::comphelper;
-// -------------------------------------------------------------------------
#define ALL_FEATURES -1
#define FIRST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() - 1000 )
#define LAST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() )
-// -------------------------------------------------------------------------
typedef ::boost::unordered_map< sal_Int16, sal_Int16 > CommandHashMap;
typedef ::std::list< DispatchInformation > DispatchInfoList;
-
-// -------------------------------------------------------------------------
const OUString& getConfirmDeletionURL()
{
static const OUString sConfirmDeletionURL( ".uno:FormSlots/ConfirmDeletion" );
@@ -93,9 +89,7 @@ const OUString& getConfirmDeletionURL()
namespace dbaui
{
-//==========================================================================
-//= UserDefinedFeatures
-//==========================================================================
+// UserDefinedFeatures
class UserDefinedFeatures
{
public:
@@ -108,13 +102,11 @@ private:
::com::sun::star::uno::WeakReference< XController > m_aController;
};
-//--------------------------------------------------------------------------
UserDefinedFeatures::UserDefinedFeatures( const Reference< XController >& _rxController )
:m_aController( _rxController )
{
}
-//--------------------------------------------------------------------------
FeatureState UserDefinedFeatures::getState( const URL& /*_rFeatureURL*/ )
{
// for now, enable all the time
@@ -125,7 +117,6 @@ FeatureState UserDefinedFeatures::getState( const URL& /*_rFeatureURL*/ )
return aState;
}
-//--------------------------------------------------------------------------
void UserDefinedFeatures::execute( const URL& _rFeatureURL, const Sequence< PropertyValue>& _rArgs )
{
try
@@ -153,9 +144,7 @@ void UserDefinedFeatures::execute( const URL& _rFeatureURL, const Sequence< Prop
}
}
-//==========================================================================
-//= OGenericUnoController_Data
-//==========================================================================
+// OGenericUnoController_Data
struct OGenericUnoController_Data
{
::sfx2::UserInputInterception m_aUserInputInterception;
@@ -168,11 +157,8 @@ struct OGenericUnoController_Data
}
};
-//==========================================================================
-//= OGenericUnoController
-//==========================================================================
+// OGenericUnoController
DBG_NAME(OGenericUnoController)
-// -------------------------------------------------------------------------
OGenericUnoController::OGenericUnoController(const Reference< XComponentContext >& _rM)
:OGenericUnoController_Base( getMutex() )
,m_pView(NULL)
@@ -235,14 +221,12 @@ OGenericUnoController::OGenericUnoController()
#endif
-// -----------------------------------------------------------------------------
OGenericUnoController::~OGenericUnoController()
{
DBG_DTOR(OGenericUnoController,NULL);
}
-// -----------------------------------------------------------------------------
sal_Bool OGenericUnoController::Construct(Window* /*pParent*/)
{
OSL_ENSURE( getView(), "the view is NULL!" );
@@ -271,18 +255,18 @@ sal_Bool OGenericUnoController::Construct(Window* /*pParent*/)
return sal_True;
}
-//------------------------------------------------------------------------------
+
IMPL_LINK_NOARG(OGenericUnoController, OnAsyncInvalidateAll)
{
if ( !OGenericUnoController_Base::rBHelper.bInDispose && !OGenericUnoController_Base::rBHelper.bDisposed )
InvalidateFeature_Impl();
return 0L;
}
-// -----------------------------------------------------------------------------
+
void OGenericUnoController::impl_initialize()
{
}
-// -------------------------------------------------------------------------
+
void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException)
{
SolarMutexGuard aSolarGuard;
@@ -341,40 +325,35 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen
}
}
-//------------------------------------------------------------------------------
void SAL_CALL OGenericUnoController::acquire( ) throw ()
{
OGenericUnoController_Base::acquire();
}
-//------------------------------------------------------------------------------
void SAL_CALL OGenericUnoController::release( ) throw ()
{
OGenericUnoController_Base::release();
}
-// -------------------------------------------------------------------------
void OGenericUnoController::startFrameListening( const Reference< XFrame >& _rxFrame )
{
if ( _rxFrame.is() )
_rxFrame->addFrameActionListener( this );
}
-// -------------------------------------------------------------------------
void OGenericUnoController::stopFrameListening( const Reference< XFrame >& _rxFrame )
{
if ( _rxFrame.is() )
_rxFrame->removeFrameActionListener( this );
}
-// -------------------------------------------------------------------------
void OGenericUnoController::disposing(const EventObject& Source) throw( RuntimeException )
{
// our frame ?
if ( Source.Source == getFrame() )
stopFrameListening( getFrame() );
}
-//------------------------------------------------------------------------
+
void OGenericUnoController::modified(const EventObject& aEvent) throw( RuntimeException )
{
::osl::MutexGuard aGuard( getMutex() );
@@ -389,19 +368,17 @@ void OGenericUnoController::modified(const EventObject& aEvent) throw( RuntimeEx
InvalidateFeature(ID_BROWSER_SAVEDOC);
InvalidateFeature(ID_BROWSER_UNDO);
}
-// -----------------------------------------------------------------------
+
Reference< XWindow > SAL_CALL OGenericUnoController::getComponentWindow() throw (RuntimeException)
{
return VCLUnoHelper::GetInterface( getView() );
}
-// -----------------------------------------------------------------------
OUString SAL_CALL OGenericUnoController::getViewControllerName() throw (::com::sun::star::uno::RuntimeException)
{
return OUString( "Default" );
}
-// -----------------------------------------------------------------------
Sequence< PropertyValue > SAL_CALL OGenericUnoController::getCreationArguments() throw (RuntimeException)
{
// currently we do not support any creation args, so anything passed to XModel2::createViewController would be
@@ -409,7 +386,6 @@ Sequence< PropertyValue > SAL_CALL OGenericUnoController::getCreationArguments()
return Sequence< PropertyValue >();
}
-// -----------------------------------------------------------------------
void OGenericUnoController::attachFrame( const Reference< XFrame >& _rxFrame ) throw( RuntimeException )
{
SolarMutexGuard aSolarGuard;
@@ -425,7 +401,6 @@ void OGenericUnoController::attachFrame( const Reference< XFrame >& _rxFrame ) t
getView()->attachFrame( xFrame );
}
-// -----------------------------------------------------------------------------
struct CommandCollector : public ::std::unary_function< SupportedFeatures::value_type, void>
{
sal_uInt16 m_nFeature;
@@ -443,12 +418,10 @@ struct CommandCollector : public ::std::unary_function< SupportedFeatures::value
}
};
-// -----------------------------------------------------------------------
namespace
{
typedef ::std::vector< Any > States;
- // ...................................................................
void lcl_notifyMultipleStates( XStatusListener& _rListener, FeatureStateEvent& _rEvent, const States& _rStates )
{
for ( States::const_iterator state = _rStates.begin();
@@ -461,7 +434,6 @@ namespace
}
}
- // ...................................................................
void lcl_collectStates( const FeatureState& _rFeatureState, States& _out_rStates )
{
// order matters, due to a bug in framework which resets the check state when any non-boolean event
@@ -483,7 +455,6 @@ namespace
}
}
-// -----------------------------------------------------------------------
void OGenericUnoController::ImplBroadcastFeatureState(const OUString& _rFeature, const Reference< XStatusListener > & xListener, sal_Bool _bIgnoreCache)
{
sal_uInt16 nFeat = m_aSupportedFeatures[ _rFeature ].nFeatureId;
@@ -549,7 +520,6 @@ void OGenericUnoController::ImplBroadcastFeatureState(const OUString& _rFeature,
}
-//------------------------------------------------------------------------------
sal_Bool OGenericUnoController::isFeatureSupported( sal_Int32 _nId )
{
SupportedFeatures::iterator aFeaturePos = ::std::find_if(
@@ -561,13 +531,11 @@ sal_Bool OGenericUnoController::isFeatureSupported( sal_Int32 _nId )
return ( m_aSupportedFeatures.end() != aFeaturePos && !aFeaturePos->first.isEmpty());
}
-// -----------------------------------------------------------------------
void OGenericUnoController::InvalidateFeature(const OUString& _rURLPath, const Reference< XStatusListener > & _xListener, sal_Bool _bForceBroadcast)
{
ImplInvalidateFeature( m_aSupportedFeatures[ _rURLPath ].nFeatureId, _xListener, _bForceBroadcast );
}
-// -----------------------------------------------------------------------------
void OGenericUnoController::InvalidateFeature_Impl()
{
#ifdef DBG_UTIL
@@ -624,7 +592,6 @@ void OGenericUnoController::InvalidateFeature_Impl()
#endif
}
-// -----------------------------------------------------------------------
void OGenericUnoController::ImplInvalidateFeature( sal_Int32 _nId, const Reference< XStatusListener >& _xListener, sal_Bool _bForceBroadcast )
{
#if OSL_DEBUG_LEVEL > 0
@@ -655,22 +622,18 @@ void OGenericUnoController::ImplInvalidateFeature( sal_Int32 _nId, const Referen
m_aAsyncInvalidateAll.Call();
}
-// -----------------------------------------------------------------------
void OGenericUnoController::InvalidateFeature(sal_uInt16 _nId, const Reference< XStatusListener > & _xListener, sal_Bool _bForceBroadcast)
{
ImplInvalidateFeature( _nId, _xListener, _bForceBroadcast );
}
-// -----------------------------------------------------------------------
void OGenericUnoController::InvalidateAll()
{
ImplInvalidateFeature( ALL_FEATURES, NULL, sal_True );
}
-// -----------------------------------------------------------------------------
void OGenericUnoController::InvalidateAll_Impl()
{
- // ---------------------------------
// invalidate all supported features
for ( SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.begin();
@@ -688,7 +651,6 @@ void OGenericUnoController::InvalidateAll_Impl()
}
}
-// -----------------------------------------------------------------------
Reference< XDispatch > OGenericUnoController::queryDispatch(const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException )
{
Reference< XDispatch > xReturn;
@@ -716,7 +678,6 @@ Reference< XDispatch > OGenericUnoController::queryDispatch(const URL& aURL, co
return xReturn;
}
-// -----------------------------------------------------------------------
Sequence< Reference< XDispatch > > OGenericUnoController::queryDispatches(const Sequence< DispatchDescriptor >& aDescripts) throw( RuntimeException )
{
Sequence< Reference< XDispatch > > aReturn;
@@ -737,31 +698,26 @@ Sequence< Reference< XDispatch > > OGenericUnoController::queryDispatches(const
return aReturn;
}
-// -----------------------------------------------------------------------
Reference< XDispatchProvider > OGenericUnoController::getSlaveDispatchProvider(void) throw( RuntimeException )
{
return m_xSlaveDispatcher;
}
-// -----------------------------------------------------------------------
void OGenericUnoController::setSlaveDispatchProvider(const Reference< XDispatchProvider > & _xNewProvider) throw( RuntimeException )
{
m_xSlaveDispatcher = _xNewProvider;
}
-// -----------------------------------------------------------------------
Reference< XDispatchProvider > OGenericUnoController::getMasterDispatchProvider(void) throw( RuntimeException )
{
return m_xMasterDispatcher;
}
-// -----------------------------------------------------------------------
void OGenericUnoController::setMasterDispatchProvider(const Reference< XDispatchProvider > & _xNewProvider) throw( RuntimeException )
{
m_xMasterDispatcher = _xNewProvider;
}
-// -----------------------------------------------------------------------
void OGenericUnoController::dispatch(const URL& _aURL, const Sequence< PropertyValue >& aArgs) throw(RuntimeException)
{
SolarMutexGuard aSolarGuard;
@@ -782,7 +738,6 @@ void OGenericUnoController::dispatch(const URL& _aURL, const Sequence< PropertyV
executeChecked(_aURL,aArgs);
}
-// -----------------------------------------------------------------------
void OGenericUnoController::addStatusListener(const Reference< XStatusListener > & aListener, const URL& _rURL) throw(RuntimeException)
{
// parse the ULR now and here, this saves later parsing in each notification round
@@ -798,7 +753,6 @@ void OGenericUnoController::addStatusListener(const Reference< XStatusListener >
// force the new state to be broadcast to the new listener
}
-// -----------------------------------------------------------------------
void OGenericUnoController::removeStatusListener(const Reference< XStatusListener > & aListener, const URL& _rURL) throw(RuntimeException)
{
DispatchIterator iterSearch = m_arrStatusListener.begin();
@@ -842,7 +796,7 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene
::std::bind2nd(FindFeatureListener(),aListener))
,m_aFeaturesToInvalidate.end());
}
-// -----------------------------------------------------------------------------
+
void OGenericUnoController::releaseNumberForComponent()
{
try
@@ -856,7 +810,7 @@ void OGenericUnoController::releaseNumberForComponent()
// NII
}
}
-// -----------------------------------------------------------------------
+
void OGenericUnoController::disposing()
{
{
@@ -892,21 +846,18 @@ void OGenericUnoController::disposing()
m_aInitParameters.clear();
}
-// -----------------------------------------------------------------------------
void SAL_CALL OGenericUnoController::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
{
// disambiguate
OGenericUnoController_Base::WeakComponentImplHelperBase::addEventListener( xListener );
}
-// -----------------------------------------------------------------------------
void SAL_CALL OGenericUnoController::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
{
// disambiguate
OGenericUnoController_Base::WeakComponentImplHelperBase::removeEventListener( xListener );
}
-//------------------------------------------------------------------------------
void OGenericUnoController::frameAction(const FrameActionEvent& aEvent) throw( RuntimeException )
{
::osl::MutexGuard aGuard( getMutex() );
@@ -914,7 +865,6 @@ void OGenericUnoController::frameAction(const FrameActionEvent& aEvent) throw( R
m_aCurrentFrame.frameAction( aEvent.Action );
}
-//------------------------------------------------------------------------------
void OGenericUnoController::implDescribeSupportedFeature( const sal_Char* _pAsciiCommandURL,
sal_uInt16 _nFeatureId, sal_Int16 _nCommandGroup )
{
@@ -935,7 +885,6 @@ void OGenericUnoController::implDescribeSupportedFeature( const sal_Char* _pAsci
m_aSupportedFeatures[ aFeature.Command ] = aFeature;
}
-//------------------------------------------------------------------------------
void OGenericUnoController::describeSupportedFeatures()
{
// add all supported features
@@ -946,7 +895,6 @@ void OGenericUnoController::describeSupportedFeatures()
implDescribeSupportedFeature( ".uno:DSBEditDoc", ID_BROWSER_EDITDOC, CommandGroup::DOCUMENT );
}
-//------------------------------------------------------------------------------
FeatureState OGenericUnoController::GetState( sal_uInt16 _nId ) const
{
FeatureState aReturn;
@@ -966,7 +914,6 @@ FeatureState OGenericUnoController::GetState( sal_uInt16 _nId ) const
return aReturn;
}
-//------------------------------------------------------------------------------
void OGenericUnoController::Execute( sal_uInt16 _nId, const Sequence< PropertyValue>& _rArgs )
{
OSL_ENSURE( isUserDefinedFeature( _nId ),
@@ -977,7 +924,6 @@ void OGenericUnoController::Execute( sal_uInt16 _nId, const Sequence< PropertyVa
m_pData->m_aUserDefinedFeatures.execute( getURLForId( _nId ), _rArgs );
}
-//------------------------------------------------------------------------------
URL OGenericUnoController::getURLForId(sal_Int32 _nId) const
{
URL aReturn;
@@ -998,13 +944,11 @@ URL OGenericUnoController::getURLForId(sal_Int32 _nId) const
return aReturn;
}
-//-------------------------------------------------------------------------
bool OGenericUnoController::isUserDefinedFeature( const sal_uInt16 _nFeatureId ) const
{
return ( _nFeatureId >= FIRST_USER_DEFINED_FEATURE ) && ( _nFeatureId < LAST_USER_DEFINED_FEATURE );
}
-//-------------------------------------------------------------------------
bool OGenericUnoController::isUserDefinedFeature( const OUString& _rFeatureURL ) const
{
SupportedFeatures::const_iterator pos = m_aSupportedFeatures.find( _rFeatureURL );
@@ -1014,7 +958,6 @@ bool OGenericUnoController::isUserDefinedFeature( const OUString& _rFeatureURL )
return ( pos != m_aSupportedFeatures.end() ) ? isUserDefinedFeature( pos->second.nFeatureId ) : false;
}
-//-------------------------------------------------------------------------
sal_Bool SAL_CALL OGenericUnoController::supportsService(const OUString& ServiceName) throw(RuntimeException)
{
Sequence< OUString > aSupported(getSupportedServiceNames());
@@ -1027,7 +970,6 @@ sal_Bool SAL_CALL OGenericUnoController::supportsService(const OUString& Service
return pArray != pArrayEnd;
}
-// -----------------------------------------------------------------------------
void OGenericUnoController::startConnectionListening(const Reference< XConnection >& _rxConnection)
{
// we have to remove ourself before dispoing the connection
@@ -1036,7 +978,6 @@ void OGenericUnoController::startConnectionListening(const Reference< XConnectio
xComponent->addEventListener(static_cast<XFrameActionListener*>(this));
}
-// -----------------------------------------------------------------------------
void OGenericUnoController::stopConnectionListening(const Reference< XConnection >& _rxConnection)
{
// we have to remove ourself before dispoing the connection
@@ -1044,7 +985,7 @@ void OGenericUnoController::stopConnectionListening(const Reference< XConnection
if (xComponent.is())
xComponent->removeEventListener(static_cast<XFrameActionListener*>(this));
}
-// -----------------------------------------------------------------------------
+
Reference< XConnection > OGenericUnoController::connect( const Reference< XDataSource>& _xDataSource,
::dbtools::SQLExceptionInfo* _pErrorInfo )
{
@@ -1056,7 +997,7 @@ Reference< XConnection > OGenericUnoController::connect( const Reference< XDataS
return xConnection;
}
-// -----------------------------------------------------------------------------
+
Reference< XConnection > OGenericUnoController::connect( const OUString& _rDataSourceName,
const OUString& _rContextInformation, ::dbtools::SQLExceptionInfo* _pErrorInfo )
{
@@ -1069,12 +1010,11 @@ Reference< XConnection > OGenericUnoController::connect( const OUString& _rDataS
return xConnection;
}
-// -----------------------------------------------------------------------------
void OGenericUnoController::showError(const SQLExceptionInfo& _rInfo)
{
::dbaui::showError(_rInfo,getView(),getORB());
}
-// -----------------------------------------------------------------------------
+
Reference< XLayoutManager > OGenericUnoController::getLayoutManager(const Reference< XFrame >& _xFrame) const
{
Reference< XPropertySet > xPropSet( _xFrame, UNO_QUERY );
@@ -1091,7 +1031,7 @@ Reference< XLayoutManager > OGenericUnoController::getLayoutManager(const Refere
}
return xLayoutManager;
}
-// -----------------------------------------------------------------------------
+
void OGenericUnoController::loadMenu(const Reference< XFrame >& _xFrame)
{
Reference< XLayoutManager > xLayoutManager = getLayoutManager(_xFrame);
@@ -1107,18 +1047,16 @@ void OGenericUnoController::loadMenu(const Reference< XFrame >& _xFrame)
onLoadedMenu( xLayoutManager );
}
-// -----------------------------------------------------------------------------
void OGenericUnoController::onLoadedMenu(const Reference< XLayoutManager >& /*_xLayoutManager*/)
{
// not interested in
}
-// -----------------------------------------------------------------------------
void OGenericUnoController::closeTask()
{
m_aAsyncCloseTask.Call();
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK_NOARG(OGenericUnoController, OnAsyncCloseTask)
{
if ( !OGenericUnoController_Base::rBHelper.bInDispose )
@@ -1135,42 +1073,38 @@ IMPL_LINK_NOARG(OGenericUnoController, OnAsyncCloseTask)
}
return 0L;
}
-// -----------------------------------------------------------------------------
+
Any SAL_CALL OGenericUnoController::getViewData(void) throw( RuntimeException )
{
return Any();
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL OGenericUnoController::restoreViewData(const Any& /*Data*/) throw( RuntimeException )
{
}
-// -----------------------------------------------------------------------------
Reference< XModel > SAL_CALL OGenericUnoController::getModel(void) throw( RuntimeException )
{
return Reference< XModel >();
}
-// -----------------------------------------------------------------------------
Reference< XFrame > SAL_CALL OGenericUnoController::getFrame(void) throw( RuntimeException )
{
::osl::MutexGuard aGuard( getMutex() );
return m_aCurrentFrame.getFrame();
}
-// -----------------------------------------------------------------------------
sal_Bool SAL_CALL OGenericUnoController::attachModel(const Reference< XModel > & /*xModel*/) throw( RuntimeException )
{
SAL_WARN("dbaccess.ui", "OGenericUnoController::attachModel: not supported!" );
return sal_False;
}
-// -----------------------------------------------------------------------------
void OGenericUnoController::executeUnChecked(sal_uInt16 _nCommandId, const Sequence< PropertyValue >& aArgs)
{
Execute(_nCommandId, aArgs);
}
-// -----------------------------------------------------------------------------
+
void OGenericUnoController::executeUnChecked(const util::URL& _rCommand, const Sequence< PropertyValue >& aArgs)
{
OSL_PRECOND( !m_aSupportedFeatures.empty(), "OGenericUnoController::executeUnChecked: shouldn't this be filled at construction time?" );
@@ -1181,7 +1115,7 @@ void OGenericUnoController::executeUnChecked(const util::URL& _rCommand, const S
if (aIter != m_aSupportedFeatures.end())
Execute( aIter->second.nFeatureId, aArgs );
}
-// -----------------------------------------------------------------------------
+
void OGenericUnoController::executeChecked(const util::URL& _rCommand, const Sequence< PropertyValue >& aArgs)
{
OSL_PRECOND( !m_aSupportedFeatures.empty(), "OGenericUnoController::executeChecked: shouldn't this be filled at construction time?" );
@@ -1196,8 +1130,7 @@ void OGenericUnoController::executeChecked(const util::URL& _rCommand, const Seq
Execute( nFeatureId, aArgs );
}
}
-// -----------------------------------------------------------------------------
-//------------------------------------------------------------------------------
+
namespace
{
OUString lcl_getModuleHelpModuleName( const Reference< XFrame >& _rxFrame )
@@ -1308,8 +1241,6 @@ namespace
}
}
-// -----------------------------------------------------------------------------
-
void OGenericUnoController::openHelpAgent(OUString const& _suHelpStringURL )
{
OUString suURL(_suHelpStringURL);
@@ -1353,7 +1284,7 @@ void OGenericUnoController::openHelpAgent( const URL& _rURL )
DBG_UNHANDLED_EXCEPTION();
}
}
-// -----------------------------------------------------------------------------
+
Reference< awt::XWindow> OGenericUnoController::getTopMostContainerWindow() const
{
Reference< ::com::sun::star::awt::XWindow> xWindow;
@@ -1373,7 +1304,7 @@ Reference< awt::XWindow> OGenericUnoController::getTopMostContainerWindow() cons
}
return xWindow;
}
-// -----------------------------------------------------------------------------
+
Reference< XTitle > OGenericUnoController::impl_getTitleHelper_throw()
{
SolarMutexGuard aSolarGuard;
@@ -1394,7 +1325,6 @@ Reference< XTitle > OGenericUnoController::impl_getTitleHelper_throw()
return m_xTitleHelper;
}
-//=============================================================================
// XTitle
OUString SAL_CALL OGenericUnoController::getTitle()
throw (RuntimeException)
@@ -1405,7 +1335,6 @@ OUString SAL_CALL OGenericUnoController::getTitle()
return getPrivateTitle() + impl_getTitleHelper_throw()->getTitle ();
}
-//=============================================================================
// XTitle
void SAL_CALL OGenericUnoController::setTitle(const OUString& sTitle)
throw (RuntimeException)
@@ -1416,7 +1345,6 @@ void SAL_CALL OGenericUnoController::setTitle(const OUString& sTitle)
impl_getTitleHelper_throw()->setTitle (sTitle);
}
-//=============================================================================
// XTitleChangeBroadcaster
void SAL_CALL OGenericUnoController::addTitleChangeListener(const Reference< XTitleChangeListener >& xListener)
throw (RuntimeException)
@@ -1426,7 +1354,6 @@ void SAL_CALL OGenericUnoController::addTitleChangeListener(const Reference< XTi
xBroadcaster->addTitleChangeListener (xListener);
}
-// -----------------------------------------------------------------------------
void SAL_CALL OGenericUnoController::removeTitleChangeListener(const Reference< XTitleChangeListener >& xListener)
throw (RuntimeException)
{
@@ -1435,49 +1362,40 @@ void SAL_CALL OGenericUnoController::removeTitleChangeListener(const Reference<
xBroadcaster->removeTitleChangeListener (xListener);
}
-// =============================================================================
// XUserInputInterception
-// -----------------------------------------------------------------------------
void SAL_CALL OGenericUnoController::addKeyHandler( const Reference< XKeyHandler >& _rxHandler ) throw (RuntimeException)
{
if ( _rxHandler.is() )
m_pData->m_aUserInputInterception.addKeyHandler( _rxHandler );
}
-// -----------------------------------------------------------------------------
void SAL_CALL OGenericUnoController::removeKeyHandler( const Reference< XKeyHandler >& _rxHandler ) throw (RuntimeException)
{
m_pData->m_aUserInputInterception.removeKeyHandler( _rxHandler );
}
-// -----------------------------------------------------------------------------
void SAL_CALL OGenericUnoController::addMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler ) throw (RuntimeException)
{
if ( _rxHandler.is() )
m_pData->m_aUserInputInterception.addMouseClickHandler( _rxHandler );
}
-// -----------------------------------------------------------------------------
void SAL_CALL OGenericUnoController::removeMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler ) throw (RuntimeException)
{
m_pData->m_aUserInputInterception.removeMouseClickHandler( _rxHandler );
}
-// =============================================================================
-// -----------------------------------------------------------------------------
void OGenericUnoController::executeChecked(sal_uInt16 _nCommandId, const Sequence< PropertyValue >& aArgs)
{
if ( isCommandEnabled(_nCommandId) )
Execute(_nCommandId, aArgs);
}
-// -----------------------------------------------------------------------------
sal_Bool OGenericUnoController::isCommandEnabled(sal_uInt16 _nCommandId) const
{
return GetState( _nCommandId ).bEnabled;
}
-// -----------------------------------------------------------------------------
sal_uInt16 OGenericUnoController::registerCommandURL( const OUString& _rCompleteCommandURL )
{
if ( _rCompleteCommandURL.isEmpty() )
@@ -1506,37 +1424,32 @@ sal_uInt16 OGenericUnoController::registerCommandURL( const OUString& _rComplete
return nFeatureId;
}
-// -----------------------------------------------------------------------------
void OGenericUnoController::notifyHiContrastChanged()
{
}
-// -----------------------------------------------------------------------------
sal_Bool OGenericUnoController::isDataSourceReadOnly() const
{
return sal_False;
}
-// -----------------------------------------------------------------------------
Reference< XController > OGenericUnoController::getXController() throw( RuntimeException )
{
return this;
}
-// -----------------------------------------------------------------------------
bool OGenericUnoController::interceptUserInput( const NotifyEvent& _rEvent )
{
return m_pData->m_aUserInputInterception.handleNotifyEvent( _rEvent );
}
-// -----------------------------------------------------------------------------
sal_Bool OGenericUnoController::isCommandChecked(sal_uInt16 _nCommandId) const
{
FeatureState aState = GetState( _nCommandId );
return aState.bChecked && (sal_Bool)*aState.bChecked;
}
-// -----------------------------------------------------------------------------
+
sal_Bool OGenericUnoController::isCommandEnabled( const OUString& _rCompleteCommandURL ) const
{
OSL_ENSURE( !_rCompleteCommandURL.isEmpty(), "OGenericUnoController::isCommandEnabled: Empty command url!" );
@@ -1549,7 +1462,6 @@ sal_Bool OGenericUnoController::isCommandEnabled( const OUString& _rCompleteComm
return bIsEnabled;
}
-// -----------------------------------------------------------------------------
Sequence< ::sal_Int16 > SAL_CALL OGenericUnoController::getSupportedCommandGroups() throw (RuntimeException)
{
CommandHashMap aCmdHashMap;
@@ -1580,7 +1492,6 @@ namespace
};
}
-// -----------------------------------------------------------------------------
Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableDispatchInformation( ::sal_Int16 CommandGroup ) throw (RuntimeException)
{
DispatchInfoList aInformationList;
@@ -1606,25 +1517,24 @@ Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableD
return aInformation;
}
-// -----------------------------------------------------------------------------
+
void OGenericUnoController::fillSupportedFeatures()
{
#ifdef DBG_UTIL
m_bDescribingSupportedFeatures = true;
#endif
describeSupportedFeatures();
-// -----------------------------------------------------------------------------
#ifdef DBG_UTIL
m_bDescribingSupportedFeatures = false;
#endif
}
-
void SAL_CALL OGenericUnoController::dispose() throw(::com::sun::star::uno::RuntimeException)
{
SolarMutexGuard aSolarGuard;
OGenericUnoController_Base::dispose();
}
+
} // namespace dbaui
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index f4b59c71b9ed..f7ef34c06c8f 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "sbagrid.hrc"
#include <svx/svxids.hrc>
@@ -105,37 +104,29 @@ extern "C" void SAL_CALL createRegistryInfo_SbaXGridControl()
{
static OMultiInstanceAutoRegistration< SbaXGridControl > aAutoRegistration;
}
-//-------------------------------------------------------------------------
+
::comphelper::StringSequence SAL_CALL SbaXGridControl::getSupportedServiceNames() throw()
{
return getSupportedServiceNames_Static();
}
-// -------------------------------------------------------------------------
+
Reference< XInterface > SAL_CALL SbaXGridControl::Create(const Reference<XMultiServiceFactory >& _rxFactory)
{
return *(new SbaXGridControl( comphelper::getComponentContext(_rxFactory) ));
}
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
-//=======================================================================================
// SbaXGridControl
-//=======================================================================================
-//------------------------------------------------------------------------------
OUString SAL_CALL SbaXGridControl::getImplementationName() throw()
{
return getImplementationName_Static();
}
-//------------------------------------------------------------------------------
OUString SbaXGridControl::getImplementationName_Static() throw( RuntimeException )
{
return OUString("com.sun.star.comp.dbu.SbaXGridControl");
}
-//------------------------------------------------------------------------------
Sequence< OUString> SbaXGridControl::getSupportedServiceNames_Static(void) throw( RuntimeException )
{
Sequence< OUString> aSupported(3);
@@ -144,21 +135,19 @@ Sequence< OUString> SbaXGridControl::getSupportedServiceNames_Static(void) throw
aSupported[2] = OUString("com.sun.star.awt.UnoControl");
return aSupported;
}
+
DBG_NAME(SbaXGridControl );
-//---------------------------------------------------------------------------------------
SbaXGridControl::SbaXGridControl(const Reference< XComponentContext >& _rM)
: FmXGridControl(_rM)
{
DBG_CTOR(SbaXGridControl ,NULL);
}
-//---------------------------------------------------------------------------------------
SbaXGridControl::~SbaXGridControl()
{
DBG_DTOR(SbaXGridControl ,NULL);
}
-//---------------------------------------------------------------------------------------
FmXGridPeer* SbaXGridControl::imp_CreatePeer(Window* pParent)
{
FmXGridPeer* pReturn = new SbaXGridPeer(m_xContext);
@@ -183,14 +172,12 @@ FmXGridPeer* SbaXGridControl::imp_CreatePeer(Window* pParent)
return pReturn;
}
-//------------------------------------------------------------------------------
Any SAL_CALL SbaXGridControl::queryInterface(const Type& _rType) throw (RuntimeException)
{
Any aRet = FmXGridControl::queryInterface(_rType);
return aRet.hasValue() ? aRet : ::cppu::queryInterface(_rType,(::com::sun::star::frame::XDispatch*)this);
}
-//------------------------------------------------------------------------------
Sequence< Type > SAL_CALL SbaXGridControl::getTypes( ) throw (RuntimeException)
{
Sequence< Type > aTypes = FmXGridControl::getTypes();
@@ -202,7 +189,6 @@ Sequence< Type > SAL_CALL SbaXGridControl::getTypes( ) throw (RuntimeException)
return aTypes;
}
-//------------------------------------------------------------------------------
Sequence< sal_Int8 > SAL_CALL SbaXGridControl::getImplementationId( ) throw (RuntimeException)
{
static ::cppu::OImplementationId * pId = 0;
@@ -218,7 +204,6 @@ Sequence< sal_Int8 > SAL_CALL SbaXGridControl::getImplementationId( ) throw (Ru
return pId->getImplementationId();
}
-//---------------------------------------------------------------------------------------
void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt::XToolkit > & rToolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer) throw( RuntimeException )
{
FmXGridControl::createPeer(rToolkit, rParentPeer);
@@ -238,14 +223,13 @@ void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt
}
}
-//---------------------------------------------------------------------------------------
void SAL_CALL SbaXGridControl::dispatch(const ::com::sun::star::util::URL& aURL, const Sequence< PropertyValue >& aArgs) throw( RuntimeException )
{
Reference< ::com::sun::star::frame::XDispatch > xDisp(getPeer(), UNO_QUERY);
if (xDisp.is())
xDisp->dispatch(aURL, aArgs);
}
-//---------------------------------------------------------------------------------------
+
void SAL_CALL SbaXGridControl::addStatusListener( const Reference< XStatusListener > & _rxListener, const URL& _rURL ) throw( RuntimeException )
{
::osl::MutexGuard aGuard( GetMutex() );
@@ -274,7 +258,6 @@ void SAL_CALL SbaXGridControl::addStatusListener( const Reference< XStatusListen
}
}
-//---------------------------------------------------------------------------------------
void SAL_CALL SbaXGridControl::removeStatusListener(const Reference< ::com::sun::star::frame::XStatusListener > & _rxListener, const ::com::sun::star::util::URL& _rURL) throw( RuntimeException )
{
::osl::MutexGuard aGuard( GetMutex() );
@@ -294,7 +277,6 @@ void SAL_CALL SbaXGridControl::removeStatusListener(const Reference< ::com::sun:
pMultiplexer->removeInterface( _rxListener );
}
-//---------------------------------------------------------------------------------------
void SAL_CALL SbaXGridControl::dispose(void) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -318,11 +300,8 @@ void SAL_CALL SbaXGridControl::dispose(void) throw( RuntimeException )
FmXGridControl::dispose();
}
-//=======================================================================================
// SbaXGridPeer
-//=======================================================================================
DBG_NAME(SbaXGridPeer )
-//---------------------------------------------------------------------------------------
SbaXGridPeer::SbaXGridPeer(const Reference< XComponentContext >& _rM)
: FmXGridPeer(_rM)
,m_aStatusListeners(m_aMutex)
@@ -330,13 +309,11 @@ SbaXGridPeer::SbaXGridPeer(const Reference< XComponentContext >& _rM)
DBG_CTOR(SbaXGridPeer ,NULL);
}
-//---------------------------------------------------------------------------------------
SbaXGridPeer::~SbaXGridPeer()
{
DBG_DTOR(SbaXGridPeer ,NULL);
}
-//---------------------------------------------------------------------------------------
void SAL_CALL SbaXGridPeer::dispose(void) throw( RuntimeException )
{
EventObject aEvt(*this);
@@ -346,7 +323,6 @@ void SAL_CALL SbaXGridPeer::dispose(void) throw( RuntimeException )
FmXGridPeer::dispose();
}
-//---------------------------------------------------------------------------------------
void SbaXGridPeer::NotifyStatusChanged(const ::com::sun::star::util::URL& _rUrl, const Reference< ::com::sun::star::frame::XStatusListener > & xControl)
{
SbaGridControl* pGrid = (SbaGridControl*) GetWindow();
@@ -379,7 +355,6 @@ void SbaXGridPeer::NotifyStatusChanged(const ::com::sun::star::util::URL& _rUrl,
}
}
-//------------------------------------------------------------------------------
Any SAL_CALL SbaXGridPeer::queryInterface(const Type& _rType) throw (RuntimeException)
{
Any aRet = ::cppu::queryInterface(_rType,(::com::sun::star::frame::XDispatch*)this);
@@ -388,7 +363,6 @@ Any SAL_CALL SbaXGridPeer::queryInterface(const Type& _rType) throw (RuntimeExce
return FmXGridPeer::queryInterface(_rType);
}
-//---------------------------------------------------------------------------------------
Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaXGridPeer::queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException )
{
if ( ( aURL.Complete == ".uno:GridSlots/BrowserAttribs" ) || ( aURL.Complete == ".uno:GridSlots/RowHeight" )
@@ -401,7 +375,6 @@ Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaXGridPeer::queryDis
return FmXGridPeer::queryDispatch(aURL, aTargetFrameName, nSearchFlags);
}
-//---------------------------------------------------------------------------------------
IMPL_LINK( SbaXGridPeer, OnDispatchEvent, void*, /*NOTINTERESTEDIN*/ )
{
SbaGridControl* pGrid = static_cast< SbaGridControl* >( GetWindow() );
@@ -425,7 +398,6 @@ IMPL_LINK( SbaXGridPeer, OnDispatchEvent, void*, /*NOTINTERESTEDIN*/ )
return 0;
}
-//---------------------------------------------------------------------------------------
SbaXGridPeer::DispatchType SbaXGridPeer::classifyDispatchURL( const URL& _rURL )
{
DispatchType eURLType = dtUnknown;
@@ -440,7 +412,6 @@ SbaXGridPeer::DispatchType SbaXGridPeer::classifyDispatchURL( const URL& _rURL )
return eURLType;
}
-//---------------------------------------------------------------------------------------
void SAL_CALL SbaXGridPeer::dispatch(const URL& aURL, const Sequence< PropertyValue >& aArgs) throw( RuntimeException )
{
SbaGridControl* pGrid = (SbaGridControl*)GetWindow();
@@ -539,7 +510,6 @@ void SAL_CALL SbaXGridPeer::dispatch(const URL& aURL, const Sequence< PropertyVa
}
}
-//---------------------------------------------------------------------------------------
void SAL_CALL SbaXGridPeer::addStatusListener(const Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( RuntimeException )
{
::cppu::OInterfaceContainerHelper* pCont = m_aStatusListeners.getContainer(aURL);
@@ -550,7 +520,6 @@ void SAL_CALL SbaXGridPeer::addStatusListener(const Reference< ::com::sun::star:
NotifyStatusChanged(aURL, xControl);
}
-//---------------------------------------------------------------------------------------
void SAL_CALL SbaXGridPeer::removeStatusListener(const Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( RuntimeException )
{
::cppu::OInterfaceContainerHelper* pCont = m_aStatusListeners.getContainer(aURL);
@@ -579,7 +548,6 @@ Sequence< Type > SAL_CALL SbaXGridPeer::getTypes() throw (RuntimeException)
}
// return implementation specific data
-//------------------------------------------------------------------
sal_Int64 SAL_CALL SbaXGridPeer::getSomething( const Sequence< sal_Int8 > & rId ) throw(::com::sun::star::uno::RuntimeException)
{
if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) )
@@ -588,7 +556,6 @@ sal_Int64 SAL_CALL SbaXGridPeer::getSomething( const Sequence< sal_Int8 > & rId
return FmXGridPeer::getSomething(rId);
}
-//---------------------------------------------------------------------------------------
SbaXGridPeer* SbaXGridPeer::getImplementation(const Reference< XInterface >& _rxIFace)
{
Reference< XUnoTunnel > xTunnel(
@@ -598,24 +565,19 @@ SbaXGridPeer* SbaXGridPeer::getImplementation(const Reference< XInterface >& _rx
return NULL;
}
-//---------------------------------------------------------------------------------------
FmGridControl* SbaXGridPeer::imp_CreateControl(Window* pParent, WinBits nStyle)
{
return new SbaGridControl( m_xContext, pParent, this, nStyle);
}
-//==================================================================
// SbaGridHeader
-//==================================================================
-//---------------------------------------------------------------------------------------
SbaGridHeader::SbaGridHeader(BrowseBox* pParent, WinBits nWinBits)
:FmGridHeader(pParent, nWinBits)
,DragSourceHelper(this)
{
}
-//---------------------------------------------------------------------------------------
void SbaGridHeader::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel )
{
SolarMutexGuard aGuard;
@@ -624,7 +586,6 @@ void SbaGridHeader::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel )
ImplStartColumnDrag( _nAction, _rPosPixel );
}
-//---------------------------------------------------------------------------------------
void SbaGridHeader::MouseButtonDown( const MouseEvent& _rMEvt )
{
if (_rMEvt.IsLeft())
@@ -638,7 +599,6 @@ void SbaGridHeader::MouseButtonDown( const MouseEvent& _rMEvt )
FmGridHeader::MouseButtonDown(_rMEvt);
}
-//---------------------------------------------------------------------------------------
sal_Bool SbaGridHeader::ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMousePos)
{
sal_uInt16 nId = GetItemId(_rMousePos);
@@ -672,7 +632,6 @@ sal_Bool SbaGridHeader::ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMo
return sal_False;
}
-//---------------------------------------------------------------------------------------
void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu)
{
FmGridHeader::PreExecuteColumnContextMenu(nColId, rMenu);
@@ -730,7 +689,6 @@ void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rM
}
}
-//---------------------------------------------------------------------------------------
void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMenu& rMenu, sal_uInt16 nExecutionResult)
{
switch (nExecutionResult)
@@ -762,11 +720,8 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM
}
}
-//==================================================================
// SbaGridControl
-//==================================================================
DBG_NAME(SbaGridControl );
-//---------------------------------------------------------------------------------------
SbaGridControl::SbaGridControl(Reference< XComponentContext > _rM,
Window* pParent, FmXGridPeer* _pPeer, WinBits nBits)
:FmGridControl(_rM,pParent, _pPeer, nBits)
@@ -778,7 +733,6 @@ SbaGridControl::SbaGridControl(Reference< XComponentContext > _rM,
DBG_CTOR(SbaGridControl ,NULL);
}
-//---------------------------------------------------------------------------------------
SbaGridControl::~SbaGridControl()
{
DBG_DTOR(SbaGridControl ,NULL);
@@ -786,13 +740,11 @@ SbaGridControl::~SbaGridControl()
Application::RemoveUserEvent(m_nAsyncDropEvent);
}
-//---------------------------------------------------------------------------------------
BrowserHeader* SbaGridControl::imp_CreateHeaderBar(BrowseBox* pParent)
{
return new SbaGridHeader(pParent);
}
-//---------------------------------------------------------------------------------------
CellController* SbaGridControl::GetController(long nRow, sal_uInt16 nCol)
{
if ( m_bActivatingForDrop )
@@ -801,7 +753,6 @@ CellController* SbaGridControl::GetController(long nRow, sal_uInt16 nCol)
return FmGridControl::GetController(nRow, nCol);
}
-//---------------------------------------------------------------------------------------
void SbaGridControl::PreExecuteRowContextMenu(sal_uInt16 nRow, PopupMenu& rMenu)
{
FmGridControl::PreExecuteRowContextMenu(nRow, rMenu);
@@ -828,7 +779,6 @@ void SbaGridControl::PreExecuteRowContextMenu(sal_uInt16 nRow, PopupMenu& rMenu)
}
}
-//------------------------------------------------------------------------------
SvNumberFormatter* SbaGridControl::GetDatasourceFormatter()
{
Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = ::dbtools::getNumberFormats(::dbtools::getConnection(Reference< XRowSet > (getDataSource(),UNO_QUERY)), sal_True, getContext());
@@ -841,7 +791,6 @@ SvNumberFormatter* SbaGridControl::GetDatasourceFormatter()
return pFormatter;
}
-//------------------------------------------------------------------------------
void SbaGridControl::SetColWidth(sal_uInt16 nColId)
{
// get the (UNO) column model
@@ -876,7 +825,6 @@ void SbaGridControl::SetColWidth(sal_uInt16 nColId)
}
}
-//------------------------------------------------------------------------------
void SbaGridControl::SetRowHeight()
{
Reference< XPropertySet > xCols(GetPeer()->getColumns(), UNO_QUERY);
@@ -917,7 +865,6 @@ void SbaGridControl::SetRowHeight()
}
}
-//------------------------------------------------------------------------------
void SbaGridControl::SetColAttrs(sal_uInt16 nColId)
{
SvNumberFormatter* pFormatter = GetDatasourceFormatter();
@@ -937,8 +884,6 @@ void SbaGridControl::SetColAttrs(sal_uInt16 nColId)
::dbaui::callColumnFormatDialog(xAffectedCol,xField,pFormatter,this);//(Window::GetSettings().GetLanguage());
}
-
-//------------------------------------------------------------------------------
void SbaGridControl::SetBrowserAttrs()
{
Reference< XPropertySet > xGridModel(GetPeer()->getColumns(), UNO_QUERY);
@@ -957,7 +902,6 @@ void SbaGridControl::SetBrowserAttrs()
}
}
-//---------------------------------------------------------------------------------------
void SbaGridControl::PostExecuteRowContextMenu(sal_uInt16 nRow, const PopupMenu& rMenu, sal_uInt16 nExecutionResult)
{
switch (nExecutionResult)
@@ -978,7 +922,6 @@ void SbaGridControl::PostExecuteRowContextMenu(sal_uInt16 nRow, const PopupMenu&
}
}
-//---------------------------------------------------------------------------------------
void SbaGridControl::Select()
{
// Some selection has changed ...
@@ -988,13 +931,11 @@ void SbaGridControl::Select()
m_pMasterListener->SelectionChanged();
}
-//---------------------------------------------------------------------------------------
void SbaGridControl::CursorMoved()
{
FmGridControl::CursorMoved();
}
-//---------------------------------------------------------------------------------------
void SbaGridControl::ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus /*= sal_True*/ )
{
FmGridControl::ActivateCell(nRow, nCol, bSetCellFocus);
@@ -1002,7 +943,6 @@ void SbaGridControl::ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellF
m_pMasterListener->CellActivated();
}
-//---------------------------------------------------------------------------------------
void SbaGridControl::DeactivateCell(sal_Bool bUpdate /*= sal_True*/)
{
FmGridControl::DeactivateCell(bUpdate);
@@ -1010,35 +950,30 @@ void SbaGridControl::DeactivateCell(sal_Bool bUpdate /*= sal_True*/)
m_pMasterListener->CellDeactivated();
}
-//---------------------------------------------------------------------------------------
void SbaGridControl::onRowChange()
{
if ( m_pMasterListener )
m_pMasterListener->RowChanged();
}
-//---------------------------------------------------------------------------------------
void SbaGridControl::onColumnChange()
{
if ( m_pMasterListener )
m_pMasterListener->ColumnChanged();
}
-//---------------------------------------------------------------------------------------
void SbaGridControl::BeforeDrop()
{
if (m_pMasterListener)
m_pMasterListener->BeforeDrop();
}
-//---------------------------------------------------------------------------------------
+
void SbaGridControl::AfterDrop()
{
if (m_pMasterListener)
m_pMasterListener->AfterDrop();
}
-
-//------------------------------------------------------------------------------
Reference< XPropertySet > SbaGridControl::getField(sal_uInt16 nModelPos)
{
Reference< XPropertySet > xEmptyReturn;
@@ -1063,7 +998,6 @@ Reference< XPropertySet > SbaGridControl::getField(sal_uInt16 nModelPos)
return xEmptyReturn;
}
-//---------------------------------------------------------------------------------------
sal_Bool SbaGridControl::IsReadOnlyDB() const
{
// assume yes if anything fails
@@ -1090,7 +1024,6 @@ sal_Bool SbaGridControl::IsReadOnlyDB() const
return bDBIsReadOnly;
}
-//---------------------------------------------------------------------------------------
void SbaGridControl::MouseButtonDown( const BrowserMouseEvent& rMEvt)
{
long nRow = GetRowAtYPosPixel(rMEvt.GetPosPixel().Y());
@@ -1106,7 +1039,6 @@ void SbaGridControl::MouseButtonDown( const BrowserMouseEvent& rMEvt)
FmGridControl::MouseButtonDown(rMEvt);
}
-//---------------------------------------------------------------------------------------
void SbaGridControl::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel )
{
SolarMutexGuard aGuard;
@@ -1200,13 +1132,11 @@ void SbaGridControl::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel )
FmGridControl::StartDrag(_nAction, _rPosPixel);
}
-//------------------------------------------------------------------------------
void SbaGridControl::Command(const CommandEvent& rEvt)
{
FmGridControl::Command(rEvt);
}
-// -----------------------------------------------------------------------
void SbaGridControl::DoColumnDrag(sal_uInt16 nColumnPos)
{
Reference< XPropertySet > xDataSource(getDataSource(), UNO_QUERY);
@@ -1243,20 +1173,17 @@ void SbaGridControl::DoColumnDrag(sal_uInt16 nColumnPos)
pDataTransfer->StartDrag(this, DND_ACTION_COPY | DND_ACTION_LINK);
}
-// -----------------------------------------------------------------------
void SbaGridControl::CopySelectedRowsToClipboard()
{
OSL_ENSURE( GetSelectRowCount() > 0, "SbaGridControl::CopySelectedRowsToClipboard: invalid call!" );
implTransferSelectedRows( (sal_Int16)FirstSelectedRow(), true );
}
-// -----------------------------------------------------------------------
void SbaGridControl::DoRowDrag( sal_Int16 nRowPos )
{
implTransferSelectedRows( nRowPos, false );
}
-// -----------------------------------------------------------------------
void SbaGridControl::implTransferSelectedRows( sal_Int16 nRowPos, bool _bTrueIfClipboardFalseIfDrag )
{
Reference< XPropertySet > xForm( getDataSource(), UNO_QUERY );
@@ -1295,7 +1222,6 @@ void SbaGridControl::implTransferSelectedRows( sal_Int16 nRowPos, bool _bTrueIfC
}
}
-// -----------------------------------------------------------------------
void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos)
{
// the only thing to do here is dragging the pure cell text
@@ -1321,6 +1247,7 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos)
}
}
+
/// unary_function Functor object for class ZZ returntype is void
struct SbaGridControlPrec : ::std::unary_function<DataFlavorExVector::value_type,bool>
{
@@ -1342,7 +1269,6 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos)
return false;
}
};
-//------------------------------------------------------------------------------
sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
{
sal_Int8 nAction = DND_ACTION_NONE;
@@ -1438,7 +1364,6 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
return (DND_ACTION_NONE != nAction) ? nAction : FmGridControl::AcceptDrop(rEvt);
}
-//------------------------------------------------------------------------------
sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt )
{
// we need some properties of our data source
@@ -1508,7 +1433,6 @@ sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt )
return DND_ACTION_NONE;
}
-//------------------------------------------------------------------------------
Reference< XPropertySet > SbaGridControl::getDataSource() const
{
Reference< XPropertySet > xReturn;
@@ -1520,7 +1444,7 @@ Reference< XPropertySet > SbaGridControl::getDataSource() const
return xReturn;
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, /*EMPTY_ARG*/)
{
m_nAsyncDropEvent = 0;
@@ -1567,7 +1491,7 @@ IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, /*EMPTY_ARG*/)
return 0L;
}
-// -------------------------------------------------------------------------
+
OUString SbaGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition) const
{
OUString sRet;
@@ -1580,11 +1504,10 @@ OUString SbaGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowse
sRet = FmGridControl::GetAccessibleObjectDescription( eObjType,_nPosition);
return sRet;
}
-// -----------------------------------------------------------------------------
+
void SbaGridControl::DeleteSelectedRows()
{
FmGridControl::DeleteSelectedRows();
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/sbamultiplex.cxx b/dbaccess/source/ui/browser/sbamultiplex.cxx
index 00ff65d0d007..1f4e91ed60fd 100644
--- a/dbaccess/source/ui/browser/sbamultiplex.cxx
+++ b/dbaccess/source/ui/browser/sbamultiplex.cxx
@@ -17,13 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "sbamultiplex.hxx"
using namespace dbaui;
-//==================================================================
// the listener multiplexers
-//==================================================================
// XStatusListener
IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXStatusMultiplexer, ::com::sun::star::frame::XStatusListener)
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 57634c90e89e..84e0d7b59794 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "browserids.hxx"
#include "dbaccess_helpid.hrc"
#include "dbexchange.hxx"
@@ -153,23 +152,18 @@ using namespace ::dbtools;
using namespace ::comphelper;
using namespace ::svx;
-// .........................................................................
namespace dbaui
{
-// .........................................................................
namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer;
-//==================================================================
-//= SbaTableQueryBrowser
-//==================================================================
-// -------------------------------------------------------------------------
+// SbaTableQueryBrowser
extern "C" void SAL_CALL createRegistryInfo_OBrowser()
{
static OMultiInstanceAutoRegistration< SbaTableQueryBrowser > aAutoRegistration;
}
-// -------------------------------------------------------------------------
+
void SafeAddPropertyListener(const Reference< XPropertySet > & xSet, const OUString& rPropName, XPropertyChangeListener* pListener)
{
Reference< XPropertySetInfo > xInfo = xSet->getPropertySetInfo();
@@ -177,36 +171,35 @@ void SafeAddPropertyListener(const Reference< XPropertySet > & xSet, const OUStr
xSet->addPropertyChangeListener(rPropName, pListener);
}
-// -------------------------------------------------------------------------
void SafeRemovePropertyListener(const Reference< XPropertySet > & xSet, const OUString& rPropName, XPropertyChangeListener* pListener)
{
Reference< XPropertySetInfo > xInfo = xSet->getPropertySetInfo();
if (xInfo->hasPropertyByName(rPropName))
xSet->removePropertyChangeListener(rPropName, pListener);
}
-//-------------------------------------------------------------------------
+
OUString SAL_CALL SbaTableQueryBrowser::getImplementationName() throw(RuntimeException)
{
return getImplementationName_Static();
}
-//-------------------------------------------------------------------------
+
::comphelper::StringSequence SAL_CALL SbaTableQueryBrowser::getSupportedServiceNames() throw(RuntimeException)
{
return getSupportedServiceNames_Static();
}
-// -------------------------------------------------------------------------
+
OUString SbaTableQueryBrowser::getImplementationName_Static() throw(RuntimeException)
{
return OUString("org.openoffice.comp.dbu.ODatasourceBrowser");
}
-//-------------------------------------------------------------------------
+
::comphelper::StringSequence SbaTableQueryBrowser::getSupportedServiceNames_Static() throw(RuntimeException)
{
::comphelper::StringSequence aSupported(1);
aSupported.getArray()[0] = OUString("com.sun.star.sdb.DataSourceBrowser");
return aSupported;
}
-//-------------------------------------------------------------------------
+
Reference< XInterface > SAL_CALL SbaTableQueryBrowser::Create(const Reference<XMultiServiceFactory >& _rxFactory)
{
SolarMutexGuard aGuard;
@@ -214,7 +207,6 @@ Reference< XInterface > SAL_CALL SbaTableQueryBrowser::Create(const Reference<XM
}
DBG_NAME(SbaTableQueryBrowser);
-//------------------------------------------------------------------------------
SbaTableQueryBrowser::SbaTableQueryBrowser(const Reference< XComponentContext >& _rM)
:SbaXDataBrowserController(_rM)
,m_aSelectionListeners( getMutex() )
@@ -234,7 +226,6 @@ SbaTableQueryBrowser::SbaTableQueryBrowser(const Reference< XComponentContext >&
DBG_CTOR(SbaTableQueryBrowser,NULL);
}
-//------------------------------------------------------------------------------
SbaTableQueryBrowser::~SbaTableQueryBrowser()
{
DBG_DTOR(SbaTableQueryBrowser,NULL);
@@ -247,7 +238,6 @@ SbaTableQueryBrowser::~SbaTableQueryBrowser()
}
}
-//------------------------------------------------------------------------------
Any SAL_CALL SbaTableQueryBrowser::queryInterface(const Type& _rType) throw (RuntimeException)
{
if ( _rType.equals( XScriptInvocationContext::static_type() ) )
@@ -264,7 +254,6 @@ Any SAL_CALL SbaTableQueryBrowser::queryInterface(const Type& _rType) throw (Run
return aReturn;
}
-//------------------------------------------------------------------------------
Sequence< Type > SAL_CALL SbaTableQueryBrowser::getTypes( ) throw (RuntimeException)
{
Sequence< Type > aTypes( ::comphelper::concatSequences(
@@ -287,7 +276,6 @@ Sequence< Type > SAL_CALL SbaTableQueryBrowser::getTypes( ) throw (RuntimeExcep
return aTypes;
}
-//------------------------------------------------------------------------------
Sequence< sal_Int8 > SAL_CALL SbaTableQueryBrowser::getImplementationId( ) throw (RuntimeException)
{
static ::cppu::OImplementationId * pId = 0;
@@ -303,7 +291,6 @@ Sequence< sal_Int8 > SAL_CALL SbaTableQueryBrowser::getImplementationId( ) thro
return pId->getImplementationId();
}
-//------------------------------------------------------------------------------
void SAL_CALL SbaTableQueryBrowser::disposing()
{
SolarMutexGuard aGuard;
@@ -349,7 +336,6 @@ void SAL_CALL SbaTableQueryBrowser::disposing()
SbaXDataBrowserController::disposing();
}
-//------------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::Construct(Window* pParent)
{
if ( !SbaXDataBrowserController::Construct( pParent ) )
@@ -412,10 +398,9 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent)
return sal_True;
}
-// ---------------------------------------------------------------------------------------------------------------------
+
namespace
{
- // -----------------------------------------------------------------------------------------------------------------
struct SelectValueByName : public ::std::unary_function< OUString, Any >
{
const Any& operator()( OUString const& i_name ) const
@@ -432,7 +417,6 @@ namespace
};
}
-// ---------------------------------------------------------------------------------------------------------------------
void SbaTableQueryBrowser::impl_sanitizeRowSetClauses_nothrow()
{
try
@@ -457,7 +441,6 @@ void SbaTableQueryBrowser::impl_sanitizeRowSetClauses_nothrow()
const Reference< XColumnsSupplier > xSuppColumns( xComposer, UNO_QUERY_THROW );
const Reference< XNameAccess > xColumnNames( xSuppColumns->getColumns(), UNO_QUERY_THROW );
- // .............................................................................................................
// check if the order columns apply to tables which really exist in the statement
const Reference< XIndexAccess > xOrderColumns( xComposer->getOrderColumns(), UNO_SET_THROW );
const sal_Int32 nOrderColumns( xOrderColumns->getCount() );
@@ -504,7 +487,6 @@ void SbaTableQueryBrowser::impl_sanitizeRowSetClauses_nothrow()
xComposer->setOrder( sEmptyOrder );
}
- // .............................................................................................................
// check if the columns participating in the filter refer to existing tables
// TODO: there's no API at all for this. The method which comes nearest to what we need is
// "getStructuredFilter", but it returns pure column names only. That is, for a statement like
@@ -541,7 +523,6 @@ void SbaTableQueryBrowser::impl_sanitizeRowSetClauses_nothrow()
// ...
// }
// enum SQLFilterOperand { Column, Literal, ... }
- //
// ... or something like this ....
}
catch( const Exception& )
@@ -550,7 +531,6 @@ void SbaTableQueryBrowser::impl_sanitizeRowSetClauses_nothrow()
}
}
-// ---------------------------------------------------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::InitializeForm( const Reference< XPropertySet > & i_formProperties )
{
if(!m_pCurrentlyDisplayed)
@@ -603,7 +583,6 @@ sal_Bool SbaTableQueryBrowser::InitializeForm( const Reference< XPropertySet > &
return sal_True;
}
-//------------------------------------------------------------------------------
void SbaTableQueryBrowser::initializePreviewMode()
{
if ( getBrowserView() && getBrowserView()->getVclControl() )
@@ -621,7 +600,6 @@ void SbaTableQueryBrowser::initializePreviewMode()
}
}
-//------------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::star::form::XFormComponent > & xGrid)
{
try
@@ -686,7 +664,6 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
xFormMultiSet->setPropertyValues(aProperties, aValues);
}
-
// get the formats supplier of the database we're working with
Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = getNumberFormatter()->getNumberFormatsSupplier();
@@ -858,7 +835,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
return sal_True;
}
-// -----------------------------------------------------------------------------
+
Reference<XPropertySet> getColumnHelper(SvTreeListEntry* _pCurrentlyDisplayed,const Reference<XPropertySet>& _rxSource)
{
Reference<XPropertySet> xRet;
@@ -875,7 +852,6 @@ Reference<XPropertySet> getColumnHelper(SvTreeListEntry* _pCurrentlyDisplayed,co
return xRet;
}
-// -----------------------------------------------------------------------
void SbaTableQueryBrowser::transferChangedControlProperty(const OUString& _rProperty, const Any& _rNewValue)
{
if(m_pCurrentlyDisplayed)
@@ -888,7 +864,6 @@ void SbaTableQueryBrowser::transferChangedControlProperty(const OUString& _rProp
}
}
-// -----------------------------------------------------------------------
void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException)
{
SbaXDataBrowserController::propertyChange(evt);
@@ -996,7 +971,6 @@ void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw(
}
}
-// -----------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::suspend(sal_Bool bSuspend) throw( RuntimeException )
{
SolarMutexGuard aSolarGuard;
@@ -1020,7 +994,6 @@ sal_Bool SbaTableQueryBrowser::suspend(sal_Bool bSuspend) throw( RuntimeExceptio
return bRet;
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaTableQueryBrowser::statusChanged( const FeatureStateEvent& _rEvent ) throw(RuntimeException)
{
// search the external dispatcher causing this call
@@ -1074,7 +1047,6 @@ void SAL_CALL SbaTableQueryBrowser::statusChanged( const FeatureStateEvent& _rEv
OSL_ENSURE(aLoop != m_aExternalFeatures.end(), "SbaTableQueryBrowser::statusChanged: don't know who sent this!");
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::checkDocumentDataSource()
{
SvTreeListEntry* pDataSourceEntry = NULL;
@@ -1111,7 +1083,6 @@ void SbaTableQueryBrowser::checkDocumentDataSource()
implCheckExternalSlot(ID_BROWSER_DOCUMENT_DATASOURCE);
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::extractDescriptorProps(const ::svx::ODataAccessDescriptor& _rDescriptor, OUString& _rDataSource, OUString& _rCommand, sal_Int32& _rCommandType, sal_Bool& _rEscapeProcessing)
{
_rDataSource = _rDescriptor.getDataSource();
@@ -1126,7 +1097,6 @@ void SbaTableQueryBrowser::extractDescriptorProps(const ::svx::ODataAccessDescri
_rEscapeProcessing = ::cppu::any2bool(_rDescriptor[daEscapeProcessing]);
}
-// -------------------------------------------------------------------------
namespace
{
bool getDataSourceDisplayName_isURL( const OUString& _rDS, OUString& _rDisplayName, OUString& _rUniqueId )
@@ -1143,7 +1113,6 @@ namespace
return false;
}
- // .....................................................................
struct FilterByEntryDataId : public IEntryFilter
{
OUString sId;
@@ -1161,7 +1130,6 @@ namespace
}
}
-// -------------------------------------------------------------------------
OUString SbaTableQueryBrowser::getDataSourceAcessor( SvTreeListEntry* _pDataSourceEntry ) const
{
OSL_ENSURE( _pDataSourceEntry, "SbaTableQueryBrowser::getDataSourceAcessor: invalid entry!" );
@@ -1172,7 +1140,6 @@ OUString SbaTableQueryBrowser::getDataSourceAcessor( SvTreeListEntry* _pDataSour
return pData->sAccessor.Len() ? OUString(pData->sAccessor) : GetEntryText( _pDataSourceEntry );
}
-// -------------------------------------------------------------------------
SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const OUString& _rDataSource, const OUString& _rCommand, sal_Int32 _nCommandType,
SvTreeListEntry** _ppDataSourceEntry, SvTreeListEntry** _ppContainerEntry, sal_Bool _bExpandAncestors,
const SharedConnection& _rxConnection )
@@ -1299,7 +1266,6 @@ SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const OUString& _rDataSour
return pObject;
}
-// -------------------------------------------------------------------------
SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const ::svx::ODataAccessDescriptor& _rDescriptor,
SvTreeListEntry** _ppDataSourceEntry, SvTreeListEntry** _ppContainerEntry,
sal_Bool _bExpandAncestors)
@@ -1314,7 +1280,6 @@ SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const ::svx::ODataAccessDe
return getObjectEntry( sDataSource, sCommand, nCommandType, _ppDataSourceEntry, _ppContainerEntry, _bExpandAncestors, SharedConnection() );
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::connectExternalDispatches()
{
Reference< XDispatchProvider > xProvider( getFrame(), UNO_QUERY );
@@ -1380,7 +1345,6 @@ void SbaTableQueryBrowser::connectExternalDispatches()
}
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::implCheckExternalSlot( sal_uInt16 _nId )
{
if ( !m_xMainToolbar.is() )
@@ -1402,7 +1366,6 @@ void SbaTableQueryBrowser::implCheckExternalSlot( sal_uInt16 _nId )
InvalidateFeature( _nId );
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaTableQueryBrowser::disposing( const com::sun::star::lang::EventObject& _rSource ) throw(RuntimeException)
{
// our frame ?
@@ -1462,7 +1425,6 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const com::sun::star::lang::Event
}
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::implRemoveStatusListeners()
{
// clear all old dispatches
@@ -1486,7 +1448,6 @@ void SbaTableQueryBrowser::implRemoveStatusListeners()
m_aExternalFeatures.clear();
}
-// -------------------------------------------------------------------------
sal_Bool SAL_CALL SbaTableQueryBrowser::select( const Any& _rSelection ) throw (IllegalArgumentException, RuntimeException)
{
SolarMutexGuard aGuard;
@@ -1515,7 +1476,6 @@ sal_Bool SAL_CALL SbaTableQueryBrowser::select( const Any& _rSelection ) throw (
return implSelect(aDescriptor,sal_True);
}
-// -------------------------------------------------------------------------
Any SAL_CALL SbaTableQueryBrowser::getSelection( ) throw (RuntimeException)
{
Any aReturn;
@@ -1542,19 +1502,16 @@ Any SAL_CALL SbaTableQueryBrowser::getSelection( ) throw (RuntimeException)
return aReturn;
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaTableQueryBrowser::addSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException)
{
m_aSelectionListeners.addInterface(_rxListener);
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaTableQueryBrowser::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException)
{
m_aSelectionListeners.removeInterface(_rxListener);
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::attachFrame(const Reference< ::com::sun::star::frame::XFrame > & _xFrame) throw( RuntimeException )
{
implRemoveStatusListeners();
@@ -1598,7 +1555,6 @@ void SbaTableQueryBrowser::attachFrame(const Reference< ::com::sun::star::frame:
connectExternalDispatches();
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::addModelListeners(const Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel)
{
SbaXDataBrowserController::addModelListeners(_xGridControlModel);
@@ -1615,7 +1571,6 @@ void SbaTableQueryBrowser::addModelListeners(const Reference< ::com::sun::star::
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::removeModelListeners(const Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel)
{
SbaXDataBrowserController::removeModelListeners(_xGridControlModel);
@@ -1630,7 +1585,7 @@ void SbaTableQueryBrowser::removeModelListeners(const Reference< ::com::sun::sta
xSourceSet->removePropertyChangeListener(PROPERTY_TEXTRELIEF, static_cast<XPropertyChangeListener*>(this));
}
}
-// -------------------------------------------------------------------------
+
void SbaTableQueryBrowser::RowChanged()
{
if(getBrowserView())
@@ -1642,7 +1597,6 @@ void SbaTableQueryBrowser::RowChanged()
SbaXDataBrowserController::RowChanged();
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::ColumnChanged()
{
if(getBrowserView())
@@ -1653,7 +1607,7 @@ void SbaTableQueryBrowser::ColumnChanged()
}
SbaXDataBrowserController::ColumnChanged();
}
-//------------------------------------------------------------------------------
+
void SbaTableQueryBrowser::AddColumnListener(const Reference< XPropertySet > & xCol)
{
SbaXDataBrowserController::AddColumnListener(xCol);
@@ -1663,7 +1617,6 @@ void SbaTableQueryBrowser::AddColumnListener(const Reference< XPropertySet > & x
SafeAddPropertyListener(xCol, PROPERTY_FORMATKEY, static_cast<XPropertyChangeListener*>(this));
}
-//------------------------------------------------------------------------------
void SbaTableQueryBrowser::RemoveColumnListener(const Reference< XPropertySet > & xCol)
{
SbaXDataBrowserController::RemoveColumnListener(xCol);
@@ -1673,14 +1626,12 @@ void SbaTableQueryBrowser::RemoveColumnListener(const Reference< XPropertySet >
SafeRemovePropertyListener(xCol, PROPERTY_FORMATKEY, static_cast<XPropertyChangeListener*>(this));
}
-//------------------------------------------------------------------------------
void SbaTableQueryBrowser::criticalFail()
{
SbaXDataBrowserController::criticalFail();
unloadAndCleanup( sal_False );
}
-//------------------------------------------------------------------------------
void SbaTableQueryBrowser::LoadFinished(sal_Bool _bWasSynch)
{
SbaXDataBrowserController::LoadFinished(_bWasSynch);
@@ -1701,7 +1652,6 @@ void SbaTableQueryBrowser::LoadFinished(sal_Bool _bWasSynch)
m_aSelectionListeners.notifyEach( &XSelectionChangeListener::selectionChanged, aEvent );
}
-//------------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::getExternalSlotState( sal_uInt16 _nId ) const
{
sal_Bool bEnabled = sal_False;
@@ -1711,7 +1661,6 @@ sal_Bool SbaTableQueryBrowser::getExternalSlotState( sal_uInt16 _nId ) const
return bEnabled;
}
-//------------------------------------------------------------------------------
FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
{
FeatureState aReturn;
@@ -1906,7 +1855,6 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
}
-//------------------------------------------------------------------------------
void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue >& aArgs)
{
switch (nId)
@@ -2095,7 +2043,6 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue
}
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::implAddDatasource( const OUString& _rDataSourceName, const SharedConnection& _rxConnection )
{
Image a, b, c;
@@ -2103,7 +2050,6 @@ void SbaTableQueryBrowser::implAddDatasource( const OUString& _rDataSourceName,
implAddDatasource( _rDataSourceName, a, d, b, e, c, _rxConnection );
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::implAddDatasource(const OUString& _rDbName, Image& _rDbImage,
OUString& _rQueryName, Image& _rQueryImage, OUString& _rTableName, Image& _rTableImage,
const SharedConnection& _rxConnection)
@@ -2158,7 +2104,7 @@ void SbaTableQueryBrowser::implAddDatasource(const OUString& _rDbName, Image& _r
}
}
-// -------------------------------------------------------------------------
+
void SbaTableQueryBrowser::initializeTreeModel()
{
if (m_xDatabaseContext.is())
@@ -2174,7 +2120,7 @@ void SbaTableQueryBrowser::initializeTreeModel()
implAddDatasource( *pIter, aDBImage, sQueriesName, aQueriesImage, sTablesName, aTablesImage, SharedConnection() );
}
}
-// -------------------------------------------------------------------------
+
void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAccess,
SvTreeListEntry* _pParent,
EntryType _eEntryType)
@@ -2210,7 +2156,6 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce
}
}
-//------------------------------------------------------------------------------
SvTreeListEntry* SbaTableQueryBrowser::implAppendEntry( SvTreeListEntry* _pParent, const OUString& _rName, void* _pUserData, EntryType _eEntryType )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -2228,7 +2173,6 @@ SvTreeListEntry* SbaTableQueryBrowser::implAppendEntry( SvTreeListEntry* _pParen
return pNewEntry;
}
-//------------------------------------------------------------------------------
IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvTreeListEntry*, _pParent)
{
if (_pParent->HasChildren())
@@ -2337,7 +2281,6 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvTreeListEntry*, _pParent)
return 1L;
}
-//------------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::ensureEntryObject( SvTreeListEntry* _pEntry )
{
OSL_ENSURE(_pEntry, "SbaTableQueryBrowser::ensureEntryObject: invalid argument!");
@@ -2421,7 +2364,7 @@ sal_Bool SbaTableQueryBrowser::ensureEntryObject( SvTreeListEntry* _pEntry )
return bSuccess;
}
-//------------------------------------------------------------------------------
+
sal_Bool SbaTableQueryBrowser::implSelect(const ::svx::ODataAccessDescriptor& _rDescriptor,sal_Bool _bSelectDirect)
{
// extract the props
@@ -2435,7 +2378,6 @@ sal_Bool SbaTableQueryBrowser::implSelect(const ::svx::ODataAccessDescriptor& _r
return implSelect( sDataSource, sCommand, nCommandType, bEscapeProcessing, SharedConnection(), _bSelectDirect );
}
-//------------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::implLoadAnything(const OUString& _rDataSourceName, const OUString& _rCommand,
const sal_Int32 _nCommandType, const sal_Bool _bEscapeProcessing, const SharedConnection& _rxConnection)
{
@@ -2520,7 +2462,6 @@ sal_Bool SbaTableQueryBrowser::implLoadAnything(const OUString& _rDataSourceName
return sal_False;
}
-//------------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::implSelect(const OUString& _rDataSourceName, const OUString& _rCommand,
const sal_Int32 _nCommandType, const sal_Bool _bEscapeProcessing,
const SharedConnection& _rxConnection
@@ -2565,12 +2506,11 @@ sal_Bool SbaTableQueryBrowser::implSelect(const OUString& _rDataSourceName, cons
return sal_False;
}
-//------------------------------------------------------------------------------
IMPL_LINK(SbaTableQueryBrowser, OnSelectionChange, void*, /*NOINTERESTEDIN*/)
{
return implSelect( m_pTreeView->getListBox().FirstSelected() ) ? 1L : 0L;
}
-//------------------------------------------------------------------------------
+
SvTreeListEntry* SbaTableQueryBrowser::implGetConnectionEntry(SvTreeListEntry* _pEntry) const
{
SvTreeListEntry* pCurrentEntry = _pEntry;
@@ -2582,7 +2522,7 @@ SvTreeListEntry* SbaTableQueryBrowser::implGetConnectionEntry(SvTreeListEntry* _
}
return pCurrentEntry;
}
-//------------------------------------------------------------------------------
+
bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry )
{
if ( !_pEntry )
@@ -2710,7 +2650,6 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry )
sStatus = sStatus.replaceFirst("$name$", aName);
BrowserViewStatusDisplay aShowStatus(static_cast<UnoDataBrowserView*>(getView()), sStatus);
-
sal_Bool bEscapeProcessing = sal_True;
if(xNameAccess.is() && xNameAccess->hasByName(sSimpleName))
{
@@ -2800,7 +2739,6 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry )
return bSuccess;
}
-// -----------------------------------------------------------------------------
SvTreeListEntry* SbaTableQueryBrowser::getEntryFromContainer(const Reference<XNameAccess>& _rxNameAccess)
{
DBTreeListBox& rListBox = m_pTreeView->getListBox();
@@ -2824,7 +2762,6 @@ SvTreeListEntry* SbaTableQueryBrowser::getEntryFromContainer(const Reference<XNa
return pContainer;
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaTableQueryBrowser::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException)
{
SolarMutexGuard aSolarGuard;
@@ -2861,7 +2798,7 @@ void SAL_CALL SbaTableQueryBrowser::elementInserted( const ContainerEvent& _rEve
else
SbaXDataBrowserController::elementInserted(_rEvent);
}
-// -------------------------------------------------------------------------
+
sal_Bool SbaTableQueryBrowser::isCurrentlyDisplayedChanged(const OUString& _sName,SvTreeListEntry* _pContainer)
{
return m_pCurrentlyDisplayed
@@ -2869,7 +2806,7 @@ sal_Bool SbaTableQueryBrowser::isCurrentlyDisplayedChanged(const OUString& _sNam
&& m_pTreeView->getListBox().GetParent(m_pCurrentlyDisplayed) == _pContainer
&& m_pTreeView->getListBox().GetEntryText(m_pCurrentlyDisplayed) == _sName;
}
-// -------------------------------------------------------------------------
+
void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException)
{
SolarMutexGuard aSolarGuard;
@@ -2922,7 +2859,6 @@ void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEven
SbaXDataBrowserController::elementRemoved(_rEvent);
}
-// -------------------------------------------------------------------------
void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException)
{
SolarMutexGuard aSolarGuard;
@@ -2994,7 +2930,6 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve
SbaXDataBrowserController::elementReplaced(_rEvent);
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::impl_releaseConnection( SharedConnection& _rxConnection )
{
// remove as event listener
@@ -3022,7 +2957,6 @@ void SbaTableQueryBrowser::impl_releaseConnection( SharedConnection& _rxConnecti
// will implicitly dispose if we have the ownership, since xConnection is a SharedConnection
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::disposeConnection( SvTreeListEntry* _pDSEntry )
{
OSL_ENSURE( _pDSEntry, "SbaTableQueryBrowser::disposeConnection: invalid entry (NULL)!" );
@@ -3036,7 +2970,6 @@ void SbaTableQueryBrowser::disposeConnection( SvTreeListEntry* _pDSEntry )
}
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::closeConnection(SvTreeListEntry* _pDSEntry,sal_Bool _bDisposeConnection)
{
OSL_ENSURE(_pDSEntry, "SbaTableQueryBrowser::closeConnection: invalid entry (NULL)!");
@@ -3072,7 +3005,6 @@ void SbaTableQueryBrowser::closeConnection(SvTreeListEntry* _pDSEntry,sal_Bool _
disposeConnection( _pDSEntry );
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::unloadAndCleanup( sal_Bool _bDisposeConnection )
{
if (!m_pCurrentlyDisplayed)
@@ -3132,7 +3064,6 @@ void SbaTableQueryBrowser::unloadAndCleanup( sal_Bool _bDisposeConnection )
}
}
-// -------------------------------------------------------------------------
namespace
{
Reference< XInterface > lcl_getDataSource( const Reference< XDatabaseContext >& _rxDatabaseContext,
@@ -3159,7 +3090,6 @@ namespace
}
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::impl_initialize()
{
SolarMutexGuard aGuard;
@@ -3333,13 +3263,11 @@ void SbaTableQueryBrowser::impl_initialize()
InvalidateAll();
}
-// -------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::haveExplorer() const
{
return m_pTreeView && m_pTreeView->IsVisible();
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::hideExplorer()
{
if (!haveExplorer())
@@ -3354,7 +3282,6 @@ void SbaTableQueryBrowser::hideExplorer()
InvalidateFeature(ID_BROWSER_EXPLORER);
}
-// -------------------------------------------------------------------------
void SbaTableQueryBrowser::showExplorer()
{
if (haveExplorer())
@@ -3370,7 +3297,6 @@ void SbaTableQueryBrowser::showExplorer()
InvalidateFeature(ID_BROWSER_EXPLORER);
}
-// -----------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::ensureConnection(SvTreeListEntry* _pAnyEntry, SharedConnection& _rConnection)
{
SvTreeListEntry* pDSEntry = m_pTreeView->getListBox().GetRootLevelParent(_pAnyEntry);
@@ -3382,7 +3308,6 @@ sal_Bool SbaTableQueryBrowser::ensureConnection(SvTreeListEntry* _pAnyEntry, Sha
return ensureConnection( pDSEntry, pDSData, _rConnection );
}
-// -----------------------------------------------------------------------------
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ImageProvider > SbaTableQueryBrowser::getImageProviderFor( SvTreeListEntry* _pAnyEntry )
{
@@ -3392,9 +3317,9 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
pImageProvider.reset( new ImageProvider( xConnection ) );
return pImageProvider;
}
+
SAL_WNODEPRECATED_DECLARATIONS_POP
-// -----------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::getExistentConnectionFor( SvTreeListEntry* _pAnyEntry, SharedConnection& _rConnection )
{
SvTreeListEntry* pDSEntry = m_pTreeView->getListBox().GetRootLevelParent( _pAnyEntry );
@@ -3408,14 +3333,13 @@ sal_Bool SbaTableQueryBrowser::getExistentConnectionFor( SvTreeListEntry* _pAnyE
}
#if OSL_DEBUG_LEVEL > 0
-// -----------------------------------------------------------------------------
bool SbaTableQueryBrowser::impl_isDataSourceEntry( SvTreeListEntry* _pEntry ) const
{
return m_pTreeModel->GetRootLevelParent( _pEntry ) == _pEntry;
}
+
#endif
-// -----------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::ensureConnection( SvTreeListEntry* _pDSEntry, void* pDSData, SharedConnection& _rConnection )
{
OSL_ENSURE( impl_isDataSourceEntry( _pDSEntry ), "SbaTableQueryBrowser::ensureConnection: this entry does not denote a data source!" );
@@ -3452,7 +3376,6 @@ sal_Bool SbaTableQueryBrowser::ensureConnection( SvTreeListEntry* _pDSEntry, voi
return _rConnection.is();
}
-// -----------------------------------------------------------------------------
IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData*, _pSortData )
{
const SvTreeListEntry* pLHS = static_cast<const SvTreeListEntry*>(_pSortData->pLeft);
@@ -3517,7 +3440,6 @@ IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData*, _pSortDa
return nCompareResult;
}
-// -----------------------------------------------------------------------------
void SbaTableQueryBrowser::implAdministrate( SvTreeListEntry* _pApplyTo )
{
OSL_PRECOND( _pApplyTo, "SbaTableQueryBrowser::implAdministrate: illegal entry!" );
@@ -3568,7 +3490,6 @@ void SbaTableQueryBrowser::implAdministrate( SvTreeListEntry* _pApplyTo )
}
}
-// -----------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::requestQuickHelp( const SvTreeListEntry* _pEntry, OUString& _rText ) const
{
const DBTreeListUserData* pData = static_cast< const DBTreeListUserData* >( _pEntry->GetUserData() );
@@ -3580,7 +3501,6 @@ sal_Bool SbaTableQueryBrowser::requestQuickHelp( const SvTreeListEntry* _pEntry,
return sal_False;
}
-// -----------------------------------------------------------------------------
PopupMenu* SbaTableQueryBrowser::getContextMenu( Control& _rControl ) const
{
OSL_PRECOND( &m_pTreeView->getListBox() == &_rControl,
@@ -3591,19 +3511,16 @@ PopupMenu* SbaTableQueryBrowser::getContextMenu( Control& _rControl ) const
return new PopupMenu( ModuleRes( MENU_BROWSER_DEFAULTCONTEXT ) );
}
-// -----------------------------------------------------------------------------
IController& SbaTableQueryBrowser::getCommandController()
{
return *this;
}
-// -----------------------------------------------------------------------------
::cppu::OInterfaceContainerHelper* SbaTableQueryBrowser::getContextMenuInterceptors()
{
return &m_aContextMenuInterceptors;
}
-// -----------------------------------------------------------------------------
Any SbaTableQueryBrowser::getCurrentSelection( Control& _rControl ) const
{
OSL_PRECOND( &m_pTreeView->getListBox() == &_rControl,
@@ -3644,7 +3561,6 @@ Any SbaTableQueryBrowser::getCurrentSelection( Control& _rControl ) const
return makeAny( aSelectedObject );
}
-// -----------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::implGetQuerySignature( OUString& _rCommand, sal_Bool& _bEscapeProcessing )
{
_rCommand = OUString();
@@ -3692,7 +3608,7 @@ sal_Bool SbaTableQueryBrowser::implGetQuerySignature( OUString& _rCommand, sal_B
return sal_False;
}
-//------------------------------------------------------------------------------
+
void SbaTableQueryBrowser::frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( RuntimeException )
{
if (aEvent.Frame == m_xCurrentFrameParent)
@@ -3706,7 +3622,7 @@ void SbaTableQueryBrowser::frameAction(const ::com::sun::star::frame::FrameActio
SbaXDataBrowserController::frameAction(aEvent);
}
-// -----------------------------------------------------------------------------
+
void SbaTableQueryBrowser::clearGridColumns(const Reference< XNameContainer >& _xColContainer)
{
// first we have to clear the grid
@@ -3721,7 +3637,7 @@ void SbaTableQueryBrowser::clearGridColumns(const Reference< XNameContainer >& _
::comphelper::disposeComponent(xColumn);
}
}
-// -----------------------------------------------------------------------------
+
void SbaTableQueryBrowser::loadMenu(const Reference< XFrame >& _xFrame)
{
if ( m_bShowMenu )
@@ -3742,7 +3658,7 @@ void SbaTableQueryBrowser::loadMenu(const Reference< XFrame >& _xFrame)
onLoadedMenu( xLayoutManager );
}
}
-// -----------------------------------------------------------------------------
+
OUString SbaTableQueryBrowser::getPrivateTitle() const
{
OUString sTitle;
@@ -3766,7 +3682,7 @@ OUString SbaTableQueryBrowser::getPrivateTitle() const
return sTitle;
}
-// -----------------------------------------------------------------------------
+
sal_Bool SbaTableQueryBrowser::preReloadForm()
{
sal_Bool bIni = sal_False;
@@ -3794,14 +3710,12 @@ sal_Bool SbaTableQueryBrowser::preReloadForm()
return bIni;
}
-// -----------------------------------------------------------------------------
void SbaTableQueryBrowser::postReloadForm()
{
InitializeGridModel(getFormComponent());
LoadFinished(sal_True);
}
-//------------------------------------------------------------------------------
Reference< XEmbeddedScripts > SAL_CALL SbaTableQueryBrowser::getScriptContainer() throw (RuntimeException)
{
// update our database document
@@ -3827,28 +3741,24 @@ Reference< XEmbeddedScripts > SAL_CALL SbaTableQueryBrowser::getScriptContainer(
return xScripts;
}
-//------------------------------------------------------------------------------
void SAL_CALL SbaTableQueryBrowser::registerContextMenuInterceptor( const Reference< XContextMenuInterceptor >& _Interceptor ) throw (RuntimeException)
{
if ( _Interceptor.is() )
m_aContextMenuInterceptors.addInterface( _Interceptor );
}
-//------------------------------------------------------------------------------
void SAL_CALL SbaTableQueryBrowser::releaseContextMenuInterceptor( const Reference< XContextMenuInterceptor >& _Interceptor ) throw (RuntimeException)
{
if ( _Interceptor.is() )
m_aContextMenuInterceptors.removeInterface( _Interceptor );
}
-//------------------------------------------------------------------------------
void SAL_CALL SbaTableQueryBrowser::registeredDatabaseLocation( const DatabaseRegistrationEvent& _Event ) throw (RuntimeException)
{
SolarMutexGuard aGuard;
implAddDatasource( _Event.Name, SharedConnection() );
}
-//------------------------------------------------------------------------------
void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const OUString& _rDataSourceName )
{
// get the top-level representing the removed data source
@@ -3898,7 +3808,6 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const OUString& _rDataSo
m_pTreeModel->Remove( pDataSourceEntry );
}
-//------------------------------------------------------------------------------
void SAL_CALL SbaTableQueryBrowser::revokedDatabaseLocation( const DatabaseRegistrationEvent& _Event ) throw (RuntimeException)
{
SolarMutexGuard aGuard;
@@ -3909,7 +3818,6 @@ void SAL_CALL SbaTableQueryBrowser::revokedDatabaseLocation( const DatabaseRegis
checkDocumentDataSource();
}
-//------------------------------------------------------------------------------
void SAL_CALL SbaTableQueryBrowser::changedDatabaseLocation( const DatabaseRegistrationEvent& _Event ) throw (RuntimeException)
{
SolarMutexGuard aGuard;
@@ -3920,10 +3828,6 @@ void SAL_CALL SbaTableQueryBrowser::changedDatabaseLocation( const DatabaseRegis
implAddDatasource( _Event.Name, SharedConnection() );
}
-
-// .........................................................................
} // namespace dbaui
-// .........................................................................
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index 0e0f60960e52..4e3eb60c3dab 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -26,7 +26,6 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/util/NumberFormatter.hpp>
-
using namespace ::dbaui;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -35,10 +34,8 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::lang;
-//========================================================================
// OColumnControlWindow
DBG_NAME(OColumnControlWindow)
-//========================================================================
OColumnControlWindow::OColumnControlWindow(Window* pParent
,const Reference<XComponentContext>& _rxContext)
: OFieldDescControl(pParent,NULL)
@@ -51,13 +48,13 @@ OColumnControlWindow::OColumnControlWindow(Window* pParent
setRightAligned();
m_aLocale = SvtSysLocale().GetLanguageTag().getLocale();
}
-// -----------------------------------------------------------------------------
+
OColumnControlWindow::~OColumnControlWindow()
{
DBG_DTOR(OColumnControlWindow,NULL);
}
-// -----------------------------------------------------------------------
+
void OColumnControlWindow::ActivateAggregate( EControlType eType )
{
switch(eType )
@@ -70,7 +67,7 @@ void OColumnControlWindow::ActivateAggregate( EControlType eType )
OFieldDescControl::ActivateAggregate( eType );
}
}
-// -----------------------------------------------------------------------
+
void OColumnControlWindow::DeactivateAggregate( EControlType eType )
{
switch(eType )
@@ -83,17 +80,17 @@ void OColumnControlWindow::DeactivateAggregate( EControlType eType )
OFieldDescControl::DeactivateAggregate( eType );
}
}
-// -----------------------------------------------------------------------------
+
void OColumnControlWindow::CellModified(long /*nRow*/, sal_uInt16 /*nColId*/ )
{
saveCurrentFieldDescData();
}
-// -----------------------------------------------------------------------------
+
::com::sun::star::lang::Locale OColumnControlWindow::GetLocale() const
{
return m_aLocale;
}
-// -----------------------------------------------------------------------------
+
Reference< XNumberFormatter > OColumnControlWindow::GetFormatter() const
{
if ( !m_xFormatter.is() )
@@ -113,29 +110,29 @@ Reference< XNumberFormatter > OColumnControlWindow::GetFormatter() const
}
return m_xFormatter;
}
-// -----------------------------------------------------------------------------
+
TOTypeInfoSP OColumnControlWindow::getTypeInfo(sal_Int32 _nPos)
{
return ( _nPos >= 0 && _nPos < static_cast<sal_Int32>(m_aDestTypeInfoIndex.size())) ? m_aDestTypeInfoIndex[_nPos]->second : TOTypeInfoSP();
}
-// -----------------------------------------------------------------------------
+
const OTypeInfoMap* OColumnControlWindow::getTypeInfo() const
{
return &m_aDestTypeInfo;
}
-// -----------------------------------------------------------------------------
+
Reference< XDatabaseMetaData> OColumnControlWindow::getMetaData()
{
if ( m_xConnection.is() )
return m_xConnection->getMetaData();
return Reference< XDatabaseMetaData>();
}
-// -----------------------------------------------------------------------------
+
Reference< XConnection> OColumnControlWindow::getConnection()
{
return m_xConnection;
}
-// -----------------------------------------------------------------------------
+
void OColumnControlWindow::setConnection(const Reference< XConnection>& _xCon)
{
m_xConnection = _xCon;
@@ -152,17 +149,17 @@ void OColumnControlWindow::setConnection(const Reference< XConnection>& _xCon)
::dbaui::fillAutoIncrementValue(m_xConnection,m_bAutoIncrementEnabled,m_sAutoIncrementValue);
}
}
-// -----------------------------------------------------------------------------
+
sal_Bool OColumnControlWindow::isAutoIncrementValueEnabled() const
{
return m_bAutoIncrementEnabled;
}
-// -----------------------------------------------------------------------------
+
OUString OColumnControlWindow::getAutoIncrementValue() const
{
return m_sAutoIncrementValue;
}
-// -----------------------------------------------------------------------------
+
TOTypeInfoSP OColumnControlWindow::getDefaultTyp() const
{
if ( !m_pTypeInfo.get() )
@@ -172,6 +169,5 @@ TOTypeInfoSP OColumnControlWindow::getDefaultTyp() const
}
return m_pTypeInfo;
}
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index b318b97b7d8e..d0714606867e 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -55,7 +55,6 @@
#include "dbu_tbl.hrc"
#include <osl/diagnose.h>
-
using namespace dbaui;
using namespace dbtools;
using namespace ::com::sun::star::uno;
@@ -64,8 +63,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::util;
-//==================================================================
-
// For the Controls on the OFieldDescGenPage
#define CONTROL_SPACING_X 18 // 6
#define CONTROL_SPACING_Y 4
@@ -76,7 +73,6 @@ using namespace ::com::sun::star::util;
#define HSCROLL_STEP 20
-
namespace
{
@@ -96,13 +92,10 @@ namespace
}
-//==================================================================
// class OFieldDescControl
-//==================================================================
DBG_NAME(OFieldDescControl)
-//==================================================================
OFieldDescControl::OFieldDescControl( Window* pParent, const ResId& rResId, OTableDesignHelpBar* pHelpBar)
:TabPage( pParent, rResId )
,pHelp( pHelpBar )
@@ -150,7 +143,7 @@ OFieldDescControl::OFieldDescControl( Window* pParent, const ResId& rResId, OTab
Contruct();
}
-//------------------------------------------------------------------------------
+
OFieldDescControl::OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar )
:TabPage( pParent, WB_3DLOOK | WB_DIALOGCONTROL )
,pHelp( pHelpBar )
@@ -197,7 +190,7 @@ OFieldDescControl::OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHel
DBG_CTOR(OFieldDescControl,NULL);
Contruct();
}
-// -----------------------------------------------------------------------------
+
void OFieldDescControl::Contruct()
{
m_pVertScroll = new ScrollBar(this, WB_VSCROLL | WB_REPEAT | WB_DRAG);
@@ -218,7 +211,6 @@ void OFieldDescControl::Contruct()
m_nOldVThumb = m_nOldHThumb = 0;
}
-//------------------------------------------------------------------------------
OFieldDescControl::~OFieldDescControl()
{
DBG_DTOR(OFieldDescControl,NULL);
@@ -239,7 +231,6 @@ OFieldDescControl::~OFieldDescControl()
::dbaui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
pLastFocusWindow = NULL;
- //////////////////////////////////////////////////////////////////////
// Destroy children
DeactivateAggregate( tpDefault );
DeactivateAggregate( tpRequired );
@@ -255,7 +246,6 @@ OFieldDescControl::~OFieldDescControl()
DeactivateAggregate( tpAutoIncrementValue );
}
-//------------------------------------------------------------------------------
String OFieldDescControl::BoolStringPersistent(const String& rUIString) const
{
if (rUIString == aNo)
@@ -265,7 +255,6 @@ String OFieldDescControl::BoolStringPersistent(const String& rUIString) const
return OUString();
}
-//------------------------------------------------------------------------------
String OFieldDescControl::BoolStringUI(const String& rPersistentString) const
{
// Older versions may store a language dependend string as a default
@@ -280,20 +269,18 @@ String OFieldDescControl::BoolStringUI(const String& rPersistentString) const
return ModuleRes(STR_VALUE_NONE).toString();
}
-//------------------------------------------------------------------------------
void OFieldDescControl::Init()
{
Reference< ::com::sun::star::util::XNumberFormatter > xFormatter = GetFormatter();
::dbaui::setEvalDateFormatForFormatter(xFormatter);
}
-//------------------------------------------------------------------------------
IMPL_LINK(OFieldDescControl, OnScroll, ScrollBar*, /*pBar*/)
{
ScrollAllAggregates();
return 0;
}
-// -----------------------------------------------------------------------------
+
namespace
{
void getMaxXPosition(Window* _pWindow,long& _rnMaxXPosition)
@@ -305,7 +292,7 @@ namespace
}
}
}
-//------------------------------------------------------------------------------
+
void OFieldDescControl::CheckScrollBars()
{
// Calculate the ScrollBars' new position
@@ -390,14 +377,12 @@ void OFieldDescControl::CheckScrollBars()
}
}
-//------------------------------------------------------------------------------
void OFieldDescControl::Resize()
{
CheckScrollBars();
ScrollAllAggregates();
}
-//------------------------------------------------------------------------------
inline void OFieldDescControl::ScrollAggregate(Control* pText, Control* pInput, Control* pButton, long nDeltaX, long nDeltaY)
{
if (!pText)
@@ -408,7 +393,6 @@ inline void OFieldDescControl::ScrollAggregate(Control* pText, Control* pInput,
pButton->SetPosPixel(pButton->GetPosPixel() + Point(nDeltaX, nDeltaY));
}
-//------------------------------------------------------------------------------
void OFieldDescControl::ScrollAllAggregates()
{
long nDeltaX = 0, nDeltaY = 0;
@@ -447,7 +431,6 @@ void OFieldDescControl::ScrollAllAggregates()
}
}
-//------------------------------------------------------------------------------
sal_uInt16 OFieldDescControl::CountActiveAggregates() const
{
Control* ppAggregates[] = { pRequired, pNumType, pAutoIncrement, pDefault, pTextLen, pLength, pScale, pFormat, m_pColumnName, m_pType,m_pAutoIncrementValue};
@@ -457,7 +440,7 @@ sal_uInt16 OFieldDescControl::CountActiveAggregates() const
++nVisibleAggregates;
return nVisibleAggregates;
}
-//------------------------------------------------------------------------------
+
sal_Int32 OFieldDescControl::GetMaxControlHeight() const
{
Size aHeight;
@@ -474,11 +457,10 @@ sal_Int32 OFieldDescControl::GetMaxControlHeight() const
return aHeight.Height();
}
-//------------------------------------------------------------------------------
+
void OFieldDescControl::SetReadOnly( sal_Bool bReadOnly )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
- //////////////////////////////////////////////////////////////////////
// Enable/disable Controls
Control* ppAggregates[] = { pRequired, pNumType
, pAutoIncrement, pDefault
@@ -504,11 +486,9 @@ void OFieldDescControl::SetReadOnly( sal_Bool bReadOnly )
}
}
-//------------------------------------------------------------------------------
String OFieldDescControl::GetControlText( sal_uInt16 nControlId )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
- //////////////////////////////////////////////////////////////////////
// Read out the Controls' texts
switch( nControlId )
{
@@ -562,11 +542,9 @@ String OFieldDescControl::GetControlText( sal_uInt16 nControlId )
return String();
}
-//------------------------------------------------------------------------------
void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const String& rText )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
- //////////////////////////////////////////////////////////////////////
// Set the Controls' texts
switch( nControlId )
{
@@ -592,7 +570,6 @@ void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const String& rTe
pRequired->SelectEntry(rText);
break;
-
case FIELD_PROPERTY_TEXTLEN:
if (pTextLen)
pTextLen->SetText(rText);
@@ -642,11 +619,9 @@ void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const String& rTe
}
}
-//------------------------------------------------------------------------
IMPL_LINK( OFieldDescControl, FormatClickHdl, Button *, /*pButton*/ )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
- //////////////////////////////////////////////////////////////////////
// Create temporary Column, which is used for data exchange with Dialog
if( !pActFieldDescr )
return 0;
@@ -681,11 +656,10 @@ IMPL_LINK( OFieldDescControl, FormatClickHdl, Button *, /*pButton*/ )
return 0;
}
-// -----------------------------------------------------------------------
void OFieldDescControl::SetModified(sal_Bool /*bModified*/)
{
}
-//------------------------------------------------------------------------
+
IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox *, pListBox )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
@@ -758,7 +732,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox *, pListBox )
return 0;
}
-//------------------------------------------------------------------------------
+
// Rearrange all Controls, such that they are in fixed order and really on top
// of the DescriptionPage
void OFieldDescControl::ArrangeAggregates()
@@ -835,11 +809,9 @@ void OFieldDescControl::ArrangeAggregates()
m_pHorzScroll->SetZOrder(NULL, WINDOW_ZORDER_FIRST);
}
-//------------------------------------------------------------------------------
void OFieldDescControl::ActivateAggregate( EControlType eType )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
- //////////////////////////////////////////////////////////////////////
// Create Controls
switch( eType )
{
@@ -1021,7 +993,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
break;
}
}
-// -----------------------------------------------------------------------------
+
void OFieldDescControl::InitializeControl(Control* _pControl,const OString& _sHelpId,bool _bAddChangeHandler)
{
_pControl->SetHelpId(_sHelpId);
@@ -1032,7 +1004,7 @@ void OFieldDescControl::InitializeControl(Control* _pControl,const OString& _sHe
_pControl->SetLoseFocusHdl(LINK(this, OFieldDescControl, OnControlFocusLost));
_pControl->EnableClipSiblings();
}
-// -----------------------------------------------------------------------------
+
FixedText* OFieldDescControl::CreateText(sal_uInt16 _nTextRes)
{
FixedText* pFixedText = new FixedText( this );
@@ -1040,7 +1012,7 @@ FixedText* OFieldDescControl::CreateText(sal_uInt16 _nTextRes)
pFixedText->EnableClipSiblings();
return pFixedText;
}
-// -----------------------------------------------------------------------------
+
OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const OString& _sHelpId)
{
OPropNumericEditCtrl* pControl = new OPropNumericEditCtrl( this, _nHelpStr, _nProperty, WB_BORDER );
@@ -1053,12 +1025,11 @@ OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(sal_uInt16 _nHelpS
return pControl;
}
-//------------------------------------------------------------------------------
+
void OFieldDescControl::DeactivateAggregate( EControlType eType )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
pLastFocusWindow = NULL;
- //////////////////////////////////////////////////////////////////////
// Destroy Controls
switch( eType )
{
@@ -1118,12 +1089,10 @@ void OFieldDescControl::DeactivateAggregate( EControlType eType )
}
}
-//------------------------------------------------------------------------------
void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 nCol )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
- //////////////////////////////////////////////////////////////////////
// Calculate size
const sal_Int32 nControlHeight = GetMaxControlHeight();
Size aSize(0,nControlHeight);
@@ -1149,8 +1118,6 @@ void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 n
}
}
-
- //////////////////////////////////////////////////////////////////////
// Calculate Position
Point aPosition;
switch( nCol )
@@ -1181,14 +1148,13 @@ void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 n
aPosition.Y() += ((nRow+1)*nControl_Spacing_y) +
(nRow*nControlHeight);
- //////////////////////////////////////////////////////////////////////
// Display Control
(*ppControl)->SetPosSizePixel( aPosition, aSize );
aSize = (*ppControl)->GetSizePixel();
(*ppControl)->Show();
}
-//------------------------------------------------------------------------------
+
void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
@@ -1208,7 +1174,6 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
DeactivateAggregate( tpType );
DeactivateAggregate( tpAutoIncrementValue );
m_pPreviousType = TOTypeInfoSP();
- //////////////////////////////////////////////////////////////////////
// Reset the saved focus' pointer
pLastFocusWindow = NULL;
if ( m_bAdded )
@@ -1233,19 +1198,15 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
ActivateAggregate( tpType );
OSL_ENSURE(pFieldType.get(),"We need a type information here!");
- //////////////////////////////////////////////////////////////////////
// If the type has changed, subsitute Controls
if( m_pPreviousType != pFieldType )
{
- //////////////////////////////////////////////////////////////////////
// Reset the saved focus' pointer
pLastFocusWindow = NULL;
- //////////////////////////////////////////////////////////////////////
// Controls, which must NOT be displayed again
DeactivateAggregate( tpNumType );
- //////////////////////////////////////////////////////////////////////
// determine which controls we should show and which not
// 1. the required control
@@ -1396,7 +1357,6 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
DeactivateAggregate( tpRequired );
}
}
- //////////////////////////////////////////////////////////////////////
// Initialize Controls
if( pAutoIncrement )
{
@@ -1514,12 +1474,9 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
m_pType->SelectEntry(pFieldDescr->getTypeInfo()->aUIName);
}
-
- //////////////////////////////////////////////////////////////////////
// Enable/disable Controls
sal_Bool bRead(IsReadOnly());
-
ArrangeAggregates();
CheckScrollBars();
ScrollAllAggregates();
@@ -1527,7 +1484,6 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
SetReadOnly( bRead );
}
-//------------------------------------------------------------------------------
IMPL_LINK(OFieldDescControl, OnControlFocusGot, Control*, pControl )
{
String strHelpText;
@@ -1570,7 +1526,6 @@ IMPL_LINK(OFieldDescControl, OnControlFocusGot, Control*, pControl )
return 0L;
}
-//------------------------------------------------------------------------------
IMPL_LINK(OFieldDescControl, OnControlFocusLost, Control*, pControl )
{
if ((pControl == pLength) || (pControl == pTextLen) || (pControl == pScale))
@@ -1605,14 +1560,13 @@ IMPL_LINK(OFieldDescControl, OnControlFocusLost, Control*, pControl )
return 0L;
}
-//------------------------------------------------------------------------------
+
void OFieldDescControl::SaveData( OFieldDescription* pFieldDescr )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
if( !pFieldDescr )
return;
- //////////////////////////////////////////////////////////////////////
// Read out Controls
OUString sDefault;
if (pDefault)
@@ -1651,18 +1605,15 @@ void OFieldDescControl::SaveData( OFieldDescription* pFieldDescr )
pFieldDescr->SetAutoIncrementValue(m_pAutoIncrementValue->GetText());
}
-//------------------------------------------------------------------------------
void OFieldDescControl::UpdateFormatSample(OFieldDescription* pFieldDescr)
{
if ( pFieldDescr && pFormatSample )
pFormatSample->SetText(getControlDefault(pFieldDescr,sal_False));
}
-//------------------------------------------------------------------------------
void OFieldDescControl::GetFocus()
{
DBG_CHKTHIS(OFieldDescControl,NULL);
- //////////////////////////////////////////////////////////////////////
// Set the Focus to the Control that has been active last
TabPage::GetFocus();
if( pLastFocusWindow )
@@ -1672,24 +1623,20 @@ void OFieldDescControl::GetFocus()
}
}
-//------------------------------------------------------------------------------
void OFieldDescControl::implFocusLost(Window* _pWhich)
{
DBG_CHKTHIS(OFieldDescControl,NULL);
OSL_ENSURE(!_pWhich || IsChild(_pWhich), "OFieldDescControl::implFocusLost : invalid window !");
- //////////////////////////////////////////////////////////////////////
// Remember the active Control
if (!pLastFocusWindow)
pLastFocusWindow = _pWhich;
- //////////////////////////////////////////////////////////////////////
// Reset HelpText
if (pHelp && !pHelp->HasChildPathFocus())
pHelp->SetHelpText( String() );
}
-//------------------------------------------------------------------------------
void OFieldDescControl::LoseFocus()
{
DBG_CHKTHIS(OFieldDescControl,NULL);
@@ -1698,7 +1645,7 @@ void OFieldDescControl::LoseFocus()
TabPage::LoseFocus();
}
-// -----------------------------------------------------------------------------
+
sal_Bool OFieldDescControl::isCopyAllowed()
{
sal_Bool bAllowed = (m_pActFocusWindow != NULL) &&
@@ -1710,7 +1657,7 @@ sal_Bool OFieldDescControl::isCopyAllowed()
return bAllowed;
}
-// -----------------------------------------------------------------------------
+
sal_Bool OFieldDescControl::isCutAllowed()
{
sal_Bool bAllowed = (m_pActFocusWindow != NULL) &&
@@ -1721,7 +1668,7 @@ sal_Bool OFieldDescControl::isCutAllowed()
!static_cast<Edit*>(m_pActFocusWindow)->GetSelected().isEmpty();
return bAllowed;
}
-// -----------------------------------------------------------------------------
+
sal_Bool OFieldDescControl::isPasteAllowed()
{
sal_Bool bAllowed = (m_pActFocusWindow != NULL) &&
@@ -1736,25 +1683,25 @@ sal_Bool OFieldDescControl::isPasteAllowed()
}
return bAllowed;
}
-// -----------------------------------------------------------------------------
+
void OFieldDescControl::cut()
{
if(isCutAllowed())
static_cast<Edit*>(m_pActFocusWindow)->Cut();
}
-// -----------------------------------------------------------------------------
+
void OFieldDescControl::copy()
{
if(isCopyAllowed()) // this only checks if the focus window is valid
static_cast<Edit*>(m_pActFocusWindow)->Copy();
}
-// -----------------------------------------------------------------------------
+
void OFieldDescControl::paste()
{
if(m_pActFocusWindow) // this only checks if the focus window is valid
static_cast<Edit*>(m_pActFocusWindow)->Paste();
}
-// -----------------------------------------------------------------------------
+
sal_Bool OFieldDescControl::isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const
{
_nFormatKey = _pFieldDescr->GetFormatKey();
@@ -1783,7 +1730,7 @@ sal_Bool OFieldDescControl::isTextFormat(const OFieldDescription* _pFieldDescr,s
return bTextFormat;
}
-// -----------------------------------------------------------------------------
+
String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDescr ,sal_Bool _bCheck) const
{
OUString sDefault;
@@ -1817,7 +1764,6 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes
else
_pFieldDescr->GetControlDefault() >>= nValue;
-
Reference< ::com::sun::star::util::XNumberFormatter> xNumberFormatter = GetFormatter();
Reference<XPropertySet> xFormSet = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats()->getByKey(nFormatKey);
OSL_ENSURE(xFormSet.is(),"XPropertySet is null!");
@@ -1836,8 +1782,6 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes
nValue = DBTypeConversion::toNullDate(DBTypeConversion::getNULLDate(xNumberFormatter->getNumberFormatsSupplier()),nValue);
}
-
-
Reference< ::com::sun::star::util::XNumberFormatPreviewer> xPreViewer(xNumberFormatter,UNO_QUERY);
OSL_ENSURE(xPreViewer.is(),"XNumberFormatPreviewer is null!");
sDefault = xPreViewer->convertNumberToPreviewString(sFormat,nValue,aLocale,sal_True);
@@ -1853,6 +1797,5 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes
return sDefault;
}
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 4d6143d2654a..b25922316f76 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -69,7 +69,6 @@ namespace dbaui
typedef list< pair < opcode, pair < OConnectionLineDataVec::size_type, OConnectionLineDataVec::size_type> > > ops_type;
ops_type m_ops;
-
void fillListBox(const Reference< XPropertySet>& _xDest,long nRow,sal_uInt16 nColumnId);
/** returns the column id for the editbrowsebox
@param _nColId
@@ -123,11 +122,8 @@ namespace dbaui
};
- //========================================================================
// class ORelationControl
- //========================================================================
DBG_NAME(ORelationControl)
- //------------------------------------------------------------------------
ORelationControl::ORelationControl( OTableListBoxControl* pParent )
:EditBrowseBox( pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, WB_TABSTOP | WB_BORDER | BROWSER_AUTOSIZE_LASTCOL)
,m_pBoxControl(pParent)
@@ -137,13 +133,11 @@ namespace dbaui
DBG_CTOR(ORelationControl,NULL);
}
- //------------------------------------------------------------------------
ORelationControl::~ORelationControl()
{
DBG_DTOR(ORelationControl,NULL);
}
- //------------------------------------------------------------------------
void ORelationControl::Init(const TTableConnectionData::value_type& _pConnData)
{
DBG_CHKTHIS(ORelationControl,NULL);
@@ -153,7 +147,6 @@ namespace dbaui
m_pConnData->normalizeLines();
}
- //------------------------------------------------------------------------------
void ORelationControl::lateInit()
{
if ( !m_pConnData.get() )
@@ -169,7 +162,6 @@ namespace dbaui
m_pListCell.reset( new ListBoxControl( &GetDataWindow() ) );
- //////////////////////////////////////////////////////////////////////
// set browse mode
SetMode( BROWSER_COLUMNSELECTION |
BROWSER_HLINESFULL |
@@ -185,7 +177,6 @@ namespace dbaui
RowInserted(0, m_pConnData->GetConnLineDataList()->size() + 1, sal_True); // add one extra row
}
- //------------------------------------------------------------------------------
void ORelationControl::Resize()
{
DBG_CHKTHIS(ORelationControl,NULL);
@@ -195,7 +186,6 @@ namespace dbaui
SetColumnWidth(2, (nOutputWidth / 2));
}
- //------------------------------------------------------------------------------
long ORelationControl::PreNotify(NotifyEvent& rNEvt)
{
DBG_CHKTHIS(ORelationControl,NULL);
@@ -207,21 +197,18 @@ namespace dbaui
return EditBrowseBox::PreNotify(rNEvt);
}
- //------------------------------------------------------------------------------
IMPL_LINK_NOARG(ORelationControl, AsynchActivate)
{
ActivateCell();
return 0L;
}
- //------------------------------------------------------------------------------
IMPL_LINK_NOARG(ORelationControl, AsynchDeactivate)
{
DeactivateCell();
return 0L;
}
- //------------------------------------------------------------------------------
sal_Bool ORelationControl::IsTabAllowed(sal_Bool bForward) const
{
DBG_CHKTHIS(ORelationControl,NULL);
@@ -234,7 +221,6 @@ namespace dbaui
return bRet && EditBrowseBox::IsTabAllowed(bForward);
}
- //------------------------------------------------------------------------------
sal_Bool ORelationControl::SaveModified()
{
DBG_CHKTHIS(ORelationControl,NULL);
@@ -276,7 +262,6 @@ namespace dbaui
return sal_True;
}
- //------------------------------------------------------------------------------
sal_uInt16 ORelationControl::getColumnIdent( sal_uInt16 _nColId ) const
{
sal_uInt16 nId = _nColId;
@@ -285,7 +270,6 @@ namespace dbaui
return nId;
}
- //------------------------------------------------------------------------------
OUString ORelationControl::GetCellText( long nRow, sal_uInt16 nColId ) const
{
DBG_CHKTHIS(ORelationControl,NULL);
@@ -306,7 +290,6 @@ namespace dbaui
return sText;
}
- //------------------------------------------------------------------------------
void ORelationControl::InitController( CellControllerRef& /*rController*/, long nRow, sal_uInt16 nColumnId )
{
DBG_CHKTHIS(ORelationControl,NULL);
@@ -344,14 +327,12 @@ namespace dbaui
}
}
- //------------------------------------------------------------------------------
CellController* ORelationControl::GetController( long /*nRow*/, sal_uInt16 /*nColumnId*/ )
{
DBG_CHKTHIS(ORelationControl,NULL);
return new ListBoxCellController( m_pListCell.get() );
}
- //------------------------------------------------------------------------------
sal_Bool ORelationControl::SeekRow( long nRow )
{
DBG_CHKTHIS(ORelationControl,NULL);
@@ -359,7 +340,6 @@ namespace dbaui
return sal_True;
}
- //------------------------------------------------------------------------------
void ORelationControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
{
DBG_CHKTHIS(ORelationControl,NULL);
@@ -379,7 +359,6 @@ namespace dbaui
if( rDev.IsClipRegion() )
rDev.SetClipRegion();
}
- // -----------------------------------------------------------------------------
void ORelationControl::fillListBox(const Reference< XPropertySet>& _xDest,long /*_nRow*/,sal_uInt16 /*nColumnId*/)
{
m_pListCell->Clear();
@@ -405,7 +384,6 @@ namespace dbaui
DBG_UNHANDLED_EXCEPTION();
}
}
- // -----------------------------------------------------------------------------
void ORelationControl::setWindowTables(const OTableWindow* _pSource,const OTableWindow* _pDest)
{
// If I edit here, hide
@@ -418,7 +396,6 @@ namespace dbaui
m_xSourceDef = _pSource->GetTable();
SetColumnTitle(1, _pSource->GetName());
-
m_xDestDef = _pDest->GetTable();
SetColumnTitle(2, _pDest->GetName());
@@ -453,7 +430,6 @@ namespace dbaui
ActivateCell();
}
}
- //------------------------------------------------------------------------
void ORelationControl::CellModified()
{
DBG_CHKTHIS(ORelationControl,NULL);
@@ -467,12 +443,9 @@ namespace dbaui
assert(parent);
parent->NotifyCellChange();
}
- //========================================================================
// class OTableListBoxControl
DBG_NAME(OTableListBoxControl)
-//========================================================================
-
OTableListBoxControl::OTableListBoxControl( Window* _pParent
,const ResId& _rResId
,const OJoinTableView::OTableWindowMap* _pTableMap
@@ -499,7 +472,6 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
FreeResource();
DBG_CTOR(OTableListBoxControl,NULL);
}
- // -----------------------------------------------------------------------------
OTableListBoxControl::~OTableListBoxControl()
{
ORelationControl* pTemp = m_pRC_Tables;
@@ -507,7 +479,6 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
delete pTemp;
DBG_DTOR(OTableListBoxControl,NULL);
}
- // -----------------------------------------------------------------------------
void OTableListBoxControl::fillListBoxes()
{
OSL_ENSURE( !m_pTableMap->empty(), "OTableListBoxControl::fillListBoxes: no table window!");
@@ -558,7 +529,6 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
m_lmbLeftTable.GrabFocus();
}
- // -----------------------------------------------------------------------------
IMPL_LINK( OTableListBoxControl, OnTableChanged, ListBox*, pListBox )
{
String strSelected(pListBox->GetSelectEntry());
@@ -640,7 +610,6 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
NotifyCellChange();
return 0;
}
- // -----------------------------------------------------------------------------
void OTableListBoxControl::NotifyCellChange()
{
// Enable/disable the OK button, depending on having a valid situation
@@ -680,25 +649,21 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
m_pRC_Tables->ActivateCell();
m_pRC_Tables->m_ops.clear();
}
- // -----------------------------------------------------------------------------
void fillEntryAndDisable(ListBox& _rListBox,const String& _sEntry)
{
_rListBox.InsertEntry(_sEntry);
_rListBox.SelectEntryPos(0);
_rListBox.Disable();
}
- // -----------------------------------------------------------------------------
void OTableListBoxControl::fillAndDisable(const TTableConnectionData::value_type& _pConnectionData)
{
fillEntryAndDisable(m_lmbLeftTable,_pConnectionData->getReferencingTable()->GetWinName());
fillEntryAndDisable(m_lmbRightTable,_pConnectionData->getReferencedTable()->GetWinName());
}
- // -----------------------------------------------------------------------------
void OTableListBoxControl::Init(const TTableConnectionData::value_type& _pConnData)
{
m_pRC_Tables->Init(_pConnData);
}
- // -----------------------------------------------------------------------------
void OTableListBoxControl::lateUIInit(Window* _pTableSeparator)
{
const sal_Int32 nDiff = LogicToPixel( Point(0,6), MAP_APPFONT ).Y();
@@ -713,7 +678,6 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
m_aFL_InvolvedFields.SetPosPixel(Point(m_aFL_InvolvedFields.GetPosPixel().X(),aDlgPoint.Y()));
aDlgPoint.Y() += nDiff + m_aFL_InvolvedFields.GetSizePixel().Height();
}
- //////////////////////////////////////////////////////////////////////
// positing BrowseBox control
const Size aCurrentSize = GetSizePixel();
Size aDlgSize = LogicToPixel( Size(24,0), MAP_APPFONT );
@@ -725,22 +689,18 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
lateInit();
}
- // -----------------------------------------------------------------------------
void OTableListBoxControl::lateInit()
{
m_pRC_Tables->lateInit();
}
- // -----------------------------------------------------------------------------
sal_Bool OTableListBoxControl::SaveModified()
{
return m_pRC_Tables->SaveModified();
}
- // -----------------------------------------------------------------------------
TTableWindowData::value_type OTableListBoxControl::getReferencingTable() const
{
return m_pRC_Tables->getData()->getReferencingTable();
}
- // -----------------------------------------------------------------------------
void OTableListBoxControl::enableRelation(bool _bEnable)
{
if ( !_bEnable )
@@ -748,8 +708,6 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
m_pRC_Tables->Enable(_bEnable);
}
- // -----------------------------------------------------------------------------
}
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/ScrollHelper.cxx b/dbaccess/source/ui/control/ScrollHelper.cxx
index 72a4729ce5b2..3e73655c444d 100644
--- a/dbaccess/source/ui/control/ScrollHelper.cxx
+++ b/dbaccess/source/ui/control/ScrollHelper.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "ScrollHelper.hxx"
#include <tools/debug.hxx>
@@ -26,20 +25,15 @@ namespace dbaui
{
DBG_NAME(OScrollHelper)
-// -----------------------------------------------------------------------------
-
-
OScrollHelper::OScrollHelper()
{
DBG_CTOR(OScrollHelper,NULL);
}
- // -----------------------------------------------------------------------------
OScrollHelper::~OScrollHelper()
{
DBG_DTOR(OScrollHelper,NULL);
}
- // -----------------------------------------------------------------------------
void OScrollHelper::scroll(const Point& _rPoint, const Size& _rOutputSize)
{
// Scrolling Areas
@@ -60,9 +54,6 @@ DBG_NAME(OScrollHelper)
if ( aToCall.IsSet() )
aToCall.Call( NULL );
}
- // -----------------------------------------------------------------------------
}
-// -----------------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx
index 6d815fc8a81b..8a6f861fc51d 100644
--- a/dbaccess/source/ui/control/SqlNameEdit.cxx
+++ b/dbaccess/source/ui/control/SqlNameEdit.cxx
@@ -20,7 +20,6 @@
#include "SqlNameEdit.hxx"
namespace dbaui
{
- //------------------------------------------------------------------
sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const OUString& _sAllowedChars)
{
return (
@@ -31,7 +30,6 @@ namespace dbaui
(!_bUpperCase && (_cChar >= 'a' && _cChar <= 'z'))
);
}
- //------------------------------------------------------------------
sal_Bool OSQLNameChecker::checkString(const OUString& _sToCheck,
OUString& _rsCorrected)
{
@@ -53,7 +51,6 @@ namespace dbaui
}
return bCorrected;
}
- //------------------------------------------------------------------
void OSQLNameEdit::Modify()
{
OUString sCorrected;
@@ -67,7 +64,6 @@ namespace dbaui
}
Edit::Modify();
}
- //------------------------------------------------------------------
void OSQLNameComboBox::Modify()
{
OUString sCorrected;
@@ -82,6 +78,5 @@ namespace dbaui
ComboBox::Modify();
}
}
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 187cba27a9d4..28ccfedb5bfd 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -46,9 +46,7 @@ const sal_uInt16 COL_DROP = 8;
DBG_NAME(OTableGrantControl)
-//================================================================================
// OTableGrantControl
-//================================================================================
OTableGrantControl::OTableGrantControl( Window* pParent,const ResId& _RsId)
:EditBrowseBox( pParent,_RsId, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE )
,m_pCheckCell( NULL )
@@ -57,7 +55,6 @@ OTableGrantControl::OTableGrantControl( Window* pParent,const ResId& _RsId)
,m_nDeactivateEvent(0)
{
DBG_CTOR(OTableGrantControl,NULL);
- //////////////////////////////////////////////////////////////////////
// Spalten einfuegen
sal_uInt16 i=1;
InsertDataColumn( i, String(ModuleRes(STR_TABLE_PRIV_NAME) ), 75);
@@ -74,7 +71,6 @@ OTableGrantControl::OTableGrantControl( Window* pParent,const ResId& _RsId)
SetColumnWidth(i,GetAutoColumnWidth(i));
}
-//------------------------------------------------------------------------
OTableGrantControl::~OTableGrantControl()
{
DBG_DTOR(OTableGrantControl,NULL);
@@ -89,7 +85,7 @@ OTableGrantControl::~OTableGrantControl()
m_xTables = NULL;
}
-// -----------------------------------------------------------------------------
+
void OTableGrantControl::setTablesSupplier(const Reference< XTablesSupplier >& _xTablesSup)
{
// first we need the users
@@ -107,12 +103,12 @@ void OTableGrantControl::setTablesSupplier(const Reference< XTablesSupplier >& _
OSL_ENSURE(m_xUsers.is(),"No user access supported!");
OSL_ENSURE(m_xTables.is(),"No tables supported!");
}
-// -----------------------------------------------------------------------------
+
void OTableGrantControl::setComponentContext(const Reference< ::com::sun::star::uno::XComponentContext>& _rxContext)
{
m_xContext = _rxContext;
}
-//------------------------------------------------------------------------
+
void OTableGrantControl::UpdateTables()
{
RemoveRows();
@@ -121,13 +117,12 @@ void OTableGrantControl::UpdateTables()
RowInserted(0, m_aTableNames.getLength());
// m_bEnable = m_xDb->GetUser() != ((OUserAdmin*)GetParent())->GetUser();
}
-//------------------------------------------------------------------------
+
void OTableGrantControl::Init()
{
DBG_CHKTHIS(OTableGrantControl,NULL);
EditBrowseBox::Init();
- //////////////////////////////////////////////////////////////////////
// ComboBox instanzieren
if(!m_pCheckCell)
{
@@ -140,7 +135,6 @@ void OTableGrantControl::Init()
}
UpdateTables();
- //////////////////////////////////////////////////////////////////////
// Browser Mode setzen
BrowserMode nMode = BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL |
BROWSER_HIDECURSOR | BROWSER_HIDESELECT;
@@ -148,14 +142,12 @@ void OTableGrantControl::Init()
SetMode(nMode);
}
-//------------------------------------------------------------------------------
void OTableGrantControl::Resize()
{
DBG_CHKTHIS(OTableGrantControl,NULL);
EditBrowseBox::Resize();
}
-//------------------------------------------------------------------------------
long OTableGrantControl::PreNotify(NotifyEvent& rNEvt)
{
DBG_CHKTHIS(OTableGrantControl,NULL);
@@ -175,7 +167,6 @@ long OTableGrantControl::PreNotify(NotifyEvent& rNEvt)
return EditBrowseBox::PreNotify(rNEvt);
}
-//------------------------------------------------------------------------------
IMPL_LINK_NOARG(OTableGrantControl, AsynchActivate)
{
m_nDeactivateEvent = 0;
@@ -183,7 +174,6 @@ IMPL_LINK_NOARG(OTableGrantControl, AsynchActivate)
return 0L;
}
-//------------------------------------------------------------------------------
IMPL_LINK_NOARG(OTableGrantControl, AsynchDeactivate)
{
m_nDeactivateEvent = 0;
@@ -191,7 +181,6 @@ IMPL_LINK_NOARG(OTableGrantControl, AsynchDeactivate)
return 0L;
}
-//------------------------------------------------------------------------------
sal_Bool OTableGrantControl::IsTabAllowed(sal_Bool bForward) const
{
DBG_CHKTHIS(OTableGrantControl,NULL);
@@ -206,14 +195,13 @@ sal_Bool OTableGrantControl::IsTabAllowed(sal_Bool bForward) const
return EditBrowseBox::IsTabAllowed(bForward);
}
-//------------------------------------------------------------------------------
+
#define GRANT_REVOKE_RIGHT(what) \
if(m_pCheckCell->GetBox().IsChecked()) \
xAuth->grantPrivileges(sTableName,PrivilegeObject::TABLE,what);\
else \
xAuth->revokePrivileges(sTableName,PrivilegeObject::TABLE,what)
-//------------------------------------------------------------------------------
sal_Bool OTableGrantControl::SaveModified()
{
DBG_CHKTHIS(OTableGrantControl,NULL);
@@ -273,7 +261,6 @@ sal_Bool OTableGrantControl::SaveModified()
return bErg;
}
-//------------------------------------------------------------------------------
OUString OTableGrantControl::GetCellText( long nRow, sal_uInt16 nColId ) const
{
DBG_CHKTHIS(OTableGrantControl,NULL);
@@ -288,7 +275,6 @@ OUString OTableGrantControl::GetCellText( long nRow, sal_uInt16 nColId ) const
return OUString::number(isAllowed(nColId,nPriv) ? 1 :0);
}
-//------------------------------------------------------------------------------
void OTableGrantControl::InitController( CellControllerRef& /*rController*/, long nRow, sal_uInt16 nColumnId )
{
DBG_CHKTHIS(OTableGrantControl,NULL);
@@ -303,7 +289,7 @@ void OTableGrantControl::InitController( CellControllerRef& /*rController*/, lon
m_pCheckCell->GetBox().Check(aFind != m_aPrivMap.end() ? isAllowed(nColumnId,aFind->second.nRights) : sal_False);
}
}
-// -----------------------------------------------------------------------------
+
void OTableGrantControl::fillPrivilege(sal_Int32 _nRow) const
{
@@ -334,7 +320,7 @@ void OTableGrantControl::fillPrivilege(sal_Int32 _nRow) const
}
}
}
-// -----------------------------------------------------------------------------
+
sal_Bool OTableGrantControl::isAllowed(sal_uInt16 _nColumnId,sal_Int32 _nPrivilege) const
{
sal_Bool bAllowed = sal_False;
@@ -364,19 +350,19 @@ sal_Bool OTableGrantControl::isAllowed(sal_uInt16 _nColumnId,sal_Int32 _nPrivile
}
return bAllowed;
}
-// -----------------------------------------------------------------------------
+
void OTableGrantControl::setUserName(const OUString _sUserName)
{
m_sUserName = _sUserName;
m_aPrivMap = TTablePrivilegeMap();
}
-// -----------------------------------------------------------------------------
+
void OTableGrantControl::setGrantUser(const Reference< XAuthorizable>& _xGrantUser)
{
OSL_ENSURE(_xGrantUser.is(),"OTableGrantControl::setGrantUser: GrantUser is null!");
m_xGrantUser = _xGrantUser;
}
-//------------------------------------------------------------------------------
+
CellController* OTableGrantControl::GetController( long nRow, sal_uInt16 nColumnId )
{
DBG_CHKTHIS(OTableGrantControl,NULL);
@@ -404,7 +390,7 @@ CellController* OTableGrantControl::GetController( long nRow, sal_uInt16 nColumn
}
return pController;
}
-//------------------------------------------------------------------------------
+
sal_Bool OTableGrantControl::SeekRow( long nRow )
{
DBG_CHKTHIS(OTableGrantControl,NULL);
@@ -413,7 +399,6 @@ sal_Bool OTableGrantControl::SeekRow( long nRow )
return (nRow <= m_aTableNames.getLength());
}
-//------------------------------------------------------------------------------
void OTableGrantControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
{
DBG_CHKTHIS(OTableGrantControl,NULL);
@@ -446,14 +431,13 @@ void OTableGrantControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect,
rDev.SetClipRegion();
}
-//------------------------------------------------------------------------
void OTableGrantControl::CellModified()
{
DBG_CHKTHIS(OTableGrantControl,NULL);
EditBrowseBox::CellModified();
SaveModified();
}
-// -----------------------------------------------------------------------------
+
OTableGrantControl::TTablePrivilegeMap::const_iterator OTableGrantControl::findPrivilege(sal_Int32 _nRow) const
{
TTablePrivilegeMap::const_iterator aFind = m_aPrivMap.find(m_aTableNames[_nRow]);
@@ -464,7 +448,7 @@ OTableGrantControl::TTablePrivilegeMap::const_iterator OTableGrantControl::findP
}
return aFind;
}
-// -----------------------------------------------------------------------------
+
Reference< XAccessible > OTableGrantControl::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos )
{
sal_uInt16 nColumnId = GetColumnId( _nColumnPos );
@@ -483,6 +467,5 @@ Reference< XAccessible > OTableGrantControl::CreateAccessibleCell( sal_Int32 _nR
}
return EditBrowseBox::CreateAccessibleCell( _nRow, _nColumnPos );
}
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index 13e6905c7a6c..c6db93c4b350 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -26,9 +26,7 @@
using namespace ::dbaui;
-//==================================================================
// class OSplitterView
-//==================================================================
DBG_NAME(OSplitterView)
OSplitterView::OSplitterView(Window* _pParent,sal_Bool _bVertical) : Window(_pParent,WB_DIALOGCONTROL) // ,WB_BORDER
,m_pSplitter( NULL )
@@ -39,13 +37,13 @@ OSplitterView::OSplitterView(Window* _pParent,sal_Bool _bVertical) : Window(_pPa
DBG_CTOR(OSplitterView,NULL);
ImplInitSettings( sal_True, sal_True, sal_True );
}
-// -----------------------------------------------------------------------------
+
OSplitterView::~OSplitterView()
{
DBG_DTOR(OSplitterView,NULL);
m_pRight = m_pLeft = NULL;
}
-//------------------------------------------------------------------------------
+
IMPL_LINK( OSplitterView, SplitHdl, Splitter*, /*pSplit*/ )
{
OSL_ENSURE(m_pSplitter, "Splitter is NULL!");
@@ -60,7 +58,7 @@ IMPL_LINK( OSplitterView, SplitHdl, Splitter*, /*pSplit*/ )
Resize();
return 0L;
}
-// -----------------------------------------------------------------------------
+
void OSplitterView::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -90,7 +88,7 @@ void OSplitterView::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_
SetBackground( rStyleSettings.GetFaceColor() );
}
}
-// -----------------------------------------------------------------------
+
void OSplitterView::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -102,7 +100,7 @@ void OSplitterView::DataChanged( const DataChangedEvent& rDCEvt )
Invalidate();
}
}
-// -----------------------------------------------------------------------------
+
void OSplitterView::GetFocus()
{
Window::GetFocus();
@@ -114,7 +112,6 @@ void OSplitterView::GetFocus()
m_pRight->GrabFocus();
}
-// -------------------------------------------------------------------------
void OSplitterView::Resize()
{
Window::Resize();
@@ -187,13 +184,13 @@ void OSplitterView::Resize()
}
}
-// -----------------------------------------------------------------------------
+
void OSplitterView::set(Window* _pRight,Window* _pLeft)
{
m_pLeft = _pLeft;
m_pRight = _pRight;
}
-// -----------------------------------------------------------------------------
+
void OSplitterView::setSplitter(Splitter* _pSplitter)
{
m_pSplitter = _pSplitter;
diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx
index 3d698e06b08a..c1c6e0b9a6b1 100644
--- a/dbaccess/source/ui/control/charsetlistbox.cxx
+++ b/dbaccess/source/ui/control/charsetlistbox.cxx
@@ -23,13 +23,9 @@
#include <svl/stritem.hxx>
#include <osl/diagnose.h>
-//........................................................................
namespace dbaui
{
- //====================================================================
- //= CharSetListBox
- //====================================================================
- //--------------------------------------------------------------------
+ // CharSetListBox
CharSetListBox::CharSetListBox( Window* _pParent, const ResId& _rResId )
:ListBox( _pParent, _rResId )
{
@@ -43,12 +39,10 @@ namespace dbaui
}
}
- //--------------------------------------------------------------------
CharSetListBox::~CharSetListBox()
{
}
- //--------------------------------------------------------------------
void CharSetListBox::SelectEntryByIanaName( const String& _rIanaName )
{
OCharsetDisplay::const_iterator aFind = m_aCharSets.findIanaName( _rIanaName );
@@ -78,7 +72,6 @@ namespace dbaui
}
}
- //--------------------------------------------------------------------
bool CharSetListBox::StoreSelectedCharSet( SfxItemSet& _rSet, const sal_uInt16 _nItemId )
{
bool bChangedSomething = false;
@@ -95,8 +88,6 @@ namespace dbaui
return bChangedSomething;
}
-//........................................................................
} // namespace dbaui
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index 9ed5523e1552..7adf78e70403 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -17,19 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "curledit.hxx"
#include <vcl/svapp.hxx>
#include <osl/diagnose.h>
-//.........................................................................
namespace dbaui
{
-//.........................................................................
DBG_NAME(OConnectionURLEdit)
-//=========================================================================
-//= OConnectionURLEdit
-//=========================================================================
+// OConnectionURLEdit
OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, const ResId& _rResId,sal_Bool _bShowPrefix)
:Edit(_pParent, _rResId)
,m_pTypeCollection(NULL)
@@ -39,7 +34,6 @@ OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, const ResId& _rResId,sa
DBG_CTOR(OConnectionURLEdit ,NULL);
}
-//-------------------------------------------------------------------------
OConnectionURLEdit::~OConnectionURLEdit()
{
DBG_DTOR(OConnectionURLEdit ,NULL);
@@ -50,7 +44,6 @@ OConnectionURLEdit::~OConnectionURLEdit()
delete m_pForcedPrefix;
}
-//-------------------------------------------------------------------------
void OConnectionURLEdit::SetTextNoPrefix(const String& _rText)
{
OSL_ENSURE(GetSubEdit(), "OConnectionURLEdit::SetTextNoPrefix: have no current type, not changing the text!");
@@ -58,7 +51,6 @@ void OConnectionURLEdit::SetTextNoPrefix(const String& _rText)
GetSubEdit()->SetText(_rText);
}
-//-------------------------------------------------------------------------
String OConnectionURLEdit::GetTextNoPrefix() const
{
if (GetSubEdit())
@@ -66,14 +58,12 @@ String OConnectionURLEdit::GetTextNoPrefix() const
return GetText();
}
-//-------------------------------------------------------------------------
void OConnectionURLEdit::SetText(const OUString& _rStr)
{
Selection aNoSelection(0,0);
SetText(_rStr, aNoSelection);
}
-//-------------------------------------------------------------------------
void OConnectionURLEdit::SetText(const OUString& _rStr, const Selection& /*_rNewSelection*/)
{
// create new sub controls, if necessary
@@ -125,22 +115,20 @@ void OConnectionURLEdit::SetText(const OUString& _rStr, const Selection& /*_rNew
Edit::SetText( sNewText );
}
-//-------------------------------------------------------------------------
OUString OConnectionURLEdit::GetText() const
{
if ( m_pForcedPrefix )
return m_pForcedPrefix->GetText() += Edit::GetText();
return Edit::GetText();
}
-// -----------------------------------------------------------------------------
+
void OConnectionURLEdit::ShowPrefix(sal_Bool _bShowPrefix)
{
m_bShowPrefix = _bShowPrefix;
if ( m_pForcedPrefix )
m_pForcedPrefix->Show(m_bShowPrefix);
}
-//.........................................................................
+
} // namespace dbaui
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index d5c8816ef482..f6a456276498 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dbtreelistbox.hxx"
#include "dbu_resource.hrc"
#include "browserids.hxx"
@@ -41,10 +40,8 @@
#include <memory>
-// .........................................................................
namespace dbaui
{
-// .........................................................................
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -57,10 +54,7 @@ using namespace ::com::sun::star::view;
DBG_NAME(DBTreeListBox)
#define SPACEBETWEENENTRIES 4
-//========================================================================
// class DBTreeListBox
-//========================================================================
-//------------------------------------------------------------------------
DBTreeListBox::DBTreeListBox( Window* pParent, WinBits nWinStyle ,sal_Bool _bHandleEnterKey)
:SvTreeListBox(pParent,nWinStyle)
,m_pDragedEntry(NULL)
@@ -71,7 +65,7 @@ DBTreeListBox::DBTreeListBox( Window* pParent, WinBits nWinStyle ,sal_Bool _bHan
DBG_CTOR(DBTreeListBox,NULL);
init();
}
-// -----------------------------------------------------------------------------
+
DBTreeListBox::DBTreeListBox( Window* pParent, const ResId& rResId,sal_Bool _bHandleEnterKey)
:SvTreeListBox(pParent,rResId)
,m_pDragedEntry(NULL)
@@ -82,7 +76,7 @@ DBTreeListBox::DBTreeListBox( Window* pParent, const ResId& rResId,sal_Bool _bHa
DBG_CTOR(DBTreeListBox,NULL);
init();
}
-// -----------------------------------------------------------------------------
+
void DBTreeListBox::init()
{
sal_uInt16 nSize = SPACEBETWEENENTRIES;
@@ -100,13 +94,13 @@ void DBTreeListBox::init()
SetStyle( GetStyle() | WB_QUICK_SEARCH );
}
-//------------------------------------------------------------------------
+
DBTreeListBox::~DBTreeListBox()
{
DBG_DTOR(DBTreeListBox,NULL);
implStopSelectionTimer();
}
-//------------------------------------------------------------------------
+
SvTreeListEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvTreeListEntry* pStart, const IEntryFilter* _pFilter ) const
{
SvTreeList* myModel = GetModel();
@@ -133,13 +127,11 @@ SvTreeListEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvTreeLi
return pEntry;
}
-// -------------------------------------------------------------------------
void DBTreeListBox::EnableExpandHandler(SvTreeListEntry* _pEntry)
{
LINK(this, DBTreeListBox, OnResetEntry).Call(_pEntry);
}
-// -------------------------------------------------------------------------
void DBTreeListBox::RequestingChildren( SvTreeListEntry* pParent )
{
if (m_aPreExpandHandler.IsSet())
@@ -154,7 +146,6 @@ void DBTreeListBox::RequestingChildren( SvTreeListEntry* pParent )
}
}
-// -------------------------------------------------------------------------
void DBTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& aStr, const Image& _rCollEntryBmp, const Image& _rExpEntryBmp, SvLBoxButtonKind eButtonKind)
{
SvTreeListBox::InitEntry( _pEntry, aStr, _rCollEntryBmp,_rExpEntryBmp, eButtonKind);
@@ -163,29 +154,25 @@ void DBTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& aStr, co
_pEntry->ReplaceItem( pString,_pEntry->GetPos(pTextItem));
}
-// -------------------------------------------------------------------------
void DBTreeListBox::implStopSelectionTimer()
{
if ( m_aTimer.IsActive() )
m_aTimer.Stop();
}
-// -------------------------------------------------------------------------
void DBTreeListBox::implStartSelectionTimer()
{
implStopSelectionTimer();
m_aTimer.Start();
}
-// -----------------------------------------------------------------------------
-
void DBTreeListBox::DeselectHdl()
{
m_aSelectedEntries.erase( GetHdlEntry() );
SvTreeListBox::DeselectHdl();
implStartSelectionTimer();
}
-// -------------------------------------------------------------------------
+
void DBTreeListBox::SelectHdl()
{
m_aSelectedEntries.insert( GetHdlEntry() );
@@ -193,7 +180,6 @@ void DBTreeListBox::SelectHdl()
implStartSelectionTimer();
}
-// -------------------------------------------------------------------------
void DBTreeListBox::MouseButtonDown( const MouseEvent& rMEvt )
{
sal_Bool bHitEmptySpace = (NULL == GetEntry(rMEvt.GetPosPixel(), sal_True));
@@ -203,7 +189,6 @@ void DBTreeListBox::MouseButtonDown( const MouseEvent& rMEvt )
SvTreeListBox::MouseButtonDown(rMEvt);
}
-// -------------------------------------------------------------------------
IMPL_LINK(DBTreeListBox, OnResetEntry, SvTreeListEntry*, pEntry)
{
// set the flag which allows if the entry can be expanded
@@ -212,7 +197,7 @@ IMPL_LINK(DBTreeListBox, OnResetEntry, SvTreeListEntry*, pEntry)
GetModel()->InvalidateEntry( pEntry );
return 0L;
}
-// -----------------------------------------------------------------------------
+
void DBTreeListBox::ModelHasEntryInvalidated( SvTreeListEntry* _pEntry )
{
SvTreeListBox::ModelHasEntryInvalidated( _pEntry );
@@ -229,7 +214,7 @@ void DBTreeListBox::ModelHasEntryInvalidated( SvTreeListEntry* _pEntry )
}
}
}
-// -------------------------------------------------------------------------
+
void DBTreeListBox::ModelHasRemoved( SvTreeListEntry* _pEntry )
{
SvTreeListBox::ModelHasRemoved(_pEntry);
@@ -241,7 +226,6 @@ void DBTreeListBox::ModelHasRemoved( SvTreeListEntry* _pEntry )
}
}
-// -------------------------------------------------------------------------
sal_Int8 DBTreeListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
{
sal_Int8 nDropOption = DND_ACTION_NONE;
@@ -282,7 +266,6 @@ sal_Int8 DBTreeListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
return nDropOption;
}
-// -------------------------------------------------------------------------
sal_Int8 DBTreeListBox::ExecuteDrop( const ExecuteDropEvent& _rEvt )
{
if ( m_pActionListener )
@@ -291,7 +274,6 @@ sal_Int8 DBTreeListBox::ExecuteDrop( const ExecuteDropEvent& _rEvt )
return DND_ACTION_NONE;
}
-// -------------------------------------------------------------------------
void DBTreeListBox::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel )
{
if ( m_pActionListener )
@@ -307,7 +289,6 @@ void DBTreeListBox::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel )
}
}
-// -------------------------------------------------------------------------
void DBTreeListBox::RequestHelp( const HelpEvent& rHEvt )
{
if ( !m_pActionListener )
@@ -338,7 +319,6 @@ void DBTreeListBox::RequestHelp( const HelpEvent& rHEvt )
SvTreeListBox::RequestHelp( rHEvt );
}
-// -----------------------------------------------------------------------------
void DBTreeListBox::KeyInput( const KeyEvent& rKEvt )
{
KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction();
@@ -380,10 +360,14 @@ void DBTreeListBox::KeyInput( const KeyEvent& rKEvt )
if ( m_aEnterKeyHdl.IsSet() )
m_aEnterKeyHdl.Call(this);
// this is a HACK. If the data source browser is opened in the "beamer", while the main frame
+ //
// contains a writer document, then pressing enter in the DSB would be rerouted to the writer
+ //
// document if we would not do this hack here.
// The problem is that the Writer uses RETURN as _accelerator_ (which is quite weird itself),
+ //
// so the SFX framework is _obligated_ to pass it to the Writer if nobody else handled it. There
+ //
// is no chance to distinguish between
// "accelerators which are to be executed if the main document has the focus"
// and
@@ -401,12 +385,12 @@ void DBTreeListBox::KeyInput( const KeyEvent& rKEvt )
if ( !bHandled )
SvTreeListBox::KeyInput(rKEvt);
}
-// -----------------------------------------------------------------------------
+
sal_Bool DBTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& /*_aSelection*/)
{
return m_aEditingHandler.Call(pEntry) != 0;
}
-// -----------------------------------------------------------------------------
+
sal_Bool DBTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText )
{
DBTreeEditedEntry aEntry;
@@ -422,7 +406,6 @@ sal_Bool DBTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rN
return sal_False; // we never want that the base change our text
}
-// -----------------------------------------------------------------------------
sal_Bool DBTreeListBox::DoubleClickHdl()
{
long nResult = aDoubleClickHdl.Call( this );
@@ -430,7 +413,6 @@ sal_Bool DBTreeListBox::DoubleClickHdl()
return nResult == 0;
}
-// -----------------------------------------------------------------------------
void scrollWindow(DBTreeListBox* _pListBox, const Point& _rPos,sal_Bool _bUp)
{
SvTreeListEntry* pEntry = _pListBox->GetEntry( _rPos );
@@ -439,20 +421,19 @@ void scrollWindow(DBTreeListBox* _pListBox, const Point& _rPos,sal_Bool _bUp)
_pListBox->ScrollOutputArea( _bUp ? -1 : 1 );
}
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK( DBTreeListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ )
{
scrollWindow(this,m_aMousePos,sal_True);
return 0;
}
-//------------------------------------------------------------------------------
IMPL_LINK( DBTreeListBox, ScrollDownHdl, SvTreeListBox*, /*pBox*/ )
{
scrollWindow(this,m_aMousePos,sal_False);
return 0;
}
-// -----------------------------------------------------------------------------
+
namespace
{
void lcl_enableEntries( PopupMenu* _pPopup, IController& _rController )
@@ -487,7 +468,6 @@ namespace
}
}
-// -----------------------------------------------------------------------------
namespace
{
void lcl_adjustMenuItemIDs( Menu& _rMenu, IController& _rCommandController )
@@ -548,9 +528,7 @@ namespace
_rMenu.SetItemImage(nId,framework::GetImageFromURL(xFrame,aCommand,sal_False));
}
}
- // =========================================================================
- // = SelectionSupplier
- // =========================================================================
+ // SelectionSupplier
typedef ::cppu::WeakImplHelper1 < XSelectionSupplier
> SelectionSupplier_Base;
class SelectionSupplier : public SelectionSupplier_Base
@@ -575,27 +553,23 @@ namespace
Any m_aSelection;
};
- //--------------------------------------------------------------------
::sal_Bool SAL_CALL SelectionSupplier::select( const Any& /*_Selection*/ ) throw (IllegalArgumentException, RuntimeException)
{
throw IllegalArgumentException();
// API bug: this should be a NoSupportException
}
- //--------------------------------------------------------------------
Any SAL_CALL SelectionSupplier::getSelection( ) throw (RuntimeException)
{
return m_aSelection;
}
- //--------------------------------------------------------------------
void SAL_CALL SelectionSupplier::addSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException)
{
OSL_FAIL( "SelectionSupplier::removeSelectionChangeListener: no support!" );
// API bug: this should be a NoSupportException
}
- //--------------------------------------------------------------------
void SAL_CALL SelectionSupplier::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException)
{
OSL_FAIL( "SelectionSupplier::removeSelectionChangeListener: no support!" );
@@ -603,7 +577,6 @@ namespace
}
}
-// -----------------------------------------------------------------------------
PopupMenu* DBTreeListBox::CreateContextMenu( void )
{
::std::auto_ptr< PopupMenu > pContextMenu;
@@ -688,14 +661,12 @@ PopupMenu* DBTreeListBox::CreateContextMenu( void )
return pContextMenu.release();
}
-// -----------------------------------------------------------------------------
void DBTreeListBox::ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry )
{
if ( m_pContextMenuProvider && _nSelectedPopupEntry )
m_pContextMenuProvider->getCommandController().executeChecked( _nSelectedPopupEntry, Sequence< PropertyValue >() );
}
-// -----------------------------------------------------------------------------
IMPL_LINK(DBTreeListBox, OnTimeOut, void*, /*EMPTY_ARG*/)
{
implStopSelectionTimer();
@@ -703,14 +674,13 @@ IMPL_LINK(DBTreeListBox, OnTimeOut, void*, /*EMPTY_ARG*/)
m_aSelChangeHdl.Call( NULL );
return 0L;
}
-// -----------------------------------------------------------------------------
+
void DBTreeListBox::StateChanged( StateChangedType nStateChange )
{
if ( nStateChange == STATE_CHANGE_VISIBLE )
implStopSelectionTimer();
}
-// .........................................................................
+
} // namespace dbaui
-// .........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx
index c98228caa08d..406eb6e580e3 100644
--- a/dbaccess/source/ui/control/listviewitems.cxx
+++ b/dbaccess/source/ui/control/listviewitems.cxx
@@ -17,19 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "listviewitems.hxx"
#include "svtools/viewdataentry.hxx"
-//........................................................................
namespace dbaui
{
-//........................................................................
- //========================================================================
// class OBoldListboxString
- //========================================================================
- //------------------------------------------------------------------------
void OBoldListboxString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* _pViewData)
{
SvLBoxString::InitViewData( pView, pEntry, _pViewData );
@@ -68,8 +62,6 @@ namespace dbaui
SvLBoxString::Paint(rPos, rDev, pView, pEntry);
}
-//........................................................................
} // namespace dbaui
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index b3136fc785d4..061a66e511d7 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "opendoccontrols.hxx"
#include <com/sun/star/uno/Sequence.hxx>
@@ -40,10 +39,8 @@
#include <osl/diagnose.h>
#include <vcl/builder.hxx>
-//........................................................................
namespace dbaui
{
-//........................................................................
namespace
{
@@ -155,27 +152,21 @@ namespace dbaui
return aIcon;
}
-
}
- //====================================================================
- //= OpenButton
- //====================================================================
+ // OpenButton
- //--------------------------------------------------------------------
OpenDocumentButton::OpenDocumentButton( Window* _pParent, const sal_Char* _pAsciiModuleName )
:PushButton( _pParent )
{
impl_init( _pAsciiModuleName );
}
- //--------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOpenDocumentButton( Window *pParent, VclBuilder::stringmap & )
{
return new OpenDocumentButton( pParent, "com.sun.star.sdb.OfficeDatabaseDocument" );
}
- //--------------------------------------------------------------------
void OpenDocumentButton::impl_init( const sal_Char* _pAsciiModuleName )
{
OSL_ENSURE( _pAsciiModuleName, "OpenDocumentButton::impl_init: invalid module name!" );
@@ -193,24 +184,19 @@ namespace dbaui
SetStyle( GetStyle() | WB_CENTER );
}
- //====================================================================
- //= OpenDocumentListBox
- //====================================================================
+ // OpenDocumentListBox
- //--------------------------------------------------------------------
OpenDocumentListBox::OpenDocumentListBox( Window* _pParent, const sal_Char* _pAsciiModuleName )
:ListBox( _pParent, WB_BORDER | WB_DROPDOWN )
{
impl_init( _pAsciiModuleName );
}
- //--------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOpenDocumentListBox( Window *pParent, VclBuilder::stringmap & )
{
return new OpenDocumentListBox( pParent, "com.sun.star.sdb.OfficeDatabaseDocument" );
}
- //--------------------------------------------------------------------
void OpenDocumentListBox::impl_init( const sal_Char* _pAsciiModuleName )
{
OSL_ENSURE( _pAsciiModuleName, "OpenDocumentListBox::impl_init: invalid module name!" );
@@ -265,7 +251,6 @@ namespace dbaui
}
}
- //--------------------------------------------------------------------
String OpenDocumentListBox::GetSelectedDocumentURL() const
{
String sURL;
@@ -275,7 +260,6 @@ namespace dbaui
return sURL;
}
- //--------------------------------------------------------------------
String OpenDocumentListBox::GetSelectedDocumentFilter() const
{
String sFilter;
@@ -285,7 +269,6 @@ namespace dbaui
return sFilter;
}
- //--------------------------------------------------------------------
OpenDocumentListBox::StringPair OpenDocumentListBox::impl_getDocumentAtIndex( sal_uInt16 _nListIndex, bool _bSystemNotation ) const
{
MapIndexToStringPair::const_iterator pos = m_aURLs.find( _nListIndex );
@@ -304,7 +287,6 @@ namespace dbaui
return aDocumentDescriptor;
}
- //--------------------------------------------------------------------
void OpenDocumentListBox::RequestHelp( const HelpEvent& _rHEvt )
{
if( !( _rHEvt.GetMode() & HELPMODE_QUICK ) )
@@ -325,8 +307,6 @@ namespace dbaui
}
}
-//........................................................................
} // namespace dbaui
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 28684605f471..adc36440ce52 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "tabletree.hxx"
#include "imageprovider.hxx"
#include "moduledbu.hxx"
@@ -46,10 +45,8 @@
#include <algorithm>
#include <o3tl/compat_functional.hxx>
-//.........................................................................
namespace dbaui
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdb;
@@ -66,9 +63,7 @@ using namespace ::comphelper;
namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer;
-//========================================================================
-//= OTableTreeListBox
-//========================================================================
+// OTableTreeListBox
OTableTreeListBox::OTableTreeListBox( Window* pParent, WinBits nWinStyle, sal_Bool _bVirtualRoot )
:OMarkableTreeListBox(pParent, nWinStyle)
,m_pImageProvider( new ImageProvider )
@@ -77,7 +72,7 @@ OTableTreeListBox::OTableTreeListBox( Window* pParent, WinBits nWinStyle, sal_Bo
{
implSetDefaultImages();
}
-//------------------------------------------------------------------------
+
OTableTreeListBox::OTableTreeListBox( Window* pParent, const ResId& rResId, sal_Bool _bVirtualRoot)
:OMarkableTreeListBox(pParent, rResId)
,m_pImageProvider( new ImageProvider )
@@ -87,12 +82,10 @@ OTableTreeListBox::OTableTreeListBox( Window* pParent, const ResId& rResId, sal_
implSetDefaultImages();
}
-// -----------------------------------------------------------------------------
OTableTreeListBox::~OTableTreeListBox()
{
}
-// -----------------------------------------------------------------------------
void OTableTreeListBox::implSetDefaultImages()
{
ImageProvider aImageProvider;
@@ -100,7 +93,6 @@ void OTableTreeListBox::implSetDefaultImages()
SetDefaultCollapsedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE ) );
}
-// -----------------------------------------------------------------------------
bool OTableTreeListBox::isFolderEntry( const SvTreeListEntry* _pEntry ) const
{
sal_Int32 nEntryType = reinterpret_cast< sal_IntPtr >( _pEntry->GetUserData() );
@@ -112,7 +104,6 @@ bool OTableTreeListBox::isFolderEntry( const SvTreeListEntry* _pEntry ) const
return false;
}
-// -----------------------------------------------------------------------------
void OTableTreeListBox::notifyHiContrastChanged()
{
implSetDefaultImages();
@@ -148,14 +139,12 @@ void OTableTreeListBox::notifyHiContrastChanged()
}
}
-//------------------------------------------------------------------------
void OTableTreeListBox::implOnNewConnection( const Reference< XConnection >& _rxConnection )
{
m_xConnection = _rxConnection;
m_pImageProvider.reset( new ImageProvider( m_xConnection ) );
}
-//------------------------------------------------------------------------
void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConnection ) throw(SQLException)
{
Sequence< OUString > sTables, sViews;
@@ -198,7 +187,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn
UpdateTableList( _rxConnection, sTables, sViews );
}
-// -----------------------------------------------------------------------------
+
namespace
{
struct OViewSetter : public ::std::unary_function< OTableTreeListBox::TNames::value_type, bool>
@@ -220,7 +209,7 @@ namespace
};
}
-// -----------------------------------------------------------------------------
+
void OTableTreeListBox::UpdateTableList(
const Reference< XConnection >& _rxConnection,
const Sequence< OUString>& _rTables,
@@ -244,7 +233,6 @@ void OTableTreeListBox::UpdateTableList(
UpdateTableList( _rxConnection, aTables );
}
-//------------------------------------------------------------------------
namespace
{
::std::vector< OUString > lcl_getMetaDataStrings_throw( const Reference< XResultSet >& _rxMetaDataResult, sal_Int32 _nColumnIndex )
@@ -263,7 +251,6 @@ namespace
}
}
-//------------------------------------------------------------------------
void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConnection, const TNames& _rTables )
{
implOnNewConnection( _rxConnection );
@@ -343,7 +330,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn
DBG_UNHANDLED_EXCEPTION();
}
}
-//------------------------------------------------------------------------
+
sal_Bool OTableTreeListBox::isWildcardChecked(SvTreeListEntry* _pEntry) const
{
if (_pEntry)
@@ -355,20 +342,17 @@ sal_Bool OTableTreeListBox::isWildcardChecked(SvTreeListEntry* _pEntry) const
return sal_False;
}
-//------------------------------------------------------------------------
void OTableTreeListBox::checkWildcard(SvTreeListEntry* _pEntry)
{
SetCheckButtonState(_pEntry, SV_BUTTON_CHECKED);
checkedButton_noBroadcast(_pEntry);
}
-//------------------------------------------------------------------------
SvTreeListEntry* OTableTreeListBox::getAllObjectsEntry() const
{
return haveVirtualRoot() ? First() : NULL;
}
-//------------------------------------------------------------------------
void OTableTreeListBox::checkedButton_noBroadcast(SvTreeListEntry* _pEntry)
{
OMarkableTreeListBox::checkedButton_noBroadcast(_pEntry);
@@ -382,7 +366,6 @@ void OTableTreeListBox::checkedButton_noBroadcast(SvTreeListEntry* _pEntry)
implEmphasize(_pEntry, SV_BUTTON_CHECKED == eState);
}
-//------------------------------------------------------------------------
void OTableTreeListBox::implEmphasize(SvTreeListEntry* _pEntry, sal_Bool _bChecked, sal_Bool _bUpdateDescendants, sal_Bool _bUpdateAncestors)
{
OSL_ENSURE(_pEntry, "OTableTreeListBox::implEmphasize: invalid entry (NULL)!");
@@ -421,7 +404,6 @@ void OTableTreeListBox::implEmphasize(SvTreeListEntry* _pEntry, sal_Bool _bCheck
}
}
-//------------------------------------------------------------------------
void OTableTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind)
{
OMarkableTreeListBox::InitEntry(_pEntry, _rString, _rCollapsedBitmap, _rExpandedBitmap, _eButtonKind);
@@ -435,7 +417,6 @@ void OTableTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& _rSt
_pEntry->ReplaceItem(new OBoldListboxString(_pEntry, 0, _rString), nTextPos);
}
-//------------------------------------------------------------------------
SvTreeListEntry* OTableTreeListBox::implAddEntry(
const Reference< XDatabaseMetaData >& _rxMeta,
const OUString& _rTableName,
@@ -496,7 +477,6 @@ SvTreeListEntry* OTableTreeListBox::implAddEntry(
return pRet;
}
-//------------------------------------------------------------------------
NamedDatabaseObject OTableTreeListBox::describeObject( SvTreeListEntry* _pEntry )
{
NamedDatabaseObject aObject;
@@ -543,7 +523,6 @@ NamedDatabaseObject OTableTreeListBox::describeObject( SvTreeListEntry* _pEntry
return aObject;
}
-//------------------------------------------------------------------------
SvTreeListEntry* OTableTreeListBox::addedTable( const OUString& _rName )
{
try
@@ -559,7 +538,6 @@ SvTreeListEntry* OTableTreeListBox::addedTable( const OUString& _rName )
return NULL;
}
-//------------------------------------------------------------------------
bool OTableTreeListBox::impl_getAndAssertMetaData( Reference< XDatabaseMetaData >& _out_rMetaData ) const
{
if ( m_xConnection.is() )
@@ -568,7 +546,6 @@ bool OTableTreeListBox::impl_getAndAssertMetaData( Reference< XDatabaseMetaData
return _out_rMetaData.is();
}
-//------------------------------------------------------------------------
String OTableTreeListBox::getQualifiedTableName( SvTreeListEntry* _pEntry ) const
{
OSL_PRECOND( !isFolderEntry( _pEntry ), "OTableTreeListBox::getQualifiedTableName: folder entries not allowed here!" );
@@ -614,7 +591,6 @@ String OTableTreeListBox::getQualifiedTableName( SvTreeListEntry* _pEntry ) cons
return String();
}
-//------------------------------------------------------------------------
SvTreeListEntry* OTableTreeListBox::getEntryByQualifiedName( const OUString& _rName )
{
try
@@ -652,7 +628,7 @@ SvTreeListEntry* OTableTreeListBox::getEntryByQualifiedName( const OUString& _rN
}
return NULL;
}
-//------------------------------------------------------------------------
+
void OTableTreeListBox::removedTable( const OUString& _rName )
{
try
@@ -667,8 +643,6 @@ void OTableTreeListBox::removedTable( const OUString& _rName )
}
}
-//.........................................................................
} // namespace dbaui
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index b833483fcc1d..eac3039585b6 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -38,11 +38,11 @@
#include "UITools.hxx"
#include <comphelper/processfactory.hxx>
-
extern "C" void SAL_CALL createRegistryInfo_OToolboxController()
{
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OToolboxController> aAutoRegistration;
}
+
namespace dbaui
{
using namespace svt;
@@ -76,7 +76,6 @@ namespace dbaui
osl_atomic_decrement(&m_refCount);
}
- // -----------------------------------------------------------------------------
IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(OToolboxController, "com.sun.star.sdb.ApplicationToolboxController")
IMPLEMENT_SERVICE_INFO_SUPPORTS(OToolboxController)
IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(OToolboxController, "com.sun.star.frame.ToolboxController")
@@ -87,8 +86,6 @@ namespace dbaui
return static_cast< XServiceInfo* >(new OToolboxController( comphelper::getComponentContext(_rxORB) ));
}
-
- // -----------------------------------------------------------------------------
// XInterface
Any SAL_CALL OToolboxController::queryInterface( const Type& _rType ) throw (RuntimeException)
{
@@ -97,17 +94,14 @@ namespace dbaui
aReturn = TToolboxController_BASE::queryInterface(_rType);
return aReturn;
}
- // -----------------------------------------------------------------------------
void SAL_CALL OToolboxController::acquire() throw ()
{
ToolboxController::acquire();
}
- // -----------------------------------------------------------------------------
void SAL_CALL OToolboxController::release() throw ()
{
ToolboxController::release();
}
- // -----------------------------------------------------------------------------
void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException)
{
ToolboxController::initialize(_rArguments);
@@ -154,7 +148,6 @@ namespace dbaui
pToolBox->SetItemBits(m_nToolBoxId,pToolBox->GetItemBits(m_nToolBoxId) | TIB_DROPDOWN);
}
}
- // -----------------------------------------------------------------------------
void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException )
{
SolarMutexGuard aSolarMutexGuard;
@@ -185,7 +178,6 @@ namespace dbaui
}
}
}
- // -----------------------------------------------------------------------------
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<PopupMenu> OToolboxController::getMenu()
{
@@ -232,7 +224,6 @@ namespace dbaui
return pMenu;
}
SAL_WNODEPRECATED_DECLARATIONS_POP
- // -----------------------------------------------------------------------------
Reference< ::com::sun::star::awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw (RuntimeException)
{
// execute the menu
@@ -271,11 +262,6 @@ namespace dbaui
}
return Reference< ::com::sun::star::awt::XWindow >();
}
- // -----------------------------------------------------------------------------
- // -----------------------------------------------------------------------------
-//..........................................................................
} // dbaui
-//..........................................................................
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/undosqledit.cxx b/dbaccess/source/ui/control/undosqledit.cxx
index 4c3b1d59bee9..ddcf28de4bbc 100644
--- a/dbaccess/source/ui/control/undosqledit.cxx
+++ b/dbaccess/source/ui/control/undosqledit.cxx
@@ -17,21 +17,18 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "undosqledit.hxx"
#include "sqledit.hxx"
namespace dbaui
{
-//------------------------------------------------------------------------------
void OSqlEditUndoAct::ToggleText()
{
String strNext = m_pOwner->GetText();
m_pOwner->SetText(m_strNextText);
m_strNextText =strNext;
}
-// -----------------------------------------------------------------------------
+
} // namespace
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index bcf349401f82..e40c32a74a0e 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -45,10 +45,8 @@
#include <osl/thread.h>
#include <connectivity/dbexception.hxx>
-//.........................................................................
namespace dbaui
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
@@ -58,7 +56,6 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::sdbc;
using namespace comphelper;
-// -----------------------------------------------------------------------------
DBG_NAME(OCollectionView)
OCollectionView::OCollectionView( Window * pParent
,const Reference< XContent>& _xContent
@@ -101,17 +98,17 @@ OCollectionView::OCollectionView( Window * pParent
m_aNewFolder.SetClickHdl( LINK( this, OCollectionView, NewFolder_Click ) );
m_aPB_OK.SetClickHdl( LINK( this, OCollectionView, Save_Click ) );
}
-// -----------------------------------------------------------------------------
+
OCollectionView::~OCollectionView( )
{
DBG_DTOR(OCollectionView,NULL);
}
-// -----------------------------------------------------------------------------
+
Reference< XContent> OCollectionView::getSelectedFolder() const
{
return m_xContent;
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK_NOARG(OCollectionView, Save_Click)
{
OUString sName = m_aName.GetText();
@@ -166,7 +163,6 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click)
OUString sTemp;
InteractiveAugmentedIOException aException(sTemp,Reference<XInterface>(),eClass,eError,aValues);
-
Reference<XInteractionHandler2> xHandler(
InteractionHandler::createWithParent(m_xContext, VCLUnoHelper::GetInterface( this )));
OInteractionRequest* pRequest = new OInteractionRequest(makeAny(aException));
@@ -200,7 +196,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click)
}
return 0;
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK_NOARG(OCollectionView, NewFolder_Click)
{
try
@@ -219,7 +215,7 @@ IMPL_LINK_NOARG(OCollectionView, NewFolder_Click)
}
return 0;
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK_NOARG(OCollectionView, Up_Click)
{
try
@@ -244,7 +240,7 @@ IMPL_LINK_NOARG(OCollectionView, Up_Click)
}
return 0;
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView)
{
try
@@ -275,7 +271,7 @@ IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView)
}
return 0;
}
-// -----------------------------------------------------------------------------
+
void OCollectionView::initCurrentPath()
{
sal_Bool bEnable = sal_False;
@@ -304,15 +300,12 @@ void OCollectionView::initCurrentPath()
}
m_aUp.Enable(bEnable);
}
-// -----------------------------------------------------------------------------
+
OUString OCollectionView::getName() const
{
return m_aName.GetText();
}
-// -----------------------------------------------------------------------------
-//.........................................................................
-} // namespace dbaui
-//.........................................................................
+} // namespace dbaui
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 52069d2a0a16..3eb5c900bfe9 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dsnItem.hxx"
#include "ConnectionHelper.hxx"
#include "AutoControls.hrc"
@@ -75,12 +74,8 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
-
-
-//.........................................................................
namespace dbaui
{
-//.........................................................................
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
@@ -93,7 +88,6 @@ namespace dbaui
using namespace ::dbtools;
using namespace ::svt;
-
DBG_NAME(OConnectionHelper)
OConnectionHelper::OConnectionHelper( Window* pParent, const ResId& _rId, const SfxItemSet& _rCoreAttrs)
@@ -113,15 +107,12 @@ DBG_NAME(OConnectionHelper)
m_aConnectionURL.SetTypeCollection(m_pCollection);
}
-
OConnectionHelper::~OConnectionHelper()
{
DBG_DTOR(OConnectionHelper,NULL);
}
-
- // -----------------------------------------------------------------------
void OConnectionHelper::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue)
{
// check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa)
@@ -150,7 +141,6 @@ DBG_NAME(OConnectionHelper)
OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);
}
- // -----------------------------------------------------------------------
void OConnectionHelper::implUpdateURLDependentStates() const
{
OSL_PRECOND( m_pAdminDialog, "OConnectionHelper::implUpdateURLDependentStates: no admin dialog!" );
@@ -161,7 +151,6 @@ DBG_NAME(OConnectionHelper)
m_pAdminDialog->enableConfirmSettings( getURLNoPrefix().Len() > 0 );
}
- // -----------------------------------------------------------------------
IMPL_LINK(OConnectionHelper, OnBrowseConnections, PushButton*, /*_pButton*/)
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
@@ -306,7 +295,6 @@ DBG_NAME(OConnectionHelper)
for (sal_Int32 index=0; index < count; index++)
aProfiles.insert(pArray[index]);
-
// execute the select dialog
ODatasourceSelectDialog aSelector(GetParent(), aProfiles);
OUString sOldProfile=getURLNoPrefix();
@@ -329,14 +317,11 @@ DBG_NAME(OConnectionHelper)
return 0L;
}
- //-------------------------------------------------------------------------
-
bool OConnectionHelper::checkTestConnection()
{
return true;
}
- //-------------------------------------------------------------------------
void OConnectionHelper::impl_setURL( const String& _rURL, sal_Bool _bPrefix )
{
String sURL( comphelper::string::stripEnd(_rURL, '*') );
@@ -380,7 +365,6 @@ DBG_NAME(OConnectionHelper)
implUpdateURLDependentStates();
}
- //-------------------------------------------------------------------------
String OConnectionHelper::impl_getURL( sal_Bool _bPrefix ) const
{
// get the pure text
@@ -419,25 +403,21 @@ DBG_NAME(OConnectionHelper)
return sURL;
}
- //-------------------------------------------------------------------------
void OConnectionHelper::setURL( const String& _rURL )
{
impl_setURL( _rURL, sal_True );
}
- //-------------------------------------------------------------------------
String OConnectionHelper::getURLNoPrefix( ) const
{
return impl_getURL( sal_False );
}
- //-------------------------------------------------------------------------
void OConnectionHelper::setURLNoPrefix( const String& _rURL )
{
impl_setURL( _rURL, sal_False );
}
- //-------------------------------------------------------------------------
sal_Int32 OConnectionHelper::checkPathExistence(const String& _rURL)
{
IS_PATH_EXIST e_exists = pathExists(_rURL, sal_False);
@@ -504,7 +484,6 @@ DBG_NAME(OConnectionHelper)
return RET_OK;
}
- // -----------------------------------------------------------------------------
IS_PATH_EXIST OConnectionHelper::pathExists(const OUString& _rURL, sal_Bool bIsFile) const
{
::ucbhelper::Content aCheckExistence;
@@ -528,7 +507,6 @@ DBG_NAME(OConnectionHelper)
}
return eExists;
}
- //-------------------------------------------------------------------------
long OConnectionHelper::PreNotify( NotifyEvent& _rNEvt )
{
if ( m_pCollection->isFileSystemBased(m_eType) )
@@ -555,8 +533,6 @@ DBG_NAME(OConnectionHelper)
return OGenericAdministrationPage::PreNotify( _rNEvt );
}
- //-------------------------------------------------------------------------
-
sal_Bool OConnectionHelper::createDirectoryDeep(const String& _rPathURL)
{
// get an URL object analyzing the URL for us ...
@@ -625,22 +601,17 @@ DBG_NAME(OConnectionHelper)
return sal_True;
}
-
- // -----------------------------------------------------------------------
void OConnectionHelper::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
{
_rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFT_Connection));
_rControlList.push_back(new ODisableWrapper<PushButton>(&m_aPB_Connection));
}
-
- // -----------------------------------------------------------------------
void OConnectionHelper::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
{
_rControlList.push_back( new OSaveValueWrapper<Edit>( &m_aConnectionURL ) );
}
- //-------------------------------------------------------------------------
sal_Bool OConnectionHelper::commitURL()
{
String sURL;
@@ -694,7 +665,6 @@ DBG_NAME(OConnectionHelper)
m_aConnectionURL.SaveValueNoPrefix();
return sal_True;
}
- //-------------------------------------------------------------------------
void OConnectionHelper::askForFileName(::sfx2::FileDialogHelper& _aFileOpen)
{
String sOldPath = getURLNoPrefix();
@@ -710,8 +680,6 @@ DBG_NAME(OConnectionHelper)
}
}
-//.........................................................................
} // namespace dbaui
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
index 2b9e4980f1d5..1e8db0c69528 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -25,10 +25,8 @@
#include "curledit.hxx"
#include <sfx2/filedlghelper.hxx>
-//.........................................................................
namespace dbaui
{
-//.........................................................................
enum IS_PATH_EXIST
{
@@ -62,7 +60,6 @@ namespace dbaui
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
-
// setting/retrieving the current connection URL
// necessary because for some types, the URL must be decoded for display purposes
//String getURL( OConnectionURLEdit* _m_pConnection ) const;
@@ -77,7 +74,6 @@ namespace dbaui
*/
sal_Int32 checkPathExistence(const String& _rURL);
-
IS_PATH_EXIST pathExists(const OUString& _rURL, sal_Bool bIsFile) const;
sal_Bool createDirectoryDeep(const String& _rPathNormalized);
sal_Bool commitURL();
@@ -99,9 +95,7 @@ namespace dbaui
void implUpdateURLDependentStates() const;
};
-//.........................................................................
} // namespace dbaui
-//.........................................................................
#endif // DBAUI_CONNECTIONHELPER_HXX
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 0f679b908027..2026b51c742e 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -18,7 +18,6 @@
*/
#include <config_features.h>
-
#include "ConnectionPage.hxx"
#include "ConnectionPage.hrc"
#include "dbu_dlg.hrc"
@@ -72,10 +71,8 @@
#include "AutoControls.hrc"
-//.........................................................................
namespace dbaui
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::ui::dialogs;
@@ -90,9 +87,7 @@ namespace dbaui
{
return ( new OConnectionTabPage( pParent, _rAttrSet ) );
}
- //========================================================================
- //= OConnectionTabPage
- //========================================================================
+ // OConnectionTabPage
DBG_NAME(OConnectionTabPage)
OConnectionTabPage::OConnectionTabPage(Window* pParent, const SfxItemSet& _rCoreAttrs)
:OConnectionHelper(pParent, ModuleRes(PAGE_CONNECTION), _rCoreAttrs)
@@ -122,13 +117,11 @@ namespace dbaui
LayoutHelper::fitSizeRightAligned( m_aTestConnection );
}
- // -----------------------------------------------------------------------
OConnectionTabPage::~OConnectionTabPage()
{
DBG_DTOR(OConnectionTabPage,NULL);
}
- // -----------------------------------------------------------------------
void OConnectionTabPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue)
{
// check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa)
@@ -266,7 +259,6 @@ namespace dbaui
m_aJavaDriver.ClearModifyFlag();
}
}
- // -----------------------------------------------------------------------
void OConnectionTabPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
{
_rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL1));
@@ -281,7 +273,6 @@ namespace dbaui
OConnectionHelper::fillWindows(_rControlList);
}
- // -----------------------------------------------------------------------
void OConnectionTabPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
{
_rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aJavaDriver));
@@ -290,7 +281,6 @@ namespace dbaui
OConnectionHelper::fillControls(_rControlList);
}
- // -----------------------------------------------------------------------
sal_Bool OConnectionTabPage::FillItemSet(SfxItemSet& _rSet)
{
sal_Bool bChangedSomething = sal_False;
@@ -313,7 +303,6 @@ namespace dbaui
return bChangedSomething;
}
- // -----------------------------------------------------------------------
IMPL_LINK(OConnectionTabPage, OnTestJavaClickHdl, PushButton*, /*_pButton*/)
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
@@ -338,7 +327,6 @@ namespace dbaui
aMsg.Execute();
return 0L;
}
- // -----------------------------------------------------------------------
bool OConnectionTabPage::checkTestConnection()
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
@@ -348,7 +336,6 @@ namespace dbaui
m_aTestConnection.Enable(bEnableTestConnection);
return true;
}
- // -----------------------------------------------------------------------
IMPL_LINK(OConnectionTabPage, OnEditModified, Edit*, _pEdit)
{
if ( _pEdit == &m_aJavaDriver )
@@ -359,8 +346,6 @@ namespace dbaui
callModifiedHdl();
return 0L;
}
-//.........................................................................
} // namespace dbaui
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 4c81b1d1f6e3..040477107d9f 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -25,14 +25,10 @@
#include <ucbhelper/content.hxx>
#include "curledit.hxx"
-//.........................................................................
namespace dbaui
{
-//.........................................................................
- //=========================================================================
- //= OConnectionTabPage
- //=========================================================================
+ // OConnectionTabPage
/** implements the connection page of the data source properties dialog.
*/
@@ -56,7 +52,6 @@ namespace dbaui
// connection test
PushButton m_aTestConnection;
-
// called when the test connection button was clicked
DECL_LINK(OnTestJavaClickHdl,PushButton*);
DECL_LINK(OnEditModified,Edit*);
@@ -89,9 +84,7 @@ namespace dbaui
*/
virtual bool checkTestConnection();
};
-//.........................................................................
} // namespace dbaui
-//.........................................................................
#endif // _DBAUI_DETAILPAGES_HXX_
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 9f966eefef17..d514634ac6b5 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "ConnectionPageSetup.hxx"
#include "AutoControls.hrc"
#include "dbadminsetup.hrc"
@@ -55,10 +54,8 @@
#include <sfx2/docfilt.hxx>
#include <vcl/mnemonic.hxx>
-//.........................................................................
namespace dbaui
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::ui::dialogs;
@@ -69,8 +66,6 @@ namespace dbaui
using namespace ::dbtools;
using namespace ::svt;
-
-
OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_DBASE, _rAttrSet, STR_DBASE_HELPTEXT, STR_DBASE_HEADERTEXT, STR_DBASE_PATH_OR_FILE);
@@ -78,7 +73,6 @@ namespace dbaui
return oDBWizardPage;
}
-
OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_MSACCESS, _rAttrSet, STR_MSACCESS_HELPTEXT, STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE);
@@ -107,10 +101,7 @@ namespace dbaui
return oDBWizardPage;
}
-
- //========================================================================
- //= OConnectionTabPageSetup
- //========================================================================
+ // OConnectionTabPageSetup
DBG_NAME(OConnectionTabPageSetup)
OConnectionTabPageSetup::OConnectionTabPageSetup(Window* pParent, sal_uInt16 _rId, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId)
:OConnectionHelper(pParent, ModuleRes(_rId), _rCoreAttrs)
@@ -127,7 +118,6 @@ namespace dbaui
else
m_aFT_HelpText.Hide();
-
if ( USHRT_MAX != _nHeaderResId )
SetHeaderText(FT_AUTOWIZARDHEADER, _nHeaderResId);
@@ -158,13 +148,11 @@ namespace dbaui
SetRoadmapStateValue(sal_False);
}
- // -----------------------------------------------------------------------
OConnectionTabPageSetup::~OConnectionTabPageSetup()
{
DBG_DTOR(OConnectionTabPageSetup,NULL);
}
- // -----------------------------------------------------------------------
void OConnectionTabPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue)
{
m_eType = m_pAdminDialog->getDatasourceType(_rSet);
@@ -189,35 +177,28 @@ namespace dbaui
callModifiedHdl();
}
- // -----------------------------------------------------------------------
sal_Bool OConnectionTabPageSetup::commitPage( ::svt::WizardTypes::CommitPageReason /*_eReason*/ )
{
return commitURL();
}
- // -----------------------------------------------------------------------
sal_Bool OConnectionTabPageSetup::FillItemSet(SfxItemSet& _rSet)
{
sal_Bool bChangedSomething = sal_False;
fillString(_rSet,&m_aConnectionURL, DSID_CONNECTURL, bChangedSomething);
return bChangedSomething;
}
- // -----------------------------------------------------------------------
bool OConnectionTabPageSetup::checkTestConnection()
{
return !m_aConnectionURL.IsVisible() || (m_aConnectionURL.GetTextNoPrefix().Len() != 0);
}
- // -----------------------------------------------------------------------
IMPL_LINK(OConnectionTabPageSetup, OnEditModified, Edit*, /*_pEdit*/)
{
SetRoadmapStateValue(checkTestConnection());
callModifiedHdl();
return 0L;
}
-//.........................................................................
} // namespace dbaui
-//.........................................................................
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index b5db0f6417e5..daf2598e3185 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef DBAUI_CONNECTIONPAGESETUP_HXX
#define DBAUI_CONNECTIONPAGESETUP_HXX
#include "ConnectionHelper.hxx"
@@ -28,15 +27,10 @@
#include <vcl/field.hxx>
-
-//.........................................................................
namespace dbaui
{
-//.........................................................................
- //=========================================================================
- //= OConnectionTabPageSetup
- //=========================================================================
+ // OConnectionTabPageSetup
/** implements the connection page of the data source properties dialog.
*/
@@ -57,13 +51,11 @@ namespace dbaui
static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
-
virtual sal_Bool FillItemSet (SfxItemSet& _rCoreAttrs);
virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
-
inline void enableConnectionURL() { m_aConnectionURL.SetReadOnly(sal_False); }
inline void disableConnectionURL() { m_aConnectionURL.SetReadOnly(); }
@@ -74,7 +66,6 @@ namespace dbaui
void changeConnectionURL( const String& _rNewDSN );
String getConnectionURL( ) const;
-
protected:
OConnectionTabPageSetup(Window* pParent, sal_uInt16 _rId, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId);
virtual bool checkTestConnection();
@@ -82,9 +73,7 @@ namespace dbaui
virtual ~OConnectionTabPageSetup();
};
-//.........................................................................
} // namespace dbaui
-//.........................................................................
#endif
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 6564699e3cf8..e822953961cb 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -57,11 +57,8 @@
#include "TextConnectionHelper.hxx"
#include <osl/diagnose.h>
-
-//.........................................................................
namespace dbaui
{
-//.........................................................................
using namespace ::com::sun::star;
OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
@@ -69,12 +66,8 @@ using namespace ::com::sun::star;
return ( new OTextConnectionPageSetup( pParent, _rAttrSet ) );
}
-
- //========================================================================
- //= OTextConnectionPageSetup
- //========================================================================
+ // OTextConnectionPageSetup
DBG_NAME(OTextConnectionPageSetup)
-//------------------------------------------------------------------------
OTextConnectionPageSetup::OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs )
:OConnectionTabPageSetup(pParent, PAGE_DBWIZARD_TEXT, _rCoreAttrs, STR_TEXT_HELPTEXT, STR_TEXT_HEADERTEXT, STR_TEXT_PATH_OR_FILE)
{
@@ -86,8 +79,6 @@ DBG_NAME(OTextConnectionPageSetup)
FreeResource();
}
-
- // -----------------------------------------------------------------------
OTextConnectionPageSetup::~OTextConnectionPageSetup()
{
DELETEZ(m_pTextConnectionHelper);
@@ -102,7 +93,6 @@ DBG_NAME(OTextConnectionPageSetup)
return sal_True;
}
-
bool OTextConnectionPageSetup::checkTestConnection()
{
bool bDoEnable = OConnectionTabPageSetup::checkTestConnection();
@@ -110,19 +100,16 @@ DBG_NAME(OTextConnectionPageSetup)
return bDoEnable;
}
- // -----------------------------------------------------------------------
void OTextConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
{
OConnectionTabPageSetup::fillControls(_rControlList);
m_pTextConnectionHelper->fillControls(_rControlList);
}
- // -----------------------------------------------------------------------
void OTextConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
{
OConnectionTabPageSetup::fillWindows(_rControlList);
m_pTextConnectionHelper->fillWindows(_rControlList);
}
- // -----------------------------------------------------------------------
void OTextConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue)
{
// first check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa)
@@ -132,8 +119,6 @@ DBG_NAME(OTextConnectionPageSetup)
m_pTextConnectionHelper->implInitControls(_rSet, bValid);
}
-
- // -----------------------------------------------------------------------
sal_Bool OTextConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
{
sal_Bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet);
@@ -141,21 +126,16 @@ DBG_NAME(OTextConnectionPageSetup)
return bChangedSomething;
}
-
sal_Bool OTextConnectionPageSetup::prepareLeave(){
return m_pTextConnectionHelper->prepareLeave();
}
-
OGenericAdministrationPage* OLDAPConnectionPageSetup::CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OLDAPConnectionPageSetup( pParent, _rAttrSet ) );
}
-
- //========================================================================
- //= OLDAPPageSetup
- //========================================================================
+ // OLDAPPageSetup
OLDAPConnectionPageSetup::OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs )
:OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_LDAP), _rCoreAttrs)
,m_aFTHeaderText (this, ModuleRes(FT_LDAP_HEADERTEXT))
@@ -179,7 +159,6 @@ DBG_NAME(OTextConnectionPageSetup)
FreeResource();
}
- // -----------------------------------------------------------------------
sal_Bool OLDAPConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
{
sal_Bool bChangedSomething = sal_False;
@@ -203,7 +182,6 @@ DBG_NAME(OTextConnectionPageSetup)
fillBool(_rSet,&m_aCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething);
return bChangedSomething;
}
- // -----------------------------------------------------------------------
void OLDAPConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
{
_rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETHostServer));
@@ -211,7 +189,6 @@ DBG_NAME(OTextConnectionPageSetup)
_rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_aNFPortNumber));
_rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aCBUseSSL));
}
- // -----------------------------------------------------------------------
void OLDAPConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
{
_rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHelpText));
@@ -220,14 +197,12 @@ DBG_NAME(OTextConnectionPageSetup)
_rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTPortNumber));
_rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDefaultPortNumber));
}
- // -----------------------------------------------------------------------
void OLDAPConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue)
{
// check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa)
sal_Bool bValid, bReadonly;
getFlags(_rSet, bValid, bReadonly);
-
SFX_ITEMSET_GET(_rSet, pBaseDN, SfxStringItem, DSID_CONN_LDAP_BASEDN, sal_True);
SFX_ITEMSET_GET(_rSet, pPortNumber, SfxInt32Item, DSID_CONN_LDAP_PORTNUMBER, sal_True);
@@ -240,7 +215,6 @@ DBG_NAME(OTextConnectionPageSetup)
callModifiedHdl();
}
- // -----------------------------------------------------------------------
IMPL_LINK(OLDAPConnectionPageSetup, OnEditModified, Edit*, /*_pEdit*/)
{
sal_Bool bRoadmapState = ((!m_aETHostServer.GetText().isEmpty() ) && ( !m_aETBaseDN.GetText().isEmpty() ) && (!m_aFTPortNumber.GetText().isEmpty() ));
@@ -249,8 +223,6 @@ DBG_NAME(OTextConnectionPageSetup)
return 0L;
}
-
- // ----------------------------------------------------------------------- //OGenericAdministrationPage*
OMySQLIntroPageSetup* OMySQLIntroPageSetup::CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet )
{
return ( new OMySQLIntroPageSetup( _pParent, _rAttrSet) );
@@ -282,15 +254,12 @@ DBG_NAME(OMySQLIntroPageSetup)
return true;
}
- // -----------------------------------------------------------------------
OMySQLIntroPageSetup::~OMySQLIntroPageSetup()
{
DBG_DTOR(OMySQLIntroPageSetup,NULL);
}
-
- // -----------------------------------------------------------------------
void OMySQLIntroPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool /*_bSaveValue*/)
{
// show the "Connect directly" option only if the driver is installed
@@ -310,26 +279,20 @@ DBG_NAME(OMySQLIntroPageSetup)
m_aRB_JDBCDatabase.Check();
}
-
- // -----------------------------------------------------------------------
void OMySQLIntroPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& /*_rControlList*/)
{
}
- // -----------------------------------------------------------------------
void OMySQLIntroPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& /*_rControlList*/)
{
}
-
- // -----------------------------------------------------------------------
sal_Bool OMySQLIntroPageSetup::FillItemSet(SfxItemSet& /*_rSet*/)
{
OSL_FAIL("Who called me?! Please ask oj for more information.");
return sal_True;
}
-
OMySQLIntroPageSetup::ConnectionType OMySQLIntroPageSetup::getMySQLMode()
{
if (m_aRB_JDBCDatabase.IsChecked())
@@ -340,10 +303,7 @@ DBG_NAME(OMySQLIntroPageSetup)
return VIA_ODBC;
}
- // =======================================================================
- // = MySQLNativeSetupPage
- // =======================================================================
- // -----------------------------------------------------------------------
+ // MySQLNativeSetupPage
MySQLNativeSetupPage::MySQLNativeSetupPage( Window* _pParent, const SfxItemSet& _rCoreAttrs )
:OGenericAdministrationPage( _pParent, ModuleRes( PAGE_DBWIZARD_MYSQL_NATIVE ), _rCoreAttrs )
,m_aHeader ( this, ModuleRes( FT_SETUP_WIZARD_HEADER ) )
@@ -359,32 +319,27 @@ DBG_NAME(OMySQLIntroPageSetup)
FreeResource();
}
- // -----------------------------------------------------------------------
OGenericAdministrationPage* MySQLNativeSetupPage::Create( Window* pParent, const SfxItemSet& _rAttrSet )
{
return new MySQLNativeSetupPage( pParent, _rAttrSet );
}
- // -----------------------------------------------------------------------
void MySQLNativeSetupPage::fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList )
{
m_aMySQLSettings.fillControls( _rControlList );
}
- // -----------------------------------------------------------------------
void MySQLNativeSetupPage::fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList )
{
_rControlList.push_back( new ODisableWrapper< FixedText >( &m_aHelpText ) );
m_aMySQLSettings.fillWindows( _rControlList );
}
- // -----------------------------------------------------------------------
sal_Bool MySQLNativeSetupPage::FillItemSet( SfxItemSet& _rSet )
{
return m_aMySQLSettings.FillItemSet( _rSet );
}
- // -----------------------------------------------------------------------
void MySQLNativeSetupPage::implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue )
{
m_aMySQLSettings.implInitControls( _rSet );
@@ -394,13 +349,11 @@ DBG_NAME(OMySQLIntroPageSetup)
OnModified( NULL );
}
- // -----------------------------------------------------------------------
Link MySQLNativeSetupPage::getControlModifiedLink()
{
return LINK( this, MySQLNativeSetupPage, OnModified );
}
- // -----------------------------------------------------------------------
IMPL_LINK( MySQLNativeSetupPage, OnModified, Edit*, _pEdit )
{
SetRoadmapStateValue( m_aMySQLSettings.canAdvance() );
@@ -408,9 +361,7 @@ DBG_NAME(OMySQLIntroPageSetup)
return OGenericAdministrationPage::getControlModifiedLink().Call( _pEdit );
}
- //========================================================================
- //= OMySQLJDBCConnectionPageSetup
- //========================================================================
+ // OMySQLJDBCConnectionPageSetup
OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( Window* pParent,sal_uInt16 _nResId, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, sal_uInt16 _nDefaultPortResId, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderTextResId, sal_uInt16 _nDriverClassId)
:OGenericAdministrationPage(pParent, ModuleRes(_nResId), _rCoreAttrs)
,m_aFTHelpText (this, ModuleRes(FT_AUTOWIZARDHELPTEXT))
@@ -453,8 +404,6 @@ DBG_NAME(OMySQLIntroPageSetup)
FreeResource();
}
-
- // -----------------------------------------------------------------------
OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent,
@@ -467,7 +416,6 @@ DBG_NAME(OMySQLIntroPageSetup)
STR_MYSQL_DRIVERCLASSTEXT) );
}
- // -----------------------------------------------------------------------
OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent,
@@ -480,7 +428,6 @@ DBG_NAME(OMySQLIntroPageSetup)
STR_ORACLE_DRIVERCLASSTEXT) );
}
- // -----------------------------------------------------------------------
void OGeneralSpecialJDBCConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
{
_rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETDatabasename));
@@ -488,7 +435,6 @@ DBG_NAME(OMySQLIntroPageSetup)
_rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETHostname));
_rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_aNFPortNumber));
}
- // -----------------------------------------------------------------------
void OGeneralSpecialJDBCConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
{
_rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHelpText));
@@ -499,7 +445,6 @@ DBG_NAME(OMySQLIntroPageSetup)
_rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass));
}
- // -----------------------------------------------------------------------
sal_Bool OGeneralSpecialJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
{
sal_Bool bChangedSomething = sal_False;
@@ -510,7 +455,6 @@ DBG_NAME(OMySQLIntroPageSetup)
return bChangedSomething;
}
- // -----------------------------------------------------------------------
void OGeneralSpecialJDBCConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue)
{
// check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa)
@@ -550,7 +494,6 @@ DBG_NAME(OMySQLIntroPageSetup)
SetRoadmapStateValue(bRoadmapState);
}
- // -----------------------------------------------------------------------
IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnTestJavaClickHdl, PushButton*, /*_pButton*/)
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
@@ -577,7 +520,6 @@ DBG_NAME(OMySQLIntroPageSetup)
return 0L;
}
- // -----------------------------------------------------------------------
IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit)
{
if ( _pEdit == &m_aETDriverClass )
@@ -588,16 +530,12 @@ DBG_NAME(OMySQLIntroPageSetup)
return 0L;
}
- // -----------------------------------------------------------------------
OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OJDBCConnectionPageSetup( pParent, _rAttrSet));
}
-
- //========================================================================
- //= OMySQLJDBCConnectionPageSetup
- //========================================================================
+ // OMySQLJDBCConnectionPageSetup
OJDBCConnectionPageSetup::OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs)
:OConnectionTabPageSetup(pParent, PAGE_DBWIZARD_JDBC, _rCoreAttrs, STR_JDBC_HELPTEXT, STR_JDBC_HEADERTEXT, STR_COMMONURL)
,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS))
@@ -609,19 +547,16 @@ DBG_NAME(OMySQLIntroPageSetup)
FreeResource();
}
- // -----------------------------------------------------------------------
void OJDBCConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
{
_rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETDriverClass));
}
- // -----------------------------------------------------------------------
void OJDBCConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
{
_rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass));
}
- // -----------------------------------------------------------------------
sal_Bool OJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
{
sal_Bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet);
@@ -629,7 +564,6 @@ DBG_NAME(OMySQLIntroPageSetup)
return bChangedSomething;
}
- // -----------------------------------------------------------------------
void OJDBCConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue)
{
// check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa)
@@ -662,7 +596,6 @@ DBG_NAME(OMySQLIntroPageSetup)
SetRoadmapStateValue(checkTestConnection());
}
-
bool OJDBCConnectionPageSetup::checkTestConnection()
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
@@ -671,8 +604,6 @@ DBG_NAME(OMySQLIntroPageSetup)
return bEnableTestConnection;
}
-
- // -----------------------------------------------------------------------
IMPL_LINK(OJDBCConnectionPageSetup, OnTestJavaClickHdl, PushButton*, /*_pButton*/)
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
@@ -697,7 +628,6 @@ DBG_NAME(OMySQLIntroPageSetup)
return 0L;
}
- // -----------------------------------------------------------------------
IMPL_LINK(OJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit)
{
if ( _pEdit == &m_aETDriverClass )
@@ -708,7 +638,6 @@ DBG_NAME(OMySQLIntroPageSetup)
return 0L;
}
-
OGenericAdministrationPage* OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OSpreadSheetConnectionPageSetup( pParent, _rAttrSet ) );
@@ -726,20 +655,16 @@ DBG_NAME(OSpreadSheetConnectionPageSetup)
FreeResource();
}
-
- // -----------------------------------------------------------------------
OSpreadSheetConnectionPageSetup::~OSpreadSheetConnectionPageSetup()
{
DBG_DTOR(OSpreadSheetConnectionPageSetup,NULL);
}
-
void OSpreadSheetConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& /*_rControlList*/)
{
}
- // -----------------------------------------------------------------------
void OSpreadSheetConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
{
OConnectionTabPageSetup::fillControls(_rControlList);
@@ -747,13 +672,11 @@ DBG_NAME(OSpreadSheetConnectionPageSetup)
}
- // -----------------------------------------------------------------------
void OSpreadSheetConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue)
{
OConnectionTabPageSetup::implInitControls(_rSet, _bSaveValue);
}
- // -----------------------------------------------------------------------
sal_Bool OSpreadSheetConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
{
sal_Bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet);
@@ -788,15 +711,12 @@ DBG_NAME(OAuthentificationPageSetup)
LayoutHelper::fitSizeRightAligned( m_aPBTestConnection );
}
-
- // -----------------------------------------------------------------------
OAuthentificationPageSetup::~OAuthentificationPageSetup()
{
DBG_DTOR(OAuthentificationPageSetup,NULL);
}
-
void OAuthentificationPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
{
_rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHelpText));
@@ -804,14 +724,12 @@ DBG_NAME(OAuthentificationPageSetup)
_rControlList.push_back(new ODisableWrapper<PushButton>(&m_aPBTestConnection));
}
- // -----------------------------------------------------------------------
void OAuthentificationPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
{
_rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETUserName));
_rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aCBPasswordRequired));
}
- // -----------------------------------------------------------------------
void OAuthentificationPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool /*_bSaveValue*/)
{
// check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa)
@@ -826,7 +744,6 @@ DBG_NAME(OAuthentificationPageSetup)
m_aETUserName.ClearModifyFlag();
}
- // -----------------------------------------------------------------------
sal_Bool OAuthentificationPageSetup::FillItemSet( SfxItemSet& _rSet )
{
sal_Bool bChangedSomething = sal_False;
@@ -841,7 +758,6 @@ DBG_NAME(OAuthentificationPageSetup)
return bChangedSomething;
}
-
OGenericAdministrationPage* OFinalDBPageSetup::CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet)
{
return ( new OFinalDBPageSetup( pParent, _rAttrSet) );
@@ -897,8 +813,6 @@ DBG_NAME(OFinalDBPageSetup)
}
}
-
- // -----------------------------------------------------------------------
OFinalDBPageSetup::~OFinalDBPageSetup()
{
@@ -920,7 +834,6 @@ DBG_NAME(OFinalDBPageSetup)
return m_aCBStartTableWizard.IsChecked() && m_aCBStartTableWizard.IsEnabled();
}
-
void OFinalDBPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
{
_rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTFinalHeader));
@@ -929,7 +842,6 @@ DBG_NAME(OFinalDBPageSetup)
_rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTFinalText));
}
- // -----------------------------------------------------------------------
void OFinalDBPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
{
_rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aCBOpenAfterwards));
@@ -938,7 +850,6 @@ DBG_NAME(OFinalDBPageSetup)
_rControlList.push_back(new OSaveValueWrapper<RadioButton>(&m_aRBDontregisterDataSource));
}
- // -----------------------------------------------------------------------
void OFinalDBPageSetup::implInitControls(const SfxItemSet& /*_rSet*/, sal_Bool /*_bSaveValue*/)
{
m_aCBOpenAfterwards.Check();
@@ -949,12 +860,10 @@ DBG_NAME(OFinalDBPageSetup)
m_aCBStartTableWizard.Enable(_bSupportsTableCreation);
}
- // -----------------------------------------------------------------------
sal_Bool OFinalDBPageSetup::FillItemSet( SfxItemSet& /*_rSet*/ )
{
return sal_True;
}
- // -----------------------------------------------------------------------------
IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, CheckBox*, _pBox)
{
m_aCBStartTableWizard.Enable( _pBox->IsEnabled() && _pBox->IsChecked() );
@@ -962,9 +871,8 @@ DBG_NAME(OFinalDBPageSetup)
// outta here
return 0L;
}
-//.........................................................................
}
+
// namespace dbaui
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index b561a3c6507c..f34eaa56e65e 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -31,16 +31,11 @@
#include <ucbhelper/content.hxx>
#include <vcl/field.hxx>
-
-//.........................................................................
namespace dbaui
{
-//.........................................................................
- //========================================================================
- //= OSpreadSheetConnectionPageSetup
- //========================================================================
+ // OSpreadSheetConnectionPageSetup
class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup
{
public:
@@ -59,9 +54,7 @@ namespace dbaui
};
- //========================================================================
- //= OTextConnectionPage
- //========================================================================
+ // OTextConnectionPage
class OTextConnectionPageSetup : public OConnectionTabPageSetup
{
public:
@@ -83,9 +76,7 @@ namespace dbaui
DECL_LINK(ImplGetExtensionHdl, OTextConnectionHelper*);
};
- //========================================================================
- //= OLDAPConnectionPageSetup
- //========================================================================
+ // OLDAPConnectionPageSetup
class OLDAPConnectionPageSetup : public OGenericAdministrationPage
{
public:
@@ -113,9 +104,7 @@ namespace dbaui
CheckBox m_aCBUseSSL;
};
- //========================================================================
- //= MySQLNativeSetupPage
- //========================================================================
+ // MySQLNativeSetupPage
class MySQLNativeSetupPage : public OGenericAdministrationPage
{
private:
@@ -141,9 +130,7 @@ namespace dbaui
DECL_LINK( OnModified, Edit* );
};
- //========================================================================
- //= OGeneralSpecialJDBCConnectionPageSetup
- //========================================================================
+ // OGeneralSpecialJDBCConnectionPageSetup
class OGeneralSpecialJDBCConnectionPageSetup : public OGenericAdministrationPage
{
public:
@@ -176,7 +163,6 @@ namespace dbaui
FixedText m_aFTDefaultPortNumber;
NumericField m_aNFPortNumber;
-
FixedText m_aFTDriverClass;
Edit m_aETDriverClass;
PushButton m_aPBTestJavaDriver;
@@ -185,10 +171,7 @@ namespace dbaui
sal_uInt16 m_nPortId;
};
-
- //========================================================================
- //= OJDBCConnectionPageSetup
- //========================================================================
+ // OJDBCConnectionPageSetup
class OJDBCConnectionPageSetup : public OConnectionTabPageSetup
{
public:
@@ -210,11 +193,7 @@ namespace dbaui
PushButton m_aPBTestJavaDriver;
};
-
-
- //========================================================================
- //= OJDBCConnectionPageSetup
- //========================================================================
+ // OJDBCConnectionPageSetup
class OMySQLIntroPageSetup : public OGenericAdministrationPage
{
public:
@@ -234,9 +213,6 @@ namespace dbaui
const Link& GetClickHdl() const { return maClickHdl; }
DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*);
-
-
-
protected:
virtual sal_Bool FillItemSet(SfxItemSet& _rSet);
virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
@@ -256,12 +232,7 @@ namespace dbaui
};
-
-
-
- //========================================================================
- //= OAuthentificationPageSetup
- //========================================================================
+ // OAuthentificationPageSetup
class OAuthentificationPageSetup : public OGenericAdministrationPage
{
public:
@@ -284,11 +255,7 @@ namespace dbaui
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
};
-
-
- //========================================================================
- //= OFinalDBPageSetup
- //========================================================================
+ // OFinalDBPageSetup
class OFinalDBPageSetup : public OGenericAdministrationPage
{
public:
@@ -323,9 +290,7 @@ namespace dbaui
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
};
-//.........................................................................
} // namespace dbaui
-//.........................................................................
#endif
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 3054e182617a..3c3667cbc900 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "DbAdminImpl.hxx"
#include "dsmeta.hxx"
@@ -73,10 +72,8 @@
#include <functional>
#include <o3tl/compat_functional.hxx>
-//.........................................................................
namespace dbaui
{
-//.........................................................................
using namespace ::dbtools;
using namespace com::sun::star::uno;
using namespace com::sun::star;
@@ -90,7 +87,6 @@ using namespace com::sun::star::util;
using namespace com::sun::star::container;
using namespace com::sun::star::frame;
-//-------------------------------------------------------------------------
namespace
{
sal_Bool implCheckItemType( SfxItemSet& _rSet, const sal_uInt16 _nId, const TypeId _nExpectedItemType )
@@ -142,9 +138,7 @@ namespace
}
}
- //========================================================================
- //= ODbDataSourceAdministrationHelper
- //========================================================================
+ // ODbDataSourceAdministrationHelper
ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Reference< XComponentContext >& _xORB,Window* _pParent,IItemSetHelper* _pItemSetHelper)
: m_xContext(_xORB)
, m_pParent(_pParent)
@@ -215,7 +209,7 @@ ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Refer
ShowServiceNotAvailableError(_pParent->GetParent(), OUString("com.sun.star.sdb.DatabaseContext"), sal_True);
}
}
- //-------------------------------------------------------------------------
+
sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyValue >& _rDriverParam)
{
OSL_ENSURE(m_pItemSetHelper->getOutputSet(), "ODbDataSourceAdministrationHelper::getCurrentSettings : not to be called without an example set!");
@@ -327,7 +321,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert
return sal_True;
}
-//-------------------------------------------------------------------------
+
void ODbDataSourceAdministrationHelper::successfullyConnected()
{
OSL_ENSURE(m_pItemSetHelper->getOutputSet(), "ODbDataSourceAdministrationHelper::successfullyConnected: not to be called without an example set!");
@@ -346,13 +340,13 @@ void ODbDataSourceAdministrationHelper::successfullyConnected()
}
}
}
-//-------------------------------------------------------------------------
+
void ODbDataSourceAdministrationHelper::clearPassword()
{
if (m_pItemSetHelper->getWriteOutputSet())
m_pItemSetHelper->getWriteOutputSet()->ClearItem(DSID_PASSWORD);
}
-// -----------------------------------------------------------------------------
+
::std::pair< Reference<XConnection>,sal_Bool> ODbDataSourceAdministrationHelper::createConnection()
{
::std::pair< Reference<XConnection>,sal_Bool> aRet;
@@ -380,12 +374,12 @@ void ODbDataSourceAdministrationHelper::clearPassword()
return aRet;
}
-// -----------------------------------------------------------------------------
+
Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver()
{
return getDriver(getConnectionURL());
}
-// -----------------------------------------------------------------------------
+
Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString& _sURL)
{
// get the global DriverManager
@@ -405,7 +399,6 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString
throw SQLException(sCurrentActionError, getORB(), OUString("S1000"), 0, makeAny(aSQLWrapper));
}
-
Reference< XDriver > xDriver = xDriverManager->getDriverByURL(_sURL);
if (!xDriver.is())
{
@@ -417,7 +410,6 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString
return xDriver;
}
-// -----------------------------------------------------------------------------
Reference< XPropertySet > ODbDataSourceAdministrationHelper::getCurrentDataSource()
{
if ( !m_xDatasource.is() )
@@ -448,11 +440,10 @@ Reference< XPropertySet > ODbDataSourceAdministrationHelper::getCurrentDataSourc
}
}
-
OSL_ENSURE(m_xDatasource.is(), "ODbDataSourceAdministrationHelper::getCurrentDataSource: no data source!");
return m_xDatasource;
}
-//-------------------------------------------------------------------------
+
OUString ODbDataSourceAdministrationHelper::getDatasourceType( const SfxItemSet& _rSet )
{
SFX_ITEMSET_GET( _rSet, pConnectURL, SfxStringItem, DSID_CONNECTURL, sal_True );
@@ -463,12 +454,11 @@ OUString ODbDataSourceAdministrationHelper::getDatasourceType( const SfxItemSet&
return pCollection->getType(pConnectURL->GetValue());
}
-//-------------------------------------------------------------------------
sal_Bool ODbDataSourceAdministrationHelper::hasAuthentication(const SfxItemSet& _rSet) const
{
return DataSourceMetaData::getAuthentication( getDatasourceType( _rSet ) ) != AuthNone;
}
-// -----------------------------------------------------------------------------
+
String ODbDataSourceAdministrationHelper::getConnectionURL() const
{
OUString sNewUrl;
@@ -560,15 +550,15 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
return sNewUrl;
}
-//-------------------------------------------------------------------------
+
struct PropertyValueLess
{
bool operator() (const PropertyValue& x, const PropertyValue& y) const
{ return x.Name < y.Name ? true : false; } // construct prevents a MSVC6 warning
};
+
DECLARE_STL_SET( PropertyValue, PropertyValueLess, PropertyValueSet);
-//..................................................