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 /basctl/source/inc | |
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 'basctl/source/inc')
-rw-r--r-- | basctl/source/inc/accessibledialogcontrolshape.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/accessibledialogwindow.hxx | 4 | ||||
-rw-r--r-- | basctl/source/inc/dlgedclip.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/dlgedfunc.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/dlgedobj.hxx | 50 |
5 files changed, 30 insertions, 30 deletions
diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index c0e667406d94..7192763c27dc 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -78,7 +78,7 @@ protected: OUString GetModelStringProperty( const sal_Char* pPropertyName ); - virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); + void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent virtual ::com::sun::star::awt::Rectangle implGetBounds() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index 7809de574d39..c57b2590ae71 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -99,8 +99,8 @@ protected: DECL_LINK( WindowEventListener, VclSimpleEvent* ); - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); - virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); + void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); + void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/basctl/source/inc/dlgedclip.hxx b/basctl/source/inc/dlgedclip.hxx index 674e0a607cab..92205ddc226a 100644 --- a/basctl/source/inc/dlgedclip.hxx +++ b/basctl/source/inc/dlgedclip.hxx @@ -39,7 +39,7 @@ private: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_SeqData; protected: - virtual bool compareDataFlavors( const ::com::sun::star::datatransfer::DataFlavor& lFlavor, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool compareDataFlavors( const ::com::sun::star::datatransfer::DataFlavor& lFlavor, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); public: DlgEdTransferableImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& aSeqFlavors, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aSeqData ); diff --git a/basctl/source/inc/dlgedfunc.hxx b/basctl/source/inc/dlgedfunc.hxx index 8775f31db110..d6982debb4b4 100644 --- a/basctl/source/inc/dlgedfunc.hxx +++ b/basctl/source/inc/dlgedfunc.hxx @@ -45,7 +45,7 @@ public: virtual bool MouseButtonDown( const MouseEvent& rMEvt ); virtual bool MouseButtonUp( const MouseEvent& rMEvt ); virtual bool MouseMove( const MouseEvent& rMEvt ); - virtual bool KeyInput( const KeyEvent& rKEvt ); + bool KeyInput( const KeyEvent& rKEvt ); }; diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index 9fc0d8539bca..5cab24c71567 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -72,16 +72,16 @@ protected: void EndListening(bool bRemoveListener = true); bool isListening() const { return bIsListening; } - virtual bool TransformSdrToControlCoordinates( + bool TransformSdrToControlCoordinates( sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut ); - virtual bool TransformSdrToFormCoordinates( + bool TransformSdrToFormCoordinates( sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut ); - virtual bool TransformControlToSdrCoordinates( + bool TransformControlToSdrCoordinates( sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut ); - virtual bool TransformFormToSdrCoordinates( + bool TransformFormToSdrCoordinates( sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut ); @@ -91,42 +91,42 @@ public: virtual ~DlgEdObj(); virtual void SetPage(SdrPage* pNewPage) SAL_OVERRIDE; - virtual void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; } - virtual DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; } + void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; } + DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; } virtual sal_uInt32 GetObjInventor() const SAL_OVERRIDE; virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; virtual DlgEdObj* Clone() const SAL_OVERRIDE; // not working yet - virtual void clonedFrom(const DlgEdObj* _pSource); // not working yet + void clonedFrom(const DlgEdObj* _pSource); // not working yet // FullDrag support virtual SdrObject* getFullDragClone() const SAL_OVERRIDE; bool supportsService( OUString const & serviceName ) const; - virtual OUString GetDefaultName() const; - virtual OUString GetUniqueName() const; + OUString GetDefaultName() const; + OUString GetUniqueName() const; - virtual sal_Int32 GetStep() const; + sal_Int32 GetStep() const; virtual void UpdateStep(); - virtual void SetDefaults(); + void SetDefaults(); virtual void SetRectFromProps(); virtual void SetPropsFromRect(); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > GetControl() const; virtual void PositionAndSizeChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ); - virtual void SAL_CALL NameChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(css::container::NoSuchElementException, css::uno::RuntimeException); - virtual void SAL_CALL TabIndexChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException); + void SAL_CALL NameChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(css::container::NoSuchElementException, css::uno::RuntimeException); + void SAL_CALL TabIndexChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException); // PropertyChangeListener - virtual void SAL_CALL _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception); // ContainerListener - virtual void SAL_CALL _elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL _elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL _elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL _elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL _elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL _elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); virtual void SetLayer(SdrLayerID nLayer) SAL_OVERRIDE; bool MakeDataAware( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); @@ -161,11 +161,11 @@ public: virtual ~DlgEdForm(); - virtual DlgEditor& GetDlgEditor () const { return rDlgEditor; } + DlgEditor& GetDlgEditor () const { return rDlgEditor; } - virtual void AddChild( DlgEdObj* pDlgEdObj ); - virtual void RemoveChild( DlgEdObj* pDlgEdObj ); - virtual std::vector<DlgEdObj*> const& GetChildren() const { return pChildren; } + void AddChild( DlgEdObj* pDlgEdObj ); + void RemoveChild( DlgEdObj* pDlgEdObj ); + std::vector<DlgEdObj*> const& GetChildren() const { return pChildren; } virtual void UpdateStep() SAL_OVERRIDE; @@ -174,10 +174,10 @@ public: virtual void PositionAndSizeChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) SAL_OVERRIDE; - virtual void UpdateTabIndices(); - virtual void UpdateTabOrder(); - virtual void UpdateGroups(); - virtual void UpdateTabOrderAndGroups(); + void UpdateTabIndices(); + void UpdateTabOrder(); + void UpdateGroups(); + void UpdateTabOrderAndGroups(); ::com::sun::star::awt::DeviceInfo getDeviceInfo() const; |