diff options
author | Noel Grandin <noel@peralex.com> | 2015-01-20 12:38:10 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-01-26 08:42:28 +0200 |
commit | b44cbb26efe1d0b0950b1e1613e131b506dc3876 (patch) | |
tree | 9b4d5d99e5dad0971079b997a02a6d96536709ca /dbaccess/source/ui | |
parent | 26ad60aec69310fecd918f1c2e09056aa4782320 (diff) |
new loplugin: change virtual methods to non-virtual
Where we can prove that the virtual method is never overriden.
In the case of pure-virtual methods, we remove the method entirely.
Sometimes this leads to entire methods and fields being
eliminated.
Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae
Diffstat (limited to 'dbaccess/source/ui')
25 files changed, 79 insertions, 79 deletions
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 3a36987643bd..d54fcc8dd401 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -543,7 +543,7 @@ namespace dbaui /** disconnects from our XConnection, and cleans up this connection */ - virtual void disconnect(); + void disconnect(); // late construction virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 9c4393e63d82..a850fbda945e 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -108,7 +108,7 @@ namespace dbaui virtual bool IsTabAllowed(bool bForward) const SAL_OVERRIDE; - virtual void Init(const TTableConnectionData::value_type& _pConnData); + void Init(const TTableConnectionData::value_type& _pConnData); virtual void Init() SAL_OVERRIDE { ORelationControl_Base::Init(); } virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) SAL_OVERRIDE; virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index 8f30a76fcd03..f74c18b11bdb 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -44,7 +44,7 @@ namespace dbaui /** isEditable returns the current editable state @return true if it is editable otherwise false */ - virtual bool isEditable() const; + bool isEditable() const; public: OConnectionLineAccess(OTableConnection* _pLine); @@ -79,15 +79,15 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent - virtual bool SAL_CALL contains( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); + bool SAL_CALL contains( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual bool SAL_CALL isShowing( ) throw (::com::sun::star::uno::RuntimeException); - virtual bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException); - virtual bool SAL_CALL isFocusTraversable( ) throw (::com::sun::star::uno::RuntimeException); + bool SAL_CALL isShowing( ) throw (::com::sun::star::uno::RuntimeException); + bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException); + bool SAL_CALL isFocusTraversable( ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleRelationSet virtual sal_Int32 SAL_CALL getRelationCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index ff1bfec69880..5bd4a7e8795d 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -41,7 +41,7 @@ namespace dbaui short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(bool _bReadOnly); + void SetSpecialReadOnly(bool _bReadOnly); }; @@ -59,7 +59,7 @@ namespace dbaui short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(bool _bReadOnly); + void SetSpecialReadOnly(bool _bReadOnly); }; class OPropNumericEditCtrl : public NumericField @@ -75,7 +75,7 @@ namespace dbaui short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(bool _bReadOnly); + void SetSpecialReadOnly(bool _bReadOnly); }; @@ -92,7 +92,7 @@ namespace dbaui short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(bool _bReadOnly); + void SetSpecialReadOnly(bool _bReadOnly); }; diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 4205212e7bd8..6360d5ec55ff 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -194,7 +194,7 @@ namespace dbaui void copy(); void paste(); - virtual void Init(); + void Init(); virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index b2ccaf15679c..d9642901a1e3 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -38,7 +38,7 @@ namespace dbaui /** isEditable returns the current editable state @return true if the controller is not readonly otherwise false */ - virtual bool isEditable() const; + bool isEditable() const; public: /** OJoinDesignViewAccess needs a valid view */ diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index ff86d28f8eaf..7b29ddde90af 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -51,7 +51,7 @@ namespace dbaui virtual void initialize() SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rEvt ) SAL_OVERRIDE; - virtual void SaveTabWinUIConfig(OTableWindow* pWin); + void SaveTabWinUIConfig(OTableWindow* pWin); OJoinController& getController() const { return m_rController; } // called when fields are deleted diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index a14be0d739de..c6a6d9e67bff 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -137,7 +137,7 @@ namespace dbaui virtual void RemoveTabWin( OTableWindow* pTabWin ); // hide all TabWins (does NOT delete them; they are put in an UNDO action) - virtual void HideTabWins(); + void HideTabWins(); virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) = 0; @@ -225,7 +225,7 @@ namespace dbaui virtual bool PreNotify(NotifyEvent& rNEvt) SAL_OVERRIDE; // DnD stuff - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; @@ -242,9 +242,9 @@ namespace dbaui @note The standard implementation just passes the new data to the Wins */ - virtual void TabWinMoved(OTableWindow* ptWhich, const Point& ptOldPosition); + void TabWinMoved(OTableWindow* ptWhich, const Point& ptOldPosition); - virtual void TabWinSized(OTableWindow* ptWhich, const Point& ptOldPosition, const Size& szOldSize); + void TabWinSized(OTableWindow* ptWhich, const Point& ptOldPosition, const Size& szOldSize); void modified(); @@ -259,7 +259,7 @@ namespace dbaui Size getRealOutputSize() const { return m_aOutputSize; } virtual void EnsureVisible(const OTableWindow* _pWin); - virtual void EnsureVisible(const Point& _rPoint,const Size& _rSize); + void EnsureVisible(const Point& _rPoint,const Size& _rSize); TTableWindowData::value_type createTableWindowData(const OUString& _rComposedName ,const OUString& _sTableName @@ -271,7 +271,7 @@ namespace dbaui virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void ConnDoubleClicked( OTableConnection* pConnection ); - virtual void SetDefaultTabWinPosSize( OTableWindow* pTabWin ); + void SetDefaultTabWinPosSize( OTableWindow* pTabWin ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index 2ca5564dd6e9..2baba04ac840 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -88,7 +88,7 @@ namespace dbaui // set the view readonly or not virtual void setReadOnly(bool _bReadOnly) SAL_OVERRIDE; // check if the statement is correct when not returning false - virtual bool checkStatement(); + bool checkStatement(); // set the statement for representation virtual void setStatement(const OUString& _rsStatement) SAL_OVERRIDE; // returns the current sql statement diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx index 9e9cdc4c6392..8155cc188fa2 100644 --- a/dbaccess/source/ui/inc/QueryTextView.hxx +++ b/dbaccess/source/ui/inc/QueryTextView.hxx @@ -35,21 +35,21 @@ namespace dbaui virtual void GetFocus() SAL_OVERRIDE; - virtual bool isCutAllowed(); - virtual bool isPasteAllowed(); - virtual bool isCopyAllowed(); - virtual void copy(); - virtual void cut(); - virtual void paste(); + bool isCutAllowed(); + bool isPasteAllowed(); + bool isCopyAllowed(); + void copy(); + void cut(); + void paste(); // clears the whole query - virtual void clear(); + void clear(); // set the view readonly or not - virtual void setReadOnly(bool _bReadOnly); + void setReadOnly(bool _bReadOnly); // check if the statement is correct when not returning false - virtual bool checkStatement(); + bool checkStatement(); // set the statement for representation - virtual void setStatement(const OUString& _rsStatement); - virtual OUString getStatement(); + void setStatement(const OUString& _rsStatement); + OUString getStatement(); // allow access to our edit OSqlEdit* getSqlEdit() const { return m_pEdit; } diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx b/dbaccess/source/ui/inc/QueryViewSwitch.hxx index 18d3597dca3e..265ad78e33a5 100644 --- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx +++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx @@ -41,25 +41,25 @@ namespace dbaui OQueryViewSwitch(OQueryContainerWindow* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); virtual ~OQueryViewSwitch(); - virtual bool isCutAllowed(); - virtual bool isPasteAllowed(); - virtual bool isCopyAllowed(); - virtual void copy(); - virtual void cut(); - virtual void paste(); + bool isCutAllowed(); + bool isPasteAllowed(); + bool isCopyAllowed(); + void copy(); + void cut(); + void paste(); // clears the whole query - virtual void clear(); + void clear(); // set the view readonly or not - virtual void setReadOnly(bool _bReadOnly); + void setReadOnly(bool _bReadOnly); // check if the statement is correct when not returning false - virtual bool checkStatement(); + bool checkStatement(); // set the statement for representation - virtual void setStatement(const OUString& _rsStatement); + void setStatement(const OUString& _rsStatement); // returns the current sql statement - virtual OUString getStatement(); + OUString getStatement(); /// late construction - virtual void Construct(); - virtual void initialize(); + void Construct(); + void initialize(); /** show the text or the design view @return <TRUE/> if and only if the view could be successfully, switched, <FALSE/> otherwise @@ -85,7 +85,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; protected: // return the Rectangle where I can paint myself - virtual void resizeDocumentView(Rectangle& rRect); + void resizeDocumentView(Rectangle& rRect); private: void impl_forceSQLView(); diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx index 36ca8d11a731..ac3431d83b75 100644 --- a/dbaccess/source/ui/inc/TableConnectionData.hxx +++ b/dbaccess/source/ui/inc/TableConnectionData.hxx @@ -95,7 +95,7 @@ namespace dbaui OUString GetConnName() const { return m_aConnName; } - virtual void SetConnName( const OUString& rConnName ){ m_aConnName = rConnName; } + void SetConnName( const OUString& rConnName ){ m_aConnName = rConnName; } /** Update create a new connection @return true if successful diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 9c40b964ec9d..d44aa341d950 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -134,8 +134,8 @@ namespace dbaui SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); - virtual void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxIn); - virtual void Save(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOut); + void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxIn); + void Save(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOut); protected: void startTableListening(); diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index e1a9f1e84ae4..4cabf5d7dd7e 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -76,8 +76,8 @@ namespace dbaui virtual bool IsInsertNewAllowed( long nRow ) = 0; virtual bool IsDeleteAllowed( long nRow ) = 0; - virtual bool IsUpdatable() const {return m_bUpdatable;} - virtual void SetUpdatable( bool bUpdate=true ); + bool IsUpdatable() const {return m_bUpdatable;} + void SetUpdatable( bool bUpdate=true ); virtual RowStatus GetRowStatus(long nRow) const SAL_OVERRIDE; virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 5926f8dbe51e..72ece65cf6cc 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -98,7 +98,7 @@ namespace dbaui virtual void paste() SAL_OVERRIDE; // set the view readonly or not - virtual void setReadOnly(bool _bReadOnly); + void setReadOnly(bool _bReadOnly); virtual void initialize() SAL_OVERRIDE; void reSync(); // resync window data with realdata diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 7fc4bfdb70ae..004139a5cb95 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -82,7 +82,7 @@ namespace dbaui virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual OTableWindowListBox* CreateListBox(); + OTableWindowListBox* CreateListBox(); // called at FIRST Init bool FillListBox(); // called at EACH Init diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx index 246ee51fc7db..c37f481e073b 100644 --- a/dbaccess/source/ui/inc/TableWindowAccess.hxx +++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx @@ -46,7 +46,7 @@ namespace dbaui /** isEditable returns the current editable state @return true if it is editable otherwise false */ - virtual bool isEditable() const; + bool isEditable() const; virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; public: diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 16d1c335f735..65caffc11f42 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -244,19 +244,19 @@ namespace dbaui virtual 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(); + ::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 // the default implementation of disposing distributes the events to the following disposingXXX functions - virtual void disposingGridControl(const ::com::sun::star::lang::EventObject& Source); // calls removeControlListeners - virtual void disposingGridModel(const ::com::sun::star::lang::EventObject& Source); // calls removeModelListeners - virtual void disposingFormModel(const ::com::sun::star::lang::EventObject& Source); - virtual void disposingColumnModel(const ::com::sun::star::lang::EventObject& Source); + void disposingGridControl(const ::com::sun::star::lang::EventObject& Source); // calls removeControlListeners + void disposingGridModel(const ::com::sun::star::lang::EventObject& Source); // calls removeModelListeners + void disposingFormModel(const ::com::sun::star::lang::EventObject& Source); + void disposingColumnModel(const ::com::sun::star::lang::EventObject& Source); // want to be a listener to the grid control ? use this ! - virtual void addControlListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > & _xGridControl); - virtual void removeControlListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > & _xGridControl); + void addControlListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > & _xGridControl); + void removeControlListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > & _xGridControl); // want to be a listener to the grid model ? use this ! virtual void addModelListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel); @@ -286,9 +286,9 @@ namespace dbaui // whole process (_both_ XLoadable::reload calls _together_) form the "reload operation" // empty the frame where our view resides - virtual bool CommitCurrent(); + bool CommitCurrent(); // commit the current column (i.e. cell) - virtual bool SaveModified(bool bAskFor = true); + bool SaveModified(bool bAskFor = true); // save the modified record ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getBoundField(sal_uInt16 nViewPos = (sal_uInt16)-1) const; @@ -302,7 +302,7 @@ namespace dbaui void initFormatter(); /// loads or reloads the form - virtual bool reloadForm(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >& _rxLoadable); + bool reloadForm(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >& _rxLoadable); virtual bool preReloadForm(){ return false; } virtual void postReloadForm(){} diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index b0c9852de938..a214e462e08e 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -64,7 +64,7 @@ namespace dbaui virtual ~UnoDataBrowserView(); /// late construction - virtual void Construct(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel); + void Construct(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel); /** as columns may be hidden there is a difference between a columns model pos and its view pos so we you may use these translation function diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index dc1a42986116..aad6e83aa88e 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -56,9 +56,9 @@ public: */ void ShowPrefix(bool _bShowPrefix); /// get the currently set text, excluding the prefix indicating the type - virtual OUString GetTextNoPrefix() const; + OUString GetTextNoPrefix() const; /// set a new text, leave the current prefix unchanged - virtual void SetTextNoPrefix(const OUString& _rText); + void SetTextNoPrefix(const OUString& _rText); inline void SaveValueNoPrefix() { m_sSaveValueNoPrefix = GetTextNoPrefix(); } inline OUString GetSavedValueNoPrefix() const { return m_sSaveValueNoPrefix; } diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 3141c0cf96b3..f016da2720bc 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -285,8 +285,8 @@ namespace dbaui virtual void onColumnChange() SAL_OVERRIDE; // my own overridables - virtual void BeforeDrop(); - virtual void AfterDrop(); + void BeforeDrop(); + void AfterDrop(); // get a fields property set from a model pos ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getField(sal_uInt16 nModelPos); @@ -295,9 +295,9 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDataSource() const; // drag events - virtual void DoColumnDrag(sal_uInt16 nColumnPos); - virtual void DoRowDrag(sal_Int16 nRowPos); - virtual void DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos); + void DoColumnDrag(sal_uInt16 nColumnPos); + void DoRowDrag(sal_Int16 nRowPos); + void DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos); void SetBrowserAttrs(); void SetColWidth(sal_uInt16 nColId); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index fd84856e3092..ee6db1330b78 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -199,12 +199,12 @@ namespace dbaui virtual void CellModified() SAL_OVERRIDE; virtual bool SaveModified() SAL_OVERRIDE; virtual void Init() SAL_OVERRIDE; - virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) const; + sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) const; virtual void ColumnResized( sal_uInt16 nColId ) SAL_OVERRIDE; virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) SAL_OVERRIDE; - virtual sal_uInt16 GetDefaultColumnWidth(const OUString& rName) const; + sal_uInt16 GetDefaultColumnWidth(const OUString& rName) const; // if you want to have an own header ... virtual BrowserHeader* imp_CreateHeaderBar(BrowseBox* pParent) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx index aaf01fd35d3c..1af0ffd68876 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx @@ -42,7 +42,7 @@ namespace dbaui virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; - virtual void Init(); + void Init(); void DisplayData( OFieldDescription* pFieldDescr ); void SaveData( OFieldDescription* pFieldDescr ); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 5eefcc6f97d3..cd9f73b4f98c 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -100,8 +100,8 @@ namespace dbaui virtual void CellModified() SAL_OVERRIDE; virtual bool SaveModified() SAL_OVERRIDE; // is called before changing a cell (false prevents change) - virtual void Undo(); - virtual void Redo(); + void Undo(); + void Redo(); virtual OUString GetCellText(long nRow, sal_uInt16 nColId) const SAL_OVERRIDE; virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) SAL_OVERRIDE; @@ -125,7 +125,7 @@ namespace dbaui OTableEditorCtrl(vcl::Window* pParentWin); virtual ~OTableEditorCtrl(); virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol) SAL_OVERRIDE; - virtual void UpdateAll(); + void UpdateAll(); SfxUndoManager& GetUndoManager() const; void SetDescrWin( OTableFieldDescWin* pWin ) diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index e92651cdea3e..f2092ff35a13 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -56,7 +56,7 @@ namespace dbaui OTableFieldDescWin( vcl::Window* pParent); virtual ~OTableFieldDescWin(); - virtual void Init(); + void Init(); void DisplayData( OFieldDescription* pFieldDescr ); void SaveData( OFieldDescription* pFieldDescr ); |