diff options
Diffstat (limited to 'dbaccess/source')
-rw-r--r-- | dbaccess/source/core/inc/definitioncontainer.hxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppDetailView.hxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppSwapWindow.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppTitleWindow.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppView.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/UserAdmin.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/advancedsettings.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/detailpages.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/QueryDesignView.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/SqlNameEdit.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/TableDesignView.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/VertSplitView.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/brwctrlr.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TEditControl.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx | 2 |
16 files changed, 23 insertions, 22 deletions
diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index f1abf03c86d3..eb752280acca 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -303,7 +303,8 @@ private: void addObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject); void removeObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject); - /** approve that the object given may be inserted into the container. Should be overloaded by derived classes, + /** approve that the object given may be inserted into the container. + Should be overridden by derived classes, the default implementation just checks the object to be non-void. @throws IllegalArgumentException diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 95c3b63c6358..e4ad394d5f7b 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -68,7 +68,7 @@ namespace dbaui public: OPreviewWindow(vcl::Window* _pParent); - // window overloads + // Window overrides virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; void setGraphic(const Graphic& _rGraphic ) { m_aGraphicObj.SetGraphic(_rGraphic); } @@ -170,7 +170,7 @@ namespace dbaui OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode); virtual ~OAppDetailPageHelper(); - // window overloads + // Window overrides virtual void Resize() SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index ac12a0d0cfe8..f90048248ce8 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -56,7 +56,7 @@ namespace dbaui public: OCreationList( OTasksWindow& _rParent ); - // window overloads + // Window overrides virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -125,7 +125,7 @@ namespace dbaui OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetailView); virtual ~OTasksWindow(); - // window overloads + // Window overrides virtual void Resize() SAL_OVERRIDE; OApplicationDetailView* getDetailView() const { return m_pDetailView; } @@ -160,7 +160,7 @@ namespace dbaui public: OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode); virtual ~OApplicationDetailView(); - // window overloads + // Window overrides virtual void GetFocus() SAL_OVERRIDE; /** creates the tables page diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index 5c10903cf9be..c7b61c4651c6 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -43,7 +43,7 @@ namespace dbaui public: OApplicationSwapWindow( vcl::Window* _pParent, OAppBorderWindow& _rBorderWindow ); virtual ~OApplicationSwapWindow(); - // window overloads + // Window overrides virtual void Resize() SAL_OVERRIDE; bool isCutAllowed() SAL_OVERRIDE { return false; } diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx index e33144a87395..76228b54b6cf 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.hxx +++ b/dbaccess/source/ui/app/AppTitleWindow.hxx @@ -37,7 +37,7 @@ namespace dbaui OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift = true); virtual ~OTitleWindow(); - // window overloads + // Window overrides virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index a19118ac1917..87288117d2cd 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -56,7 +56,7 @@ namespace dbaui OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePreviewMode); virtual ~OAppBorderWindow(); - // window overloads + // Window overrides virtual void GetFocus() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; @@ -110,7 +110,7 @@ namespace dbaui /// automatically creates mnemonics for the texts in our task pane void setTaskExternalMnemonics( MnemonicGenerator& _rMnemonics ); - // window overloads + // Window overrides virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 605baea7b30e..6f0720d7a43b 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -67,7 +67,7 @@ public: virtual ~OUserAdmin(); OUString GetUser(); - // must be overloaded by subclasses, but it isn't pure virtual + // subclasses must override this, but it isn't pure virtual virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; // <method>OGenericAdministrationPage::fillControls</method> diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index af8d91a8d258..005f0cb909c5 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -116,7 +116,7 @@ namespace dbaui // nControlFlags is a combination of the CBTP_xxx-constants virtual ~GeneratedValuesPage(); - // must be overloaded by subclasses, but it isn't pure virtual + // subclasses must override this, but it isn't pure virtual virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; // <method>OGenericAdministrationPage::fillControls</method> diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index d70246976339..fd4119bdbbfa 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -75,7 +75,7 @@ namespace dbaui virtual ~OCommonBehaviourTabPage(); - // must be overloaded by subclasses, but it isn't pure virtual + // subclasses must override this, but it isn't pure virtual virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; // <method>OGenericAdministrationPage::fillControls</method> diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index c09a01400144..2ca5564dd6e9 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -96,7 +96,7 @@ namespace dbaui /// late construction virtual void Construct() SAL_OVERRIDE; virtual void initialize() SAL_OVERRIDE; - // window overloads + // Window overrides virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index 4368648429d9..2c1ecd27aa9f 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -67,7 +67,7 @@ namespace dbaui { } - // Window overload + // Window overrides // virtual bool PreNotify( NotifyEvent& rNEvt ); // Edit virtual void Modify() SAL_OVERRIDE; @@ -88,7 +88,7 @@ namespace dbaui { } - // Window overload + // Window overrides // Edit virtual void Modify() SAL_OVERRIDE; }; diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 1643aaccb037..5926f8dbe51e 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -44,7 +44,7 @@ namespace dbaui public: OTableBorderWindow(vcl::Window* pParent); virtual ~OTableBorderWindow(); - // window overloads + // Window overrides virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; @@ -78,7 +78,7 @@ namespace dbaui OTableController& _rController); virtual ~OTableDesignView(); - // window overloads + // Window overrides virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx index f34af430a936..4a91f47e05d5 100644 --- a/dbaccess/source/ui/inc/VertSplitView.hxx +++ b/dbaccess/source/ui/inc/VertSplitView.hxx @@ -39,7 +39,7 @@ namespace dbaui public: OSplitterView(vcl::Window* _pParent,bool _bVertical = true); virtual ~OSplitterView(); - // window overloads + // Window overrides virtual void GetFocus() SAL_OVERRIDE; void setSplitter(Splitter* _pSplitter); diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 4644830f66c0..63e536a0f6c9 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -233,7 +233,7 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > CreateForm(); // our default implementation simply instantiates a stardiv.one.form.component.Form service - // (probably this needs not to be overloaded, but you may return anything you want as long as it + // (probably this needs not to be overridden, but you may return anything you want as long as it // supports the ::com::sun::star::form::DatabaseForm service. For instance you may want to create an adapter here which // is synchronized with a foreign ::com::sun::star::form::DatabaseForm you got elsewhere) virtual bool InitializeForm( diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 3c0a550d148a..5eefcc6f97d3 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -163,7 +163,7 @@ namespace dbaui bool IsReadOnly() { return bReadOnly;} OFieldDescription* GetFieldDescr( long nRow ); - // window overloads + // Window overrides virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; // IClipboardTest diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index 4d56b8769ed0..e92651cdea3e 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -62,7 +62,7 @@ namespace dbaui void SaveData( OFieldDescription* pFieldDescr ); void SetReadOnly( bool bReadOnly ); - // window overloads + // Window overrides virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; |