diff options
Diffstat (limited to 'dbaccess/source/ui/inc')
83 files changed, 57 insertions, 570 deletions
diff --git a/dbaccess/source/ui/inc/AppElementType.hxx b/dbaccess/source/ui/inc/AppElementType.hxx index ef535422b38a..e0983cf1dbd5 100644 --- a/dbaccess/source/ui/inc/AppElementType.hxx +++ b/dbaccess/source/ui/inc/AppElementType.hxx @@ -21,10 +21,8 @@ #include <com/sun/star/sdb/application/DatabaseObject.hpp> -//........................................................................ namespace dbaui { -//........................................................................ enum ElementType { @@ -51,9 +49,7 @@ namespace dbaui E_OPEN_FOR_MAIL }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // DBAUI_APPELEMENTTYPE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 6ec8a4140117..3ec0b8f5fc78 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -27,10 +27,8 @@ #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//......................................................................... namespace dbaui { -//......................................................................... /* this class allows to browse through the collection of forms and reports */ class OCollectionView : public ModalDialog @@ -69,12 +67,8 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> getSelectedFolder() const; OUString getName() const; }; -//......................................................................... } // namespace dbaui -//......................................................................... - #endif //DBAUI_COLLECTIONVIEW_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx index 76c290e5f840..4f5e4e30396d 100644 --- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx +++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx @@ -24,13 +24,9 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XNumberFormatter.hpp> -//......................................................................... namespace dbaui { -//......................................................................... - // ============================================================================================= // OColumnControlWindow - // ============================================================================================= class OColumnControlWindow : public OFieldDescControl { ::com::sun::star::lang::Locale m_aLocale; @@ -68,9 +64,7 @@ namespace dbaui virtual const OTypeInfoMap* getTypeInfo() const; TOTypeInfoSP getDefaultTyp() const; }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // DBAUI_COLUMNCONTROLWINDOW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx index 8e8283169c52..83e8310e1203 100644 --- a/dbaccess/source/ui/inc/ConnectionLine.hxx +++ b/dbaccess/source/ui/inc/ConnectionLine.hxx @@ -28,12 +28,10 @@ class OutputDevice; namespace dbaui { - //================================================================== // ConnData ---------->* ConnLineData // ^1 ^1 // | | // Conn ---------->* ConnLine - //================================================================== /* the class OConnectionLine represents the graphical line between the to two windows diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx index 4ddb87927606..628d0c42c8f7 100644 --- a/dbaccess/source/ui/inc/ConnectionLineData.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineData.hxx @@ -30,15 +30,11 @@ namespace dbaui { - //================================================================== // ConnData ---------->* ConnLineData // ^1 ^1 // | | // Conn ---------->* ConnLine - //================================================================== - - //================================================================== /** the class OConnectionLineData contains the data of a connection e.g. the source and the destanation field @@ -82,8 +78,6 @@ namespace dbaui OConnectionLineData& operator=( const OConnectionLineData& rConnLineData ); }; - //------------------------------------------------------------------------- - //------------------------------------------------------------------ typedef ::rtl::Reference< OConnectionLineData > OConnectionLineDataRef; typedef ::std::vector< OConnectionLineDataRef > OConnectionLineDataVec; } diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 1f2648973dbb..46b703c602f7 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -25,7 +25,6 @@ #include "SqlNameEdit.hxx" #include "moduledbu.hxx" - namespace dbaui { namespace @@ -39,7 +38,6 @@ namespace dbaui } } - //================================================================== class OPropColumnEditCtrl : public OSQLNameEdit { OModuleClient m_aModuleClient; @@ -69,7 +67,6 @@ namespace dbaui { m_strHelpText=String(ModuleRes(nHelpId)); } - //================================================================== class OPropEditCtrl : public Edit { OModuleClient m_aModuleClient; @@ -105,7 +102,6 @@ namespace dbaui m_strHelpText =String(ModuleRes(nHelpId)); } - //================================================================== class OPropNumericEditCtrl : public NumericField { short m_nPos; @@ -140,7 +136,6 @@ namespace dbaui m_strHelpText =String(ModuleRes(nHelpId)); } - //================================================================== class OPropListBoxCtrl : public ListBox { short m_nPos; @@ -177,6 +172,4 @@ namespace dbaui } #endif // DBAUI_FIELDCONTROLS_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index 6a1a60f8de72..51d83a05d60e 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -24,7 +24,6 @@ namespace dbaui { - // ================================================================================================ // SbaCommentUndoAction - Undo-Basisklasse fuer Aktionen, deren GetComment einen aus einer Sba-Resource // geladenen String liefert @@ -44,5 +43,4 @@ namespace dbaui } #endif // DBAUI_GENERALUNDO_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index f7477d9ba134..14d95335997b 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -82,18 +82,15 @@ namespace dbaui public: OJoinController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM); - // --------------------------------------------------------------- // attribute access inline TTableWindowData* getTableWindowData() { return &m_vTableData; } inline TTableConnectionData* getTableConnectionData() { return &m_vTableConnectionData;} inline OAddTableDlg* getAddTableDialog()const { return m_pAddTableDialog; } - // --------------------------------------------------------------- // OSingleDocumentController overridables virtual void reconnect( sal_Bool _bUI ); virtual void impl_onModifyChanged(); - // --------------------------------------------------------------- // own overridables /** determines whether or not it's allowed for database views to participate in the game */ @@ -108,8 +105,6 @@ namespace dbaui */ virtual OJoinDesignView* getJoinView(); - - // --------------------------------------------------------------- /** erase the data in the data vector @param _pData the data whioch should be erased @@ -120,7 +115,6 @@ namespace dbaui void SaveTabWinPosSize(OTableWindow* pTabWin, long nOffsetX, long nOffsetY); - // --------------------------------------------------------------- // UNO interface overridables // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); @@ -130,8 +124,6 @@ namespace dbaui // ::com::sun::star::frame::XController virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException ); - - // --------------------------------------------------------------- // misc /** only defines a method to save a SQLException in d&d methods to show the error at a later state set the internal member m_aExceptionInfo to _rInfo diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx index 1f86862a5bb7..2e20e8bc0052 100644 --- a/dbaccess/source/ui/inc/RTableConnectionData.hxx +++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx @@ -32,7 +32,6 @@ namespace dbaui const sal_uInt16 CARDINAL_ONE_ONE = 0x0004; class OConnectionLineData; - //================================================================== class ORelationTableConnectionData : public OTableConnectionData { friend bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableConnectionData& rhs); @@ -71,7 +70,6 @@ namespace dbaui */ virtual sal_Bool Update(); - void SetCardinality(); inline void SetUpdateRules( sal_Int32 nAttr ){ m_nUpdateRules = nAttr; } inline void SetDeleteRules( sal_Int32 nAttr ){ m_nDeleteRules = nAttr; } @@ -88,6 +86,4 @@ namespace dbaui #endif // DBAUI_RTABLECONNECTIONDATA_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/RefFunctor.hxx b/dbaccess/source/ui/inc/RefFunctor.hxx index 84a697b5bf14..fa9c69e6dd26 100644 --- a/dbaccess/source/ui/inc/RefFunctor.hxx +++ b/dbaccess/source/ui/inc/RefFunctor.hxx @@ -39,9 +39,7 @@ namespace dbaui m_aFunction(_aType.get()); } }; -// ----------------------------------------------------------------------------- } // namespace dbaui -// ----------------------------------------------------------------------------- #endif //DBAUI_REFFUNCTOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/RelationControl.hxx b/dbaccess/source/ui/inc/RelationControl.hxx index 5926d48f04ee..72d27f5efa01 100644 --- a/dbaccess/source/ui/inc/RelationControl.hxx +++ b/dbaccess/source/ui/inc/RelationControl.hxx @@ -25,7 +25,6 @@ namespace dbaui { - //======================================================================== class OTableListBoxControl; class IRelationControlInterface; class ORelationControl; diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index 6d8de83f29b2..0aef7b3effc4 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -28,12 +28,10 @@ #include "RelControliFace.hxx" #include "moduledbu.hxx" - namespace dbaui { class OJoinTableView; class OTableListBoxControl; - //======================================================================== class ORelationDialog : public ModalDialog ,public IRelationControlInterface { @@ -56,7 +54,6 @@ namespace dbaui CancelButton aPB_CANCEL; HelpButton aPB_HELP; - TTableConnectionData::value_type m_pConnData; TTableConnectionData::value_type m_pOrigConnData; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; @@ -101,5 +98,4 @@ namespace dbaui } #endif // DBAUI_RELATIONDIALOG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index 9d638e7c18c4..8cf281cc3cb5 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -52,7 +52,6 @@ namespace dbaui } sal_Bool checkString(const OUString& _sToCheck,OUString& _rsCorrected); }; - //================================================================== class OSQLNameEdit : public Edit ,public OSQLNameChecker { @@ -97,5 +96,4 @@ namespace dbaui } #endif // DBAUI_SQLNAMEEDIT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index 01835f762a30..f2b1dc503543 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -29,10 +29,8 @@ #include <functional> class SvTreeListEntry; -//........................................................................ namespace dbaui { -//........................................................................ class OGenericUnoController; /// unary_function Functor object for class DataFlavorExVector::value_type returntype is bool struct TAppSupportedSotFunctor : ::std::unary_function<DataFlavorExVector::value_type,bool> @@ -183,9 +181,7 @@ namespace dbaui ); }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // DBUI_TABLECOPYHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 7e99ac682d8c..f23d6b3156bb 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -30,7 +30,6 @@ namespace dbaui class OTableController; class OTableFieldDescWin; class OTableEditorCtrl; - //================================================================== class OTableBorderWindow : public Window { Splitter m_aHorzSplitter; @@ -52,7 +51,6 @@ namespace dbaui OTableEditorCtrl* GetEditorCtrl() const { return m_pEditorCtrl; } OTableFieldDescWin* GetDescWin() const { return m_pFieldDescWin; } }; - //================================================================== class OTableDesignView : public ODataView ,public IClipboardTest { @@ -71,7 +69,6 @@ namespace dbaui IClipboardTest* getActiveChild() const; protected: - // return the Rectangle where I can paint myself virtual void resizeDocumentView(Rectangle& rRect); diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index ae46b51dd00a..3f9bdf6b9b24 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -34,7 +34,6 @@ class SvTreeListEntry; namespace dbaui { - ////////////////////////////////////////////////////////////////////////// // Flags for the size adjustment of SbaJoinTabWins const sal_uInt16 SIZING_NONE = 0x0000; const sal_uInt16 SIZING_TOP = 0x0001; @@ -195,5 +194,4 @@ namespace dbaui } #endif //DBAUI_TABLEWINDOW_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index 3c045ef40777..6e0638cae43a 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -36,14 +36,10 @@ namespace com { namespace sun { namespace star { } }}} -//......................................................................... namespace dbaui { -//......................................................................... class ODbDataSourceAdministrationHelper; - //======================================================================== - //= OTableSubscriptionDialog - //======================================================================== + // OTableSubscriptionDialog class OTableSubscriptionDialog : public SfxNoLayoutSingleTabDialog, public IItemSetHelper { ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; @@ -74,9 +70,7 @@ class ODbDataSourceAdministrationHelper; virtual short Execute(); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_TABLESSINGLEDLG_HXX_ diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index f7bbb8205526..b6cf5b8360d2 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -47,9 +47,7 @@ namespace com { namespace sun { namespace star { namespace dbaui { - // ========================================================================= // ODatabaseImportExport base class for import/export - // ========================================================================= class ODatabaseExport; typedef ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener> ODatabaseImportExport_BASE; class ODatabaseImportExport : public ODatabaseImportExport_BASE @@ -123,15 +121,12 @@ namespace dbaui void enableCheckOnly() { m_bCheckOnly = sal_True; } sal_Bool isCheckEnabled() const { return m_bCheckOnly; } - private: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); void impl_initFromDescriptor( const ::svx::ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit ); }; - // ========================================================================= // RTF Import and Export - // ========================================================================= class ORTFImportExport : public ODatabaseImportExport { @@ -154,9 +149,7 @@ namespace dbaui virtual sal_Bool Write(); virtual sal_Bool Read(); }; - // ========================================================================= // HTML Import and Export - // ========================================================================= #define SBA_HTML_FONTSIZES 7 const sal_Int16 nIndentMax = 23; class OHTMLImportExport : public ODatabaseImportExport @@ -199,18 +192,16 @@ namespace dbaui virtual sal_Bool Read(); }; - // ========================================================================= // normal RowSet Import and Export - // ========================================================================= class ORowSetImportExport : public ODatabaseImportExport { OModuleClient m_aModuleClient; ::std::vector<sal_Int32> m_aColumnMapping; ::std::vector<sal_Int32> m_aColumnTypes; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate; // - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xTargetRowUpdate; // - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xTargetResultSetMetaData; // + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xTargetRowUpdate; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xTargetResultSetMetaData; Window* m_pParent; sal_Bool m_bAlreadyAsked; @@ -242,6 +233,4 @@ namespace dbaui } #endif // DBAUI_TOKENWRITER_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx index 5e8c0d6ebd3f..f81ab55be1c9 100644 --- a/dbaccess/source/ui/inc/TypeInfo.hxx +++ b/dbaccess/source/ui/inc/TypeInfo.hxx @@ -19,7 +19,6 @@ #ifndef DBAUI_TYPEINFO_HXX #define DBAUI_TYPEINFO_HXX - #include <rtl/ustring.hxx> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ColumnSearch.hpp> @@ -27,11 +26,8 @@ #include <boost/shared_ptr.hpp> #include <map> - - namespace dbaui { -//======================================================================== // Based on these ids the language dependent OUString are fetched from the resource const sal_uInt16 TYPE_UNKNOWN = 0; const sal_uInt16 TYPE_TEXT = 1; @@ -84,7 +80,6 @@ const sal_uInt16 TYPE_BIT = 31; sal_Int16 nSearchType; // if it is possible to search for type - sal_Bool bCurrency : 1, // currency bAutoIncrement : 1, // if automatic incrementing field bNullable : 1, // if field can be NULL @@ -133,5 +128,4 @@ const sal_uInt16 TYPE_BIT = 31; #endif // DBAUI_TYPEINFO_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 7c4f62401e35..474685fc0502 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -71,10 +71,8 @@ class Font; class SvNumberFormatter; class SfxFilter; -// ......................................................................... namespace dbaui { -// ......................................................................... /** creates a new connection and appends the eventlistener @param _rsDataSourceName name of the datasource @@ -414,10 +412,7 @@ namespace dbaui // detect installed locale void AppendConfigToken( OUString& _rURL, sal_Bool _bQuestionMark ); -// ......................................................................... } -// ......................................................................... #endif // DBAUI_TOOLS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 470fa6b95494..da672145631e 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -36,14 +36,10 @@ namespace com { namespace sun { namespace star { } }}} -//......................................................................... namespace dbaui { -//......................................................................... class ODbDataSourceAdministrationHelper; - //========================================================================= - //= OUserAdminDlg - //========================================================================= + // OUserAdminDlg /** implements the user adin dialog */ @@ -80,9 +76,7 @@ namespace dbaui virtual void setTitle(const OUString& _sTitle); virtual void enableConfirmSettings( bool _bEnable ); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // DBAUI_USERADMINDLG_HXX diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx index 55ccc1cbac5f..e537982e0f5c 100644 --- a/dbaccess/source/ui/inc/VertSplitView.hxx +++ b/dbaccess/source/ui/inc/VertSplitView.hxx @@ -25,7 +25,6 @@ class Splitter; namespace dbaui { - //================================================================== class OSplitterView : public Window { Splitter* m_pSplitter; diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index bae5fef2ed87..71bd4dbbc3f7 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -31,7 +31,6 @@ namespace dbaui { class OWizColumnSelect; class OWizNormalExtend; - //======================================================================== class OCopyTable : public OWizardPage { protected: @@ -54,7 +53,6 @@ namespace dbaui sal_Bool m_bPKeyAllowed; sal_Bool m_bUseHeaderAllowed; - DECL_LINK( AppendDataClickHdl, Button* ); DECL_LINK( RadioChangeHdl, Button* ); DECL_LINK( KeyClickHdl, Button* ); @@ -94,5 +92,4 @@ namespace dbaui } #endif // DBAUI_WIZARD_CPAGE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index f960ead3e383..71cb8c479d48 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -31,9 +31,7 @@ namespace dbaui { class OFieldDescription; - // ======================================================== // Wizard Page: OWizColumnSelect - // ======================================================== class OWizColumnSelect : public OWizardPage { @@ -46,11 +44,9 @@ namespace dbaui ImageButton m_ibColumns_LH; MultiListBox m_lbNewColumnNames; // right side - DECL_LINK( ButtonClickHdl, Button * ); DECL_LINK( ListDoubleClickHdl, MultiListBox * ); - void clearListBox(MultiListBox& _rListBox); void fillColumns( ListBox* pRight, ::std::vector< OUString> &_rRightColumns); @@ -73,7 +69,6 @@ namespace dbaui void enableButtons(); - sal_uInt16 adjustColumnPosition(ListBox* _pLeft, const OUString& _sColumnName, ODatabaseExport::TColumnVector::size_type nCurrentPos, @@ -91,6 +86,4 @@ namespace dbaui } #endif // DBAUI_WIZ_COLUMNSELECT_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 659f13c66a3b..186aa872668f 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -91,9 +91,7 @@ namespace dbaui } }; - // ======================================================== // ICopyTableSourceObject - // ======================================================== /** interface to an object to copy to another DB, using the OCopyTableWizard when the wizard is used to copy an object to another DB, it usually requires @@ -142,9 +140,7 @@ namespace dbaui virtual ~ICopyTableSourceObject(); }; - // ======================================================== // ObjectCopySource - // ======================================================== class ObjectCopySource : public ICopyTableSourceObject { private: @@ -175,9 +171,7 @@ namespace dbaui getPreparedSelectStatement() const; }; - // ======================================================== // NamedTableCopySource - // ======================================================== class NamedTableCopySource : public ICopyTableSourceObject { private: @@ -216,9 +210,7 @@ namespace dbaui impl_ensureStatement_throw(); }; - // ======================================================== // Wizard Dialog - // ======================================================== class OCopyTableWizard : public WizardDialog { friend class OWizColumnSelect; diff --git a/dbaccess/source/ui/inc/WExtendPages.hxx b/dbaccess/source/ui/inc/WExtendPages.hxx index 074368d61bfa..fc57159cf6f7 100644 --- a/dbaccess/source/ui/inc/WExtendPages.hxx +++ b/dbaccess/source/ui/inc/WExtendPages.hxx @@ -24,9 +24,7 @@ class SvStream; namespace dbaui { - // ======================================================== // Wizard Page: OWizHTMLExtend - // ======================================================== class OWizHTMLExtend : public OWizTypeSelect { protected: @@ -41,9 +39,7 @@ namespace dbaui virtual ~OWizHTMLExtend(){} }; - // ======================================================== // Wizard Page: OWizRTFExtend - // ======================================================== class OWizRTFExtend : public OWizTypeSelect { protected: @@ -59,9 +55,7 @@ namespace dbaui virtual ~OWizRTFExtend(){} }; - // ======================================================== // Wizard Page: OWizNormalExtend - // ======================================================== class OWizNormalExtend : public OWizTypeSelect { protected: @@ -72,6 +66,4 @@ namespace dbaui } #endif // DBAUI_WIZ_EXTENDPAGES_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index bd2a2de7b15c..486e6fd01be2 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -28,9 +28,7 @@ namespace dbaui { - // ======================================================== // columns are at root only no children - // ======================================================== class OColumnTreeBox : public OMarkableTreeListBox { sal_Bool m_bReadOnly; @@ -48,10 +46,8 @@ namespace dbaui using OMarkableTreeListBox::Select; }; - // ======================================================== // Wizard Page: OWizNameMatching // Name matching for data appending - // ======================================================== class OWizNameMatching : public OWizardPage { FixedText m_FT_TABLE_LEFT; @@ -86,6 +82,4 @@ namespace dbaui } #endif // DBAUI_WIZ_NAMEMATCHING_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx index df603a807274..a97715b993d3 100644 --- a/dbaccess/source/ui/inc/WTabPage.hxx +++ b/dbaccess/source/ui/inc/WTabPage.hxx @@ -24,9 +24,7 @@ namespace dbaui { - // ======================================================== // Wizard Page - // ======================================================== class OCopyTableWizard; class OWizardPage : public TabPage { @@ -46,6 +44,4 @@ namespace dbaui } #endif // DBAUI_WIZ_TABBPAGE_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index 8289bdef28f2..56803b91badd 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -33,9 +33,7 @@ class SvParser; namespace dbaui { class OTableDesignHelpBar; - // ============================================================================================= // OWizTypeSelectControl - // ============================================================================================= class OWizTypeSelectControl : public OFieldDescControl { protected: @@ -59,11 +57,8 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection(); }; - - // ======================================================== // Wizard Page: OWizTypeSelectList // just defines the ::com::sun::star::ucb::Command for the Contextmenu - // ======================================================== class OWizTypeSelectList : public MultiListBox { sal_Bool m_bPKey; @@ -79,11 +74,9 @@ namespace dbaui void SetPKey(sal_Bool bPKey) { m_bPKey = bPKey; } }; - // ======================================================== // Wizard Page: OWizTypeSelect // Serves as base class for different copy properties. // Calls FillColumnList, when button AUTO is triggered - // ======================================================== class OWizTypeSelect : public OWizardPage { friend class OWizTypeSelectControl; @@ -125,11 +118,8 @@ namespace dbaui inline void setDuplicateName(sal_Bool _bDuplicateName) { m_bDuplicateName = _bDuplicateName; } }; - // ======================================================== typedef OWizTypeSelect* (*TypeSelectionPageFactory)( Window*, SvStream& ); } #endif // DBAUI_WIZ_TYPESELECT_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index d66f20dcded1..c6c5e9137bfe 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -36,7 +36,6 @@ namespace dbaui { - //======================================================================== /** unifies the access to a list of table/query objects */ class TableObjectListFacade @@ -49,7 +48,6 @@ namespace dbaui virtual ~TableObjectListFacade(); }; - //======================================================================== class IAddTableDialogContext { public: @@ -65,7 +63,6 @@ namespace dbaui ~IAddTableDialogContext() {} }; - //======================================================================== class OAddTableDlg : public ModelessDialog { RadioButton m_aCaseTables; diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index 84b715da92df..1504f1c9c630 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -27,14 +27,10 @@ #include <memory> -//........................................................................ namespace dbaui { -//........................................................................ - //========================================================================= - //= AdvancedSettingsDialog - //========================================================================= + // AdvancedSettingsDialog class ODbDataSourceAdministrationHelper; /** implements the advanced page dlg of the data source properties. */ @@ -75,9 +71,7 @@ namespace dbaui virtual void enableConfirmSettings( bool _bEnable ); }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // DBACCESS_ADVANCEDSETTINGSDLG_HXX diff --git a/dbaccess/source/ui/inc/asyncmodaldialog.hxx b/dbaccess/source/ui/inc/asyncmodaldialog.hxx index 8a03d91a29b1..0906116796f9 100644 --- a/dbaccess/source/ui/inc/asyncmodaldialog.hxx +++ b/dbaccess/source/ui/inc/asyncmodaldialog.hxx @@ -22,14 +22,10 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -//........................................................................ namespace dbaui { -//........................................................................ - //==================================================================== - //= AsyncDialogExecutor - //==================================================================== + // AsyncDialogExecutor /** helper class for executing (UNO) dialogs modal, but asynchronously */ class AsyncDialogExecutor @@ -47,9 +43,7 @@ namespace dbaui ); }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // DBACCESS_ASYNCMODALDIALOG_HXX diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index c7651a1bbf37..27c500fa1a53 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -56,7 +56,6 @@ namespace dbtools namespace dbaui { - // ========================================================================= typedef ::cppu::ImplInheritanceHelper9 < OGenericUnoController , ::com::sun::star::sdb::XSQLErrorListener @@ -73,7 +72,6 @@ namespace dbaui class SbaXDataBrowserController :public SbaXDataBrowserController_Base ,public SbaGridListener { - // ========== // attributes private: // for implementing the XFormController @@ -126,7 +124,6 @@ namespace dbaui }; friend class FormErrorHelper; - // ================ // attribute access protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > getRowSet() const { return m_xRowSet; } @@ -249,7 +246,6 @@ namespace dbaui virtual sal_Bool InitializeGridModel(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & xGrid); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > CreateGridModel(); // our default implementation simply instantiates a stardiv.one.form.component.Grid service // you most probably don't want to override this behaviuor @@ -272,7 +268,6 @@ namespace dbaui virtual void AddColumnListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xCol); virtual void RemoveColumnListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xCol); - // call after "major changes" (e.g. the completion of the async load). // invalidates all toolbox slots and all supported features. @@ -292,8 +287,6 @@ namespace dbaui // after setting this filter fails, the filter is reset and the form is reloaded, again. Only the // whole process (_both_ XLoadable::reload calls _together_) form the "reload operation" - // -------------------- - // empty the frame where our view resides virtual sal_Bool CommitCurrent(); // commit the current column (i.e. cell) diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index d43b1094c9f9..7bca0a3224ee 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -28,14 +28,12 @@ #include <dbaccess/dataview.hxx> #include <unotools/eventlisteneradapter.hxx> - namespace com { namespace sun { namespace star { namespace awt { class XControl; class XControlContainer; class XControlModel; }}}} -// ========================================================================= class Splitter; namespace dbaui diff --git a/dbaccess/source/ui/inc/callbacks.hxx b/dbaccess/source/ui/inc/callbacks.hxx index e914505474a3..3bec36dd42ac 100644 --- a/dbaccess/source/ui/inc/callbacks.hxx +++ b/dbaccess/source/ui/inc/callbacks.hxx @@ -34,15 +34,11 @@ struct ExecuteDropEvent; namespace cppu { class OInterfaceContainerHelper; } -//........................................................................ namespace dbaui { -//........................................................................ class IController; - //==================================================================== - //= IControlActionListener - //==================================================================== + // IControlActionListener class SAL_NO_VTABLE IControlActionListener { public: @@ -68,9 +64,7 @@ namespace dbaui ~IControlActionListener() {} }; - //==================================================================== - //= IContextMenuProvider - //==================================================================== + // IContextMenuProvider class SAL_NO_VTABLE IContextMenuProvider { public: @@ -106,9 +100,7 @@ namespace dbaui ~IContextMenuProvider() {} }; - //==================================================================== - //= IDragTransferableListener - //==================================================================== + // IDragTransferableListener class SAL_NO_VTABLE IDragTransferableListener { public: @@ -119,9 +111,7 @@ namespace dbaui ~IDragTransferableListener() {} }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // _DBACCESS_UI_CALLBACKS_HXX_ diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx b/dbaccess/source/ui/inc/charsetlistbox.hxx index 5782a1792ef9..262f2e70a01f 100644 --- a/dbaccess/source/ui/inc/charsetlistbox.hxx +++ b/dbaccess/source/ui/inc/charsetlistbox.hxx @@ -26,14 +26,10 @@ class SfxItemSet; -//........................................................................ namespace dbaui { -//........................................................................ - //==================================================================== - //= CharSetListBox - //==================================================================== + // CharSetListBox class CharSetListBox : public ListBox { public: @@ -47,9 +43,7 @@ namespace dbaui OCharsetDisplay m_aCharSets; }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // CHARSETLISTBOX_HXX diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx index 0828feac0f82..34edadc05548 100644 --- a/dbaccess/source/ui/inc/charsets.hxx +++ b/dbaccess/source/ui/inc/charsets.hxx @@ -24,14 +24,10 @@ #include <rtl/ustring.hxx> #include <svx/txenctab.hxx> -//......................................................................... namespace dbaui { -//......................................................................... - //========================================================================= - //= OCharsetDisplay - //========================================================================= + // OCharsetDisplay typedef ::dbtools::OCharsetMap OCharsetDisplay_Base; class OCharsetDisplay :protected OCharsetDisplay_Base @@ -68,9 +64,7 @@ namespace dbaui using OCharsetDisplay_Base::find; }; - //------------------------------------------------------------------------- //- CharsetDisplayDerefHelper - //------------------------------------------------------------------------- typedef ::dbtools::CharsetIteratorDerefHelper CharsetDisplayDerefHelper_Base; class CharsetDisplayDerefHelper : protected CharsetDisplayDerefHelper_Base { @@ -89,9 +83,7 @@ namespace dbaui CharsetDisplayDerefHelper(const ::dbtools::CharsetIteratorDerefHelper& _rBase, const OUString& _rDisplayName); }; - //------------------------------------------------------------------------- //- OCharsetDisplay::ExtendedCharsetIterator - //------------------------------------------------------------------------- class OCharsetDisplay::ExtendedCharsetIterator { friend class OCharsetDisplay; @@ -125,9 +117,7 @@ namespace dbaui ExtendedCharsetIterator( const OCharsetDisplay* _pContainer, const base_iterator& _rPosition ); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_CHARSETS_HXX_ diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx index 6a907217662a..f89f56972e97 100644 --- a/dbaccess/source/ui/inc/commontypes.hxx +++ b/dbaccess/source/ui/inc/commontypes.hxx @@ -29,10 +29,8 @@ namespace com { namespace sun { namespace star { } } } } -//......................................................................... namespace dbaui { -//......................................................................... DECLARE_STL_STDKEY_SET( OUString, StringBag ); DECLARE_STL_VECTOR( sal_Int8, ByteVector ); @@ -40,9 +38,7 @@ namespace dbaui typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_COMMON_TYPES_HXX_ diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index 981d790b8dc4..4006f403f164 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -25,14 +25,10 @@ #include "dsntypes.hxx" #include <memory> -//......................................................................... namespace dbaui { -//......................................................................... -//========================================================================= -//= OConnectionURLEdit -//========================================================================= +// OConnectionURLEdit /** an edit control which may be used to edit connection URLs like "sdbc:odbc:" or "jdbc:". It prevents the user from editing this prefix, though it is normally shown. @@ -55,7 +51,6 @@ public: virtual void SetText(const OUString& _rStr, const Selection& _rNewSelection); virtual OUString GetText() const; - /** Showsthe Prefix @param _bShowPrefix If <TRUE/> than the prefix will be visible, otherwise not. @@ -71,9 +66,7 @@ public: inline void SetTypeCollection(::dbaccess::ODsnTypeCollection* _pTypeCollection) { m_pTypeCollection = _pTypeCollection; } }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_CURLEDIT_HXX_ diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx index 95211ca67375..fa92f260e081 100644 --- a/dbaccess/source/ui/inc/databaseobjectview.hxx +++ b/dbaccess/source/ui/inc/databaseobjectview.hxx @@ -37,11 +37,8 @@ #include <boost/shared_ptr.hpp> - -// ......................................................................... namespace dbaui { -// ......................................................................... /** encapsulates access to the view of a database object. @todo @@ -60,7 +57,6 @@ namespace dbaui m_xApplication; OUString m_sComponentURL; - private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > doDispatch( @@ -149,9 +145,7 @@ namespace dbaui ); }; - //====================================================================== - //= QueryDesigner - //====================================================================== + // QueryDesigner class QueryDesigner : public DatabaseObjectView { protected: @@ -173,9 +167,7 @@ namespace dbaui ); }; - //====================================================================== - //= TableDesigner - //====================================================================== + // TableDesigner class TableDesigner : public DatabaseObjectView { protected: @@ -211,9 +203,7 @@ namespace dbaui impl_getConnectionProvidedDesigner_nothrow( const OUString& _rTableName ); }; - //====================================================================== - //= ResultSetBrowser - //====================================================================== + // ResultSetBrowser class ResultSetBrowser : public DatabaseObjectView { private: @@ -235,9 +225,7 @@ namespace dbaui ); }; - //====================================================================== - //= RelationDesigner - //====================================================================== + // RelationDesigner class RelationDesigner : public DatabaseObjectView { public: @@ -247,9 +235,7 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxParentFrame ); }; -// ......................................................................... } // namespace dbaui -// ......................................................................... #endif // DBACCESS_DATABASE_OBJECT_VIEW_HXX diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx index 76b3f27f6d60..fd7d86661281 100644 --- a/dbaccess/source/ui/inc/datasourceconnector.hxx +++ b/dbaccess/source/ui/inc/datasourceconnector.hxx @@ -31,14 +31,10 @@ namespace dbtools } class Window; -//......................................................................... namespace dbaui { -//......................................................................... - //===================================================================== - //= ODatasourceConnector - //===================================================================== + // ODatasourceConnector class ODatasourceConnector { protected: @@ -78,9 +74,7 @@ namespace dbaui ) const; }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_DATASOURCECONNECTOR_HXX_ diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index fb5758db17a0..9e7a591eb248 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -38,14 +38,10 @@ namespace com { namespace sun { namespace star { } }}} -//......................................................................... namespace dbaui { -//......................................................................... -//========================================================================= -//= ODbAdminDialog -//========================================================================= +// ODbAdminDialog class ODbDataSourceAdministrationHelper; /** tab dialog for administrating the office wide registered data sources */ @@ -127,9 +123,7 @@ private: ApplyResult implApplyChanges(); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_DBADMIN_HXX_ diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 16ad5901134e..0bd0badc5d96 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -29,7 +29,6 @@ #include <set> - namespace dbaui { struct DBTreeEditedEntry @@ -47,7 +46,6 @@ namespace dbaui ~IEntryFilter() {} }; - //======================================================================== class IControlActionListener; class IContextMenuProvider; class DBTreeListBox :public SvTreeListBox @@ -72,7 +70,6 @@ namespace dbaui Link m_aEditedHandler; // called after someone edited an entry Link m_aEnterKeyHdl; - sal_Bool m_bHandleEnterKey; private: diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 63748ff23fac..2949a0f810ae 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -44,14 +44,10 @@ namespace dbaccess { class ODsnTypeCollection; } -//......................................................................... namespace dbaui { -//......................................................................... -//========================================================================= -//= ODbTypeWizDialog -//========================================================================= +// ODbTypeWizDialog class OGeneralPage; class ODbDataSourceAdministrationHelper; /** tab dialog for administrating the office wide registered data sources @@ -125,9 +121,7 @@ private: DECL_LINK(OnTypeSelected, OGeneralPage*); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // DBAUI_DBWIZ_HXX diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index fa35c499ad2e..697b9a0cb85e 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -42,16 +42,12 @@ namespace com { namespace sun { namespace star { } }}} -//......................................................................... namespace dbaui { -//......................................................................... class OGenericAdministrationPage; -//========================================================================= -//= ODbTypeWizDialogSetup -//========================================================================= +// ODbTypeWizDialogSetup class OGeneralPage; class OGeneralPageWizard; class ODbDataSourceAdministrationHelper; @@ -96,8 +92,6 @@ private: ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance - - public: /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed after the dialog has been destroyed @@ -188,9 +182,7 @@ private: DECL_LINK(ImplModifiedHdl, OGenericAdministrationPage*); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // DBAUI_DBWIZ2_HXX diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx index 8e09bb6ad9f8..82157a97e57d 100644 --- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx +++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx @@ -29,14 +29,10 @@ #include <memory> #include <boost/noncopyable.hpp> -//........................................................................ namespace dbaui { -//........................................................................ - //==================================================================== - //= HierarchicalNameCheck - //==================================================================== + // HierarchicalNameCheck struct HierarchicalNameCheck_Impl; /** class implementing the IObjectNameCheck interface, and checking given object names against a hierarchical name container @@ -74,9 +70,7 @@ namespace dbaui HierarchicalNameCheck(); // never implemented }; - //==================================================================== - //= DynamicTableOrQueryNameCheck - //==================================================================== + // DynamicTableOrQueryNameCheck struct DynamicTableOrQueryNameCheck_Impl; /** class implementing the IObjectNameCheck interface, and checking a given name for being valid as either a query or a table name. @@ -126,9 +120,7 @@ namespace dbaui DynamicTableOrQueryNameCheck(); // never implemented }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // DBACCESS_SOURCE_UI_INC_DEFAULTOBJECTNAMECHECK_HXX diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index 3876bf4d3c37..999854660e66 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -35,14 +35,10 @@ #include <svtools/editbrowsebox.hxx> -//........................................................................ namespace dbaui { -//........................................................................ - //==================================================================== - //= DirectSQLDialog - //==================================================================== + // DirectSQLDialog class DirectSQLDialog :public ModalDialog ,public ::utl::OEventListenerAdapter @@ -113,7 +109,6 @@ namespace dbaui #endif }; - //==================================================================== #ifdef DBG_UTIL #define CHECK_INVARIANTS(methodname) \ { \ @@ -125,9 +120,7 @@ namespace dbaui #define CHECK_INVARIANTS(methodname) #endif -//........................................................................ } // namespace dbaui -//........................................................................ #endif // _DBACCESS_UI_DIRECTSQL_HXX_ diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx index eabd02b6b793..57e6550618aa 100644 --- a/dbaccess/source/ui/inc/dlgattr.hxx +++ b/dbaccess/source/ui/inc/dlgattr.hxx @@ -19,21 +19,16 @@ #ifndef DBAUI_SBATTRDLG_HXX #define DBAUI_SBATTRDLG_HXX - #include "dlgattr.hrc" #include <sfx2/tabdlg.hxx> #include <tools/solar.h> - - class SvxNumberInfoItem; class SfxItemSet; class SvNumberFormatter; -//......................................................................... namespace dbaui { -//......................................................................... class SbaSbAttrDlg : public SfxTabDialog { @@ -46,9 +41,7 @@ namespace dbaui virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif//DBAUI_SBATTRDLG_HXX diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index 0f93c3223583..73f91b09a24c 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -27,10 +27,8 @@ #include <vcl/fixed.hxx> -//......................................................................... namespace dbaui { -//......................................................................... class DlgSize : public ModalDialog { @@ -54,9 +52,7 @@ namespace dbaui sal_Int32 GetValue(); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_DLGSIZE_HXX diff --git a/dbaccess/source/ui/inc/dsitems.hxx b/dbaccess/source/ui/inc/dsitems.hxx index 365982d7cf74..1de1555e531c 100644 --- a/dbaccess/source/ui/inc/dsitems.hxx +++ b/dbaccess/source/ui/inc/dsitems.hxx @@ -22,8 +22,7 @@ typedef sal_Int32 ItemID; -//======================================================================== -//= item ids for the data source administration dialog +// item ids for the data source administration dialog #define DSID_NAME 1 // name of a data source, SfxStringItem #define DSID_ORIGINALNAME 2 // orginal name, internal, SfxStringItem @@ -88,9 +87,7 @@ typedef sal_Int32 ItemID; #define DSID_RESPECTRESULTSETTYPE 61 // don't forget to adjust DSID_LAST_ITEM_ID below! - -//======================================================================== -//= item range. Adjust this if you introduce new items above +// item range. Adjust this if you introduce new items above #define DSID_FIRST_ITEM_ID DSID_NAME #define DSID_LAST_ITEM_ID DSID_RESPECTRESULTSETTYPE diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx index e6c40abf7d80..249dcd5cccf2 100644 --- a/dbaccess/source/ui/inc/dsmeta.hxx +++ b/dbaccess/source/ui/inc/dsmeta.hxx @@ -25,14 +25,10 @@ #include <boost/shared_ptr.hpp> -//........................................................................ namespace dbaui { -//........................................................................ - //==================================================================== - //= AutheticationMode - //==================================================================== + // AutheticationMode enum AuthenticationMode { AuthNone, @@ -40,9 +36,7 @@ namespace dbaui AuthPwd }; - //==================================================================== - //= DataSourceMetaData - //==================================================================== + // DataSourceMetaData class FeatureSet; class DataSourceMetaData_Impl; /** encapsulates meta data for a data source @@ -70,9 +64,7 @@ namespace dbaui ::boost::shared_ptr< DataSourceMetaData_Impl > m_pImpl; }; - //==================================================================== - //= FeatureSet - //==================================================================== + // FeatureSet /** can be used to ask for (UI) support for certain advanced features */ class FeatureSet @@ -96,13 +88,11 @@ namespace dbaui ::std::set< ItemID > m_aContent; }; - //-------------------------------------------------------------------- inline bool FeatureSet::supportsGeneratedValues() const { return has( DSID_AUTORETRIEVEENABLED ); } - //-------------------------------------------------------------------- inline bool FeatureSet::supportsAnySpecialSetting() const { return has( DSID_SQL92CHECK ) @@ -126,9 +116,7 @@ namespace dbaui ; } -//........................................................................ } // namespace dbaui -//........................................................................ #endif // DBACCESS_DSMETA_HXX diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx index 0c98ce481316..817e077fd982 100644 --- a/dbaccess/source/ui/inc/exsrcbrw.hxx +++ b/dbaccess/source/ui/inc/exsrcbrw.hxx @@ -25,9 +25,7 @@ #include <comphelper/uno3.hxx> #include <cppuhelper/implbase2.hxx> -//============================================================================== -//= SbaExternalSourceBrowser -//============================================================================== +// SbaExternalSourceBrowser namespace dbaui { diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx index 3101068a1e4c..88f694e07c76 100644 --- a/dbaccess/source/ui/inc/formadapter.hxx +++ b/dbaccess/source/ui/inc/formadapter.hxx @@ -62,9 +62,7 @@ namespace dbaui { - //================================================================== // SbaXFormAdapter - //================================================================== typedef ::cppu::WeakImplHelper12< ::com::sun::star::sdbc::XResultSetMetaDataSupplier , ::com::sun::star::sdb::XResultSetAccess diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx index a5d7ba09b270..0e047041cf43 100644 --- a/dbaccess/source/ui/inc/imageprovider.hxx +++ b/dbaccess/source/ui/inc/imageprovider.hxx @@ -28,17 +28,13 @@ #include <tools/string.hxx> #include <boost/shared_ptr.hpp> -//........................................................................ namespace dbaui { -//........................................................................ // for convenience of our clients namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject; - //==================================================================== - //= ImageProvider - //==================================================================== + // ImageProvider struct ImageProvider_Data; /** provides images for database objects such as tables, queries, forms, reports ... @@ -139,9 +135,7 @@ namespace dbaui Image getDatabaseImage(); }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // DBACCESS_IMAGEPROVIDER_HXX diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx index e741fc65e35e..e31039a769f4 100644 --- a/dbaccess/source/ui/inc/indexcollection.hxx +++ b/dbaccess/source/ui/inc/indexcollection.hxx @@ -25,14 +25,10 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include "indexes.hxx" -//...................................................................... namespace dbaui { -//...................................................................... - //================================================================== - //= OIndexCollection - //================================================================== + // OIndexCollection class OIndexCollection { protected: @@ -100,10 +96,7 @@ namespace dbaui void implFillIndexInfo(OIndex& _rIndex) SAL_THROW((::com::sun::star::uno::Exception)); }; - -//...................................................................... } // namespace dbaui -//...................................................................... #endif // _DBAUI_INDEXCOLLECTION_HXX_ diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index ddb467152c73..fd845760c591 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -34,14 +34,10 @@ #include "indexes.hxx" #include <dbaccess/ToolBoxHelper.hxx> -//...................................................................... namespace dbaui { -//...................................................................... - //================================================================== - //= DbaIndexList - //================================================================== + // DbaIndexList class DbaIndexList : public SvTreeListBox { protected: @@ -78,9 +74,7 @@ namespace dbaui using SvTreeListBox::Select; }; - //================================================================== - //= DbaIndexDialog - //================================================================== + // DbaIndexDialog class IndexFieldsControl; class OIndexCollection; class DbaIndexDialog : public ModalDialog, @@ -167,9 +161,7 @@ namespace dbaui void checkControls(); }; -//...................................................................... } // namespace dbaui -//...................................................................... #endif // _DBAUI_INDEXDIALOG_HXX_ diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx index d215cfaceabd..abc3a0b418f5 100644 --- a/dbaccess/source/ui/inc/indexes.hxx +++ b/dbaccess/source/ui/inc/indexes.hxx @@ -23,13 +23,9 @@ #include <tools/string.hxx> #include <comphelper/stl_types.hxx> -//...................................................................... namespace dbaui { -//...................................................................... - //================================================================== - //= OIndexField - //================================================================== + // OIndexField struct OIndexField { String sFieldName; @@ -40,9 +36,7 @@ namespace dbaui DECLARE_STL_VECTOR( OIndexField, IndexFields ); - //================================================================== - //= OIndex - //================================================================== + // OIndex struct GrantIndexAccess { friend class OIndexCollection; @@ -50,7 +44,6 @@ namespace dbaui GrantIndexAccess() { } }; - //.................................................................. struct OIndex { protected: @@ -80,16 +73,13 @@ namespace dbaui void flagAsNew(const GrantIndexAccess&) { sOriginalName = OUString(); } void flagAsCommitted(const GrantIndexAccess&) { sOriginalName = sName; } - private: OIndex(); // not implemented }; DECLARE_STL_VECTOR( OIndex, Indexes ); -//...................................................................... } // namespace dbaui -//...................................................................... #endif // _DBAUI_INDEXES_HXX_ diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 7f4dd8c61655..4465b3fc39ee 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -25,14 +25,10 @@ #include "indexcollection.hxx" #include <com/sun/star/uno/Sequence.hxx> -//...................................................................... namespace dbaui { -//...................................................................... - //================================================================== // IndexFieldsControl - //================================================================== class IndexFieldsControl : public ::svt::EditBrowseBox { OModuleClient m_aModuleClient; @@ -94,9 +90,7 @@ namespace dbaui using ::svt::EditBrowseBox::Init; }; -//...................................................................... } // namespace dbaui -//...................................................................... #endif // _DBAUI_INDEXFIELDSCONTROL_HXX_ diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index 7f1c5dfc72d0..1f77ed693bd2 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -35,14 +35,10 @@ #include <comphelper/namedvaluecollection.hxx> class Window; -//...................................................................... namespace dbaui { -//...................................................................... - //================================================================== - //= OLinkedDocumentsAccess - //================================================================== + // OLinkedDocumentsAccess class OLinkedDocumentsAccess { protected: @@ -122,9 +118,7 @@ namespace dbaui }; -//...................................................................... } // namespace dbaui -//...................................................................... #endif // _DBAUI_LINKEDDOCUMENTS_HXX_ diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx index f9a81789921f..470695926a62 100644 --- a/dbaccess/source/ui/inc/listviewitems.hxx +++ b/dbaccess/source/ui/inc/listviewitems.hxx @@ -22,16 +22,12 @@ #include <svtools/svlbitm.hxx> -//........................................................................ namespace dbaui { -//........................................................................ #define SV_ITEM_ID_BOLDLBSTRING SV_ITEM_ID_LBOXSTRING - //==================================================================== - //= OBoldListboxString - //==================================================================== + // OBoldListboxString class OBoldListboxString : public SvLBoxString { sal_Bool m_bEmphasized; @@ -53,9 +49,7 @@ namespace dbaui void emphasize(sal_Bool _bEmphasize) { m_bEmphasized = _bEmphasize; } }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // _DBAUI_LISTVIEWITEMS_HXX_ diff --git a/dbaccess/source/ui/inc/localresaccess.hxx b/dbaccess/source/ui/inc/localresaccess.hxx index ae8c8ff7ed5a..5d5e10b51fe0 100644 --- a/dbaccess/source/ui/inc/localresaccess.hxx +++ b/dbaccess/source/ui/inc/localresaccess.hxx @@ -23,14 +23,10 @@ #include <svtools/localresaccess.hxx> #include "moduledbu.hxx" -//......................................................................... namespace dbaui { -//......................................................................... -//========================================================================= -//= LocalResourceAccess -//========================================================================= +// LocalResourceAccess /** helper class for acessing local resources */ typedef ::svt::OLocalResourceAccess LRA_Base; @@ -44,9 +40,7 @@ public: } }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_LOCALRESACCESS_HXX_ diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx index 05dc9e85b77d..1c6f19811f0d 100644 --- a/dbaccess/source/ui/inc/marktree.hxx +++ b/dbaccess/source/ui/inc/marktree.hxx @@ -24,15 +24,10 @@ #include "svtools/svlbitm.hxx" - -//......................................................................... namespace dbaui { -//......................................................................... -//======================================================================== -//= OMarkableTreeListBox -//======================================================================== +// OMarkableTreeListBox /** a tree list box where all entries can be marked (with a checkbox) and unmarked. In addition, inner nodes know a third state which applies if some, but not all of their descendants are marked. @@ -65,9 +60,7 @@ private: void InitButtonData(); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_MARKTREE_HXX_ diff --git a/dbaccess/source/ui/inc/moduledbu.hxx b/dbaccess/source/ui/inc/moduledbu.hxx index 3d34259e964a..49e09e73511a 100644 --- a/dbaccess/source/ui/inc/moduledbu.hxx +++ b/dbaccess/source/ui/inc/moduledbu.hxx @@ -25,14 +25,10 @@ class ResMgr; -//......................................................................... namespace dbaui { -//......................................................................... -//========================================================================= -//= OModule -//========================================================================= +// OModule class OModuleImpl; class OModule { @@ -64,9 +60,7 @@ private: static void ensureImpl(); }; -//========================================================================= -//= OModuleClient -//========================================================================= +// OModuleClient /** base class for objects which uses any global module-specific resources */ class OModuleClient @@ -76,9 +70,7 @@ public: ~OModuleClient() { OModule::revokeClient(); } }; -//========================================================================= -//= ModuleRes -//========================================================================= +// ModuleRes /** specialized ResId, using the resource manager provided by the global module */ class ModuleRes : public ::ResId @@ -87,9 +79,7 @@ public: ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { } }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_MODULE_DBU_HXX_ diff --git a/dbaccess/source/ui/inc/objectnamecheck.hxx b/dbaccess/source/ui/inc/objectnamecheck.hxx index 8f834ebef82b..858d26de40b2 100644 --- a/dbaccess/source/ui/inc/objectnamecheck.hxx +++ b/dbaccess/source/ui/inc/objectnamecheck.hxx @@ -24,14 +24,10 @@ namespace dbtools { class SQLExceptionInfo; } -//........................................................................ namespace dbaui { -//........................................................................ - //==================================================================== - //= IObjectNameCheck - //==================================================================== + // IObjectNameCheck /** interface encapsulating the check for the validity of an object name */ class IObjectNameCheck @@ -57,9 +53,7 @@ namespace dbaui virtual ~IObjectNameCheck() { } }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index 14406c8b7be9..63501cb90a8c 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -25,14 +25,10 @@ #include <rtl/ustring.hxx> #include <map> -//........................................................................ namespace dbaui { -//........................................................................ - //==================================================================== - //= OpenDocumentButton - //==================================================================== + // OpenDocumentButton /** a button which can be used to open a document The text of the button is the same as for the "Open" command in the application @@ -50,9 +46,7 @@ namespace dbaui void impl_init( const sal_Char* _pAsciiModuleName ); }; - //==================================================================== - //= OpenDocumentListBox - //==================================================================== + // OpenDocumentListBox class OpenDocumentListBox : public ListBox { private: @@ -77,9 +71,7 @@ namespace dbaui void impl_init( const sal_Char* _pAsciiModuleName ); }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // DBACCESS_SOURCE_UI_INC_OPENDOCCONTROLS_HXX diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index b53887770420..b19b84b17f92 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -42,14 +42,10 @@ namespace connectivity class OSQLParseNode; } -//......................................................................... namespace dbaui { -//......................................................................... - //================================================================== - //= OParameterDialog - //================================================================== + // OParameterDialog class OParameterDialog :public ModalDialog ,public ::svxform::OParseContextClient @@ -94,7 +90,6 @@ namespace dbaui ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getValues() const { return m_aFinalValues; } - protected: void Construct(); @@ -108,9 +103,7 @@ namespace dbaui DECL_LINK(OnValueLoseFocus, Control*); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_PARAMDIALOG_HXX_ diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx index 82b47ae48876..f10d46f1901a 100644 --- a/dbaccess/source/ui/inc/propertysetitem.hxx +++ b/dbaccess/source/ui/inc/propertysetitem.hxx @@ -23,14 +23,10 @@ #include <svl/poolitem.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -//......................................................................... namespace dbaui { -//......................................................................... - //========================================================================= - //= OPropertySetItem - //========================================================================= + // OPropertySetItem /** <type>SfxPoolItem</type> which transports a XPropertySet */ class OPropertySetItem : public SfxPoolItem @@ -51,9 +47,7 @@ namespace dbaui getPropertySet() const { return m_xSet; } }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_PROPERTYSETITEM_HXX_ diff --git a/dbaccess/source/ui/inc/propertystorage.hxx b/dbaccess/source/ui/inc/propertystorage.hxx index 66daa0be0320..3bf8350961ff 100644 --- a/dbaccess/source/ui/inc/propertystorage.hxx +++ b/dbaccess/source/ui/inc/propertystorage.hxx @@ -29,14 +29,10 @@ class SfxItemSet; -//........................................................................ namespace dbaui { -//........................................................................ - //==================================================================== - //= PropertyStorage - //==================================================================== + // PropertyStorage class SAL_NO_VTABLE PropertyStorage { public: @@ -49,9 +45,7 @@ namespace dbaui typedef ::boost::shared_ptr< PropertyStorage > PPropertyStorage; typedef ::std::map< sal_Int32, PPropertyStorage > PropertyValues; - //==================================================================== - //= SetItemPropertyStorage - //==================================================================== + // SetItemPropertyStorage typedef sal_uInt16 ItemId; /** a PropertyStorage implementation which stores the value in an item set @@ -77,9 +71,7 @@ namespace dbaui const ItemId m_nItemID; }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // PROPERTYSTORAGE_HXX diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index e052f9a39c33..d1126b4d3309 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -27,14 +27,10 @@ #include "QueryViewSwitch.hxx" #include <vcl/dockwin.hxx> -//......................................................................... namespace dbaui { -//......................................................................... - //===================================================================== - //= OBeamer - //===================================================================== + // OBeamer // tempoaray class until the beamer is implemented class OBeamer : public DockingWindow { @@ -42,9 +38,7 @@ namespace dbaui OBeamer(Window* _pParent) : DockingWindow(_pParent,0){} }; - //===================================================================== - //= OQueryContainerWindow - //===================================================================== + // OQueryContainerWindow class OQueryContainerWindow : public ODataView { OQueryViewSwitch* m_pViewSwitch; @@ -107,9 +101,7 @@ namespace dbaui }; // end of temp classes -//......................................................................... } // namespace dbaui -//......................................................................... #endif // DBAUI_QUERYCONTAINERWINDOW_HXX diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index fb0e0febf1bd..e87856d01fc8 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -60,9 +60,7 @@ namespace com } } } -//================================================================== // DlgFilterCrit -//================================================================== namespace dbaui { class DlgFilterCrit :public ModalDialog @@ -132,5 +130,4 @@ namespace dbaui #endif // DBAUI_QUERYFILTER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index 021fd64690bc..9b32a4413275 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -53,9 +53,7 @@ namespace com } } -//================================================================== // DlgOrderCrit -//================================================================== namespace dbaui { class DlgOrderCrit : public ModalDialog @@ -83,7 +81,6 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ListBox* m_aColumnList[DOG_ROWS]; ListBox* m_aValueList[DOG_ROWS]; @@ -108,5 +105,4 @@ namespace dbaui } #endif // DBAUI_QUERYORDER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index d930cc08cf86..da1898f02faa 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -43,7 +43,6 @@ namespace com { namespace sun { namespace star { namespace dbaui { - //------------------------------------------------------------------ struct SbaURLCompare : public ::std::binary_function< ::com::sun::star::util::URL, ::com::sun::star::util::URL, bool> { bool operator() (const ::com::sun::star::util::URL& x, const ::com::sun::star::util::URL& y) const {return x.Complete == y.Complete ? true : false;} @@ -53,9 +52,7 @@ namespace dbaui { sal_Int32 operator() (const ::com::sun::star::util::URL& x) const {return x.Complete.hashCode();} }; - //================================================================== // SbaXGridControl - //================================================================== class SbaXStatusMultiplexer; class SbaXGridControl @@ -100,9 +97,7 @@ namespace dbaui virtual FmXGridPeer* imp_CreatePeer(Window* pParent); }; - //================================================================== // SbaXGridPeer - //================================================================== class SbaXGridPeer :public FmXGridPeer @@ -172,9 +167,7 @@ namespace dbaui MapDispatchToBool m_aDispatchStates; }; - //================================================================== // SbaGridHeader - //================================================================== class SbaGridHeader :public FmGridHeader @@ -202,9 +195,7 @@ namespace dbaui using FmGridHeader::StartDrag; }; - // ========================================================================= // interfaces for communication between the vcl grid control and a controller - // ------------------------------------------------------------------------- class SbaGridListener { public: @@ -220,10 +211,7 @@ namespace dbaui ~SbaGridListener() {} }; - //================================================================== // SbaGridControl - //================================================================== - //------------------------------------------------------------------ class SbaGridControl : public FmGridControl { friend class SbaGridHeader; @@ -279,7 +267,6 @@ namespace dbaui */ void CopySelectedRowsToClipboard(); - protected: // DragSourceHelper overridables virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ); diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx index 9deadd748ec1..8e9c4fbf295f 100644 --- a/dbaccess/source/ui/inc/sbamultiplex.hxx +++ b/dbaccess/source/ui/inc/sbamultiplex.hxx @@ -47,7 +47,6 @@ namespace dbaui { - //------------------------------------------------------------------ // TODO : replace this class if MM provides an WeakSubObject in cppu class OSbaWeakSubObject : public ::cppu::OWeakObject { @@ -61,7 +60,6 @@ namespace dbaui virtual void SAL_CALL release() throw() { m_rParent.release(); } }; - //------------------------------------------------------------------ // declaration of a listener multiplexer class #define BEGIN_DECLARE_LISTENER_MULTIPLEXER(classname, listenerclass) \ class classname \ @@ -79,26 +77,22 @@ namespace dbaui /* ::com::sun::star::lang::XEventListener */ \ virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException); \ - #define DECLARE_MULTIPLEXER_VOID_METHOD(methodname, eventtype) \ virtual void SAL_CALL methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException); \ #define DECLARE_MULTIPLEXER_BOOL_METHOD(methodname, eventtype) \ virtual sal_Bool SAL_CALL methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException); \ - #define END_DECLARE_LISTENER_MULTIPLEXER() \ /* resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators */ \ void * SAL_CALL operator new( size_t size ) throw() { return OSbaWeakSubObject::operator new(size); } \ void SAL_CALL operator delete( void * p ) throw() { OSbaWeakSubObject::operator delete(p); } \ }; \ - //------------------------------------------------------------------ // implementation of a listener multiplexer class #define IMPLEMENT_LISTENER_MULTIPLEXER_CORE(classname, listenerclass) \ \ - /*................................................................*/ \ classname::classname(::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex) \ :OSbaWeakSubObject(rSource) \ ,OInterfaceContainerHelper(_rMutex) \ @@ -118,12 +112,10 @@ namespace dbaui \ return aReturn; \ } \ - /*................................................................*/ \ void SAL_CALL classname::disposing(const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException)\ { \ } \ - #define IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(classname, listenerclass, methodname, eventtype) \ void SAL_CALL classname::methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException) \ { \ @@ -135,7 +127,6 @@ namespace dbaui } \ #define IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(classname, listenerclass, methodname, eventtype) \ - /*................................................................*/ \ sal_Bool SAL_CALL classname::methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException) \ { \ eventtype aMulti(e); \ @@ -147,10 +138,8 @@ namespace dbaui return bResult; \ } \ - //------------------------------------------------------------------ // helper for classes which do event multiplexing #define IMPLEMENT_LISTENER_ADMINISTRATION(classname, listenernamespace, listenerdesc, multiplexer, braodcasterclass, broadcaster) \ - /*................................................................*/ \ void SAL_CALL classname::add##listenerdesc(const ::com::sun::star::uno::Reference< ::com::sun::star::listenernamespace::X##listenerdesc >& l) throw(::com::sun::star::uno::RuntimeException)\ { \ multiplexer.addInterface(l); \ @@ -161,7 +150,6 @@ namespace dbaui xBroadcaster->add##listenerdesc(&multiplexer); \ } \ } \ - /*................................................................*/ \ void SAL_CALL classname::remove##listenerdesc(const ::com::sun::star::uno::Reference< ::com::sun::star::listenernamespace::X##listenerdesc >& l) throw(::com::sun::star::uno::RuntimeException)\ { \ if (multiplexer.getLength() == 1) \ @@ -173,7 +161,6 @@ namespace dbaui multiplexer.removeInterface(l); \ } \ - #define STOP_MULTIPLEXER_LISTENING(listenerdesc, multiplexer, braodcasterclass, broadcaster) \ if (multiplexer.getLength()) \ { \ @@ -190,9 +177,6 @@ namespace dbaui xBroadcaster->add##listenerdesc(&multiplexer); \ } \ - - - //------------------------------------------------------------------ // declaration of property listener multiplexers // (with support for specialized and unspecialized property listeners) @@ -231,11 +215,8 @@ namespace dbaui void Notify(::cppu::OInterfaceContainerHelper& rListeners, const eventtype& e); \ }; \ - - //------------------------------------------------------------------ // implementation of property listener multiplexers #define IMPLEMENT_PROPERTY_MULTIPLEXER(classname, listenerclass, methodname, eventtype, exceptions) \ - /*................................................................*/ \ classname::classname(::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex) \ :OSbaWeakSubObject(rSource) \ ,m_aListeners(rMutex) \ @@ -255,7 +236,6 @@ namespace dbaui \ return aReturn; \ } \ - /*................................................................*/ \ void SAL_CALL classname::disposing(const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException)\ { \ } \ @@ -309,10 +289,8 @@ namespace dbaui static_cast< listenerclass*>(aIt.next())->methodname(aMulti); \ } \ - //------------------------------------------------------------------ // helper for classes which do property event multiplexing #define IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(classname, listenerdesc, multiplexer, braodcasterclass, broadcaster) \ - /*................................................................*/ \ void SAL_CALL classname::add##listenerdesc(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)\ { \ multiplexer.addInterface(rName, l); \ @@ -323,7 +301,6 @@ namespace dbaui xBroadcaster->add##listenerdesc(OUString(), &multiplexer); \ } \ } \ - /*................................................................*/ \ void SAL_CALL classname::remove##listenerdesc(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)\ { \ if (multiplexer.getOverallLen() == 1) \ @@ -351,11 +328,7 @@ namespace dbaui xBroadcaster->add##listenerdesc(OUString(), &multiplexer); \ } \ - - - //================================================================== // some listener multiplexers - //================================================================== // ::com::sun::star::frame::XStatusListener BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXStatusMultiplexer, ::com::sun::star::frame::XStatusListener) DECLARE_MULTIPLEXER_VOID_METHOD(statusChanged, ::com::sun::star::frame::FeatureStateEvent) diff --git a/dbaccess/source/ui/inc/singledoccontroller.hxx b/dbaccess/source/ui/inc/singledoccontroller.hxx index f4b1e8327fa1..eaa51b7b4c44 100644 --- a/dbaccess/source/ui/inc/singledoccontroller.hxx +++ b/dbaccess/source/ui/inc/singledoccontroller.hxx @@ -29,14 +29,10 @@ class SfxUndoAction; class SfxUndoManager; -//...................................................................................................................... namespace dbaui { -//...................................................................................................................... - //================================================================================================================== - //= OSingleDocumentController - //================================================================================================================== + // OSingleDocumentController struct OSingleDocumentController_Data; typedef ::cppu::ImplInheritanceHelper1 < DBSubComponentController , ::com::sun::star::document::XUndoManagerSupplier @@ -77,9 +73,7 @@ namespace dbaui ::std::auto_ptr< OSingleDocumentController_Data > m_pData; }; -//...................................................................................................................... } // namespace dbaui -//...................................................................................................................... #endif // DBAUI_SINGLEDOCCONTROLLER_HXX diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 42c96a6f4452..a1926e9250f5 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -38,14 +38,10 @@ namespace com { namespace sun { namespace star { } } } } -//......................................................................... namespace dbaui { -//......................................................................... -//================================================================== // OSQLMessageBox -//================================================================== struct SQLMessageBox_Impl; class OSQLMessageBox : public ButtonDialog { @@ -107,9 +103,7 @@ private: void impl_addDetailsButton(); }; -//================================================================== // OSQLWarningBox -//================================================================== class OSQLWarningBox : public OSQLMessageBox { public: @@ -119,9 +113,7 @@ public: const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL ); }; -//================================================================== // OSQLErrorBox -//================================================================== class OSQLErrorBox : public OSQLMessageBox { public: @@ -131,9 +123,7 @@ public: const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL ); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_SQLMESSAGE_HXX_ diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index e3c235fd317d..e1e34e76dd26 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -25,14 +25,10 @@ #include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustring.hxx> -//......................................................................... namespace dbaui { -//......................................................................... -//========================================================================= -//= OStringListItem -//========================================================================= +// OStringListItem /** <type>SfxPoolItem</type> which transports a sequence of <type scope="rtl">OUString</type>'s */ class OStringListItem : public SfxPoolItem @@ -50,9 +46,7 @@ public: ::com::sun::star::uno::Sequence< OUString > getList() const { return m_aList; } }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_STRINGLISTITEM_HXX_ diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index 0632169a6386..d6edecd755c1 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -31,16 +31,12 @@ #include <memory> -//......................................................................... namespace dbaui { -//......................................................................... class ImageProvider; -//======================================================================== -//= OTableTreeListBox -//======================================================================== +// OTableTreeListBox class OTableTreeListBox : public OMarkableTreeListBox { protected: @@ -180,9 +176,7 @@ protected: }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_TABLETREE_HXX_ diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx index 96a35c81a6e5..ff9b6243fb12 100644 --- a/dbaccess/source/ui/inc/textconnectionsettings.hxx +++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx @@ -28,16 +28,12 @@ #include <memory> class SfxItemSet; -//........................................................................ namespace dbaui { -//........................................................................ class OTextConnectionHelper; - //==================================================================== - //= TextConnectionSettingsDialog - //==================================================================== + // TextConnectionSettingsDialog class TextConnectionSettingsDialog : public ModalDialog { public: @@ -61,9 +57,7 @@ namespace dbaui DECL_LINK( OnOK, PushButton* ); }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // TEXTCONNECTIONSETTINGS_HXX diff --git a/dbaccess/source/ui/inc/toolboxcontroller.hxx b/dbaccess/source/ui/inc/toolboxcontroller.hxx index f360731da0c7..e28715dd2a9b 100644 --- a/dbaccess/source/ui/inc/toolboxcontroller.hxx +++ b/dbaccess/source/ui/inc/toolboxcontroller.hxx @@ -58,9 +58,7 @@ namespace dbaui // XToolbarController virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException); }; -//.......................................................................... } // dbaui -//.......................................................................... #endif //DBACCESS_TOOLBOXCONTROLLER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/undosqledit.hxx b/dbaccess/source/ui/inc/undosqledit.hxx index 85ba09c13e3e..2d913de33dfe 100644 --- a/dbaccess/source/ui/inc/undosqledit.hxx +++ b/dbaccess/source/ui/inc/undosqledit.hxx @@ -25,9 +25,7 @@ namespace dbaui { class OSqlEdit; - // ================================================================================================ // OSqlEditUndoAct - Undo-class for changing sql text - //------------------------------------------------------------------------ class OSqlEditUndoAct : public OCommentUndoAction { protected: @@ -46,5 +44,4 @@ namespace dbaui } #endif // DBAUI_UNDOSQLEDIT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx index 8364fa57c5b6..dcc67c6d9bc7 100644 --- a/dbaccess/source/ui/inc/unoadmin.hxx +++ b/dbaccess/source/ui/inc/unoadmin.hxx @@ -29,14 +29,10 @@ class SfxItemSet; class SfxItemPool; class SfxPoolItem; -//......................................................................... namespace dbaui { -//......................................................................... -//========================================================================= -//= ODatabaseAdministrationDialog -//========================================================================= +// ODatabaseAdministrationDialog typedef ::svt::OGenericUnoDialog ODatabaseAdministrationDialogBase; class ODatabaseAdministrationDialog :public ODatabaseAdministrationDialogBase @@ -61,9 +57,7 @@ protected: virtual void implInitialize(const com::sun::star::uno::Any& _rValue); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_UNOADMIN_ diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 7a61ec19c29b..44487a5db7d4 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -43,7 +43,6 @@ #include "TableCopyHelper.hxx" #include "commontypes.hxx" -// ========================================================================= class SvTreeListEntry; class Splitter; struct SvSortData; @@ -51,16 +50,13 @@ struct SvSortData; namespace com { namespace sun{ namespace star { namespace container { class XNameContainer; } } } } class SvTreeList; -// ......................................................................... namespace dbaui { -// ......................................................................... class DBTreeView; struct DBTreeEditedEntry; class ImageProvider; - // ===================================================================== typedef ::cppu::ImplHelper5 < ::com::sun::star::frame::XStatusListener , ::com::sun::star::view::XSelectionSupplier , ::com::sun::star::document::XScriptInvocationContext @@ -75,12 +71,10 @@ namespace dbaui { protected: - // --------------------------- ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > m_xCollator; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xCurrentFrameParent; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xMainToolbar; - // --------------------------- struct ExternalFeature { ::com::sun::star::util::URL aURL; @@ -122,7 +116,6 @@ namespace dbaui ::boost::optional< bool > m_aDocScriptSupport; // relevant if and only if we are associated with exactly one DBDoc - virtual OUString getPrivateTitle( ) const; // attribute access public: @@ -482,9 +475,7 @@ namespace dbaui void impl_sanitizeRowSetClauses_nothrow(); }; -// ......................................................................... } // namespace dbaui -// ......................................................................... #endif // _SBA_UNODATBR_HXX_ diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 4b32fa437a93..0a88aa53bfaa 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -22,10 +22,8 @@ #include <svtools/genericunodialog.hxx> #include "moduledbu.hxx" -//......................................................................... namespace dbaui { -//......................................................................... typedef ::svt::OGenericUnoDialog OSQLMessageDialogBase; class OSQLMessageDialog @@ -74,9 +72,7 @@ protected: virtual Dialog* createDialog(Window* _pParent); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_UNOSQLMESSAGE_HXX_ |