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 | |
| 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
615 files changed, 1922 insertions, 1966 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx index 591dc6adea0c..b1fd3116519c 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx @@ -161,7 +161,7 @@ protected: /** This method creates (once) and returns the accessible data table child. @attention This method requires locked mutex's and a living object. @return The XAccessible interface of the data table. */ - virtual ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > implGetTable(); /** This method creates (once) and returns the specified header bar. diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx index a10356fe276f..f01ffbf6c23c 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx @@ -278,7 +278,7 @@ protected: behaviour. @attention This method requires locked mutex's and a living object. @return <TRUE/>, if the object is really showing. */ - virtual bool implIsShowing(); + bool implIsShowing(); /** Derived classes return the bounding box relative to the parent window. @attention This method requires locked mutex's and a living object. diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx index 32e7231b49e0..1430a011f806 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx @@ -149,7 +149,7 @@ protected: /** This method creates (once) and returns the accessible data table child. @attention This method requires locked mutex's and a living object. @return The XAccessible interface of the data table. */ - virtual ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > implGetTable(); /** This method creates (once) and returns the specified header bar. @@ -169,7 +169,7 @@ protected: /** This method creates and returns an accessible table. @return An AccessibleGridControlTable. */ - virtual AccessibleGridControlTable* createAccessibleTable(); + AccessibleGridControlTable* createAccessibleTable(); private: // members ---------------------------------------------------------------- diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx index 93b4da974f31..ddc127fe9fd4 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx @@ -243,7 +243,7 @@ protected: behaviour. @attention This method requires locked mutex's and a living object. @return <TRUE/>, if the object is really showing. */ - virtual bool implIsShowing(); + bool implIsShowing(); /** Derived classes return the bounding box relative to the parent window. @attention This method requires locked mutex's and a living object. diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx index b6de9cd32f64..6259d29cf97e 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx @@ -171,10 +171,10 @@ protected: /** @attention This method requires locked mutex's and a living object. @return The count of used rows. */ - virtual sal_Int32 implGetRowCount() const; + sal_Int32 implGetRowCount() const; /** @attention This method requires locked mutex's and a living object. @return The count of used columns. */ - virtual sal_Int32 implGetColumnCount() const; + sal_Int32 implGetColumnCount() const; // internal helper methods ------------------------------------------------ diff --git a/accessibility/inc/accessibility/extended/accessibletabbar.hxx b/accessibility/inc/accessibility/extended/accessibletabbar.hxx index 746b544f9e7b..61dc631daf37 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbar.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbar.hxx @@ -54,7 +54,7 @@ namespace accessibility protected: virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; - virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); + void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx index c13b5a7e4393..bdadbf782881 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx @@ -70,7 +70,7 @@ namespace accessibility sal_uInt16 GetPageId() const { return m_nPageId; } - virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); + void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx index fd0ac5288e15..a20e7d1de938 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx @@ -66,7 +66,7 @@ namespace accessibility void MoveChild( sal_Int32 i, sal_Int32 j ); virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; - virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); + void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/extended/listboxaccessible.hxx b/accessibility/inc/accessibility/extended/listboxaccessible.hxx index 1140c81f69c5..0a5f1c22985a 100644 --- a/accessibility/inc/accessibility/extended/listboxaccessible.hxx +++ b/accessibility/inc/accessibility/extended/listboxaccessible.hxx @@ -59,7 +59,7 @@ namespace accessibility // own overridables /// will be called for any VclWindowEvent events broadcasted by our VCL window - virtual void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ); + void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ); /** will be called when our window broadcasts the VCLEVENT_OBJECT_DYING event diff --git a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx index 07703788385c..3a2b6b9aa950 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx @@ -116,7 +116,7 @@ protected: DECL_LINK( MenuEventListener, VclSimpleEvent* ); - virtual void ProcessMenuEvent( const VclMenuEvent& rVclMenuEvent ); + void ProcessMenuEvent( const VclMenuEvent& rVclMenuEvent ); virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) = 0; diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx index efbb80c5a762..4c04432a7382 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx @@ -111,9 +111,9 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent - virtual bool SAL_CALL contains (const ::com::sun::star::awt::Point& aPoint) + 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 + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleAt (const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); @@ -138,7 +138,7 @@ public: virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; bool IsInDropDown(); void HandleDropOpen(); - virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent, bool b_IsDropDownList); + void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent, bool b_IsDropDownList); void UpdateSelection_Acc (const ::rtl::OUString& sTextOfSelectedItem, bool b_IsDropDownList); void UpdateSelection_Impl_Acc (bool b_IsDropDownList); @@ -179,7 +179,7 @@ protected: /** Create the specified child and insert it into the list of children. Sets the child's states. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateChild (sal_Int32 i); /** Call this method when the item list has been changed, i.e. items @@ -191,7 +191,7 @@ protected: Index of the new or removed item. A value of -1 indicates that the whole list has been cleared. */ - virtual void HandleChangedItemList (bool bItemInserted, sal_Int32 nIndex); + void HandleChangedItemList (bool bItemInserted, sal_Int32 nIndex); // VCLXAccessibleComponent virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx index a792d51cccad..2ca6def7ba42 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx @@ -40,7 +40,7 @@ protected: DECL_LINK( WindowEventListener, VclSimpleEvent* ); - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); + void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); // XComponent virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx index cd3edc5b8d64..f720374f3af5 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx @@ -66,7 +66,7 @@ protected: OUString GetItemText(); sal_uInt16 GetItemId() const { return m_nItemId; } - virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); + void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx index 4d6c8803422c..182235a0ad12 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx @@ -70,7 +70,7 @@ protected: sal_uInt16 GetPageId() const { return m_nPageId; } - virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); + void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx index bda39ccf0dfd..1b7972ab7c14 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx @@ -134,7 +134,7 @@ public: // XAccessibleExtendedComponent virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getFontMetrics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& xFont ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::awt::FontDescriptor SAL_CALL getFontMetrics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& xFont ) throw (::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx index 687bbb25b3ba..ee6af421b9ef 100644 --- a/avmedia/source/framework/soundhandler.hxx +++ b/avmedia/source/framework/soundhandler.hxx @@ -94,7 +94,7 @@ class SoundHandler : // interfaces static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception ); static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); /* Helper for initialization of service by using own reference! */ - virtual void SAL_CALL impl_initService ( ); + void SAL_CALL impl_initService ( ); // XNotifyingDispatch virtual void SAL_CALL dispatchWithNotification(const css::util::URL& aURL , diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx index 33c9e4dbf32e..671251d977f1 100644 --- a/avmedia/source/gstreamer/gstplayer.hxx +++ b/avmedia/source/gstreamer/gstplayer.hxx @@ -48,8 +48,8 @@ public: void preparePlaybin( const OUString& rURL, GstElement *pSink ); bool create( const OUString& rURL ); - virtual void processMessage( GstMessage *message ); - virtual GstBusSyncReply processSyncMessage( GstMessage *message ); + void processMessage( GstMessage *message ); + GstBusSyncReply processSyncMessage( GstMessage *message ); // XPlayer virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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; diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx index 37f1b100b187..0f586a9e3a66 100644 --- a/basic/inc/sbobjmod.hxx +++ b/basic/inc/sbobjmod.hxx @@ -60,7 +60,7 @@ class BASIC_DLLPUBLIC SbUserFormModule : public SbObjModule bool mbInit; //protected: - virtual void InitObject(); + void InitObject(); public: TYPEINFO_OVERRIDE(); SbUserFormModule( const OUString& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat ); diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index a60c5c56d0ee..943d96d65aa6 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -141,7 +141,7 @@ class BasicScriptListener_Impl : public WeakImplHelper1< XScriptListener > StarBASICRef maBasicRef; Reference< frame::XModel > m_xModel; - virtual void firing_impl(const ScriptEvent& aScriptEvent, Any* pRet); + void firing_impl(const ScriptEvent& aScriptEvent, Any* pRet); public: BasicScriptListener_Impl( StarBASIC* pBasic, const Reference< frame::XModel >& xModel ) diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 76ff71356b3c..0ae9bd5e154d 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -3894,7 +3894,7 @@ void SbUnoSingleton::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, // solely transmits several events to an general AllListener class BasicAllListener_Impl : public BasicAllListenerHelper { - virtual void firing_impl(const AllEventObject& Event, Any* pRet); + void firing_impl(const AllEventObject& Event, Any* pRet); public: SbxObjectRef xSbxObj; diff --git a/chart2/source/controller/dialogs/ChangingResource.hxx b/chart2/source/controller/dialogs/ChangingResource.hxx index c823979616b1..242b41e13206 100644 --- a/chart2/source/controller/dialogs/ChangingResource.hxx +++ b/chart2/source/controller/dialogs/ChangingResource.hxx @@ -40,7 +40,7 @@ public: ChangingResource(); virtual ~ChangingResource(); - virtual void setChangeListener( ResourceChangeListener* pListener ); + void setChangeListener( ResourceChangeListener* pListener ); protected: ResourceChangeListener* m_pChangeListener; diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index f27fd813c549..413ff20c7f7d 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -111,16 +111,16 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps=::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ) const; virtual void setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException); - virtual bool isSubType( const OUString& rServiceName ); - virtual ChartTypeParameter getChartTypeParameterForService( const OUString& rServiceName, const ::com::sun::star::uno::Reference< + bool isSubType( const OUString& rServiceName ); + ChartTypeParameter getChartTypeParameterForService( const OUString& rServiceName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ); virtual void adjustSubTypeAndEnableControls( ChartTypeParameter& rParameter );//if you have different counts of subtypes you may need to adjust the index virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ); - virtual OUString getServiceNameForParameter( const ChartTypeParameter& rParameter ) const; - virtual bool commitToModel( const ChartTypeParameter& rParameter + OUString getServiceNameForParameter( const ChartTypeParameter& rParameter ) const; + bool commitToModel( const ChartTypeParameter& rParameter , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel ); - virtual ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeTemplate > getCurrentTemplate( const ChartTypeParameter& rParameter , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xTemplateManager ) const; diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index a0794da69994..6508a4d8d7f1 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -133,7 +133,7 @@ protected: @return If an object is the addressee of the event it should return true, false otherwise. */ - virtual bool NotifyEvent( EventType eType, const AccessibleUniqueId & rId ); + bool NotifyEvent( EventType eType, const AccessibleUniqueId & rId ); /** Adds a state to the set. */ @@ -200,7 +200,7 @@ protected: This method cares about mutex locking, and thus should be called without the mutex locked. */ - virtual void KillAllChildren(); + void KillAllChildren(); /** Is called from getAccessibleChild(). Before this method is called, an update of children is done if necessary. diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index e54fefb2e054..5e20108a562f 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -110,7 +110,7 @@ private: // methods a decoration. Thus you have an offset of (currently) (2,2) which isn't taken into account. */ - virtual ::com::sun::star::awt::Rectangle GetWindowPosSize() const; + ::com::sun::star::awt::Rectangle GetWindowPosSize() const; ExplicitValueProvider* getExplicitValueProvider(); diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx index a068a0134d82..505053516756 100644 --- a/chart2/source/controller/main/DragMethod_Base.hxx +++ b/chart2/source/controller/main/DragMethod_Base.hxx @@ -35,7 +35,7 @@ public: , ActionDescriptionProvider::ActionType eActionType = ActionDescriptionProvider::MOVE ); virtual ~DragMethod_Base(); - virtual OUString getUndoDescription() const; + OUString getUndoDescription() const; virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE; virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE; diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index c5ff30df1390..6d81e4b0ed63 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -158,9 +158,9 @@ protected: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChild ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParent( + void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/inc/MutexContainer.hxx b/chart2/source/inc/MutexContainer.hxx index dafd0a77eb31..59c0d43edf8f 100644 --- a/chart2/source/inc/MutexContainer.hxx +++ b/chart2/source/inc/MutexContainer.hxx @@ -33,7 +33,7 @@ public: protected: mutable ::osl::Mutex m_aMutex; - virtual ::osl::Mutex & GetMutex() const; + ::osl::Mutex & GetMutex() const; }; } // namespace chart diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index 697f6cfaf225..1ea2c64d03f1 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -151,7 +151,7 @@ protected: virtual void firePropertyChangeEvent(); /// call this when a derived component is disposed - virtual void disposePropertySet(); + void disposePropertySet(); // Interfaces diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx index 7d074000b1cf..16f43c65323c 100644 --- a/chart2/source/model/main/UndoManager.cxx +++ b/chart2/source/model/main/UndoManager.cxx @@ -77,7 +77,7 @@ namespace chart } // IUndoManagerImplementation - virtual ::osl::Mutex& getMutex(); + ::osl::Mutex& getMutex(); virtual ::svl::IUndoManager& getImplUndoManager() SAL_OVERRIDE; virtual Reference< XUndoManager > getThis() SAL_OVERRIDE; diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index 4835b6785fa0..b13e8eafb1b2 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -116,7 +116,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL applyStyles( + void SAL_CALL applyStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) throw (::com::sun::star::uno::RuntimeException); @@ -224,7 +224,7 @@ protected: represents one of the dimensions of the coordinate systems. If there are series requesting asecondary axes a secondary y axes is added</p> */ - virtual void createAxes( + void createAxes( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys ); diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx b/chart2/source/view/axes/Tickmarks_Equidistant.hxx index 66f6760438db..259708ffc606 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx @@ -36,8 +36,8 @@ public: , sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 ); virtual ~EquidistantTickIter(); - virtual double* firstValue(); - virtual double* nextValue(); + double* firstValue(); + double* nextValue(); virtual TickInfo* firstInfo() SAL_OVERRIDE; virtual TickInfo* nextInfo() SAL_OVERRIDE; diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.hxx b/chart2/source/view/charttypes/CategoryPositionHelper.hxx index ee0e2aa95ca5..efa3e6e639aa 100644 --- a/chart2/source/view/charttypes/CategoryPositionHelper.hxx +++ b/chart2/source/view/charttypes/CategoryPositionHelper.hxx @@ -35,7 +35,7 @@ public: double getScaledSlotWidth() const; virtual double getScaledSlotPos( double fCategoryX, double fSeriesNumber ) const; - virtual void setCategoryWidth( double fCategoryWidth ); + void setCategoryWidth( double fCategoryWidth ); //Distance between two neighboring bars in same category, seen relative to width of the bar void setInnerDistance( double fInnerDistance ); diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index 27ee100d3d31..e913cdd0ed51 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -45,7 +45,7 @@ public: virtual ~PlottingPositionHelper(); virtual PlottingPositionHelper* clone() const; - virtual PlottingPositionHelper* createSecondaryPosHelper( const ExplicitScaleData& rSecondaryScale ); + PlottingPositionHelper* createSecondaryPosHelper( const ExplicitScaleData& rSecondaryScale ); virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix); diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 8408f6661a30..645149edf498 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -51,7 +51,7 @@ public: static VCoordinateSystem* createCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& xCooSysModel ); - virtual void initPlottingTargets( + void initPlottingTargets( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xLogicTarget , const ::com::sun::star::uno::Reference< @@ -64,7 +64,7 @@ public: void setParticle( const OUString& rCooSysParticle ); - virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); + void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); ::com::sun::star::drawing::HomogenMatrix getTransformationSceneToScreen() { return m_aMatrixSceneToScreen;} //better performance for big data @@ -109,18 +109,18 @@ public: virtual void initVAxisInList(); virtual void updateScalesAndIncrementsOnAxes(); - virtual void createMaximumAxesLabels(); - virtual void createAxesLabels(); - virtual void updatePositions(); - virtual void createAxesShapes(); + void createMaximumAxesLabels(); + void createAxesLabels(); + void updatePositions(); + void createAxesShapes(); virtual void createGridShapes(); - virtual bool getPropertySwapXAndYAxis() const; + bool getPropertySwapXAndYAxis() const; sal_Int32 getMaximumAxisIndexByDimension( sal_Int32 nDimensionIndex ) const; - virtual bool needSeriesNamesForAxis() const; + bool needSeriesNamesForAxis() const; void setSeriesNamesForAxis( const ::com::sun::star::uno::Sequence< OUString >& rSeriesNames ); protected: //methods diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 0f45b401a376..16218f7a4a9d 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -153,7 +153,7 @@ public: ) */ - virtual void addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex ) + void addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex ) throw (::com::sun::star::uno::RuntimeException); // MinimumAndMaximumSupplier @@ -210,7 +210,7 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xShapeFactory ); - virtual std::vector< ViewLegendEntry > createLegendEntriesForSeries( + std::vector< ViewLegendEntry > createLegendEntriesForSeries( const ::com::sun::star::awt::Size& rEntryKeyAspectRatio, const VDataSeries& rSeries, const ::com::sun::star::uno::Reference< @@ -330,7 +330,7 @@ protected: @param bVertical for y-error bars this is true, for x-error-bars it is false. */ - virtual void createErrorBar( + void createErrorBar( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D & rPos @@ -342,26 +342,26 @@ protected: , double* pfScaledLogicX ); - virtual void createErrorBar_X( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition + void createErrorBar_X( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition , VDataSeries& rVDataSeries, sal_Int32 nPointIndex , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , double* pfScaledLogicX=0 ); - virtual void createErrorBar_Y( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition + void createErrorBar_Y( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition , VDataSeries& rVDataSeries, sal_Int32 nPointIndex , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , double* pfScaledLogicX=0 ); - virtual void createRegressionCurvesShapes( VDataSeries& rVDataSeries + void createRegressionCurvesShapes( VDataSeries& rVDataSeries , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xEquationTarget , bool bMaySkipPointsInRegressionCalculation ); - virtual void createRegressionCurveEquationShapes( const OUString & rEquationCID + void createRegressionCurveEquationShapes( const OUString & rEquationCID , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xEquationProperties , const ::com::sun::star::uno::Reference< @@ -370,7 +370,7 @@ protected: ::com::sun::star::chart2::XRegressionCurveCalculator > & xRegressionCurveCalculator , ::com::sun::star::awt::Point aDefaultPos ); - virtual void setMappedProperties( + void setMappedProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xTarget , const ::com::sun::star::uno::Reference< diff --git a/compilerplugins/clang/removevirtuals.cxx b/compilerplugins/clang/removevirtuals.cxx new file mode 100644 index 000000000000..c2bf4841d30d --- /dev/null +++ b/compilerplugins/clang/removevirtuals.cxx @@ -0,0 +1,141 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <cassert> +#include <string> +#include <iostream> +#include "plugin.hxx" +#include "compat.hxx" +#include <sys/mman.h> +#include <sys/types.h> +#include <fcntl.h> +#include <unistd.h> +#include <sys/stat.h> +#include <assert.h> +#include <cstring> + +/** + This is intended to be run as the second stage of the "unnecessaryvirtuals" clang plugin. +*/ + +namespace { + +class RemoveVirtuals: + public RecursiveASTVisitor<RemoveVirtuals>, public loplugin::RewritePlugin +{ +public: + explicit RemoveVirtuals(InstantiationData const & data); + ~RemoveVirtuals(); + + virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } + + bool VisitCXXMethodDecl( const CXXMethodDecl* var ); +private: + // I use a brute-force approach - mmap the results file and do a linear search on it + // It works surprisingly well, because the file is small enough to fit into L2 cache on modern CPU's + size_t mmapFilesize; + int mmapFD; + char* mmappedData; +}; + +static size_t getFilesize(const char* filename) +{ + struct stat st; + stat(filename, &st); + return st.st_size; +} + +RemoveVirtuals::RemoveVirtuals(InstantiationData const & data): RewritePlugin(data) +{ + static const char sInputFile[] = "/home/noel/libo4/result.txt"; + mmapFilesize = getFilesize(sInputFile); + //Open file + mmapFD = open(sInputFile, O_RDONLY, 0); + assert(mmapFD != -1); + //Execute mmap + mmappedData = static_cast<char*>(mmap(NULL, mmapFilesize, PROT_READ, MAP_PRIVATE | MAP_POPULATE, mmapFD, 0)); + assert(mmappedData != NULL); +} + +RemoveVirtuals::~RemoveVirtuals() +{ + //Cleanup + int rc = munmap(mmappedData, mmapFilesize); + assert(rc == 0); + close(mmapFD); +} + +static std::string niceName(const CXXMethodDecl* functionDecl) +{ + std::string s = + functionDecl->getParent()->getQualifiedNameAsString() + "::" + + compat::getReturnType(*functionDecl).getAsString() + "-" + + functionDecl->getNameAsString() + "("; + for (const ParmVarDecl *pParmVarDecl : functionDecl->params()) { + s += pParmVarDecl->getType().getAsString(); + s += ","; + } + s += ")"; + if (functionDecl->isConst()) { + s += "const"; + } + return s; +} + +bool RemoveVirtuals::VisitCXXMethodDecl( const CXXMethodDecl* functionDecl ) +{ + if (rewriter == nullptr) { + return true; + } + if (ignoreLocation(functionDecl)) { + return true; + } + // ignore stuff that forms part of the stable URE interface + if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc( + functionDecl->getCanonicalDecl()->getNameInfo().getLoc()))) { + return true; + } + + // don't mess with templates + if (functionDecl->getParent()->getDescribedClassTemplate() != nullptr) { + return true; + } + if (functionDecl->getTemplatedKind() != FunctionDecl::TK_NonTemplate) { + return true; + } + + if (!functionDecl->isVirtualAsWritten()) { + return true; + } + std::string aNiceName = "\n" + niceName(functionDecl) + "\n"; + const char *aNiceNameStr = aNiceName.c_str(); + char* found = std::search(mmappedData, mmappedData + mmapFilesize, aNiceNameStr, aNiceNameStr + strlen(aNiceNameStr)); + if(!(found < mmappedData + mmapFilesize)) { + return true; + } + if (functionDecl->isPure()) { + removeText(functionDecl->getSourceRange()); + } else { + std::string aOrigText = rewriter->getRewrittenText(functionDecl->getSourceRange()); + size_t iVirtualTokenIndex = aOrigText.find_first_of("virtual "); + if (iVirtualTokenIndex == std::string::npos) { + return true; + } + replaceText(functionDecl->getSourceRange(), aOrigText.replace(iVirtualTokenIndex, strlen("virtual "), "")); + } + return true; +} + + + +loplugin::Plugin::Registration< RemoveVirtuals > X("removevirtuals", false); + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/compilerplugins/clang/unnecessaryvirtual.cxx b/compilerplugins/clang/unnecessaryvirtual.cxx new file mode 100644 index 000000000000..0ead077473de --- /dev/null +++ b/compilerplugins/clang/unnecessaryvirtual.cxx @@ -0,0 +1,119 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <cassert> +#include <string> +#include <iostream> +#include "plugin.hxx" +#include "compat.hxx" + +/** +Dump a list of virtual methods and a list of methods overriding virtual methods. +Then we will post-process the 2 lists and find the set of virtual methods which don't need to be virtual. + +The process goes something like this: + $ make check + $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='unnecessaryvirtual' check > log.txt + $ grep 'definition' log.txt | cut -f 2 | sort -u > definition.txt + $ grep 'overriding' log.txt | cut -f 2 | sort -u > overriding.txt + $ cat definition.txt overriding.txt | sort | uniq -u > result.txt + $ echo "\n" >> result.txt + $ for dir in *; do make FORCE_COMPILE_ALL=1 UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='removevirtuals' $dir; done + +Note that the actual process may involve a fair amount of undoing, hand editing, and general messing around +to get it to work :-) +Notably templates tend to confuse it into removing stuff that is still needed. +*/ + +namespace { + +class UnnecessaryVirtual: + public RecursiveASTVisitor<UnnecessaryVirtual>, public loplugin::Plugin +{ +public: + explicit UnnecessaryVirtual(InstantiationData const & data): Plugin(data) {} + + virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } + + bool VisitCXXMethodDecl( const CXXMethodDecl* var ); + +}; + +static std::string niceName(const CXXMethodDecl* functionDecl) +{ + std::string s = + functionDecl->getParent()->getQualifiedNameAsString() + "::" + + compat::getReturnType(*functionDecl).getAsString() + "-" + + functionDecl->getNameAsString() + "("; + for (const ParmVarDecl *pParmVarDecl : functionDecl->params()) { + s += pParmVarDecl->getType().getAsString(); + s += ","; + } + s += ")"; + if (functionDecl->isConst()) { + s += "const"; + } + return s; +} + +bool UnnecessaryVirtual::VisitCXXMethodDecl( const CXXMethodDecl* functionDecl ) +{ + if (ignoreLocation(functionDecl)) { + return true; + } + functionDecl = functionDecl->getCanonicalDecl(); + // ignore stuff that forms part of the stable URE interface + if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc( + functionDecl->getNameInfo().getLoc()))) { + return true; + } + if (!functionDecl->isVirtual()) { + return true; + } + // ignore UNO interface definitions, cannot change those + static const char cssPrefix[] = "com::sun::star"; + if (functionDecl->getParent()->getQualifiedNameAsString().compare(0, strlen(cssPrefix), cssPrefix) == 0) { + return true; + } + std::string aNiceName = niceName(functionDecl); + // Ignore virtual destructors for now. + // I cannot currently detect the case where we are overriding a pure virtual destructor. + if (dyn_cast<CXXDestructorDecl>(functionDecl)) { + return true; + } + if (functionDecl->size_overridden_methods() == 0) { + // ignore definition of virtual functions in templates +// if (functionDecl->getTemplatedKind() != FunctionDecl::TK_NonTemplate +// && functionDecl->getParent()->getDescribedClassTemplate() == nullptr) +// { + cout << "definition\t" << aNiceName << endl; +// } + } else { + for (CXXMethodDecl::method_iterator iter = functionDecl->begin_overridden_methods(); iter != functionDecl->end_overridden_methods(); ++iter) { + const CXXMethodDecl *pOverriddenMethod = *iter; + // we only care about the first level override to establish that a virtual qualifier was useful. + if (pOverriddenMethod->size_overridden_methods() == 0) { + // ignore UNO interface definitions, cannot change those + if (pOverriddenMethod->getParent()->getQualifiedNameAsString().compare(0, strlen(cssPrefix), cssPrefix) != 0) { + std::string aOverriddenNiceName = niceName(pOverriddenMethod); + cout << "overriding\t" << aOverriddenNiceName << endl; + } + } + } + } + return true; +} + + + +loplugin::Plugin::Registration< UnnecessaryVirtual > X("unnecessaryvirtual", false); + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index e5467ebe3083..31f17e6e4a21 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -174,7 +174,7 @@ namespace connectivity Connection(FirebirdDriver* _pDriver); virtual ~Connection(); - virtual void construct( const ::rtl::OUString& url, + void construct( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(css::sdbc::SQLException, css::uno::RuntimeException, @@ -211,7 +211,7 @@ namespace connectivity * Create and/or connect to the sdbcx Catalog. This is completely * unrelated to the SQL "Catalog". */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > createCatalog(); // OComponentHelper diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx index dbb971afad39..e1f2c689452a 100644 --- a/connectivity/source/drivers/firebird/ResultSet.hxx +++ b/connectivity/source/drivers/firebird/ResultSet.hxx @@ -110,10 +110,10 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; - virtual void SAL_CALL checkColumnIndex( sal_Int32 index ) + void SAL_CALL checkColumnIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL checkRowIndex() + void SAL_CALL checkRowIndex() throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index 1d7549815795..452b58b2d447 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -58,7 +58,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; public: - virtual void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); + void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); OConnection(MorkDriver* const driver); virtual ~OConnection(); diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index aa25fc49053d..08b4c561d612 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -144,7 +144,7 @@ namespace connectivity void analyseSQL(); void setOrderbyColumn( connectivity::OSQLParseNode* pColumnRef, connectivity::OSQLParseNode* pAscendingDescending); - virtual void createTable( ) throw ( + void createTable( ) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); public: diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx index 1adf0c95689c..5f3296aa6feb 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx @@ -85,9 +85,9 @@ protected: */ virtual void checkClosed() throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ) = 0; - virtual void checkColumnIndex( sal_Int32 index ) + void checkColumnIndex( sal_Int32 index ) throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); - virtual void checkRowIndex( bool mustBeOnValidRow ); + void checkRowIndex( bool mustBeOnValidRow ); virtual ::com::sun::star::uno::Any getValue( sal_Int32 columnIndex ) = 0; com::sun::star::uno::Any convertTo( diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx index b20d51afa7ec..ed424641373c 100644 --- a/connectivity/source/inc/dbase/DIndex.hxx +++ b/connectivity/source/inc/dbase/DIndex.hxx @@ -105,7 +105,7 @@ namespace connectivity const ODbaseTable* getTable() const { return m_pTable; } const NDXHeader& getHeader() const { return m_aHeader; } - virtual OIndexIterator* createIterator(OBoolOperator_BASE* pOp, + OIndexIterator* createIterator(OBoolOperator_BASE* pOp, const OOperand_BASE* pOperand = NULL); void SetRootPos(sal_uInt32 nPos) {m_nRootPage = nPos;} @@ -117,10 +117,10 @@ namespace connectivity bool IsText() const {return m_aHeader.db_keytype == 0;} sal_uInt16 GetMaxNodes() const {return m_aHeader.db_maxkeys;} - virtual bool Insert(sal_uInt32 nRec, const ORowSetValue& rValue); - virtual bool Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&); - virtual bool Delete(sal_uInt32 nRec, const ORowSetValue& rValue); - virtual bool Find(sal_uInt32 nRec, const ORowSetValue& rValue); + bool Insert(sal_uInt32 nRec, const ORowSetValue& rValue); + bool Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&); + bool Delete(sal_uInt32 nRec, const ORowSetValue& rValue); + bool Find(sal_uInt32 nRec, const ORowSetValue& rValue); void createINFEntry(); bool CreateImpl(); diff --git a/connectivity/source/inc/dbase/DResultSet.hxx b/connectivity/source/inc/dbase/DResultSet.hxx index bc2980088bd7..32c2379a60cc 100644 --- a/connectivity/source/inc/dbase/DResultSet.hxx +++ b/connectivity/source/inc/dbase/DResultSet.hxx @@ -47,7 +47,7 @@ namespace connectivity // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; virtual bool fillIndexValues(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> &_xIndex) SAL_OVERRIDE; - virtual file::OSQLAnalyzer* createAnalyzer(); + file::OSQLAnalyzer* createAnalyzer(); public: DECLARE_SERVICE_INFO(); diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 36a671137050..cb7de4bda3e7 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -271,8 +271,8 @@ namespace connectivity // special methods inline sal_Int32 mapColumn(sal_Int32 column); - virtual bool OpenImpl(); - virtual void doTableSpecials(const OSQLTable& _xTable); + bool OpenImpl(); + void doTableSpecials(const OSQLTable& _xTable); inline sal_Int32 getRowCountResult() const { return m_nRowCountResult; } inline void setParameterRow(const OValueRefRow& _rParaRow) { m_aParameterRow = _rParaRow; } diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index 976a409562a8..0706b83c682e 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -111,7 +111,7 @@ namespace connectivity virtual void initializeResultSet(OResultSet* _pResult); // create the analyzer - virtual OSQLAnalyzer* createAnalyzer(); + OSQLAnalyzer* createAnalyzer(); void closeResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception); sal_Int32 getPrecision ( sal_Int32 sqlType); diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx index ea502f103711..dc6d0febf384 100644 --- a/connectivity/source/inc/file/fanalyzer.hxx +++ b/connectivity/source/inc/file/fanalyzer.hxx @@ -71,8 +71,8 @@ namespace connectivity void dispose(); void start(OSQLParseNode* pSQLParseNode); - virtual bool hasRestriction() const; - virtual bool hasFunctions() const; + bool hasRestriction() const; + bool hasFunctions() const; inline bool evaluateRestriction() { return m_aInterpreter->start(); } void setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping); void setOrigColumns(const OFileColumns& rCols); diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index f8cb32afcf6e..681a3e4310d7 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -75,7 +75,7 @@ namespace connectivity virtual const ORowSetValue& getValue() const = 0; virtual void setValue(const ORowSetValue& _rVal) = 0; - virtual sal_Int32 getDBType() const {return m_eDBType;} + sal_Int32 getDBType() const {return m_eDBType;} virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0); inline bool isValid() const; diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx index a154d102f523..e1c136ae5348 100644 --- a/connectivity/source/inc/java/lang/Object.hxx +++ b/connectivity/source/inc/java/lang/Object.hxx @@ -97,7 +97,7 @@ namespace connectivity void clearObject(JNIEnv& rEnv); void clearObject(); - virtual OUString toString() const; + OUString toString() const; static void ThrowSQLException(JNIEnv * pEnv,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> & _rContext); static void ThrowLoggedSQLException( diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index 37f730bc1a4d..59e645ef903c 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -80,11 +80,11 @@ namespace connectivity SQLRETURN OpenConnection(const OUString& aConnectStr,sal_Int32 nTimeOut, bool bSilent); - virtual OConnection* cloneConnection(); // creates a new connection + OConnection* cloneConnection(); // creates a new connection public: oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const; - virtual SQLRETURN Construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); + SQLRETURN Construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver); // OConnection(const SQLHANDLE _pConnectionHandle); diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 03a070c3c0b2..aa71fb544ac7 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -99,9 +99,9 @@ namespace connectivity void setEscapeProcessing( const bool _bEscapeProc ); template < typename T, SQLINTEGER BufferLength > SQLRETURN setStmtOption (SQLINTEGER fOption, T value) const; - virtual void setResultSetConcurrency(sal_Int32 _par0) ; - virtual void setResultSetType(sal_Int32 _par0) ; - virtual void setUsingBookmarks(bool _bUseBookmark) ; + void setResultSetConcurrency(sal_Int32 _par0) ; + void setResultSetType(sal_Int32 _par0) ; + void setUsingBookmarks(bool _bUseBookmark) ; void reset() throw (css::sdbc::SQLException, css::uno::RuntimeException); void clearMyResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException); diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 081a7373c3d0..8c7420f858f4 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -511,7 +511,7 @@ class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory public: virtual VclAbstractDialog* CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) SAL_OVERRIDE; virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE; - virtual SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId, + SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId, vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, const SfxItemSet* pAttrSet=0 ); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 09ff336dac9f..8c9bfc0d6457 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -740,8 +740,8 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual XPropertyListRef GetPropertyList( XPropertyListType t ); - virtual void SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef ); + XPropertyListRef GetPropertyList( XPropertyListType t ); + void SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef ); void SetColorList( XColorListRef pColList ); XColorListRef GetColorList() { return pColorList; } @@ -757,22 +757,22 @@ public: virtual void FillUserData() SAL_OVERRIDE; - virtual bool IsModified() + bool IsModified() { return *pnColorListState & CT_MODIFIED; } - virtual void SetModified(bool bIsModified) + void SetModified(bool bIsModified) { if (bIsModified) *pnColorListState |= CT_MODIFIED; else *pnColorListState &= ~CT_MODIFIED; } - virtual void AddState(ChangeType nState) + void AddState(ChangeType nState) { *pnColorListState |= nState; } - virtual void Update(bool bLoaded); + void Update(bool bLoaded); }; #endif // INCLUDED_CUI_SOURCE_INC_CUITABAREA_HXX diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index d2c229db98c7..8b645e84d619 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -90,12 +90,12 @@ protected: SvxHlinkDlgMarkWnd* mpMarkWnd; void InitStdControls (); - virtual void FillStandardDlgFields ( const SvxHyperlinkItem* pHyperlinkItem ); + void FillStandardDlgFields ( const SvxHyperlinkItem* pHyperlinkItem ); virtual void FillDlgFields(const OUString& rStrURL) = 0; virtual void GetCurentItemData ( OUString& rStrURL, OUString& aStrName, OUString& aStrIntName, OUString& aStrFrame, SvxLinkInsertMode& eMode ) = 0; - virtual OUString CreateUiNameFromURL( const OUString& aStrURL ); + OUString CreateUiNameFromURL( const OUString& aStrURL ); void GetDataFromCommonFields( OUString& aStrName, OUString& aStrIntName, OUString& aStrFrame, diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 531b0b6e7b03..c98fe8cd4e95 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -112,8 +112,8 @@ public : virtual int DeactivatePage( SfxItemSet* pSet = 0 ); void SetUserData(const OUString& rString) { aUserString = rString; } OUString GetUserData() { return aUserString; } - virtual void FillUserData(); - virtual bool IsReadOnly() const; + void FillUserData(); + bool IsReadOnly() const; virtual bool QueryClose(); void StateChanged( StateChangedType nType ) SAL_OVERRIDE; @@ -166,7 +166,7 @@ protected : void HidePageImpl ( IconChoicePageData* pData ); virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ); - virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); + SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); inline SfxItemSet* GetInputSetImpl() { return (SfxItemSet*)pSet; } inline IconChoicePage* GetTabPage( sal_uInt16 nPageId ) { return ( GetPageData (nPageId)->pPage?GetPageData (nPageId)->pPage:NULL); } diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index bdcd93c6f724..22c70eb36350 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -63,7 +63,7 @@ public: const SvxMacroTableDtor& GetMacroTbl() const; void SetMacroTbl( const SvxMacroTableDtor& rTbl ); - virtual void ScriptChanged(); + void ScriptChanged(); virtual void PageCreated (const SfxAllItemSet& aSet) SAL_OVERRIDE; using TabPage::ActivatePage; // FIXME WTF is this nonsense? virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index 63ed48b9943b..91d13a0f963f 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -36,7 +36,7 @@ public: SvxNewTableDialog( vcl::Window* pWindow ); virtual short Execute(void) SAL_OVERRIDE; - virtual void Apply(void); + void Apply(void); virtual sal_Int32 getRows() const SAL_OVERRIDE; virtual sal_Int32 getColumns() const SAL_OVERRIDE; diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 179d99bca75a..5a81d8b9c06b 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -43,9 +43,9 @@ public: virtual ~PasswordToOpenModifyDialog(); // AbstractPasswordToOpenModifyDialog - virtual OUString GetPasswordToOpen() const; - virtual OUString GetPasswordToModify() const; - virtual bool IsRecommendToOpenReadonly() const; + OUString GetPasswordToOpen() const; + OUString GetPasswordToModify() const; + bool IsRecommendToOpenReadonly() const; }; diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx index 66080975ca5d..1e7146aca101 100644 --- a/cui/source/inc/sdrcelldlg.hxx +++ b/cui/source/inc/sdrcelldlg.hxx @@ -39,7 +39,7 @@ private: sal_uInt16 m_nBorderPageId; protected: - virtual void Apply(); + void Apply(); public: SvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel ); diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index 822827856287..ec69e48a7e95 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -117,7 +117,7 @@ namespace dbaccess virtual bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual bool SAL_CALL rowDeleted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XRowLocate virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; virtual bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index 51168cece933..0f86b00d8fa5 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -198,7 +198,7 @@ namespace dbaccess virtual bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL ensureRowForData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL ensureRowForData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; // ::com::sun::star::sdbcx::XRowLocate virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx index cbc2ca920a13..f9c44648fe9b 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx @@ -127,7 +127,7 @@ public: /** tell the container to free all resources. After that it's in a state like after the construction, i.e. you may call <code>initialize</code> again (maybe with another configuration node). */ - virtual void dispose(); + void dispose(); protected: /** checks whether the object is basically alive, i.e. it has been fully initialized (@see initialize) and diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index 84c1131dba12..56e374b515a3 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -315,7 +315,7 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 09032e3410f2..63d51d7a25bd 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -230,9 +230,6 @@ namespace dbaccess virtual void SAL_CALL saveObject( ) throw (ObjectSaveVetoException, Exception, RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL onShowWindow( bool /*bVisible*/ ) throw (RuntimeException) - { - } // XComponentSupplier virtual Reference< util::XCloseable > SAL_CALL getComponent( ) throw (RuntimeException, std::exception) SAL_OVERRIDE { diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index eb752280acca..439c87f35c1f 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -231,7 +231,7 @@ protected: @throws NoSuchElementException if there is no object with the given name. @see createObject */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implGetByName(const OUString& _rName, bool _bCreateIfNecessary) throw (::com::sun::star::container::NoSuchElementException); /** quickly checks if there already is an element with a given name. No access to the configuration occurs, i.e. diff --git a/dbaccess/source/core/recovery/settingsimport.hxx b/dbaccess/source/core/recovery/settingsimport.hxx index 01089abb6241..dfd0ada47468 100644 --- a/dbaccess/source/core/recovery/settingsimport.hxx +++ b/dbaccess/source/core/recovery/settingsimport.hxx @@ -45,11 +45,11 @@ namespace dbaccess virtual ::rtl::Reference< SettingsImport > nextState( const OUString& i_rElementName ) = 0; - virtual void startElement( + void startElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& i_rAttributes ); virtual void endElement(); - virtual void characters( const OUString& i_rCharacters ); + void characters( const OUString& i_rCharacters ); protected: virtual ~SettingsImport(); diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx index 87597b298f67..31876d22d572 100644 --- a/dbaccess/source/core/recovery/storagestream.hxx +++ b/dbaccess/source/core/recovery/storagestream.hxx @@ -73,7 +73,7 @@ namespace dbaccess /** simply calls closeInput on our input stream, override to extend/modify this behavior */ - virtual void close(); + void close(); protected: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& 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 ); diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 03dc39477fac..58fa25a6878b 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -153,7 +153,7 @@ public: virtual bool next(OUString * argument) SAL_OVERRIDE { return next(argument, true); } private: - virtual bool next(OUString * argument, bool prefix) { + bool next(OUString * argument, bool prefix) { OSL_ASSERT(argument != NULL); if (m_index < m_input.getLength()) { if (prefix) { diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index b31b9cbb4e16..5e956689123e 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -158,8 +158,8 @@ public: virtual ~RegisteredDb() {}; - virtual void addEntry(OUString const & url); - virtual bool getEntry(OUString const & url); + void addEntry(OUString const & url); + bool getEntry(OUString const & url); }; diff --git a/editeng/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx index 277f1421368f..00376ab01ec7 100644 --- a/editeng/source/outliner/outlundo.hxx +++ b/editeng/source/outliner/outlundo.hxx @@ -88,7 +88,7 @@ public: virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(); + void Repeat(); }; // Help-Undo: If it does not exist an OutlinerUndoAction for a certain action @@ -105,7 +105,7 @@ public: virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(); + void Repeat(); }; @@ -122,7 +122,7 @@ public: virtual ~OLUndoExpand(); virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(); + void Repeat(); sal_uInt16* pParas; // 0 == nCount contains paragraph number Outliner* pOutliner; diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index 1461c1139b57..9b92ab7dbfae 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -114,9 +114,6 @@ public: virtual ~SvxXMLXTextImportComponent() throw (); -protected: - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ); - private: const uno::Reference< XText > mxText; }; @@ -214,18 +211,4 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r } } -SvXMLImportContext *SvxXMLXTextImportComponent::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) -{ - SvXMLImportContext* pContext; - if(XML_NAMESPACE_OFFICE == nPrefix && ( IsXMLToken( rLocalName, XML_DOCUMENT ) || IsXMLToken( rLocalName, XML_DOCUMENT_CONTENT ) ) ) - { - pContext = new SvxXMLTextImportContext(*this, nPrefix, rLocalName, xAttrList, mxText ); - } - else - { - pContext = SvXMLImport::CreateContext(nPrefix, rLocalName, xAttrList); - } - return pContext; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/embeddedobj/source/commonembedding/xfactory.hxx b/embeddedobj/source/commonembedding/xfactory.hxx index 1cfe18a03b13..0635f8b8e2e0 100644 --- a/embeddedobj/source/commonembedding/xfactory.hxx +++ b/embeddedobj/source/commonembedding/xfactory.hxx @@ -64,7 +64,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLinkFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx index 0808363733ca..ddaf55aaec66 100644 --- a/embeddedobj/source/inc/commonembobj.hxx +++ b/embeddedobj/source/inc/commonembobj.hxx @@ -263,7 +263,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ) ; // XEmbeddedObject diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx index 5eafe0976ec5..f08135f113ba 100644 --- a/embeddedobj/source/inc/intercept.hxx +++ b/embeddedobj/source/inc/intercept.hxx @@ -44,12 +44,12 @@ public: // overwritten to release the statuslistner. // XComponent - virtual void SAL_CALL + void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL + void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) throw( com::sun::star::uno::RuntimeException ); diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx index 171b41f14b28..22dfcaeaf609 100644 --- a/embeddedobj/source/inc/xcreator.hxx +++ b/embeddedobj/source/inc/xcreator.hxx @@ -64,7 +64,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLinkFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aClassID, const OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntryName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aClassID, const OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntryName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx index e36bc7906453..bfecf435ecb5 100644 --- a/extensions/source/bibliography/bibbeam.hxx +++ b/extensions/source/bibliography/bibbeam.hxx @@ -67,7 +67,7 @@ namespace bib getControlContainer() SAL_OVERRIDE; public: // #100312# ------------------- - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception > + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception > getDispatchProviderInterception(); BibBeamer(vcl::Window* pParent,BibDataManager* pDatMan, WinBits nStyle = WB_3DLOOK ); diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx index cc7c876c42e1..701f2129b9d3 100644 --- a/extensions/source/bibliography/loadlisteneradapter.hxx +++ b/extensions/source/bibliography/loadlisteneradapter.hxx @@ -52,7 +52,7 @@ namespace bib virtual ~OComponentListener(); // XEventListener equivalents - virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw( ::com::sun::star::uno::RuntimeException ); + void _disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw( ::com::sun::star::uno::RuntimeException ); protected: void setAdapter( OComponentAdapterBase* _pAdapter ); diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index a22af7c8ba6f..6f1cc352c4a5 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -303,7 +303,7 @@ public: virtual Reference< com::sun::star::plugin::XPluginContext > SAL_CALL createPluginContext() throw(std::exception) SAL_OVERRIDE; // has to be implemented per system - virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL impl_getPluginDescriptions() throw(css::uno::RuntimeException, std::exception); + Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL impl_getPluginDescriptions() throw(css::uno::RuntimeException, std::exception); // calls system specific impl_getPluginDescriptions // checks whether plugins are disabled virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL getPluginDescriptions() diff --git a/extensions/source/plugin/inc/plugin/plcom.hxx b/extensions/source/plugin/inc/plugin/plcom.hxx index e08c264b519e..883a5a5122ce 100644 --- a/extensions/source/plugin/inc/plugin/plcom.hxx +++ b/extensions/source/plugin/inc/plugin/plcom.hxx @@ -78,8 +78,8 @@ public: virtual NPError NPP_SetValue( NPP instance, NPNVariable variable, void *value) = 0; - virtual NPError NPP_SetWindow( XPlugin_Impl* ); - virtual NPError NPP_Destroy( XPlugin_Impl*, NPSavedData** save ); + NPError NPP_SetWindow( XPlugin_Impl* ); + NPError NPP_Destroy( XPlugin_Impl*, NPSavedData** save ); }; #endif diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx index b12675f98a97..59979da4f921 100644 --- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx @@ -71,7 +71,7 @@ public: virtual int32_t NPP_Write( NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer ) SAL_OVERRIDE; virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream ) SAL_OVERRIDE; - virtual char* NPP_GetMIMEDescription(); + char* NPP_GetMIMEDescription(); virtual NPError NPP_GetValue( NPP instance, NPPVariable variable, void* value ) SAL_OVERRIDE; virtual NPError NPP_SetValue( NPP instance, NPNVariable variable, void *value) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index 28d17eaf169a..bd37e92974a0 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -53,7 +53,7 @@ namespace pcr virtual ::std::vector< OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const SAL_OVERRIDE; virtual OUString getPropertyName( sal_Int32 _nPropId ) SAL_OVERRIDE; - virtual bool isComposeable( const OUString& _rPropertyName ) const; + bool isComposeable( const OUString& _rPropertyName ) const; protected: static const OPropertyInfoImpl* getPropertyInfo(); diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index 97091b003a3f..dc8ce7767e88 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -155,7 +155,7 @@ class BaseContainer : public BaseLock specify, which sub container of the used filter cache must be wrapped by this container interface. */ - virtual void init(const css::uno::Reference< css::uno::XComponentContext >& rxContext , + void init(const css::uno::Reference< css::uno::XComponentContext >& rxContext , const OUString& sImplementationName, const css::uno::Sequence< OUString >& lServiceNames , FilterCache::EItemType eType ); diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx index 1d5572b5517f..a6b2e7410110 100644 --- a/filter/source/config/cache/cacheupdatelistener.hxx +++ b/filter/source/config/cache/cacheupdatelistener.hxx @@ -92,13 +92,13 @@ class CacheUpdateListener : public BaseLock // must be the first one to guarante /** @short starts listening. */ - virtual void startListening(); + void startListening(); /** @short stop listening. */ - virtual void stopListening(); + void stopListening(); // uno interface diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index 883ced96e553..1c3d998fc0d2 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -300,13 +300,13 @@ class FilterCache : public BaseLock @note The cloned instance is created on the heap. The user of this instance has to remove it later. */ - virtual FilterCache* clone() const; + FilterCache* clone() const; /** @short copy the cache content or rClone back to this instance. */ - virtual void takeOver(const FilterCache& rClone); + void takeOver(const FilterCache& rClone); @@ -325,7 +325,7 @@ class FilterCache : public BaseLock at all if this method does nothing inside, because the cache is already full filled! */ - virtual void load(EFillState eRequired) + void load(EFillState eRequired) throw(css::uno::Exception); @@ -341,7 +341,7 @@ class FilterCache : public BaseLock @return sal_True if the required fill state exists for this cache; FALSE otherwise. */ - virtual bool isFillState(EFillState eRequired) const + bool isFillState(EFillState eRequired) const throw(css::uno::Exception); @@ -377,7 +377,7 @@ class FilterCache : public BaseLock if some input parameter are wrong or the cache itself is not valid any longer, because any operation before damage it. */ - virtual OUStringList getMatchingItemsByProps( EItemType eType , + OUStringList getMatchingItemsByProps( EItemType eType , const CacheItem& lIProps , const CacheItem& lEProps = CacheItem()) const throw(css::uno::Exception); @@ -405,7 +405,7 @@ class FilterCache : public BaseLock if some input parameter are wrong or the cache itself is not valid any longer, because any operation before damage it. */ - virtual bool hasItems(EItemType eType) const + bool hasItems(EItemType eType) const throw(css::uno::Exception); @@ -430,7 +430,7 @@ class FilterCache : public BaseLock if some input parameter are wrong or the cache itself is not valid any longer, because any operation before damage it. */ - virtual OUStringList getItemNames(EItemType eType) const + OUStringList getItemNames(EItemType eType) const throw(css::uno::Exception); @@ -454,7 +454,7 @@ class FilterCache : public BaseLock if some input parameter are wrong or the cache itself is not valid any longer, because any operation before damage it. */ - virtual bool hasItem( EItemType eType, + bool hasItem( EItemType eType, const OUString& sItem) throw(css::uno::Exception); @@ -484,7 +484,7 @@ class FilterCache : public BaseLock if some input parameter are wrong or the cache itself is not valid any longer, because any operation before damage it. */ - virtual CacheItem getItem( EItemType eType, + CacheItem getItem( EItemType eType, const OUString& sItem) throw(css::uno::Exception); @@ -492,7 +492,7 @@ class FilterCache : public BaseLock /** TODO document me ... */ - virtual void removeItem( EItemType eType, + void removeItem( EItemType eType, const OUString& sItem) throw(css::uno::Exception); @@ -500,7 +500,7 @@ class FilterCache : public BaseLock /** TODO document me ... */ - virtual void setItem( EItemType eType , + void setItem( EItemType eType , const OUString& sItem , const CacheItem& aValue) throw(css::uno::Exception, std::exception); @@ -509,7 +509,7 @@ class FilterCache : public BaseLock /** TODO document me ... */ - virtual void refreshItem( EItemType eType, + void refreshItem( EItemType eType, const OUString& sItem) throw(css::uno::Exception); @@ -550,7 +550,7 @@ class FilterCache : public BaseLock was not migrated to the new one. So we can't provide write access to such items ... */ - virtual void addStatePropsToItem( EItemType eType, + void addStatePropsToItem( EItemType eType, const OUString& sItem, CacheItem& rItem) throw(css::uno::Exception); @@ -559,7 +559,7 @@ class FilterCache : public BaseLock /** TODO document me */ - virtual void removeStatePropsFromItem(CacheItem& aValue) + void removeStatePropsFromItem(CacheItem& aValue) throw(css::uno::Exception); @@ -573,7 +573,7 @@ class FilterCache : public BaseLock if the cache itself is not valid any longer, because any operation before damage it. */ - virtual void flush() + void flush() throw(css::uno::Exception); @@ -604,7 +604,7 @@ class FilterCache : public BaseLock if the cache itself is not valid any longer, because any operation before damage it. */ - virtual void detectFlatForURL(const css::util::URL& aURL , + void detectFlatForURL(const css::util::URL& aURL , FlatDetection& rFlatTypes) const throw(css::uno::Exception); diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index 2ad810cfefb1..cb754e5a2c6a 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -91,7 +91,7 @@ class QueryTokenizer : public std::unordered_map< OUString , /** @short can be used to check if analyzing of given query was successfully or not. */ - virtual bool valid() const; + bool valid() const; }; } // namespace config diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx index 49712e1f44ff..2a8dd5f48ec1 100644 --- a/filter/source/graphicfilter/icgm/outact.hxx +++ b/filter/source/graphicfilter/icgm/outact.hxx @@ -63,7 +63,7 @@ class CGMOutAct public: CGMOutAct( CGM& rCGM ); virtual ~CGMOutAct(); - virtual void FirstOutPut() { mpCGM->mbFirstOutPut = false; } ; + void FirstOutPut() { mpCGM->mbFirstOutPut = false; } ; virtual void InsertPage() { mnCurrentPage++; } ; virtual void BeginGroup() {} ; virtual void EndGroup() {}; diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx index 03c10c53109a..276450e9fc4c 100644 --- a/filter/source/graphicfilter/idxf/dxfentrd.hxx +++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx @@ -78,7 +78,7 @@ protected: public: virtual ~DXFBasicEntity(); - virtual void Read(DXFGroupReader & rDGR); + void Read(DXFGroupReader & rDGR); // Reads a parameter till the next 0-group protected: diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index 669d156c8e4e..d619b6e39c3e 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -85,8 +85,8 @@ public: virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream); - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream); + void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream); + void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream); // XPropertySet virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE = 0; diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx index 30ec45f5e3bd..51143f1b974b 100644 --- a/forms/source/component/EventThread.hxx +++ b/forms/source/component/EventThread.hxx @@ -65,7 +65,7 @@ protected: // XThread virtual void SAL_CALL run() SAL_OVERRIDE; - virtual void SAL_CALL kill(); + void SAL_CALL kill(); virtual void SAL_CALL onTerminated() SAL_OVERRIDE; // The following method is called to duplicate the Event while respecting it's type. diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx index 5c47c530e1e3..9e5fd5a7b999 100644 --- a/forms/source/component/File.hxx +++ b/forms/source/component/File.hxx @@ -78,7 +78,7 @@ public: using OControlModel::getFastPropertyValue; protected: - virtual void _reset(); + void _reset(); virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index e5b5ffc59ff7..5367ceb29c50 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -315,7 +315,7 @@ public: protected: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; // implement the lock setting - virtual void _setLock(bool _bLock); + void _setLock(bool _bLock); }; @@ -922,14 +922,14 @@ protected: virtual void onConnectedExternalValue( ); /** called whenever a connection to an external supplier of values (XValueBinding) has been suspended */ - virtual void onDisconnectedExternalValue(); + void onDisconnectedExternalValue(); /** called whenever an external validator has been registered */ - virtual void onConnectedValidator( ); + void onConnectedValidator( ); /** called whenever an external validator has been revoked */ - virtual void onDisconnectedValidator( ); + void onDisconnectedValidator( ); /** nFieldType is the type of the field, on which the model will be linked. The linking happens when sal_True is returned. diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index d04c020e9238..6d5ec45be1c1 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -186,7 +186,7 @@ public: protected: // helper virtual void SAL_CALL disposing(); - virtual void removeElementsNoEvents(sal_Int32 nIndex); + void removeElementsNoEvents(sal_Int32 nIndex); /** to be overridden if elements which are to be inserted into the container shall be checked diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx index 598141d94fcd..e69bb805a807 100644 --- a/forms/source/richtext/featuredispatcher.hxx +++ b/forms/source/richtext/featuredispatcher.hxx @@ -66,7 +66,7 @@ namespace frm protected: // overridables - virtual void newStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener ); + void newStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener ); virtual void disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify ); virtual void invalidateFeatureState_Broadcast(); diff --git a/forms/source/xforms/submission/serialization.hxx b/forms/source/xforms/submission/serialization.hxx index 405f563dbb1b..f467754fd802 100644 --- a/forms/source/xforms/submission/serialization.hxx +++ b/forms/source/xforms/submission/serialization.hxx @@ -49,7 +49,7 @@ public: /** sets the XObject that is to serialized */ - virtual void setSource(const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment) + void setSource(const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment) { m_aFragment = aFragment; } diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx index 0cca95090eb7..a8cd11d4a87b 100644 --- a/forms/source/xforms/submission/submission.hxx +++ b/forms/source/xforms/submission/submission.hxx @@ -138,13 +138,13 @@ public: virtual ~CSubmission() {} - virtual void setEncoding(const OUString& aEncoding) + void setEncoding(const OUString& aEncoding) { m_aEncoding = aEncoding; } virtual SubmissionResult submit(const css::uno::Reference< css::task::XInteractionHandler >& ) = 0; - virtual SubmissionResult replace(const OUString&, const css::uno::Reference< css::xml::dom::XDocument >&, const css::uno::Reference< css::frame::XFrame>&); + SubmissionResult replace(const OUString&, const css::uno::Reference< css::xml::dom::XDocument >&, const css::uno::Reference< css::frame::XFrame>&); }; diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index b36cf4058a50..35ab7ef80505 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -38,7 +38,7 @@ private: protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void SelectionChanged(); + void SelectionChanged(); virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; @@ -106,12 +106,12 @@ private: protected: - virtual void FxClick(); - virtual void RefClick(); - virtual void FxFocus(); - virtual void RefFocus(); - virtual void EdFocus(); - virtual void EdModify(); + void FxClick(); + void RefClick(); + void FxFocus(); + void RefFocus(); + void EdFocus(); + void EdModify(); public: diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index a490133ecd1e..ea1668dd0524 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -101,9 +101,9 @@ private: protected: - virtual void SliderMoved(); - virtual void ArgumentModified(); - virtual void FxClick(); + void SliderMoved(); + void ArgumentModified(); + void FxClick(); void InitArgInput( sal_uInt16 nPos, FixedText& rFtArg, PushButton& rBtnFx, ArgEdit& rEdArg, RefButton& rRefBtn); diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index d99bf4dbd125..cbe4d4aaea6d 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -195,7 +195,7 @@ public: SvtFileDialog( vcl::Window* _pParent, WinBits nBits ); virtual ~SvtFileDialog(); - virtual long OK(); + long OK(); virtual short Execute() SAL_OVERRIDE; virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE; diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx index 19bb4fbd5dbf..1e022a3c5f16 100644 --- a/framework/inc/classes/propertysethelper.hxx +++ b/framework/inc/classes/propertysethelper.hxx @@ -108,7 +108,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet * The owner of this class has to be sure, that every new property does * not clash with any existing one. */ - virtual void SAL_CALL impl_addPropertyInfo(const css::beans::Property& aProperty) + void SAL_CALL impl_addPropertyInfo(const css::beans::Property& aProperty) throw(css::beans::PropertyExistException, css::uno::Exception ); @@ -120,7 +120,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet * @throw [com::sun::star::beans::UnknownPropertyException] * if no property with the specified name exists. */ - virtual void SAL_CALL impl_removePropertyInfo(const OUString& sProperty) + void SAL_CALL impl_removePropertyInfo(const OUString& sProperty) throw(css::beans::UnknownPropertyException, css::uno::Exception ); @@ -130,8 +130,8 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet * There is no chance to reactive a "dead" object by calling impl_enablePropertySet() * again! */ - virtual void SAL_CALL impl_enablePropertySet(); - virtual void SAL_CALL impl_disablePropertySet(); + void SAL_CALL impl_enablePropertySet(); + void SAL_CALL impl_disablePropertySet(); /** */ diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx index 8dfff638566e..33d8951cdcc4 100644 --- a/framework/inc/helper/ocomponentenumeration.hxx +++ b/framework/inc/helper/ocomponentenumeration.hxx @@ -139,7 +139,7 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star @seealso destructor ~TaskEnumeration() *//*-*****************************************************************************************************/ - virtual void impl_resetObject(); + void impl_resetObject(); private: diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx index 5e1bc562e0c1..67b7e57c6284 100644 --- a/framework/inc/helper/oframes.hxx +++ b/framework/inc/helper/oframes.hxx @@ -178,7 +178,7 @@ class OFrames : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XFr @seealso method dispose() (if it exist!) @seealso destructor ~TaskEnumeration() *//*-*****************************************************************************************************/ - virtual void impl_resetObject(); + void impl_resetObject(); private: diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index 142eb8256bd1..328e71320e7f 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -229,18 +229,18 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper4< throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // similar (XStatusIndicator) - virtual void start(const css::uno::Reference< css::task::XStatusIndicator >& xChild, + void start(const css::uno::Reference< css::task::XStatusIndicator >& xChild, const OUString& sText , sal_Int32 nRange); - virtual void SAL_CALL reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild); + void SAL_CALL reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild); - virtual void SAL_CALL end(const css::uno::Reference< css::task::XStatusIndicator >& xChild); + void SAL_CALL end(const css::uno::Reference< css::task::XStatusIndicator >& xChild); - virtual void SAL_CALL setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild, + void SAL_CALL setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild, const OUString& sText ); - virtual void SAL_CALL setValue(const css::uno::Reference< css::task::XStatusIndicator >& xChild, + void SAL_CALL setValue(const css::uno::Reference< css::task::XStatusIndicator >& xChild, sal_Int32 nValue); // specials diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx index bcc01ca7bbfe..9318afe236d2 100644 --- a/framework/inc/jobs/configaccess.hxx +++ b/framework/inc/jobs/configaccess.hxx @@ -80,11 +80,11 @@ class FWI_DLLPUBLIC ConfigAccess const OUString& sRoot ); virtual ~ConfigAccess(); - virtual void open ( EOpenMode eMode ); - virtual void close ( ); - virtual EOpenMode getMode( ) const; + void open ( EOpenMode eMode ); + void close ( ); + EOpenMode getMode( ) const; - virtual const css::uno::Reference< css::uno::XInterface >& cfg(); + const css::uno::Reference< css::uno::XInterface >& cfg(); }; } // namespace framework diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx index a5813c149cfa..c9f432456abb 100644 --- a/framework/inc/xml/acceleratorconfigurationwriter.hxx +++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx @@ -74,7 +74,7 @@ class AcceleratorConfigurationWriter virtual ~AcceleratorConfigurationWriter(); /** @short TODO */ - virtual void flush(); + void flush(); // helper diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 921f3eb6d026..cbb83f07d297 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -150,19 +150,19 @@ class OWriteImagesDocumentHandler ::com::sun::star::uno::RuntimeException ); protected: - virtual void WriteImageList( const ImageListItemDescriptor* ) throw + void WriteImageList( const ImageListItemDescriptor* ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void WriteExternalImageList( const ExternalImageItemListDescriptor* ) throw + void WriteExternalImageList( const ExternalImageItemListDescriptor* ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void WriteImage( const ImageItemDescriptor* ) throw + void WriteImage( const ImageItemDescriptor* ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void WriteExternalImage( const ExternalImageItemDescriptor* ) throw + void WriteExternalImage( const ExternalImageItemDescriptor* ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index 2462bb2e9336..10de22c60af6 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -260,11 +260,11 @@ class FWE_DLLPUBLIC OWriteMenuDocumentHandler void WriteMenuDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); protected: - virtual void WriteMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rSubMenuContainer ) throw + void WriteMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rSubMenuContainer ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void WriteMenuItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle = 0 ); - virtual void WriteMenuSeparator(); + void WriteMenuItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle = 0 ); + void WriteMenuSeparator(); com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xMenuBarContainer; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index dfe8ef9c9a6b..96c70fdb72b3 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -137,7 +137,7 @@ class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler ::com::sun::star::uno::RuntimeException ); protected: - virtual void WriteStatusBarItem( + void WriteStatusBarItem( const OUString& rCommandURL, const OUString& rHelpURL, sal_Int16 nOffset, diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index e50df109378b..8fb52012d832 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -162,20 +162,20 @@ class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler ::com::sun::star::uno::RuntimeException ); protected: - virtual void WriteToolBoxItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, const OUString& aTooltip, sal_Int16 nStyle, + void WriteToolBoxItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, const OUString& aTooltip, sal_Int16 nStyle, sal_Int16 nWidth, bool bVisible ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void WriteToolBoxSpace() throw + void WriteToolBoxSpace() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void WriteToolBoxBreak() throw + void WriteToolBoxBreak() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void WriteToolBoxSeparator() throw + void WriteToolBoxSeparator() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index 790ab0e03896..47e0d86ce81e 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -94,7 +94,7 @@ class AcceleratorCache the (changed!) copy, which should be written back to this original container. */ - virtual void takeOver(const AcceleratorCache& rCopy); + void takeOver(const AcceleratorCache& rCopy); /** TODO document me */ AcceleratorCache& operator=(const AcceleratorCache& rCopy); @@ -107,11 +107,11 @@ class AcceleratorCache @return [bool] sal_True if the speicfied key exists inside this container. */ - virtual bool hasKey(const css::awt::KeyEvent& aKey) const; - virtual bool hasCommand(const OUString& sCommand) const; + bool hasKey(const css::awt::KeyEvent& aKey) const; + bool hasCommand(const OUString& sCommand) const; /** TODO document me */ - virtual TKeyList getAllKeys() const; + TKeyList getAllKeys() const; /** @short add a new or change an existing key-command pair of this container. @@ -122,7 +122,7 @@ class AcceleratorCache @param sCommand describe the command. */ - virtual void setKeyCommandPair(const css::awt::KeyEvent& aKey , + void setKeyCommandPair(const css::awt::KeyEvent& aKey , const OUString& sCommand); /** @short returns the list of keys, which are registered @@ -134,14 +134,14 @@ class AcceleratorCache @return [TKeyList] the list of registered keys. Can be empty! */ - virtual TKeyList getKeysByCommand(const OUString& sCommand) const; + TKeyList getKeysByCommand(const OUString& sCommand) const; /** TODO */ - virtual OUString getCommandByKey(const css::awt::KeyEvent& aKey) const; + OUString getCommandByKey(const css::awt::KeyEvent& aKey) const; /** TODO */ - virtual void removeKey(const css::awt::KeyEvent& aKey); - virtual void removeCommand(const OUString& sCommand); + void removeKey(const css::awt::KeyEvent& aKey); + void removeCommand(const OUString& sCommand); }; } // namespace framework diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index 90670d45327d..dfdd327caa91 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -93,7 +93,7 @@ class KeyMapping if the given identifier does not describe a well known key code. */ - virtual sal_uInt16 mapIdentifierToCode(const OUString& sIdentifier) + sal_uInt16 mapIdentifierToCode(const OUString& sIdentifier) throw(css::lang::IllegalArgumentException); /** @short return a suitable key identifier @@ -104,7 +104,7 @@ class KeyMapping @return The corresponding string identifier. */ - virtual OUString mapCodeToIdentifier(sal_uInt16 nCode); + OUString mapCodeToIdentifier(sal_uInt16 nCode); // helper diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index 344318460e94..fcef47674374 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -84,59 +84,59 @@ class StorageHolder /** @short TODO */ - virtual void forgetCachedStorages(); + void forgetCachedStorages(); /** @short TODO */ - virtual void setRootStorage(const css::uno::Reference< css::embed::XStorage >& xRoot); + void setRootStorage(const css::uno::Reference< css::embed::XStorage >& xRoot); /** @short TODO */ - virtual css::uno::Reference< css::embed::XStorage > getRootStorage() const; + css::uno::Reference< css::embed::XStorage > getRootStorage() const; /** @short TODO open or get! */ - virtual css::uno::Reference< css::embed::XStorage > openPath(const OUString& sPath , + css::uno::Reference< css::embed::XStorage > openPath(const OUString& sPath , sal_Int32 nOpenMode); /** @short TODO */ - virtual StorageHolder::TStorageList getAllPathStorages(const OUString& sPath); + StorageHolder::TStorageList getAllPathStorages(const OUString& sPath); /** @short TODO */ - virtual void commitPath(const OUString& sPath); + void commitPath(const OUString& sPath); /** @short TODO */ - virtual void closePath(const OUString& sPath); + void closePath(const OUString& sPath); /** @short TODO */ - virtual void notifyPath(const OUString& sPath); + void notifyPath(const OUString& sPath); /** @short TODO */ - virtual void addStorageListener( IStorageListener* pListener, + void addStorageListener( IStorageListener* pListener, const OUString& sPath ); /** @short TODO */ - virtual void removeStorageListener( IStorageListener* pListener, + void removeStorageListener( IStorageListener* pListener, const OUString& sPath ); /** @short TODO */ - virtual OUString getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage); + OUString getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage); /** @short TODO */ - virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const css::uno::Reference< css::embed::XStorage >& xChild); + css::uno::Reference< css::embed::XStorage > getParentStorage(const css::uno::Reference< css::embed::XStorage >& xChild); /** @short TODO */ - virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const OUString& sChildPath); + css::uno::Reference< css::embed::XStorage > getParentStorage(const OUString& sChildPath); /** @short TODO */ diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx index b60aa0a8c8e7..caa70314a7e6 100644 --- a/framework/source/inc/loadenv/actionlockguard.hxx +++ b/framework/source/inc/loadenv/actionlockguard.hxx @@ -91,7 +91,7 @@ class ActionLockGuard @return sal_True, if new resource could be set and locked. sal_False otherwise. */ - virtual bool setResource(const css::uno::Reference< css::document::XActionLockable >& xLock) + bool setResource(const css::uno::Reference< css::document::XActionLockable >& xLock) { osl::MutexGuard g(m_mutex); @@ -116,7 +116,7 @@ class ActionLockGuard @return sal_True, if new resource could be set and locked. sal_False otherwise. */ - virtual void freeResource() + void freeResource() { // SAFE -> .......................... osl::ClearableMutexGuard aMutexLock(m_mutex); @@ -135,7 +135,7 @@ class ActionLockGuard } /** @short lock the internal wrapped resource, if its not already done. */ - virtual void lock() + void lock() { osl::MutexGuard g(m_mutex); if (!m_bActionLocked && m_xActionLock.is()) @@ -146,7 +146,7 @@ class ActionLockGuard } /** @short unlock the internal wrapped resource, if its not already done. */ - virtual void unlock() + void unlock() { osl::MutexGuard g(m_mutex); if (m_bActionLocked && m_xActionLock.is()) diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 4558cc7175f2..41b2c55d8124 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -81,27 +81,6 @@ class LangSelectionStatusbarController: public: explicit LangSelectionStatusbarController( const css::uno::Reference< css::uno::XComponentContext >& xContext ); - // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) - { - return OUString("com.sun.star.comp.framework.LangSelectionStatusbarController"); - } - - virtual bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) - { - return ServiceName == "com.sun.star.frame.StatusbarController"; - } - - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) - { - css::uno::Sequence< OUString > aSeq(1); - aSeq[0] = "com.sun.star.frame.StatusbarController"; - return aSeq; - } - // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index b83e31cf1bbe..2a7a19ce9942 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -112,7 +112,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual ::com::sun::star::uno::Any SAL_CALL getByNameImpl( const OUString& aName ); + ::com::sun::star::uno::Any SAL_CALL getByNameImpl( const OUString& aName ); struct CmdToInfoMap { diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h index 1ae07fd974bc..aa00c862c2c6 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -52,7 +52,7 @@ struct HBox /** * @returns The Size of HBox object */ - virtual int WSize(); + int WSize(); /** * @returns The Height of HBox object as hunit value. */ @@ -383,12 +383,12 @@ struct TxtBox: public FBox /** * @returns Count of cell. */ - virtual int NCell() { return nCell; } + int NCell() { return nCell; } /** * This is one of table, text-box, equalizer and button * @returns Type of this object. */ - virtual int Type() { return type; } + int Type() { return type; } virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; @@ -660,7 +660,7 @@ struct Picture: public FBox Picture(); virtual ~Picture(); - virtual int Type (); + int Type (); virtual bool Read (HWPFile &hwpf) SAL_OVERRIDE; virtual hunit Height (CharShape *sty) SAL_OVERRIDE; diff --git a/hwpfilter/source/hiodev.h b/hwpfilter/source/hiodev.h index a47de8f095bc..def45bbed51c 100644 --- a/hwpfilter/source/hiodev.h +++ b/hwpfilter/source/hiodev.h @@ -58,9 +58,9 @@ class DLLEXPORT HIODev virtual int readBlock( void *ptr, int size ) = 0; virtual int skipBlock( int size ) = 0; - virtual int read1b( void *ptr, int nmemb ); - virtual int read2b( void *ptr, int nmemb ); - virtual int read4b( void *ptr, int nmemb ); + int read1b( void *ptr, int nmemb ); + int read2b( void *ptr, int nmemb ); + int read4b( void *ptr, int nmemb ); }; struct gz_stream; diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx index a4c5d8d19ee1..e10c02877395 100644 --- a/hwpfilter/source/hwpreader.hxx +++ b/hwpfilter/source/hwpreader.hxx @@ -86,7 +86,7 @@ public: */ virtual sal_Bool SAL_CALL filter(const Sequence< PropertyValue >& aDescriptor) throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL cancel() throw(RuntimeException, std::exception) SAL_OVERRIDE {} - virtual void SAL_CALL setDocumentHandler(Reference< XDocumentHandler > xHandler) + void SAL_CALL setDocumentHandler(Reference< XDocumentHandler > xHandler) { m_rxDocumentHandler = xHandler; } diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index 646cde618708..eee1d156e2fd 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -82,7 +82,7 @@ class SvMetaName : public SvMetaObject SvString aDescription; protected: - virtual bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); + bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm, char c = '\0' ); virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx index a82493f56c97..017c06152cf9 100644 --- a/idl/inc/module.hxx +++ b/idl/inc/module.hxx @@ -76,7 +76,7 @@ public: virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); + void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); }; typedef tools::SvRef<SvMetaModule> SvMetaModuleRef; diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx index 5ca27f676b94..8b9297a8054a 100644 --- a/include/basic/sbmeth.hxx +++ b/include/basic/sbmeth.hxx @@ -63,7 +63,7 @@ public: void GetLineRange( sal_uInt16&, sal_uInt16& ); // Interface to execute a method from the applications - virtual ErrCode Call( SbxValue* pRet = NULL, SbxVariable* pCaller = NULL ); + ErrCode Call( SbxValue* pRet = NULL, SbxVariable* pCaller = NULL ); virtual void Broadcast( sal_uIntPtr nHintId ) SAL_OVERRIDE; }; diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index 3c60c668e386..f0cd12a30976 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -102,21 +102,21 @@ public: virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; - virtual const OUString& GetSource() const; + const OUString& GetSource() const; const OUString& GetSource32() const { return aOUSource;} const OUString& GetComment() const { return aComment; } - virtual void SetSource( const OUString& r ); + void SetSource( const OUString& r ); void SetSource32( const OUString& r ); - virtual bool Compile(); - virtual bool IsCompiled() const; + bool Compile(); + bool IsCompiled() const; const SbxObject* FindType( const OUString& aTypeName ) const; - virtual bool IsBreakable( sal_uInt16 nLine ) const; - virtual bool IsBP( sal_uInt16 nLine ) const; - virtual bool SetBP( sal_uInt16 nLine ); - virtual bool ClearBP( sal_uInt16 nLine ); - virtual void ClearAllBP(); + bool IsBreakable( sal_uInt16 nLine ) const; + bool IsBP( sal_uInt16 nLine ) const; + bool SetBP( sal_uInt16 nLine ); + bool ClearBP( sal_uInt16 nLine ); + void ClearAllBP(); // Store only image, no source (needed for new password protection) bool StoreBinaryData( SvStream& ); diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx index cb1d49a72bf4..105bf944c419 100644 --- a/include/basic/sbstar.hxx +++ b/include/basic/sbstar.hxx @@ -79,8 +79,8 @@ private: virtual bool StoreData( SvStream& ) const SAL_OVERRIDE; protected: - virtual bool ErrorHdl(); - virtual sal_uInt16 BreakHdl(); + bool ErrorHdl(); + sal_uInt16 BreakHdl(); virtual ~StarBASIC(); public: diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx index cec5f587fe85..8410f4352c00 100644 --- a/include/basic/sbx.hxx +++ b/include/basic/sbx.hxx @@ -155,7 +155,7 @@ public: OUString GetAlias( sal_uInt16 ); void PutAlias( const OUString&, sal_uInt16 ); SbxVariable* FindUserData( sal_uInt32 nUserData ); - virtual SbxVariable* Find( const OUString&, SbxClassType ); + SbxVariable* Find( const OUString&, SbxClassType ); // Additional methods for 32-bit indices sal_uInt32 Count32() const; @@ -225,7 +225,7 @@ protected: const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; // Overridable methods (why not pure virtual?): virtual void CollAdd( SbxArray* pPar ); - virtual void CollItem( SbxArray* pPar ); + void CollItem( SbxArray* pPar ); virtual void CollRemove( SbxArray* pPar ); public: diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx index c755a6f5714b..12de6e03057f 100644 --- a/include/basic/sbxcore.hxx +++ b/include/basic/sbxcore.hxx @@ -90,7 +90,7 @@ public: static void Skip( SvStream& ); bool Store( SvStream& ); virtual bool LoadCompleted(); - virtual bool StoreCompleted(); + bool StoreCompleted(); static SbxError GetError(); static void SetError( SbxError ); diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx index 004e14b34d3d..e6240ddbd58a 100644 --- a/include/basic/sbxobj.hxx +++ b/include/basic/sbxobj.hxx @@ -67,18 +67,18 @@ public: // Execution of DDE-Commands SbxVariable* Execute( const OUString& ); // Manage elements - virtual bool GetAll( SbxClassType ) { return true; } + bool GetAll( SbxClassType ) { return true; } SbxVariable* Make( const OUString&, SbxClassType, SbxDataType, bool bIsRuntimeFunction = false ); - virtual SbxObject* MakeObject( const OUString&, const OUString& ); + SbxObject* MakeObject( const OUString&, const OUString& ); virtual void Insert( SbxVariable* ); // AB 23.4.1997, Optimization, Insertion without check for duplicate Entries and // without Broadcasts, only used in SO2/auto.cxx void QuickInsert( SbxVariable* ); - virtual void Remove( const OUString&, SbxClassType ); + void Remove( const OUString&, SbxClassType ); virtual void Remove( SbxVariable* ); // Macro-Recording - virtual OUString GenerateSource( const OUString &rLinePrefix, + OUString GenerateSource( const OUString &rLinePrefix, const SbxObject *pRelativeTo ); // Direct access on arrays SbxArray* GetMethods() { return pMethods; } diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index 2ae113073f3e..ed0bf8b599c5 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -140,9 +140,9 @@ public: SbxDataType GetFullType() const { return aData.eType;} bool SetType( SbxDataType ); - virtual bool Get( SbxValues& ) const; + bool Get( SbxValues& ) const; const SbxValues& GetValues_Impl() const { return aData; } - virtual bool Put( const SbxValues& ); + bool Put( const SbxValues& ); inline SbxValues& data() { return aData; } @@ -196,9 +196,9 @@ public: bool PutObject( SbxBase* ); - virtual bool Convert( SbxDataType ); - virtual bool Compute( SbxOperator, const SbxValue& ); - virtual bool Compare( SbxOperator, const SbxValue& ) const; + bool Convert( SbxDataType ); + bool Compute( SbxOperator, const SbxValue& ); + bool Compare( SbxOperator, const SbxValue& ) const; bool Scan( const OUString&, sal_uInt16* = NULL ); void Format( OUString&, const OUString* = NULL ) const; @@ -312,8 +312,8 @@ public: void Dump( SvStream&, bool bDumpAll=false ); - virtual void SetName( const OUString& ); - virtual const OUString& GetName( SbxNameType = SbxNAME_NONE ) const; + void SetName( const OUString& ); + const OUString& GetName( SbxNameType = SbxNAME_NONE ) const; sal_uInt16 GetHashCode() const { return nHash; } virtual void SetModified( bool ) SAL_OVERRIDE; diff --git a/include/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx index ecd3a02dcd1b..b8aa4f7e9fef 100644 --- a/include/comphelper/ChainablePropertySet.hxx +++ b/include/comphelper/ChainablePropertySet.hxx @@ -95,16 +95,16 @@ namespace comphelper virtual void _postGetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; - virtual void _preGetPropertyState () + void _preGetPropertyState () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); - virtual void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState ) + void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException ); - virtual void _postGetPropertyState () + void _postGetPropertyState () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); - virtual void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry ) + void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry ) throw(::com::sun::star::beans::UnknownPropertyException ); - virtual ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) + ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); public: diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx index 9ccca3d8984a..b2cb4d9a1067 100644 --- a/include/comphelper/MasterPropertySet.hxx +++ b/include/comphelper/MasterPropertySet.hxx @@ -84,16 +84,16 @@ namespace comphelper virtual void _postGetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; - virtual void _preGetPropertyState () + void _preGetPropertyState () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); - virtual void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState ) + void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException ); - virtual void _postGetPropertyState () + void _postGetPropertyState () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); - virtual void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry ) + void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry ) throw(::com::sun::star::beans::UnknownPropertyException ); - virtual ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) + ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); public: diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx index bb516125927e..1ccd03ee4aff 100644 --- a/include/comphelper/accessibletexthelper.hxx +++ b/include/comphelper/accessibletexthelper.hxx @@ -53,14 +53,14 @@ namespace comphelper ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > implGetBreakIterator(); ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification > implGetCharacterClassification(); bool implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength ); - virtual bool implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength ); - virtual bool implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength ); + bool implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength ); + bool implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength ); virtual OUString implGetText() = 0; virtual ::com::sun::star::lang::Locale implGetLocale() = 0; virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) = 0; - virtual void implGetGlyphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - virtual bool implGetWordBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - virtual void implGetSentenceBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + void implGetGlyphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + bool implGetWordBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + void implGetSentenceBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); virtual void implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); virtual void implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx index 61dfe8a9d7ba..7881ae4de5e0 100644 --- a/include/comphelper/componentbase.hxx +++ b/include/comphelper/componentbase.hxx @@ -100,7 +100,7 @@ namespace comphelper The default implementation returns <NULL/>. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponent() const; private: diff --git a/include/comphelper/propertystatecontainer.hxx b/include/comphelper/propertystatecontainer.hxx index ed7c6b341742..82d51fba6bcd 100644 --- a/include/comphelper/propertystatecontainer.hxx +++ b/include/comphelper/propertystatecontainer.hxx @@ -75,14 +75,14 @@ namespace comphelper <p>Already implemented by this base class, no need to override</p> @precond <arg>_nHandle</arg> is a valid property handle */ - virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle( sal_Int32 _nHandle ); + ::com::sun::star::beans::PropertyState getPropertyStateByHandle( sal_Int32 _nHandle ); /** set the property denoted by the given handle to it's default value <p>Already implemented by this base class, no need to override</p> @precond <arg>_nHandle</arg> is a valid property handle */ - virtual void setPropertyToDefaultByHandle( sal_Int32 _nHandle ); + void setPropertyToDefaultByHandle( sal_Int32 _nHandle ); /** get the default value for the property denoted by the given handle diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx index 085233df21a4..6d193e7697e8 100644 --- a/include/connectivity/formattedcolumnvalue.hxx +++ b/include/connectivity/formattedcolumnvalue.hxx @@ -82,19 +82,19 @@ namespace dbtools virtual ~FormattedColumnValue(); - virtual void clear(); + void clear(); // access to the details of the formatting we determined - virtual sal_Int32 getFormatKey() const; - virtual sal_Int32 getFieldType() const; - virtual sal_Int16 getKeyType() const; - virtual const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& + sal_Int32 getFormatKey() const; + sal_Int32 getFieldType() const; + sal_Int16 getKeyType() const; + const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& getColumn() const; - virtual const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate >& + const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate >& getColumnUpdate() const; - virtual bool setFormattedValue( const OUString& _rFormattedStringValue ) const; - virtual OUString getFormattedValue() const; + bool setFormattedValue( const OUString& _rFormattedStringValue ) const; + OUString getFormattedValue() const; private: ::std::unique_ptr< FormattedColumnValue_Data > m_pData; diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index c38f5a615797..2096260afbb2 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -105,7 +105,7 @@ namespace param virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; // pseudo-XComponent - virtual void SAL_CALL dispose(); + void SAL_CALL dispose(); protected: virtual ~ParameterWrapper(); diff --git a/include/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx index 1975fae84a3d..fb7292d8a8b9 100644 --- a/include/connectivity/sdbcx/VDescriptor.hxx +++ b/include/connectivity/sdbcx/VDescriptor.hxx @@ -63,7 +63,7 @@ namespace connectivity bool isNew() const { return m_bNew; } bool getNew() const { return m_bNew; } - virtual void setNew(bool _bNew); + void setNew(bool _bNew); bool isCaseSensitive() const { return m_aCase.isCaseSensitive(); } diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx index b97c273ae21b..d41bee600ae8 100644 --- a/include/connectivity/sdbcx/VView.hxx +++ b/include/connectivity/sdbcx/VView.hxx @@ -79,7 +79,7 @@ namespace connectivity virtual void construct() SAL_OVERRIDE; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + void SAL_CALL disposing(void); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx index 301efddc6dca..d89949acae17 100644 --- a/include/connectivity/sqlscan.hxx +++ b/include/connectivity/sqlscan.hxx @@ -53,11 +53,11 @@ namespace connectivity inline static void SAL_CALL operator delete( void *,void* ) { } - virtual sal_Int32 SQLyygetc(void); - virtual void SQLyyerror(char const *fmt); - virtual void output(sal_Int32) { OSL_FAIL("Internal error in sdblex.l: output not possible"); } - virtual void ECHO(void) { OSL_FAIL("Internal error in sdblex.l: ECHO not possible"); } - virtual IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const; + sal_Int32 SQLyygetc(void); + void SQLyyerror(char const *fmt); + void output(sal_Int32) { OSL_FAIL("Internal error in sdblex.l: output not possible"); } + void ECHO(void) { OSL_FAIL("Internal error in sdblex.l: ECHO not possible"); } + IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const; // setting the new information before scanning void prepareScan(const OUString & rNewStatement, const IParseContext* pContext, bool bInternational); diff --git a/include/cppcanvas/text.hxx b/include/cppcanvas/text.hxx index b25a1e6ad9fa..622e553a5ad9 100644 --- a/include/cppcanvas/text.hxx +++ b/include/cppcanvas/text.hxx @@ -33,8 +33,8 @@ namespace cppcanvas class Text : public virtual CanvasGraphic { public: - virtual void setFont( const FontSharedPtr& ) = 0; - virtual FontSharedPtr getFont() = 0; + ; + ; }; typedef ::boost::shared_ptr< ::cppcanvas::Text > TextSharedPtr; diff --git a/include/dbaccess/ToolBoxHelper.hxx b/include/dbaccess/ToolBoxHelper.hxx index 821294bf4433..4757c8ffb802 100644 --- a/include/dbaccess/ToolBoxHelper.hxx +++ b/include/dbaccess/ToolBoxHelper.hxx @@ -61,7 +61,7 @@ namespace dbaui @attention Must be called after a FreeResource() call. */ - virtual void setToolBox(ToolBox* _pTB); + void setToolBox(ToolBox* _pTB); inline ToolBox* getToolBox() const { return m_pToolBox; } diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index b50149299f38..8189cc93a4f0 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.hxx @@ -61,7 +61,7 @@ namespace dbaui /** will be called when the controls need to be resized. */ - virtual void resizeControls(const Size& /*_rDiff*/) { Resize(); } + void resizeControls(const Size& /*_rDiff*/) { Resize(); } ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() { return m_xContext;} diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx index d7087e025b97..fd1d2567a57f 100644 --- a/include/dbaccess/dbsubcomponentcontroller.hxx +++ b/include/dbaccess/dbsubcomponentcontroller.hxx @@ -166,7 +166,7 @@ namespace dbaui DBSubComponentController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxORB); virtual ~DBSubComponentController(); - virtual void disconnect(); + void disconnect(); virtual void reconnect( bool _bUI ); bool ensureConnected( bool _bUI ) { if ( !isConnected() ) reconnect( _bUI ); return isConnected(); } diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index c8dbb0b2660c..0a02ef7b0231 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -414,15 +414,15 @@ namespace dbaui // if xListener is NULL the change will be forwarded to all listeners to the given ::com::sun::star::util::URL // if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state - virtual void InvalidateFeature(const OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, bool _bForceBroadcast = false); + void InvalidateFeature(const OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, bool _bForceBroadcast = false); // if there is an ::com::sun::star::util::URL translation for the id ('handle') the preceding InvalidateFeature is used. // if there is a toolbar slot with the given id it is updated (the new state is determined via GetState) // if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state - virtual void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, bool _bForceBroadcast = false); + void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, bool _bForceBroadcast = false); /** InvalidateAll invalidates all features currently known */ - virtual void InvalidateAll(); + void InvalidateAll(); // late construction virtual bool Construct(vcl::Window* pParent); @@ -448,7 +448,7 @@ namespace dbaui virtual bool interceptUserInput( const NotifyEvent& _rEvent ) SAL_OVERRIDE; // misc - virtual bool isCommandChecked(sal_uInt16 _nCommandId) const; + bool isCommandChecked(sal_uInt16 _nCommandId) const; // ::com::sun::star::lang::XEventListener virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/include/drawinglayer/processor2d/baseprocessor2d.hxx b/include/drawinglayer/processor2d/baseprocessor2d.hxx index 70fa3b61f32a..4f9eedf7d626 100644 --- a/include/drawinglayer/processor2d/baseprocessor2d.hxx +++ b/include/drawinglayer/processor2d/baseprocessor2d.hxx @@ -181,7 +181,7 @@ namespace drawinglayer virtual ~BaseProcessor2D(); /// the central processing method - virtual void process(const primitive2d::Primitive2DSequence& rSource); + void process(const primitive2d::Primitive2DSequence& rSource); /// data read access const geometry::ViewInformation2D& getViewInformation2D() const { return maViewInformation2D; } diff --git a/include/drawinglayer/processor3d/baseprocessor3d.hxx b/include/drawinglayer/processor3d/baseprocessor3d.hxx index 9738fb6d4c92..73b353aa06f2 100644 --- a/include/drawinglayer/processor3d/baseprocessor3d.hxx +++ b/include/drawinglayer/processor3d/baseprocessor3d.hxx @@ -60,7 +60,7 @@ namespace drawinglayer virtual ~BaseProcessor3D(); // the central processing method - virtual void process(const primitive3d::Primitive3DSequence& rSource); + void process(const primitive3d::Primitive3DSequence& rSource); // data access const geometry::ViewInformation3D& getViewInformation3D() const { return maViewInformation3D; } diff --git a/include/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx index 3584ca7602e1..f50aa485413c 100644 --- a/include/editeng/AccessibleContextBase.hxx +++ b/include/editeng/AccessibleContextBase.hxx @@ -164,7 +164,7 @@ public: @param rRelationSet The new relation set that replaces the old one. */ - virtual void SetRelationSet ( + void SetRelationSet ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet>& rxRelationSet) throw (::com::sun::star::uno::RuntimeException); diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index 0764d703e270..026ebc9042e1 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -167,7 +167,7 @@ namespace accessibility virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceName - virtual OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); /** Set the current index in the accessibility parent @@ -230,7 +230,7 @@ namespace accessibility void Dispose(); /// Calls all Listener objects to tell them the change. Don't hold locks when calling this! - virtual void FireEvent(const sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const; + void FireEvent(const sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const; /// Sets the given state on the internal state set and fires STATE_CHANGE event. Don't hold locks when calling this! void SetState( const sal_Int16 nStateId ); diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx index 02cbc75843ba..fa78d5abfd07 100644 --- a/include/editeng/AccessibleImageBullet.hxx +++ b/include/editeng/AccessibleImageBullet.hxx @@ -94,7 +94,7 @@ namespace accessibility virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceName - virtual OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); /** Set the current index in the accessibility parent @@ -148,7 +148,7 @@ namespace accessibility sal_Int32 GetParagraphIndex() const { return mnParagraphIndex; } /// Calls all Listener objects to tell them the change. Don't hold locks when calling this! - virtual void FireEvent(const sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const; + void FireEvent(const sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const; private: diff --git a/include/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx index 06bd708c869a..3ce0c4bb8f78 100644 --- a/include/editeng/AccessibleStaticTextBase.hxx +++ b/include/editeng/AccessibleStaticTextBase.hxx @@ -121,7 +121,7 @@ namespace accessibility should only be called from the main office thread. */ - virtual const SvxEditSource& GetEditSource() const; + const SvxEditSource& GetEditSource() const; /** Set the current edit source @@ -150,7 +150,7 @@ namespace accessibility The new edit source to set. Object ownership is transferred from the caller to the callee. */ - virtual void SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource ); + void SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource ); /** Set the event source @@ -162,14 +162,14 @@ namespace accessibility The interface that should be set as the source for accessibility events sent by this object. */ - virtual void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface ); + void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface ); /** Get the event source @return the interface that is set as the source for accessibility events sent by this object. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetEventSource() const; + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetEventSource() const; /** Set offset of EditEngine from parent @@ -184,13 +184,13 @@ namespace accessibility @param rPoint The offset in screen coordinates (i.e. pixel) */ - virtual void SetOffset( const Point& rPoint ); + void SetOffset( const Point& rPoint ); /** Query offset of EditEngine from parent @return the offset in screen coordinates (i.e. pixel) */ - virtual Point GetOffset() const; + Point GetOffset() const; /** Update the visible children @@ -208,7 +208,7 @@ namespace accessibility internally. Normally, there should not be a need to call this method. */ - virtual void UpdateChildren(); + void UpdateChildren(); /** Drop all references and enter disposed state @@ -218,7 +218,7 @@ namespace accessibility return default values or throw a uno::DisposedException exception). */ - virtual void Dispose(); + void Dispose(); // XAccessibleText interface implementation virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 444a732c61de..f85c43b00836 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -298,7 +298,7 @@ public: void SetText(sal_Int32 nPara, const OUString& rText); virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); - virtual const SfxItemSet& GetParaAttribs( sal_Int32 nPara ) const; + const SfxItemSet& GetParaAttribs( sal_Int32 nPara ) const; void GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const; @@ -464,7 +464,7 @@ public: virtual void ParagraphConnected( sal_Int32 nLeftParagraph, sal_Int32 nRightParagraph ); virtual void ParaAttribsChanged( sal_Int32 nParagraph ); virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); - virtual void ParagraphHeightChanged( sal_Int32 nPara ); + void ParagraphHeightChanged( sal_Int32 nPara ); virtual void DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen, @@ -486,7 +486,7 @@ public: const Color& rOverlineColor, const Color& rTextLineColor); virtual OUString GetUndoComment( sal_uInt16 nUndoId ) const; - virtual bool FormattingParagraph( sal_Int32 nPara ); + bool FormattingParagraph( sal_Int32 nPara ); virtual bool SpellNextDocument(); virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); virtual void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); @@ -508,7 +508,7 @@ public: static SvxFont CreateSvxFontFromItemSet( const SfxItemSet& rItemSet ); static bool IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); } static bool HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable ); - virtual SdrObject* GetCurTextObj() { return NULL; } + SdrObject* GetCurTextObj() { return NULL; } /** sets a link that is called at the beginning of a drag operation at an edit view */ void SetBeginDropHdl( const Link& rLink ); Link GetBeginDropHdl() const; diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index e35e503b0c37..7386faea93af 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -59,7 +59,7 @@ public: virtual bool operator==( const SvxFieldData& ) const; virtual MetaAction* createBeginComment() const; - virtual MetaAction* createEndComment() const; + MetaAction* createEndComment() const; }; /** diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index 6e09634ab4ab..de71bd96f1a2 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -45,7 +45,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual OUString GetValueText( sal_uInt16 nVal ) const; + OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; @@ -78,7 +78,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual OUString GetValueText( sal_uInt16 nVal ) const; + OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; @@ -107,7 +107,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual OUString GetValueText( sal_uInt16 nVal ) const; + OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index f27818f9d9d5..b56ac7fd6878 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -646,7 +646,7 @@ protected: void ParagraphDeleted( sal_Int32 nParagraph ); void ParaAttribsChanged( sal_Int32 nParagraph ); - virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); + void StyleSheetChanged( SfxStyleSheet* pStyle ); void InvalidateBullet(sal_Int32 nPara); void PaintBullet( sal_Int32 nPara, const Point& rStartPos, @@ -655,7 +655,7 @@ protected: // used by OutlinerEditEng. Allows Outliner objects to provide // bullet access to the EditEngine. - virtual const SvxNumberFormat* GetNumberFormat( sal_Int32 nPara ) const; + const SvxNumberFormat* GetNumberFormat( sal_Int32 nPara ) const; public: @@ -744,28 +744,28 @@ public: Paragraph* GetHdlParagraph() const { return pHdlParagraph; } bool IsExpanding() const { return bIsExpanding; } - virtual void ExpandHdl(); + void ExpandHdl(); void SetExpandHdl( const Link& rLink ) { aExpandHdl = rLink; } Link GetExpandHdl() const { return aExpandHdl; } - virtual void ParagraphInsertedHdl(); + void ParagraphInsertedHdl(); void SetParaInsertedHdl(const Link& rLink){aParaInsertedHdl=rLink;} Link GetParaInsertedHdl() const { return aParaInsertedHdl; } - virtual void ParagraphRemovingHdl(); + void ParagraphRemovingHdl(); void SetParaRemovingHdl(const Link& rLink){aParaRemovingHdl=rLink;} Link GetParaRemovingHdl() const { return aParaRemovingHdl; } - virtual void DepthChangedHdl(); + void DepthChangedHdl(); void SetDepthChangedHdl(const Link& rLink){aDepthChangedHdl=rLink;} Link GetDepthChangedHdl() const { return aDepthChangedHdl; } sal_Int16 GetPrevDepth() const { return static_cast<sal_Int16>(nDepthChangedHdlPrevDepth); } sal_uInt16 GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; } - virtual long RemovingPagesHdl( OutlinerView* ); + long RemovingPagesHdl( OutlinerView* ); void SetRemovingPagesHdl(const Link& rLink){aRemovingPagesHdl=rLink;} Link GetRemovingPagesHdl() const { return aRemovingPagesHdl; } - virtual long IndentingPagesHdl( OutlinerView* ); + long IndentingPagesHdl( OutlinerView* ); void SetIndentingPagesHdl(const Link& rLink){aIndentingPagesHdl=rLink;} Link GetIndentingPagesHdl() const { return aIndentingPagesHdl; } // valid only in the two upper handlers @@ -834,7 +834,7 @@ public: void StripPortions(); - virtual void DrawingText( const Point& rStartPos, const OUString& rText, + void DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen, const long* pDXArray, const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft, @@ -847,7 +847,7 @@ public: const Color& rOverlineColor, const Color& rTextLineColor); - virtual void DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar, + void DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar, const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft, bool bEndOfLine, bool bEndOfParagraph, @@ -910,8 +910,8 @@ public: bool UpdateFields(); void RemoveFields( bool bKeepFieldText, TypeId aType = NULL ); - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); - virtual void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ); void SetSpeller( ::com::sun::star::uno::Reference< @@ -986,11 +986,11 @@ public: void SetEndPasteOrDropHdl( const Link& rLink ); Link GetEndPasteOrDropHdl() const { return maEndPasteOrDropHdl; } - virtual sal_Int16 GetNumberingStartValue( sal_Int32 nPara ); - virtual void SetNumberingStartValue( sal_Int32 nPara, sal_Int16 nNumberingStartValue ); + sal_Int16 GetNumberingStartValue( sal_Int32 nPara ); + void SetNumberingStartValue( sal_Int32 nPara, sal_Int16 nNumberingStartValue ); - virtual bool IsParaIsNumberingRestart( sal_Int32 nPara ); - virtual void SetParaIsNumberingRestart( sal_Int32 nPara, bool bParaIsNumberingRestart ); + bool IsParaIsNumberingRestart( sal_Int32 nPara ); + void SetParaIsNumberingRestart( sal_Int32 nPara, bool bParaIsNumberingRestart ); /** determine the bullets/numbering status of the given paragraphs diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index 2763be8ecaae..b09bff62ee58 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -125,8 +125,8 @@ protected: virtual bool SpellContinue(); // Check Areas // Result available through GetLast virtual void ReplaceAll( const OUString &rNewText, sal_Int16 nLanguage ); //Replace word from the replace list - virtual void StartThesaurus( const OUString &rWord, sal_uInt16 nLang ); - virtual ::com::sun::star::uno::Reference< + void StartThesaurus( const OUString &rWord, sal_uInt16 nLang ); + ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetAllRightDic() const; virtual void SpellEnd(); // Finish area @@ -135,7 +135,7 @@ protected: virtual void ChangeWord( const OUString& rNewWord, const sal_uInt16 nLang ); // Wort via Thesaurus ersetzen virtual void ChangeThesWord( const OUString& rNewWord ); - virtual void SetLanguage( const sal_uInt16 nLang ); // Change Language + void SetLanguage( const sal_uInt16 nLang ); // Change Language virtual void AutoCorrect( const OUString& rAktStr, const OUString& rNewStr ); virtual void InsertHyphen( const sal_uInt16 nPos ); // Insert hyphen diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index 4971578bbfd1..b33cf16a4f7d 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -240,9 +240,9 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser RTF_CharTypeDef eType, SfxItemSet& rSet, SfxPoolItem& rItem ); protected: - virtual void EnterEnvironment(); - virtual void LeaveEnvironment(); - virtual void ResetPard(); + void EnterEnvironment(); + void LeaveEnvironment(); + void ResetPard(); virtual void InsertPara() = 0; @@ -263,7 +263,7 @@ protected: // Read Document-Info ::com::sun::star::util::DateTime GetDateTimeStamp( ); OUString& GetTextToEndGroup( OUString& rStr ); - virtual void ReadInfo( const sal_Char* pChkForVerNo = 0 ); + void ReadInfo( const sal_Char* pChkForVerNo = 0 ); inline SfxItemSet& GetAttrSet(); // no text yet inserted? (SttPos from the top stack entry!) @@ -341,7 +341,7 @@ public: // get RTF default ItemSets. Must be used by pard/plain tokens or in // reset of Style-Items const SfxItemSet& GetRTFDefaults(); - virtual bool UncompressableStackEntry(const SvxRTFItemStackType &rSet) const; + bool UncompressableStackEntry(const SvxRTFItemStackType &rSet) const; }; // The stack for the attributes: diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index 091adcc9b96a..a9404de5862c 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -42,7 +42,7 @@ public: virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE; virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const SAL_OVERRIDE; - virtual sal_uInt16 CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex ); + sal_uInt16 CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex ); virtual SfxItemState GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const SAL_OVERRIDE; virtual SfxItemState GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const SAL_OVERRIDE; diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx index 2bfe5746b0ed..431053fdad44 100644 --- a/include/editeng/unoedsrc.hxx +++ b/include/editeng/unoedsrc.hxx @@ -210,7 +210,7 @@ public: */ virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const = 0; - virtual OUString GetNumStr(sal_uInt16) const { return OUString(); } + OUString GetNumStr(sal_uInt16) const { return OUString(); } virtual void SetUpdateModeForAcc(bool) {} virtual bool GetUpdateModeForAcc() const { return true; } @@ -536,9 +536,9 @@ public: */ virtual bool Paste() = 0; - virtual bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return false; }; - virtual bool IsShapeParaFocusable( ) { return true; }; - virtual bool BreakParaWrongList(sal_Int32, sal_Int32&, sal_Int32&, sal_Int32){ return false; }; + bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return false; }; + bool IsShapeParaFocusable( ) { return true; }; + bool BreakParaWrongList(sal_Int32, sal_Int32&, sal_Int32&, sal_Int32){ return false; }; }; #endif diff --git a/include/editeng/unopracc.hxx b/include/editeng/unopracc.hxx index 953bf6f01326..162c6131e752 100644 --- a/include/editeng/unopracc.hxx +++ b/include/editeng/unopracc.hxx @@ -43,7 +43,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // uno::XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index da7708ce98ea..1612e5db3130 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -199,7 +199,7 @@ public: virtual bool IsValid() const SAL_OVERRIDE; - virtual void SetNotifyHdl( const Link& ); + void SetNotifyHdl( const Link& ); virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const SAL_OVERRIDE; virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const SAL_OVERRIDE; virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const SAL_OVERRIDE; @@ -255,25 +255,25 @@ protected: ESelection maSelection; const SvxItemPropertySet* mpPropSet; - virtual void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL _setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Int32 nPara = -1 ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL _getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara = -1 ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL _setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Int32 nPara = -1 ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL _getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara = -1 ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL _getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL _getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); // returns true if property found or false if unknown property - virtual bool _getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::beans::PropertyState& rState); + bool _getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::beans::PropertyState& rState); - virtual void SAL_CALL _setPropertyToDefault( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException ); + void SAL_CALL _setPropertyToDefault( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException ); void SetEditSource( SvxEditSource* _pEditSource ) throw(); - virtual void getPropertyValue( const SfxItemPropertySimpleEntry* pMap, com::sun::star::uno::Any& rAny, const SfxItemSet& rSet ) + void getPropertyValue( const SfxItemPropertySimpleEntry* pMap, com::sun::star::uno::Any& rAny, const SfxItemSet& rSet ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const com::sun::star::uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException ); + void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const com::sun::star::uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException ); SvxUnoTextRangeBase( const SvxItemPropertySet* _pSet ) throw(); SvxUnoTextRangeBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet ) throw(); @@ -285,13 +285,13 @@ public: const ESelection& GetSelection() const throw() { CheckSelection( ((SvxUnoTextRangeBase*)this)->maSelection, mpEditSource->GetTextForwarder() ); return maSelection; }; void SetSelection( const ESelection& rSelection ) throw(); - virtual void CollapseToStart(void) throw(); - virtual void CollapseToEnd(void) throw(); - virtual bool IsCollapsed(void) throw(); - virtual bool GoLeft(sal_Int16 nCount, bool Expand) throw(); - virtual bool GoRight(sal_Int16 nCount, bool Expand) throw(); - virtual void GotoStart(bool Expand) throw(); - virtual void GotoEnd(bool Expand) throw(); + void CollapseToStart(void) throw(); + void CollapseToEnd(void) throw(); + bool IsCollapsed(void) throw(); + bool GoLeft(sal_Int16 nCount, bool Expand) throw(); + bool GoRight(sal_Int16 nCount, bool Expand) throw(); + void GotoStart(bool Expand) throw(); + void GotoEnd(bool Expand) throw(); //const SfxItemPropertyMapEntry* getPropertyMapEntries() const throw() { return maPropSet.getPropertyMapEntries(); } const SvxItemPropertySet* getPropertySet() const throw() { return mpPropSet; } diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 16a5a71a0c7a..546d2d0eea6c 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -1189,7 +1189,7 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable OUString mEditAs; - virtual bool DoSeek( sal_uInt32 nKey ); + bool DoSeek( sal_uInt32 nKey ); public: explicit EscherEx( const EscherExGlobalRef& rxGlobal, SvStream* pOutStrm, bool bOOXML = false ); @@ -1214,7 +1214,7 @@ public: /// If pPicStreamMergeBSE is known, the BLIPs from this stream are being /// merged into the MsofbtBSE Records of the EscherStream like it's /// required for Excel (and maybe Word?) - virtual void Flush( SvStream* pPicStreamMergeBSE = NULL ); + void Flush( SvStream* pPicStreamMergeBSE = NULL ); /** Inserts the passed number of bytes at the current position of the output stream. @@ -1240,7 +1240,7 @@ public: void ReplacePersistOffset( sal_uInt32 nKey, sal_uInt32 nOffset ); sal_uInt32 GetPersistOffset( sal_uInt32 nKey ); bool SeekToPersistOffset( sal_uInt32 nKey ); - virtual bool InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue ); // nValue is being inserted into the Stream where it's appropriate (overwrite modus), without that the + bool InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue ); // nValue is being inserted into the Stream where it's appropriate (overwrite modus), without that the // current StreamPosition changes void SetEditAs( const OUString& rEditAs ); rtl::OUString GetEditAs() { return mEditAs; } @@ -1257,17 +1257,17 @@ public: virtual void OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance = 0 ); virtual void CloseContainer(); - virtual void BeginAtom(); - virtual void EndAtom( sal_uInt16 nRecType, int nRecVersion = 0, int nRecInstance = 0 ); - virtual void AddAtom( sal_uInt32 nAtomSitze, sal_uInt16 nRecType, int nRecVersion = 0, int nRecInstance = 0 ); - virtual void AddChildAnchor( const Rectangle& rRectangle ); - virtual void AddClientAnchor( const Rectangle& rRectangle ); + void BeginAtom(); + void EndAtom( sal_uInt16 nRecType, int nRecVersion = 0, int nRecInstance = 0 ); + void AddAtom( sal_uInt32 nAtomSitze, sal_uInt16 nRecType, int nRecVersion = 0, int nRecInstance = 0 ); + void AddChildAnchor( const Rectangle& rRectangle ); + void AddClientAnchor( const Rectangle& rRectangle ); virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect = 0 ); sal_uInt32 EnterGroup( const Rectangle* pBoundRect = NULL ); sal_uInt32 GetGroupLevel() const { return mnGroupLevel; }; - virtual bool SetGroupSnapRect( sal_uInt32 nGroupLevel, const Rectangle& rRect ); - virtual bool SetGroupLogicRect( sal_uInt32 nGroupLevel, const Rectangle& rRect ); + bool SetGroupSnapRect( sal_uInt32 nGroupLevel, const Rectangle& rRect ); + bool SetGroupLogicRect( sal_uInt32 nGroupLevel, const Rectangle& rRect ); virtual void LeaveGroup(); // a ESCHER_Sp is being written ( a ESCHER_DgContainer has to be opened for this purpose!) diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 71424e21d016..e6342f72d0df 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -483,14 +483,14 @@ protected : const Rectangle& rVisArea ); // the following methods need to be overridden for Excel imports - virtual bool ProcessClientAnchor( SvStream& rStData, + bool ProcessClientAnchor( SvStream& rStData, sal_uInt32 nDatLen, char*& rpBuff, sal_uInt32& rBuffLen ) const; virtual void ProcessClientAnchor2( SvStream& rStData, DffRecordHeader& rHd, void* pData, DffObjData& ); - virtual bool ProcessClientData( SvStream& rStData, + bool ProcessClientData( SvStream& rStData, sal_uInt32 nDatLen, char*& rpBuff, sal_uInt32& rBuffLen ) const; diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 9d72a6ea011e..9a78411390bb 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -1320,7 +1320,7 @@ public : mpPPTImporter ( pPPTImporter ), mxInStrm ( rxInStrm ) {}; - virtual bool ReadOCXStream( SotStorageRef& rSrc1, + bool ReadOCXStream( SotStorageRef& rSrc1, com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShapeRef=0, bool bFloatingCtrl=false ); diff --git a/include/framework/preventduplicateinteraction.hxx b/include/framework/preventduplicateinteraction.hxx index 1a15c3e3af65..bfc9ff6f9102 100644 --- a/include/framework/preventduplicateinteraction.hxx +++ b/include/framework/preventduplicateinteraction.hxx @@ -181,7 +181,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 @param xHandler the new interaction handler */ - virtual void setHandler(const css::uno::Reference< css::task::XInteractionHandler >& xHandler); + void setHandler(const css::uno::Reference< css::task::XInteractionHandler >& xHandler); /** @@ -190,7 +190,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 @note This overwrites the settings of e.g. setHandler()! */ - virtual void useDefaultUUIHandler(); + void useDefaultUUIHandler(); /** @@ -208,7 +208,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 @threadsafe yes */ - virtual void addInteractionRule(const PreventDuplicateInteraction::InteractionInfo& aInteractionInfo); + void addInteractionRule(const PreventDuplicateInteraction::InteractionInfo& aInteractionInfo); /** @@ -229,7 +229,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 @threadsafe yes */ - virtual bool getInteractionInfo(const css::uno::Type& aInteraction, + bool getInteractionInfo(const css::uno::Type& aInteraction, PreventDuplicateInteraction::InteractionInfo* pReturn ) const; }; diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx index ae0d29db900a..0f5f1c93f24b 100644 --- a/include/linguistic/lngprophelp.hxx +++ b/include/linguistic/lngprophelp.hxx @@ -232,7 +232,7 @@ public: propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 GetDefaultNumberOfSuggestions() const; + sal_Int16 GetDefaultNumberOfSuggestions() const; sal_Int16 GetMaxNumberOfSuggestions() const { return nResMaxNumberOfSuggestions; } bool IsSpellUpperCase() const { return bResIsSpellUpperCase; } diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index e46340c4f7c0..6a8a44eb3404 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -66,8 +66,8 @@ public: virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); private: void parseRelationship( const AttributeList& rAttribs ); diff --git a/include/oox/crypto/CryptoEngine.hxx b/include/oox/crypto/CryptoEngine.hxx index 1f9f0d129b45..ed7cd697ca9c 100644 --- a/include/oox/crypto/CryptoEngine.hxx +++ b/include/oox/crypto/CryptoEngine.hxx @@ -31,7 +31,7 @@ public: virtual ~CryptoEngine() {} - virtual std::vector<sal_uInt8>& getKey() + std::vector<sal_uInt8>& getKey() { return mKey; } diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 73357bae4a07..e3ccce306d52 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -223,7 +223,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > renderDiagramToGraphic( ::oox::core::XmlFilterBase& rFilterBase ); - virtual OUString finalizeServiceName( + OUString finalizeServiceName( ::oox::core::XmlFilterBase& rFilter, const OUString& rServiceName, const ::com::sun::star::awt::Rectangle& rShapeRect ); diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx index 25683ea14aa8..257642fe8d3c 100644 --- a/include/oox/dump/dffdumper.hxx +++ b/include/oox/dump/dffdumper.hxx @@ -44,7 +44,7 @@ protected: virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE; virtual void implWriteExtHeader() SAL_OVERRIDE; virtual void implDumpRecordBody() SAL_OVERRIDE; - virtual void implDumpClientAnchor(); + void implDumpClientAnchor(); private: sal_uInt32 dumpDffSimpleColor( const String& rName ); diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 9a89f0ae5973..e055832c2445 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -963,8 +963,8 @@ protected: const OUString& rSysFileName ); virtual bool implIsValid() const SAL_OVERRIDE; - virtual const OUString* implGetOption( const OUString& rKey ) const; - virtual NameListRef implGetNameList( const OUString& rListName ) const; + const OUString* implGetOption( const OUString& rKey ) const; + NameListRef implGetNameList( const OUString& rListName ) const; private: typedef ::boost::shared_ptr< SharedConfigData > SharedConfigDataRef; @@ -1734,7 +1734,7 @@ public: protected: virtual void implDumpText( TextInputStream& rTextStrm ) SAL_OVERRIDE; - virtual void implDumpLine( const OUString& rLine, sal_uInt32 nLine ); + void implDumpLine( const OUString& rLine, sal_uInt32 nLine ); }; diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index b76811df6376..668e9a197cfc 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -187,7 +187,7 @@ public: sal_Int32 GetChartID( ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel(){ return mxChartModel; } - virtual ChartExport& WriteChartObj( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, sal_Int32 nChartCount ); + ChartExport& WriteChartObj( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, sal_Int32 nChartCount ); void ExportContent(); void InitRangeSegmentationProperties( diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx index fb93a1022e5d..516220029e47 100644 --- a/include/oox/export/shapes.hxx +++ b/include/oox/export/shapes.hxx @@ -83,29 +83,29 @@ public: static bool NonEmptyText( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xIface ); - virtual ShapeExport& + ShapeExport& WriteBezierShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, bool bClosed ); - virtual ShapeExport& + ShapeExport& WriteClosedBezierShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteConnectorShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteCustomShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteEllipseShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteGraphicObjectShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteGroupShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteLineShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteNonVisualDrawingProperties( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, const char* sName ); virtual ShapeExport& WriteNonVisualProperties( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteOpenBezierShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteRectangleShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); /** @@ -145,15 +145,15 @@ public: * @param xShape The shape to export as DrawingML. * @return <tt>*this</tt> */ - virtual ShapeExport& + ShapeExport& WriteShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteTextBox( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xIface, sal_Int32 nXmlNamespace ); virtual ShapeExport& WriteTextShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteTableShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteOLE2Shape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); virtual ShapeExport& WriteUnknownShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 397a379f7574..282d3a0e40bf 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -406,8 +406,8 @@ public: protected: virtual void importControlData( BinaryInputStream& rInStrm ) = 0; - virtual void importCommonExtraData( BinaryInputStream& rInStrm ); - virtual void importCommonTrailingData( BinaryInputStream& rInStrm ); + void importCommonExtraData( BinaryInputStream& rInStrm ); + void importCommonTrailingData( BinaryInputStream& rInStrm ); private: /** Returns the data part identifier according to the model version. */ @@ -886,7 +886,7 @@ public: explicit AxMultiPageModel(); virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual bool importPageAndMultiPageProperties( BinaryInputStream& rInStrm, sal_Int32 nPages ); + bool importPageAndMultiPageProperties( BinaryInputStream& rInStrm, sal_Int32 nPages ); virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; std::vector<sal_uInt32> mnIDs; sal_uInt32 mnActiveTab; diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index 0bfd244d04d6..0c996acfd999 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -152,7 +152,7 @@ protected: /** Called when the import process of the VBA project has been started. */ virtual void prepareImport(); /** Called when the import process of the VBA project is finished. */ - virtual void finalizeImport(); + void finalizeImport(); private: VbaProject( const VbaProject& ); diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx index 3efad8bcd677..0591f5e2aec3 100644 --- a/include/oox/ppt/dgmimport.hxx +++ b/include/oox/ppt/dgmimport.hxx @@ -44,7 +44,7 @@ public: virtual bool exportDocument() throw() SAL_OVERRIDE; virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; - virtual sal_Int32 getSchemeClr( sal_Int32 nColorSchemeToken ) const; + sal_Int32 getSchemeClr( sal_Int32 nColorSchemeToken ) const; virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; virtual oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx index 52dcfbd05981..74c7186ff96c 100644 --- a/include/oox/ppt/dgmlayout.hxx +++ b/include/oox/ppt/dgmlayout.hxx @@ -44,7 +44,7 @@ public: virtual bool exportDocument() throw() SAL_OVERRIDE; virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; - virtual sal_Int32 getSchemeClr( sal_Int32 nColorSchemeToken ) const; + sal_Int32 getSchemeClr( sal_Int32 nColorSchemeToken ) const; virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 85506bdbffe9..9001c5d1b5a3 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -127,7 +127,7 @@ public: FloatingWindow* GetFloatingWindow() const; virtual void Resizing( Size& rSize ); - virtual bool Close(); + bool Close(); static void RegisterChildWindowContext(SfxModule*, sal_uInt16, SfxChildWinContextFactory*); }; @@ -199,7 +199,7 @@ public: bool WantsFocus() const; virtual bool QueryClose(); - virtual com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame(); + com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame(); void SetFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & ); SAL_DLLPRIVATE static void InitializeChildWinFactory_Impl(sal_uInt16, SfxChildWinInfo&); diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index d3355e33f0e0..91ae1f25ac5e 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -69,7 +69,7 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void DeleteFloatingWindow(); + void DeleteFloatingWindow(); SfxMapUnit GetCoreMetric() const; diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index 729513adeee4..e5c919900fe5 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -103,7 +103,7 @@ public: void SetMinOutputSizePixel( const Size& rSize ); Size GetMinOutputSizePixel() const; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void FadeIn( bool ); + void FadeIn( bool ); DECL_LINK(TimerHdl, void *); SAL_DLLPRIVATE void Initialize_Impl(); diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 10a2a12b158c..2afd9ae682d2 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -198,14 +198,14 @@ public: ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker > GetFilePicker() const; // XFilePickerListener methods - virtual void SAL_CALL FileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); - virtual void SAL_CALL DirectoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); + void SAL_CALL FileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); + void SAL_CALL DirectoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); virtual void SAL_CALL ControlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); - virtual void SAL_CALL DialogSizeChanged(); - virtual OUString SAL_CALL HelpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); + void SAL_CALL DialogSizeChanged(); + OUString SAL_CALL HelpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); // XDialogClosedListener methods - virtual void SAL_CALL DialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& _rEvent ); + void SAL_CALL DialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& _rEvent ); /** sets help ids for the controls in the dialog @param _pControlId diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index ecf87e437df7..1bb50587d722 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -236,7 +236,7 @@ public: SfxFrameItem( sal_uInt16 nWhich, SfxFrame *p ); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx index 6b562a715a41..6474682c0d7c 100644 --- a/include/sfx2/hintpost.hxx +++ b/include/sfx2/hintpost.hxx @@ -50,7 +50,7 @@ private: protected: virtual ~SfxHintPoster(); - virtual void Event( SfxHint* pPostedHint ); + void Event( SfxHint* pPostedHint ); public: SfxHintPoster( const GenLink& rLink ); diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index 14c680f37885..eb0c4c6dcb8c 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -54,7 +54,7 @@ class SfxInfoBarWindow : public vcl::Window SfxInfoBarWindow(vcl::Window* parent, const OUString& sId, const OUString& sMessage); virtual ~SfxInfoBarWindow( ); - virtual const OUString& getId() const { return m_sId; } + const OUString& getId() const { return m_sId; } virtual void Paint( const Rectangle& ) SAL_OVERRIDE; virtual void Resize( ) SAL_OVERRIDE; diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 7595a2bcb63a..173e259bf8e0 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -75,7 +75,7 @@ public: SfxObjectFactory* pFactoryP, ... ); virtual ~SfxModule(); - virtual ResMgr* GetResMgr(); + ResMgr* GetResMgr(); SfxSlotPool* GetSlotPool() const; void RegisterToolBoxControl(SfxTbxCtrlFactory*); diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index c4a4206f2c82..5ae302bbb082 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -58,7 +58,7 @@ public: const SfxSlot* GetRealSlot( const SfxSlot * ) const; const SfxSlot* GetRealSlot( sal_uInt16 nSlotId ) const; - virtual const SfxSlot* GetSlot( sal_uInt16 nSlotId ) const; + const SfxSlot* GetSlot( sal_uInt16 nSlotId ) const; const SfxSlot* GetSlot( const OUString& rCommand ) const; const char* GetClassName() const { return pName; } diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 10fea30971bb..0b1bb68d8d07 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -191,7 +191,7 @@ protected: SfxObjectShell( const sal_uInt64 i_nCreationFlags ); // see sfxmodelfactory.hxx virtual ~SfxObjectShell(); - virtual void ModifyChanged(); + void ModifyChanged(); virtual bool Close() SAL_OVERRIDE; /** declares the document to have capabilities to contain basic/dialog libraries @@ -247,7 +247,7 @@ public: void UpdateDocInfoForSave( ); void FlushDocInfo(); bool HasName() const { return bHasName; } - virtual OUString GetAPIName() const; + OUString GetAPIName() const; void SetReadOnly(); bool IsReadOnly() const; bool IsReadOnlyMedium() const; @@ -257,7 +257,7 @@ public: void SetNoName(); bool IsInModalMode() const; bool IsInPrepareClose() const; - virtual bool AcceptStateUpdate() const; + bool AcceptStateUpdate() const; bool IsHelpDocument() const; bool IsDocShared() const; @@ -296,7 +296,7 @@ public: // TODO/LATER: currently only overridden in Calc, should be made non-virtual virtual bool DoSaveCompleted( SfxMedium* pNewStor=0 ); - virtual bool LoadOwnFormat( SfxMedium& pMedium ); + bool LoadOwnFormat( SfxMedium& pMedium ); virtual bool SaveAsOwnFormat( SfxMedium& pMedium ); virtual bool ConvertFrom( SfxMedium &rMedium ); virtual bool ConvertTo( SfxMedium &rMedium ); @@ -306,7 +306,7 @@ public: virtual bool Save(); virtual bool SaveAs( SfxMedium &rMedium ); virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); - virtual bool SwitchPersistance( + bool SwitchPersistance( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); virtual void UpdateLinks(); virtual bool LoadExternal( SfxMedium& rMedium ); @@ -402,19 +402,19 @@ public: static sal_uInt32 HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDoc ); - virtual void ViewAssigned(); + void ViewAssigned(); virtual bool PrepareClose(bool bUI = true); virtual bool IsInformationLost(); virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates ); sal_Int16 QueryHiddenInformation( HiddenWarningFact eFact, vcl::Window* pParent ); - virtual bool HasSecurityOptOpenReadOnly() const; + bool HasSecurityOptOpenReadOnly() const; bool IsSecurityOptOpenReadOnly() const; void SetSecurityOptOpenReadOnly( bool bOpenReadOnly = true ); virtual Size GetFirstPageSize(); - virtual bool DoClose(); + bool DoClose(); virtual void PrepareReload(); - virtual ::boost::shared_ptr<GDIMetaFile> GetPreviewMetaFile( bool bFullContent = false ) const; + ::boost::shared_ptr<GDIMetaFile> GetPreviewMetaFile( bool bFullContent = false ) const; virtual void CancelTransfers(); bool GenerateAndStoreThumbnail( @@ -453,7 +453,7 @@ public: void InvalidateName(); // Re-set to unnamed // DDE-Interface - virtual long DdeExecute( const OUString& rCmd ); + long DdeExecute( const OUString& rCmd ); virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ); @@ -473,7 +473,7 @@ public: // Determine the position of the "Automatic" filter in the stylist void SetAutoStyleFilterIndex(sal_uInt16 nSet); sal_uInt16 GetAutoStyleFilterIndex(); - virtual bool HasBasic() const; + bool HasBasic() const; BasicManager* GetBasicManager() const; com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer > GetBasicContainer(); @@ -497,7 +497,7 @@ public: virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE; - virtual SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); + SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel() const; @@ -518,7 +518,7 @@ public: bool IsInPlaceActive(); bool IsUIActive(); virtual void InPlaceActivate( bool ); - virtual void UIActivate( bool ); + void UIActivate( bool ); static bool CopyStoragesOfUnknownMediaType( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xSource, @@ -800,7 +800,7 @@ public: {} virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx index 46d28af5ea5f..2fb014393f11 100644 --- a/include/sfx2/progress.hxx +++ b/include/sfx2/progress.hxx @@ -46,7 +46,7 @@ public: bool bWait = true ); virtual ~SfxProgress(); - virtual void SetText( const OUString& rText ); + void SetText( const OUString& rText ); bool SetStateText( sal_uIntPtr nVal, const rtl::OUString &rVal, sal_uIntPtr nNewRange = 0 ); bool SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 ); sal_uIntPtr GetState() const { return nVal; } diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index f0e98a5f10b1..ba3404ee3676 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -387,7 +387,7 @@ public: SfxShell::Activate() */ - virtual void ParentActivate(); + void ParentActivate(); /** The active parent of the <SfxDispatcher> on which the SfxShell is located, @@ -399,7 +399,7 @@ public: SfxShell::Deactivate() */ - virtual void ParentDeactivate(); + void ParentDeactivate(); /** This method returns a pointer to the <SfxDispatcher>, when the SfxShell diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index c931a8803dde..e3046c624398 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -98,11 +98,11 @@ protected: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Click(); - virtual void DoubleClick(); + void DoubleClick(); virtual void Command( const CommandEvent& rCEvt ); virtual bool MouseButtonDown( const MouseEvent & ); virtual bool MouseMove( const MouseEvent & ); - virtual bool MouseButtonUp( const MouseEvent & ); + bool MouseButtonUp( const MouseEvent & ); virtual void Paint( const UserDrawEvent &rUDEvt ); static sal_uInt16 convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons ); diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx index da1f70140728..f64401823ab8 100644 --- a/include/sfx2/taskpane.hxx +++ b/include/sfx2/taskpane.hxx @@ -86,10 +86,7 @@ namespace sfx2 <li>1 if the tool panel described by i_rLHS should succeed the one described by i_rRHS</li> */ - virtual short compareToolPanelsURLs( - const OUString& i_rLHS, - const OUString& i_rRHS - ) const = 0; + ; protected: ~IToolPanelCompare() {} diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index a1c99d1672bc..f3ca152c5f2a 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -120,7 +120,7 @@ private: protected: virtual void PopupModeEnd() SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; - virtual void DeleteFloatingWindow(); + void DeleteFloatingWindow(); sal_uInt16 GetId() const { return m_nId; } const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& GetFrame() const { return m_xFrame; } diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx index b2a500bae4c9..5e316e10c430 100644 --- a/include/sfx2/templateabstractview.hxx +++ b/include/sfx2/templateabstractview.hxx @@ -51,7 +51,7 @@ public: virtual ~ViewFilter_Application () {} - virtual bool operator () (const ThumbnailViewItem *pItem); + bool operator () (const ThumbnailViewItem *pItem); static bool isFilteredExtension(FILTER_APPLICATION filter, const OUString &rExt); bool isValid (const OUString& rPath) const; diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index 91fbb9af50b2..91361265ed3f 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -45,12 +45,12 @@ public: SfxTemplatePanelControl (SfxBindings* pBindings, vcl::Window* pParentWindow); virtual ~SfxTemplatePanelControl(); - virtual void Update(); + void Update(); virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; - virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ); + SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ); virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void FreeResource (void); + void FreeResource (void); private: SfxTemplateDialog_Impl* pImpl; diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index 57ce556a53ea..2c9967b601da 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -274,7 +274,7 @@ protected: // Drawing item related functions, override them to make your own custom ones. - virtual void DrawItem (ThumbnailViewItem *pItem); + void DrawItem (ThumbnailViewItem *pItem); virtual void OnItemDblClicked (ThumbnailViewItem *pItem); diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index f2fa42dca7f3..9136a5688476 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -102,7 +102,7 @@ public: virtual void setEditTitle (bool edit, bool bChangeFocus = true); void updateTitleEditSize (); - virtual void setTitle (const OUString& rTitle); + void setTitle (const OUString& rTitle); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible( bool bIsTransientChildrenDisabled ); diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index ec5ef1374c8d..5f8232872e96 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -119,7 +119,7 @@ public: SfxBindings& GetBindings() { return *pBindings; } const SfxBindings& GetBindings() const { return *pBindings; } vcl::Window& GetWindow() const; - virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); + void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); SfxProgress* GetProgress() const; @@ -136,19 +136,19 @@ public: bool IsVisible() const; void ToTop(); void Enable( bool bEnable ); - virtual bool Close(); + bool Close(); virtual void Activate( bool bUI ) SAL_OVERRIDE; virtual void Deactivate( bool bUI ) SAL_OVERRIDE; // DDE-Interface - virtual long DdeExecute( const OUString& rCmd ); - virtual bool DdeGetData( const OUString& rItem, + long DdeExecute( const OUString& rCmd ); + bool DdeGetData( const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ); - virtual bool DdeSetData( const OUString& rItem, + bool DdeSetData( const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ); - virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ); + ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ); void UpdateTitle(); @@ -306,7 +306,7 @@ public: {} virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; SfxViewFrame* GetFrame() const diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 8919d8fc0a58..3498dc98a5b7 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -172,9 +172,9 @@ public: virtual ErrCode DoVerb(long nVerb); - virtual void OutplaceActivated( bool bActive, SfxInPlaceClient* pClient ); - virtual void InplaceActivating( SfxInPlaceClient* pClient ); - virtual void InplaceDeactivated( SfxInPlaceClient* pClient ); + void OutplaceActivated( bool bActive, SfxInPlaceClient* pClient ); + void InplaceActivating( SfxInPlaceClient* pClient ); + void InplaceDeactivated( SfxInPlaceClient* pClient ); virtual void UIActivating( SfxInPlaceClient* pClient ); virtual void UIDeactivated( SfxInPlaceClient* pClient ); @@ -188,7 +188,7 @@ public: * has been set. By the time this is called the document has been fully * imported. */ - virtual void Initialize(); + void Initialize(); virtual bool PrepareClose( bool bUI = true ); virtual OUString GetSelectionText( bool bCompleteWords = false ); virtual bool HasSelection( bool bText = true ) const; @@ -223,7 +223,7 @@ public: virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); virtual bool HasPrintOptionsPage() const; virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ); - virtual JobSetup GetJobSetup() const; + JobSetup GetJobSetup() const; Printer* GetActivePrinter() const; // Working set @@ -256,7 +256,7 @@ public: const Size& GetMargin() const; void SetMargin( const Size& ); void DisconnectAllClients(); - virtual SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); + SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); bool NewWindowAllowed() const { return !bNoNewWindow; } void SetNewWindowAllowed( bool bSet ) { bNoNewWindow = !bSet; } diff --git a/include/sot/factory.hxx b/include/sot/factory.hxx index 60094b4772d8..e08847b93f30 100644 --- a/include/sot/factory.hxx +++ b/include/sot/factory.hxx @@ -58,7 +58,7 @@ public: const OUString & rClassName, CreateInstanceType ); void PutSuperClass( const SotFactory * ); - virtual void * CreateInstance( SotObject ** ppObj = NULL ) const; + void * CreateInstance( SotObject ** ppObj = NULL ) const; bool Is( const SotFactory * pSuperClass ) const; const SotFactory * GetSuper( sal_uInt16 nPos ) const diff --git a/include/sot/object.hxx b/include/sot/object.hxx index 9c52bdbbf74d..19428d6183bd 100644 --- a/include/sot/object.hxx +++ b/include/sot/object.hxx @@ -116,7 +116,7 @@ public: virtual void * Cast( const SotFactory * ); // only for the macros in So3 not to get out of hand - virtual IUnknown * GetInterface( const SvGlobalName & ); + IUnknown * GetInterface( const SvGlobalName & ); bool Owner() const { return bOwner; } diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index b7adb8e32b5d..10940c4bd7f5 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -75,8 +75,8 @@ public: virtual void SetSize( sal_uInt64 nNewSize ) SAL_OVERRIDE; sal_uInt32 GetSize() const; bool CopyTo( SotStorageStream * pDestStm ); - virtual bool Commit(); - virtual bool Revert(); + bool Commit(); + bool Revert(); bool SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue ); virtual sal_uInt64 remainingSize() SAL_OVERRIDE; }; @@ -137,9 +137,9 @@ public: static bool IsStorageFile( const OUString & rFileName ); static bool IsStorageFile( SvStream* pStream ); - virtual const OUString& GetName() const; + const OUString& GetName() const; - virtual bool Validate(); + bool Validate(); const OString& GetKey() const { return m_aKey;} @@ -159,29 +159,29 @@ public: if( m_nError == SVSTREAM_OK ) m_nError = nErrorCode; } - virtual void ResetError(); + void ResetError(); bool IsRoot() const { return m_bIsRoot; } void SignAsRoot( bool b = true ) { m_bIsRoot = b; } void SetDeleteStream( bool bDelete ) { m_bDelStm = bDelete; } // own data sector - virtual void SetClass( const SvGlobalName & rClass, + void SetClass( const SvGlobalName & rClass, sal_uLong bOriginalClipFormat, const OUString & rUserTypeName ); - virtual void SetConvertClass( const SvGlobalName & rConvertClass, + void SetConvertClass( const SvGlobalName & rConvertClass, sal_uLong bOriginalClipFormat, const OUString & rUserTypeName ); - virtual SvGlobalName GetClassName(); // type of data in the storage - virtual sal_uLong GetFormat(); - virtual OUString GetUserName(); - virtual bool ShouldConvert(); + SvGlobalName GetClassName(); // type of data in the storage + sal_uLong GetFormat(); + OUString GetUserName(); + bool ShouldConvert(); // list of all elements - virtual void FillInfoList( SvStorageInfoList * ) const; - virtual bool CopyTo( SotStorage * pDestStg ); - virtual bool Commit(); - virtual bool Revert(); + void FillInfoList( SvStorageInfoList * ) const; + bool CopyTo( SotStorage * pDestStg ); + bool Commit(); + bool Revert(); // create stream with connection to Storage, // more or less a Parent-Child relationship @@ -192,17 +192,17 @@ public: StreamMode = STREAM_STD_READWRITE, bool transacted = true ); // query whether Storage or Stream - virtual bool IsStream( const OUString & rEleName ) const; - virtual bool IsStorage( const OUString & rEleName ) const; - virtual bool IsContained( const OUString & rEleName ) const; + bool IsStream( const OUString & rEleName ) const; + bool IsStorage( const OUString & rEleName ) const; + bool IsContained( const OUString & rEleName ) const; // remove element - virtual bool Remove( const OUString & rEleName ); + bool Remove( const OUString & rEleName ); // change element's name - virtual bool Rename( const OUString & rEleName, + bool Rename( const OUString & rEleName, const OUString & rNewName ); - virtual bool CopyTo( const OUString & rEleName, SotStorage * pDest, + bool CopyTo( const OUString & rEleName, SotStorage * pDest, const OUString & rNewName ); - virtual bool MoveTo( const OUString & rEleName, SotStorage * pDest, + bool MoveTo( const OUString & rEleName, SotStorage * pDest, const OUString & rNewName ); bool IsOLEStorage() const; diff --git a/include/store/store.hxx b/include/store/store.hxx index 1d9b74c44a9b..85c546564e47 100644 --- a/include/store/store.hxx +++ b/include/store/store.hxx @@ -316,42 +316,6 @@ public: return store_findNext (m_hImpl, &it); } - /** Directory traversal helper. - @see travel() - */ - class traveller - { - public: - /** Directory traversal callback. - @param it [in] current directory entry. - @return sal_True to continue iteration, sal_False to stop. - */ - virtual bool visit (const iterator& it) = 0; - - protected: - ~traveller() {} - }; - - /** Directory traversal. - @see store_findFirst() - @see store_findNext() - - @param rTraveller [in] the traversal callback. - @return store_E_NoMoreFiles upon end of iteration. - */ - inline storeError travel (traveller & rTraveller) const - { - storeError eErrCode = store_E_InvalidHandle; - if (m_hImpl) - { - iterator it; - eErrCode = store_findFirst (m_hImpl, &it); - while ((eErrCode == store_E_None) && rTraveller.visit(it)) - eErrCode = store_findNext (m_hImpl, &it); - } - return eErrCode; - } - private: /** Representation. */ diff --git a/include/svl/SfxBroadcaster.hxx b/include/svl/SfxBroadcaster.hxx index 56a335730041..a35b62a2d694 100644 --- a/include/svl/SfxBroadcaster.hxx +++ b/include/svl/SfxBroadcaster.hxx @@ -38,7 +38,7 @@ private: protected: void Forward(SfxBroadcaster& rBC, const SfxHint& rHint); - virtual void ListenersGone(); + void ListenersGone(); public: TYPEINFO(); diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 658aa94099a7..29c9795818e2 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -63,11 +63,11 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - virtual sal_uInt8 GetMin() const; + sal_uInt8 GetMin() const; - virtual sal_uInt8 GetMax() const; + sal_uInt8 GetMax() const; - virtual SfxFieldUnit GetUnit() const; + SfxFieldUnit GetUnit() const; sal_uInt8 GetValue() const { return m_nValue; } @@ -122,11 +122,11 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - virtual sal_uInt16 GetMin() const; + sal_uInt16 GetMin() const; - virtual sal_uInt16 GetMax() const; + sal_uInt16 GetMax() const; - virtual SfxFieldUnit GetUnit() const; + SfxFieldUnit GetUnit() const; sal_uInt16 GetValue() const { return m_nValue; } @@ -181,11 +181,11 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - virtual sal_Int32 GetMin() const; + sal_Int32 GetMin() const; - virtual sal_Int32 GetMax() const; + sal_Int32 GetMax() const; - virtual SfxFieldUnit GetUnit() const; + SfxFieldUnit GetUnit() const; sal_Int32 GetValue() const { return m_nValue; } @@ -240,11 +240,11 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - virtual sal_uInt32 GetMin() const; + sal_uInt32 GetMin() const; - virtual sal_uInt32 GetMax() const; + sal_uInt32 GetMax() const; - virtual SfxFieldUnit GetUnit() const; + SfxFieldUnit GetUnit() const; sal_uInt32 GetValue() const { return m_nValue; } diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index e8c65904660b..2f27c358d888 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -111,7 +111,7 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const; + sal_uInt16 GetValueCount() const; virtual OUString GetValueTextByVal(bool bTheValue) const; diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx index 92f1a403389b..5a64eb1d1435 100644 --- a/include/svl/filerec.hxx +++ b/include/svl/filerec.hxx @@ -473,7 +473,7 @@ public: void NewContent(); - virtual sal_uInt32 Close( bool bSeekToEndOfRec = true ); + sal_uInt32 Close( bool bSeekToEndOfRec = true ); }; /** write record with multiple content items with identical size diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx index 222f79afe8e4..6c4e4fb60d36 100644 --- a/include/svl/instrm.hxx +++ b/include/svl/instrm.hxx @@ -61,9 +61,9 @@ public: virtual ~SvInputStream(); - virtual void AddMark(sal_uLong nPos); + void AddMark(sal_uLong nPos); - virtual void RemoveMark(sal_uLong nPos); + void RemoveMark(sal_uLong nPos); }; #endif // INCLUDED_SVL_INSTRM_HXX diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 152f5b5ae8bf..70879b31d1fd 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -80,11 +80,11 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - virtual sal_Int16 GetMin() const; + sal_Int16 GetMin() const; - virtual sal_Int16 GetMax() const; + sal_Int16 GetMax() const; - virtual SfxFieldUnit GetUnit() const; + SfxFieldUnit GetUnit() const; sal_Int16 GetValue() const { return m_nValue; } diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 9f1ffbc715ce..7fc64e1189f2 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -151,7 +151,7 @@ public: virtual const SfxPoolItem& Put( const SfxPoolItem&, sal_uInt16 nWhich = 0 ); virtual void Remove( const SfxPoolItem& ); - virtual const SfxPoolItem& GetDefaultItem( sal_uInt16 nWhich ) const; + const SfxPoolItem& GetDefaultItem( sal_uInt16 nWhich ) const; const SfxPoolItem* LoadItem( SvStream &rStream, bool bDirect = false, @@ -170,7 +170,7 @@ public: bool StoreSurrogate(SvStream& rStream, const SfxPoolItem *pItem ) const; - virtual SvStream & Load(SvStream &); + SvStream & Load(SvStream &); virtual SvStream & Store(SvStream &) const; bool HasPersistentRefCounts() const; void LoadCompleted(); diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index c84bcf179bf9..cc9009d5942d 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -106,7 +106,7 @@ class SVL_DLLPUBLIC SfxItemPropertySet SfxItemPropertyMap m_aMap; mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo; protected: - virtual bool FillItem(SfxItemSet& rSet, sal_uInt16 nWhich, bool bGetProperty) const; + bool FillItem(SfxItemSet& rSet, sal_uInt16 nWhich, bool bGetProperty) const; public: SfxItemPropertySet( const SfxItemPropertyMapEntry *pMap ) : diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index 5cb28c262103..8fd2e3f997fd 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -83,7 +83,7 @@ public: sal_uInt16 Count() const { return _nCount; } sal_uInt16 TotalCount() const; - virtual const SfxPoolItem& Get( sal_uInt16 nWhich, bool bSrchInParent = true ) const; + const SfxPoolItem& Get( sal_uInt16 nWhich, bool bSrchInParent = true ) const; const SfxPoolItem* GetItem( sal_uInt16 nWhich, bool bSrchInParent = true, TypeId aItemType = 0 ) const; @@ -97,10 +97,10 @@ public: bool HasItem(sal_uInt16 nWhich, const SfxPoolItem** ppItem = NULL) const; - virtual void DisableItem(sal_uInt16 nWhich); - virtual void InvalidateItem( sal_uInt16 nWhich ); - virtual sal_uInt16 ClearItem( sal_uInt16 nWhich = 0); - virtual void ClearInvalidItems( bool bHardDefault = false ); + void DisableItem(sal_uInt16 nWhich); + void InvalidateItem( sal_uInt16 nWhich ); + sal_uInt16 ClearItem( sal_uInt16 nWhich = 0); + void ClearInvalidItems( bool bHardDefault = false ); void InvalidateAllItems(); // HACK(via nWhich = 0) ??? void InvalidateDefaultItems(); @@ -116,12 +116,12 @@ public: SfxItemState eDontCareAs = SfxItemState::UNKNOWN, SfxItemState eDefaultAs = SfxItemState::UNKNOWN ); - virtual bool Set( const SfxItemSet&, bool bDeep = true ); + bool Set( const SfxItemSet&, bool bDeep = true ); - virtual void Intersect( const SfxItemSet& rSet ); - virtual void MergeValues( const SfxItemSet& rSet, bool bOverwriteDefaults = false ); - virtual void Differentiate( const SfxItemSet& rSet ); - virtual void MergeValue( const SfxPoolItem& rItem, bool bOverwriteDefaults = false ); + void Intersect( const SfxItemSet& rSet ); + void MergeValues( const SfxItemSet& rSet, bool bOverwriteDefaults = false ); + void Differentiate( const SfxItemSet& rSet ); + void MergeValue( const SfxPoolItem& rItem, bool bOverwriteDefaults = false ); SfxItemPool* GetPool() const { return _pPool; } const sal_uInt16* GetRanges() const { return _pWhichRanges; } @@ -129,9 +129,9 @@ public: void MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo ); const SfxItemSet* GetParent() const { return _pParent; } - virtual SvStream & Load( SvStream &, bool bDirect = false, + SvStream & Load( SvStream &, bool bDirect = false, const SfxItemPool *pRefPool = 0 ); - virtual SvStream & Store( SvStream &, bool bDirect = false ) const; + SvStream & Store( SvStream &, bool bDirect = false ) const; bool operator==(const SfxItemSet &) const; sal_Int32 getHash() const; diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx index 940d62485394..9c416a2f561f 100644 --- a/include/svl/numuno.hxx +++ b/include/svl/numuno.hxx @@ -63,9 +63,9 @@ public: SvNumberFormatter* GetNumberFormatter() const; // override to adapt attributes in the document - virtual void NumberFormatDeleted(sal_uInt32 nKey); + void NumberFormatDeleted(sal_uInt32 nKey); // override to possibly format something anew - virtual void SettingsChanged(); + void SettingsChanged(); // XNumberFormatsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index f63d8b35a804..738e867a616f 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -47,8 +47,8 @@ public: const std::vector<OUString>& GetList() const; // String-Separator: \n - virtual void SetString( const OUString& ); - virtual OUString GetString(); + void SetString( const OUString& ); + OUString GetString(); void SetStringList( const com::sun::star::uno::Sequence< OUString >& rList ); void GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const; diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 8254f684b88e..75bef0d2875a 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -114,10 +114,10 @@ public: /** returns the display name of this style, it is used at the user interface. If the display name is empty, this method returns the internal name. */ - virtual OUString GetDisplayName() const; + OUString GetDisplayName() const; // sets the display name of this style - virtual void SetDisplayName( const OUString& ); + void SetDisplayName( const OUString& ); virtual const OUString& GetParent() const; virtual bool SetParent( const OUString& ); @@ -146,7 +146,7 @@ public: virtual void SetHelpId( const OUString& r, sal_uLong nId ); virtual SfxItemSet& GetItemSet(); - virtual sal_uInt16 GetVersion() const; + sal_uInt16 GetVersion() const; }; /* Class to iterate and search on a SfxStyleSheetBasePool */ @@ -158,8 +158,8 @@ public: */ SfxStyleSheetIterator(SfxStyleSheetBasePool *pBase, SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL ); - virtual sal_uInt16 GetSearchMask() const; - virtual SfxStyleFamily GetSearchFamily() const; + sal_uInt16 GetSearchMask() const; + SfxStyleFamily GetSearchFamily() const; virtual sal_uInt16 Count(); virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx); virtual SfxStyleSheetBase* First(); @@ -232,8 +232,8 @@ public: const SfxItemPool& GetPool() const { return rPool;} virtual SfxStyleSheetIteratorPtr CreateIterator(SfxStyleFamily, sal_uInt16 nMask); - virtual sal_uInt16 Count(); - virtual SfxStyleSheetBase* operator[](sal_uInt16 nIdx); + sal_uInt16 Count(); + SfxStyleSheetBase* operator[](sal_uInt16 nIdx); virtual SfxStyleSheetBase& Make(const OUString&, SfxStyleFamily eFam, @@ -243,17 +243,17 @@ public: SfxStyleSheetBase& rSource, SfxStyleSheetBase& rTarget ); virtual void Remove( SfxStyleSheetBase* ); - virtual void Insert( SfxStyleSheetBase* ); + void Insert( SfxStyleSheetBase* ); - virtual void Clear(); + void Clear(); SfxStyleSheetBasePool& operator=( const SfxStyleSheetBasePool& ); SfxStyleSheetBasePool& operator+=( const SfxStyleSheetBasePool& ); unsigned GetNumberOfStyles(); - virtual SfxStyleSheetBase* First(); - virtual SfxStyleSheetBase* Next(); + SfxStyleSheetBase* First(); + SfxStyleSheetBase* Next(); virtual SfxStyleSheetBase* Find( const OUString&, SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL ); virtual bool SetParent(SfxStyleFamily eFam, @@ -304,7 +304,7 @@ class SVL_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool protected: using SfxStyleSheetBasePool::Create; virtual SfxStyleSheetBase* Create(const OUString&, SfxStyleFamily, sal_uInt16 mask) SAL_OVERRIDE; - virtual SfxStyleSheetBase* Create(const SfxStyleSheet &); + SfxStyleSheetBase* Create(const SfxStyleSheet &); public: SfxStyleSheetPool( SfxItemPool const& ); diff --git a/include/svl/stylepool.hxx b/include/svl/stylepool.hxx index dd330ffbe736..4a971f0916fd 100644 --- a/include/svl/stylepool.hxx +++ b/include/svl/stylepool.hxx @@ -44,7 +44,7 @@ public: @return a shared pointer to the SfxItemSet */ - virtual SfxItemSet_Pointer_t insertItemSet( const SfxItemSet& rSet ); + SfxItemSet_Pointer_t insertItemSet( const SfxItemSet& rSet ); /** Create an iterator @@ -64,12 +64,12 @@ public: @postcond the iterator "points before the first" SfxItemSet of the pool. The first StylePoolIterator::getNext() call will deliver the first SfxItemSet. */ - virtual IStylePoolIteratorAccess* createIterator( const bool bSkipUnusedItemSets = false, + IStylePoolIteratorAccess* createIterator( const bool bSkipUnusedItemSets = false, const bool bSkipIgnorableItems = false ); /** Returns the number of styles */ - virtual sal_Int32 getCount() const; + sal_Int32 getCount() const; virtual ~StylePool(); diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx index 20b8a22633f8..7880958f7e0e 100644 --- a/include/svtools/acceleratorexecute.hxx +++ b/include/svtools/acceleratorexecute.hxx @@ -166,7 +166,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit is used only. Further the global Desktop instance is used for dispatch. */ - virtual void init(const css::uno::Reference< css::uno::XComponentContext >& rxContext, + void init(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xEnv ); diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx index 23ffc5008c73..73d97f111808 100644 --- a/include/svtools/accessibleruler.hxx +++ b/include/svtools/accessibleruler.hxx @@ -68,21 +68,21 @@ public: protected: virtual ~SvtRulerAccessible(); public: - virtual bool SAL_CALL + bool SAL_CALL isShowing() throw( ::com::sun::star::uno::RuntimeException ); - virtual bool SAL_CALL + bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException ); - virtual bool SAL_CALL + bool SAL_CALL isFocusTraversable() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL + void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL + void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); @@ -115,7 +115,7 @@ public: virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL + ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -183,10 +183,10 @@ public: protected: /// @Return the object's current bounding box relative to the desktop. - virtual Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); /// @Return the object's current bounding box relative to the parent object. - virtual Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 5fb89b0823ba..1dd3ca44d244 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -362,9 +362,9 @@ protected: nRow starts at 0 */ virtual bool SeekRow( long nRow ) = 0; - virtual void DrawCursor(); - virtual void PaintRow( OutputDevice &rDev, const Rectangle &rRect ); - virtual void PaintData( vcl::Window& rWin, const Rectangle& rRect ); + void DrawCursor(); + void PaintRow( OutputDevice &rDev, const Rectangle &rRect ); + void PaintData( vcl::Window& rWin, const Rectangle& rRect ); virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const = 0; // Advice for the subclass: the visible scope of rows has changed. @@ -450,9 +450,9 @@ public: // neue Handler virtual void MouseButtonDown( const BrowserMouseEvent& rEvt ); - virtual void MouseMove( const BrowserMouseEvent& rEvt ); + void MouseMove( const BrowserMouseEvent& rEvt ); virtual void MouseButtonUp( const BrowserMouseEvent& rEvt ); - virtual void StartScroll(); + void StartScroll(); virtual void EndScroll(); virtual void Select(); virtual void DoubleClick( const BrowserMouseEvent& rEvt ); @@ -460,7 +460,7 @@ public: virtual void CursorMoved(); virtual void ColumnMoved( sal_uInt16 nColId ); virtual void ColumnResized( sal_uInt16 nColId ); - virtual long QueryColumnResize( sal_uInt16 nColId, long nWidth ); + long QueryColumnResize( sal_uInt16 nColId, long nWidth ); /// called when the row height has been changed interactively virtual void RowHeightChanged(); virtual long QueryMinimumRowHeight(); @@ -498,7 +498,7 @@ public: long GetDataRowHeight() const; void SetTitleLines( sal_uInt16 nLines ); sal_uInt16 GetTitleLines() const { return nTitleLines; } - virtual long GetTitleHeight() const; + long GetTitleHeight() const; // access to dynamic values of cursor row OUString GetColumnTitle( sal_uInt16 nColumnId ) const; diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 3ad7b9718276..10dff86e49a8 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -274,11 +274,11 @@ public: virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void SelectionChanging(); - virtual void DateRangeChanged(); - virtual void RequestDateInfo(); - virtual void DoubleClick(); - virtual void Select(); + void SelectionChanging(); + void DateRangeChanged(); + void RequestDateInfo(); + void DoubleClick(); + void Select(); const CalendarWrapper& GetCalendarWrapper() const { return maCalendarWrapper; } @@ -418,10 +418,10 @@ public: CalendarField( vcl::Window* pParent, WinBits nWinStyle ); virtual ~CalendarField(); - virtual void Select(); + void Select(); virtual bool ShowDropDown( bool bShow ) SAL_OVERRIDE; - virtual Calendar* CreateCalendar( vcl::Window* pParent ); + Calendar* CreateCalendar( vcl::Window* pParent ); Calendar* GetCalendar(); void SetDefaultDate( const Date& rDate ) { maDefaultDate = rDate; } diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx index daee9bb1fef6..a898b08bc658 100644 --- a/include/svtools/colrdlg.hxx +++ b/include/svtools/colrdlg.hxx @@ -47,7 +47,7 @@ public: void SetMode( sal_Int16 eMode ); - virtual short Execute(); + short Execute(); private: vcl::Window* mpParent; diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index de433f61389d..2968848cc277 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -163,20 +163,20 @@ public: virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; using ListBox::InsertEntry; - virtual sal_Int32 InsertEntry( const OUString& rStr, + sal_Int32 InsertEntry( const OUString& rStr, sal_Int32 nPos = LISTBOX_APPEND ); - virtual sal_Int32 InsertEntry( const Color& rColor, const OUString& rStr, + sal_Int32 InsertEntry( const Color& rColor, const OUString& rStr, sal_Int32 nPos = LISTBOX_APPEND ); void InsertAutomaticEntryColor(const Color &rAutoColorValue); bool IsAutomaticSelected() { return !GetSelectEntryPos(); } using ListBox::RemoveEntry; - virtual void RemoveEntry( sal_Int32 nPos ); - virtual void Clear(); + void RemoveEntry( sal_Int32 nPos ); + void Clear(); void CopyEntries( const ColorListBox& rBox ); using ListBox::GetEntryPos; - virtual sal_Int32 GetEntryPos( const Color& rColor ) const; - virtual Color GetEntryColor( sal_Int32 nPos ) const; + sal_Int32 GetEntryPos( const Color& rColor ) const; + Color GetEntryColor( sal_Int32 nPos ) const; Size GetImageSize() const { return aImageSize; } void SelectEntry( const OUString& rStr, bool bSelect = true ) @@ -311,7 +311,7 @@ public: void SetNone( const OUString& sNone ); using ListBox::InsertEntry; - virtual sal_Int32 InsertEntry( const OUString& rStr, sal_Int32 nPos = LISTBOX_APPEND ); + sal_Int32 InsertEntry( const OUString& rStr, sal_Int32 nPos = LISTBOX_APPEND ); /** Insert a listbox entry with all widths in Twips. */ void InsertEntry( BorderWidthImpl aWidthImpl, sal_uInt16 nStyle, long nMinWidth = 0, @@ -320,11 +320,11 @@ public: ColorDistFunc pColorDistFn = &sameDistColor ); using ListBox::RemoveEntry; - virtual void RemoveEntry( sal_Int32 nPos ); - virtual void Clear(); + void RemoveEntry( sal_Int32 nPos ); + void Clear(); using ListBox::GetEntryPos; - virtual sal_Int32 GetEntryPos( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID ) const; + sal_Int32 GetEntryPos( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID ) const; sal_uInt16 GetEntryStyle( sal_Int32 nPos ) const; void SelectEntry( const OUString& rStr, bool bSelect = true ) { ListBox::SelectEntry( rStr, bSelect ); } diff --git a/include/svtools/editsyntaxhighlighter.hxx b/include/svtools/editsyntaxhighlighter.hxx index 8ec02d388281..5099750026b2 100644 --- a/include/svtools/editsyntaxhighlighter.hxx +++ b/include/svtools/editsyntaxhighlighter.hxx @@ -33,7 +33,7 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit svtools::ColorConfig m_aColorConfig; private: - virtual void DoBracketHilight(sal_uInt16 aKey); + void DoBracketHilight(sal_uInt16 aKey); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index 991e9e8033fd..8197e6fc3cec 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -54,8 +54,8 @@ public: virtual ~SfxErrorHandler(); protected: - virtual bool GetErrorString(sal_uLong lErrId, OUString &, sal_uInt16&) const; - virtual bool GetMessageString(sal_uLong lErrId, OUString &, sal_uInt16&) const; + bool GetErrorString(sal_uLong lErrId, OUString &, sal_uInt16&) const; + bool GetMessageString(sal_uLong lErrId, OUString &, sal_uInt16&) const; private: diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index 8dcc0f73108a..7400618d1a44 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -105,8 +105,8 @@ public: double GetMaxValue() const { return m_dMaxValue; } // Current value - virtual void SetValue(double dVal); - virtual double GetValue(); + void SetValue(double dVal); + double GetValue(); // The default implementation uses a formatter, if available void GetColor() const; @@ -243,12 +243,12 @@ protected: void ImplSetFormatKey(sal_uLong nFormatKey); // SetFormatKey without FormatChanged notification - virtual SvNumberFormatter* CreateFormatter() { SetFormatter(StandardFormatter()); return m_pFormatter; } + SvNumberFormatter* CreateFormatter() { SetFormatter(StandardFormatter()); return m_pFormatter; } SvNumberFormatter* ImplGetFormatter() const { return m_pFormatter ? m_pFormatter : ((FormattedField*)this)->CreateFormatter(); } bool PreNotify(NotifyEvent& rNEvt) SAL_OVERRIDE; - virtual void ReFormat(); + void ReFormat(); }; diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index fcfa66176cdc..377f92b29f95 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -311,8 +311,8 @@ private: void SVT_DLLPRIVATE ImplAfterDataChange(); protected: - virtual void GraphicManagerDestroyed(); - virtual SvStream* GetSwapStream() const; + void GraphicManagerDestroyed(); + SvStream* GetSwapStream() const; void SetSwapState(); virtual void Load( SvStream& ) SAL_OVERRIDE; diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index af7e0f62f3a4..e9ff21b7d364 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -297,9 +297,9 @@ public: virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void UserDraw( const UserDrawEvent& rUDEvt ); - virtual void StartDrag(); - virtual void Drag(); + void UserDraw( const UserDrawEvent& rUDEvt ); + void StartDrag(); + void Drag(); virtual void EndDrag(); virtual void Select(); virtual void DoubleClick(); diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx index 9c0f73b91450..874614ba214a 100644 --- a/include/svtools/imapobj.hxx +++ b/include/svtools/imapobj.hxx @@ -87,7 +87,7 @@ public: bool bActive ); virtual ~IMapObject() {}; - virtual sal_uInt16 GetVersion() const; + sal_uInt16 GetVersion() const; virtual sal_uInt16 GetType() const = 0; virtual bool IsHit( const Point& rPoint ) const = 0; diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index f23436962193..2c086637bddc 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -228,10 +228,10 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control protected: virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual bool EditedEntry( SvxIconChoiceCtrlEntry*, const OUString& rNewText, bool bCancelled ); - virtual void DocumentRectChanged(); - virtual void VisibleRectChanged(); - virtual bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); + bool EditedEntry( SvxIconChoiceCtrlEntry*, const OUString& rNewText, bool bCancelled ); + void DocumentRectChanged(); + void VisibleRectChanged(); + bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -240,11 +240,11 @@ protected: virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; - virtual void ClickIcon(); + void ClickIcon(); virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual void DrawEntryImage( + void DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, OutputDevice& rDev ); @@ -320,10 +320,10 @@ public: void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 ); #endif - virtual bool HasBackground() const; - virtual bool HasFont() const; - virtual bool HasFontTextColor() const; - virtual bool HasFontFillColor() const; + bool HasBackground() const; + bool HasFont() const; + bool HasFontTextColor() const; + bool HasFontFillColor() const; void SetFontColorToBackground ( bool bDo = true ) { _bAutoFontColor = bDo; } bool AutoFontColor () { return _bAutoFontColor; } diff --git a/include/svtools/parrtf.hxx b/include/svtools/parrtf.hxx index 2730d5a5b551..7a78c12591cb 100644 --- a/include/svtools/parrtf.hxx +++ b/include/svtools/parrtf.hxx @@ -55,7 +55,7 @@ protected: // scanne das naechste Token, virtual int _GetNextToken() SAL_OVERRIDE; - virtual void ReadUnknownData(); + void ReadUnknownData(); virtual void ReadBitmapData(); virtual void ReadOLEData(); diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx index 168c43b79076..739969500232 100644 --- a/include/svtools/popupmenucontrollerbase.hxx +++ b/include/svtools/popupmenucontrollerbase.hxx @@ -107,7 +107,7 @@ namespace svt */ virtual void SAL_CALL disposing() SAL_OVERRIDE; - virtual void resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); + void resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); virtual void impl_setPopupMenu(); virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL); OUString determineBaseURL( const OUString& aURL ); diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 8667f699bd92..f165f5a91b50 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -744,7 +744,7 @@ public: virtual void Drag(); virtual void EndDrag(); virtual void Click(); - virtual void DoubleClick(); + void DoubleClick(); virtual void ExtraDown(); void Activate() SAL_OVERRIDE; diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx index 41a6a00ca341..a3f3bf4629ed 100644 --- a/include/svtools/scrwin.hxx +++ b/include/svtools/scrwin.hxx @@ -69,12 +69,12 @@ public: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDEvt ) SAL_OVERRIDE; - virtual void StartScroll(); - virtual void EndScroll( long nDeltaX, long nDeltaY ); + void StartScroll(); + void EndScroll( long nDeltaX, long nDeltaY ); using OutputDevice::SetMapMode; virtual void SetMapMode( const MapMode& rNewMapMode ) SAL_OVERRIDE; - virtual MapMode GetMapMode() const; + MapMode GetMapMode() const; void SetTotalSize( const Size& rNewSize ); Size GetTotalSize() { return PixelToLogic( aTotPixSz ); } diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 006973422190..1f702147f894 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -77,10 +77,10 @@ protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void HBarClick(); - virtual void HBarDblClick(); - virtual void HBarStartDrag(); - virtual void HBarDrag(); - virtual void HBarEndDrag(); + void HBarDblClick(); + void HBarStartDrag(); + void HBarDrag(); + void HBarEndDrag(); virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index 491f2c58730f..46e5df4d77b5 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -101,7 +101,7 @@ public: virtual sal_uInt16 GetType() const SAL_OVERRIDE; virtual void InitViewData(SvTreeListBox*, SvTreeListEntry*, SvViewDataItem*) SAL_OVERRIDE; OUString GetText() const { return maText; } - virtual OUString GetExtendText() const { return OUString(); } + OUString GetExtendText() const { return OUString(); } void SetText( const OUString& rText ) { maText = rText; } virtual void Paint( @@ -153,7 +153,7 @@ public: virtual ~SvLBoxButton(); virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) SAL_OVERRIDE; virtual sal_uInt16 GetType() const SAL_OVERRIDE; - virtual bool ClickHdl(SvTreeListBox* pView, SvTreeListEntry* ); + bool ClickHdl(SvTreeListBox* pView, SvTreeListEntry* ); virtual void Paint( const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; virtual SvLBoxItem* Create() const SAL_OVERRIDE; diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 1ecb744d5e25..e41f52e8cbb2 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -403,7 +403,7 @@ public: virtual void Select(); virtual void DoubleClick(); - virtual void Split(); + void Split(); virtual void ActivatePage(); virtual bool DeactivatePage(); virtual bool StartRenaming(); diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx index ae0159510d8f..e702833ead21 100644 --- a/include/svtools/treelist.hxx +++ b/include/svtools/treelist.hxx @@ -224,8 +224,8 @@ public: const Link& GetCloneLink() const { return aCloneLink; } - virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ) const; // Calls the Clone Link - virtual SvTreeListEntry* CreateEntry() const; // To create Entries + SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ) const; // Calls the Clone Link + SvTreeListEntry* CreateEntry() const; // To create Entries sal_uInt16 GetRefCount() const { return nRefCount; } void SetRefCount( sal_uInt16 nRef ) { nRefCount = nRef; } diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 9a6c24d80046..f3558583a1d7 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -285,9 +285,9 @@ protected: // Put View-specific data into the Dragserver // Is called at the SourceView (in BeginDrag Handler) - virtual void WriteDragServerInfo( const Point&, SvLBoxDDInfo* ); + void WriteDragServerInfo( const Point&, SvLBoxDDInfo* ); // Is called at the TargetView (in Drop Handler) - virtual void ReadDragServerInfo( const Point&,SvLBoxDDInfo* ); + void ReadDragServerInfo( const Point&,SvLBoxDDInfo* ); // Invalidate children on enable/disable virtual void StateChanged( StateChangedType eType ) SAL_OVERRIDE; @@ -312,7 +312,7 @@ protected: // Calls InitViewData for all Items void RecalcViewData(); // Callback of RecalcViewData - virtual void ViewDataInitialized( SvTreeListEntry* ); + void ViewDataInitialized( SvTreeListEntry* ); // Handler and methods for Drag - finished handler. This link can be set // to the TransferDataContainer. The AddBox/RemoveBox methods must be @@ -465,7 +465,7 @@ public: SvTreeListBox* GetSourceView() const; - virtual void NotifyRemoving( SvTreeListEntry* ); + void NotifyRemoving( SvTreeListEntry* ); virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ); virtual SvTreeListEntry* CreateEntry() const; // To create new Entries @@ -490,16 +490,16 @@ public: ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; /** Fills the StateSet with all states (except DEFUNC, done by the accessible object). */ - virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet ) const; + void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet ) const; /** Fills the StateSet of one entry. */ - virtual void FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const; + void FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const; /** Calculate and return the bounding rectangle of an entry. @param pEntry The entry. @return The bounding rectangle of an entry. */ - virtual Rectangle GetBoundingRect( SvTreeListEntry* pEntry ); + Rectangle GetBoundingRect( SvTreeListEntry* pEntry ); /** Enables, that one cell of a tablistbox entry can be focused */ void EnableCellFocus(); @@ -561,10 +561,10 @@ protected: virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind); - virtual void NotifyBeginScroll(); + void NotifyBeginScroll(); virtual void NotifyEndScroll(); // nLines == 0 => horizontal Scrolling - virtual void NotifyScrolling( long nLines ); + void NotifyScrolling( long nLines ); virtual void NotifyScrolled(); void SetScrolledHdl( const Link& rLink ) { aScrolledHdl = rLink; } const Link& GetScrolledHdl() const { return aScrolledHdl; } @@ -572,12 +572,12 @@ protected: // Is called _before_ Areas in the Control are invalidated. // This can be used to hide Elements which are painted from outside into the Control - virtual void NotifyInvalidating(); + void NotifyInvalidating(); virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual void CursorMoved( SvTreeListEntry* pNewCursor ); + void CursorMoved( SvTreeListEntry* pNewCursor ); virtual void PreparePaint( SvTreeListEntry* ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 28a74a7dbd73..8342b603eee6 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -303,7 +303,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void Select(); - virtual void DoubleClick(); + void DoubleClick(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); void InsertItem( sal_uInt16 nItemId, const Image& rImage, diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index ab79abb3eaba..93188dad31a0 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -167,7 +167,7 @@ public: @return Returns true if both shapes are the same object. */ - virtual bool operator== (const AccessibleShape& rShape); + bool operator== (const AccessibleShape& rShape); /** Set the specified state. If the state is <const>FOCUSED</const> then, additionally to the inherited functionality, the focus @@ -448,7 +448,7 @@ protected: virtual OUString CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual OUString + OUString GetFullAccessibleName(AccessibleShape *shape) throw (::com::sun::star::uno::RuntimeException); virtual OUString GetStyle(); @@ -456,7 +456,7 @@ protected: ::com::sun::star::accessibility::XAccessibleStateSet > &xStateSet); /** Update the <const>OPAQUE</const> and <const>SELECTED</const> state. */ - virtual void UpdateStates (void); + void UpdateStates (void); private: /** Don't use the default constructor. Use the public constructor that diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx index a55a3a197a07..08585d19015d 100644 --- a/include/svx/AccessibleTextHelper.hxx +++ b/include/svx/AccessibleTextHelper.hxx @@ -144,7 +144,7 @@ namespace accessibility should only be called from the main office thread. */ - virtual const SvxEditSource& GetEditSource() const; + const SvxEditSource& GetEditSource() const; /** Set the current edit source @@ -186,7 +186,7 @@ namespace accessibility The new edit source to set. Object ownership is transferred from the caller to the callee. */ - virtual void SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource ); + void SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource ); /** Set the event source @@ -204,14 +204,14 @@ namespace accessibility The interface that should be set as the source for accessibility events sent by this object. */ - virtual void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface ); + void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface ); /** Get the event source @return the interface that is set as the source for accessibility events sent by this object. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetEventSource() const; + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetEventSource() const; /** Set offset of EditEngine/Outliner from parent @@ -227,13 +227,13 @@ namespace accessibility @param rPoint The offset in screen coordinates (i.e. pixel) */ - virtual void SetOffset( const Point& rPoint ); + void SetOffset( const Point& rPoint ); /** Query offset of EditEngine/Outliner from parent @return the offset in screen coordinates (i.e. pixel) */ - virtual Point GetOffset() const; + Point GetOffset() const; /** Set offset the object adds to all children's indices @@ -252,13 +252,13 @@ namespace accessibility @param nOffset The offset to add to every children's index. */ - virtual void SetStartIndex( sal_Int32 nOffset ); + void SetStartIndex( sal_Int32 nOffset ); /** Query offset the object adds to all children's indices @return the offset to add to every children's index. */ - virtual sal_Int32 GetStartIndex() const; + sal_Int32 GetStartIndex() const; /** Sets a vector of additional accessible states. @@ -285,7 +285,7 @@ namespace accessibility (e.g. via TEXT_HINT_VIEWSCROLLED). Normally, there should not be a need to call this method. */ - virtual void UpdateChildren(); + void UpdateChildren(); /** Drop all references and enter disposed state @@ -295,7 +295,7 @@ namespace accessibility return default values or throw a uno::DisposedException exception). */ - virtual void Dispose(); + void Dispose(); /** Set the focus state of the accessibility object @@ -320,7 +320,7 @@ namespace accessibility @see HaveFocus() */ - virtual void SetFocus( bool bHaveFocus = true ); + void SetFocus( bool bHaveFocus = true ); /** Query the focus state of the surrounding object @@ -332,7 +332,7 @@ namespace accessibility @return the state of the focus ownership */ - virtual bool HaveFocus(); + bool HaveFocus(); /** Call this method to invoke all event listeners with the given event @@ -347,7 +347,7 @@ namespace accessibility @param rOldValue The old value before the change */ - virtual void FireEvent( const sal_Int16 nEventId, + void FireEvent( const sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const; @@ -369,7 +369,7 @@ namespace accessibility @return sal_True, if the text or parts of it are currently selected */ - virtual bool IsSelected() const; + bool IsSelected() const; // XAccessibleContext child handling methods @@ -378,13 +378,13 @@ namespace accessibility @attention Don't call with locked mutexes. You may hold the solar mutex, but this method acquires it anyway. */ - virtual sal_Int32 GetChildCount(); + sal_Int32 GetChildCount(); /** Implements getAccessibleChild @attention Don't call with locked mutexes. You may hold the solar mutex, but this method acuires it anyway. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChild( sal_Int32 i ); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChild( sal_Int32 i ); // XAccessibleEventBroadcaster child related methods @@ -392,12 +392,12 @@ namespace accessibility @attention Don't call with locked mutexes */ - virtual void AddEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ); + void AddEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ); /** Implements removeEventListener @attention Don't call with locked mutexes */ - virtual void RemoveEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ); + void RemoveEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ); // XAccessibleComponent child related methods @@ -406,7 +406,7 @@ namespace accessibility @attention Don't call with locked mutexes. You may hold the solar mutex, but this method acquires it anyway. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL GetAt( const ::com::sun::star::awt::Point& aPoint ); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL GetAt( const ::com::sun::star::awt::Point& aPoint ); private: diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index 8ccf990d02be..3851b8e349a3 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -51,7 +51,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual OUString GetValueText( sal_uInt16 nVal ) const; + OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 840df880c710..3371a15e2a07 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -312,7 +312,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -323,10 +323,10 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVersion) const SAL_OVERRIDE; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual double GetMin() const; - virtual double GetMax() const; + double GetMin() const; + double GetMax() const; - virtual SfxFieldUnit GetUnit() const; + SfxFieldUnit GetUnit() const; double GetValue() const { return fVal; } void SetValue(double fNewVal) { fVal = fNewVal; } diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 46ca48af47eb..f66294fbebde 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -42,8 +42,8 @@ public: void SetSize(const Size& rSize); void CopyBackground( const DialControlBmp& rSrc ); void DrawBackground( const Size& rSize, bool bEnabled ); - virtual void DrawBackground(); - virtual void DrawElements( const OUString& rText, sal_Int32 nAngle ); + void DrawBackground(); + void DrawElements( const OUString& rText, sal_Int32 nAngle ); protected: Rectangle maRect; @@ -150,7 +150,7 @@ protected: std::unique_ptr< DialControl_Impl > mpImpl; virtual void HandleMouseEvent( const Point& rPos, bool bInitial ); - virtual void HandleEscapeEvent(); + void HandleEscapeEvent(); void SetRotation( sal_Int32 nAngle, bool bBroadcast ); diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 21cba2546081..456c4f8afb25 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -228,7 +228,7 @@ public: ColorLB( vcl::Window* pParent, ResId Id ) : ColorListBox( pParent, Id ) {} ColorLB( vcl::Window* pParent, WinBits aWB ) : ColorListBox( pParent, aWB ) {} - virtual void Fill( const XColorListRef &pTab ); + void Fill( const XColorListRef &pTab ); void Append( const XColorEntry& rEntry ); void Modify( const XColorEntry& rEntry, sal_Int32 nPos ); @@ -242,7 +242,7 @@ class SVX_DLLPUBLIC HatchingLB : public ListBox public: explicit HatchingLB(vcl::Window* pParent, WinBits aWB); - virtual void Fill( const XHatchListRef &pList ); + void Fill( const XHatchListRef &pList ); void Append( const XHatchEntry& rEntry, const Bitmap& rBitmap ); void Modify( const XHatchEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap ); @@ -256,7 +256,7 @@ class SVX_DLLPUBLIC GradientLB : public ListBox public: explicit GradientLB(vcl::Window* pParent, WinBits aWB); - virtual void Fill( const XGradientListRef &pList ); + void Fill( const XGradientListRef &pList ); void Append( const XGradientEntry& rEntry, const Bitmap& rBitmap ); void Modify( const XGradientEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap ); @@ -271,7 +271,7 @@ class SVX_DLLPUBLIC BitmapLB : public ListBox public: explicit BitmapLB(vcl::Window* pParent, WinBits aWB); - virtual void Fill(const XBitmapListRef &pList); + void Fill(const XBitmapListRef &pList); void Append(const Size& rSize, const XBitmapEntry& rEntry); void Modify(const Size& rSize, const XBitmapEntry& rEntry, sal_Int32 nPos); @@ -293,10 +293,10 @@ private: public: FillAttrLB( vcl::Window* pParent, WinBits aWB ); - virtual void Fill( const XColorListRef &pList ); - virtual void Fill( const XHatchListRef &pList ); - virtual void Fill( const XGradientListRef &pList ); - virtual void Fill( const XBitmapListRef &pList ); + void Fill( const XColorListRef &pList ); + void Fill( const XHatchListRef &pList ); + void Fill( const XGradientListRef &pList ); + void Fill( const XBitmapListRef &pList ); }; /************************************************************************/ @@ -308,7 +308,7 @@ public: FillTypeLB( vcl::Window* pParent, ResId Id ) : ListBox( pParent, Id ) {} FillTypeLB( vcl::Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) {} - virtual void Fill(); + void Fill(); }; /************************************************************************/ @@ -324,7 +324,7 @@ public: LineLB(vcl::Window* pParent, WinBits aWB); virtual ~LineLB(); - virtual void Fill(const XDashListRef &pList); + void Fill(const XDashListRef &pList); bool getAddStandardFields() const { return mbAddStandardFields; } void setAddStandardFields(bool bNew); @@ -343,7 +343,7 @@ public: LineEndLB( vcl::Window* pParent, WinBits aWB ); virtual ~LineEndLB (void); - virtual void Fill( const XLineEndListRef &pList, bool bStart = true ); + void Fill( const XLineEndListRef &pList, bool bStart = true ); void Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap, bool bStart = true ); void Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap, bool bStart = true ); diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx index ad8075e28c16..0d87726917d7 100644 --- a/include/svx/e3dundo.hxx +++ b/include/svx/e3dundo.hxx @@ -104,7 +104,7 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction virtual bool CanRepeat(SfxRepeatTarget& rView) const SAL_OVERRIDE; virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(); + void Repeat(); }; #endif // INCLUDED_SVX_E3DUNDO_HXX diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index 63f96a747bf7..5c568ded8ed5 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -110,8 +110,8 @@ public: FmFormShell(SfxViewShell* pParent, FmFormView* pView = NULL); virtual ~FmFormShell(); - virtual void Execute( SfxRequest& ); - virtual void GetState( SfxItemSet& ); + void Execute( SfxRequest& ); + void GetState( SfxItemSet& ); virtual bool HasUIFeature( sal_uInt32 nFeature ) SAL_OVERRIDE; void ExecuteTextAttribute( SfxRequest& ); diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index 3e116f0a278c..76b88ab457c3 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -141,8 +141,8 @@ public: struct ImplAccess { friend class FmXFormView; private: ImplAccess() { } }; void SetMoveOutside( bool _bMoveOutside, ImplAccess ) { E3dView::SetMoveOutside( _bMoveOutside ); } - virtual void InsertControlContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& xCC); - virtual void RemoveControlContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& xCC); + void InsertControlContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& xCC); + void RemoveControlContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& xCC); virtual SdrPaintWindow* BeginCompleteRedraw(OutputDevice* pOut) SAL_OVERRIDE; virtual void EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer) SAL_OVERRIDE; diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx index f1ff2033d9be..54166cd234b4 100644 --- a/include/svx/fontwork.hxx +++ b/include/svx/fontwork.hxx @@ -164,7 +164,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow void ApplyImageList(); protected: - virtual void Zoom(); + void Zoom(); virtual SfxChildAlignment CheckAlignment( SfxChildAlignment eActAlign, SfxChildAlignment eAlign ) SAL_OVERRIDE; diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index b11f1d5623a2..6aaa25db18d8 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -163,7 +163,7 @@ public: virtual SdrObjList* GetSubList() const SAL_OVERRIDE; // Insert 3D object into the group; transfer to other owner! - virtual void Insert3DObj(E3dObject* p3DObj); + void Insert3DObj(E3dObject* p3DObj); void Remove3DObj(E3dObject* p3DObj); E3dObject* GetParentObj() const; diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index fda9314581b3..05799ed8347b 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -44,7 +44,7 @@ public: virtual ~SvxRotateModeItem(); virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual OUString GetValueText( sal_uInt16 nVal ) const; + OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index 96f301229928..60bc63e0e786 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -224,7 +224,7 @@ protected: // calculation of boundary values for object borders // values refer to the page - virtual bool CalcLimits(long &nMax1, long &nMax2, bool bFirst) const; + bool CalcLimits(long &nMax1, long &nMax2, bool bFirst) const; bool IsActLastColumn( bool bForceDontConsiderHidden = false, sal_uInt16 nAct=USHRT_MAX) const; diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index a114e2a07642..fdb56896a0fe 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -35,7 +35,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -69,7 +69,7 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -102,7 +102,7 @@ protected: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -171,7 +171,7 @@ class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem protected: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -229,7 +229,7 @@ private: protected: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx index 09b63255db00..d49d19db48c0 100644 --- a/include/svx/sdr/contact/objectcontact.hxx +++ b/include/svx/sdr/contact/objectcontact.hxx @@ -60,7 +60,7 @@ private: void AddViewObjectContact(ViewObjectContact& rVOContact); // A ViewObjectContact was deleted and shall be forgotten. - virtual void RemoveViewObjectContact(ViewObjectContact& rVOContact); + void RemoveViewObjectContact(ViewObjectContact& rVOContact); // the primitiveAnimator which is used if this View and/or the contained primitives // support animatedSwitchPrimitives diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx index 446fb15fc10a..8af91c7a7af8 100644 --- a/include/svx/sdr/contact/viewcontact.hxx +++ b/include/svx/sdr/contact/viewcontact.hxx @@ -89,8 +89,8 @@ protected: // Methods to react on start getting viewed or stop getting // viewed. This info is derived from the count of members of // registered ViewObjectContacts. Default does nothing. - virtual void StartGettingViewed(); - virtual void StopGettingViewed(); + void StartGettingViewed(); + void StopGettingViewed(); public: // basic destructor with needed cleanups diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index 07b82f51f46c..d3490a7eb90f 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -59,7 +59,7 @@ protected: virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; // get notified if some properties have changed - virtual void mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState ); + void mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState ); protected: // This method is responsible for creating the graphical visualisation data diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx index e371c9c28ac7..dca5c60abbba 100644 --- a/include/svx/sdr/contact/viewobjectcontact.hxx +++ b/include/svx/sdr/contact/viewobjectcontact.hxx @@ -108,7 +108,7 @@ public: bool isAnimated() const { return (0 != mpPrimitiveAnimation); } // Take some action when new objects are inserted - virtual void ActionChildInserted(ViewContact& rChild); + void ActionChildInserted(ViewContact& rChild); // access to the local primitive. This will ensure that the local primitive is // current in comparing the local one with a fresh created incarnation diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx index 243b1c6c8a4a..857b7f9f20c0 100644 --- a/include/svx/sdr/overlay/overlayobject.hxx +++ b/include/svx/sdr/overlay/overlayobject.hxx @@ -111,7 +111,7 @@ namespace sdr // set changed flag. Call after change, since the old range is invalidated // and then the new one is calculated and invalidated, too. This will only // work after the change. - virtual void objectChange(); + void objectChange(); // write access to AntiAliase flag. This is protected since // only implementations are allowed to change this, preferably in their diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx index 6489504e79aa..7da54df7971d 100644 --- a/include/svx/sdrmasterpagedescriptor.hxx +++ b/include/svx/sdrmasterpagedescriptor.hxx @@ -55,7 +55,7 @@ namespace sdr void operator=(const MasterPageDescriptor& rCandidate); protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + sdr::contact::ViewContact* CreateObjectSpecificViewContact(); public: MasterPageDescriptor(SdrPage& aOwnerPage, SdrPage& aUsedPage); diff --git a/include/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx index c5a1eee729dd..2e5d7910fe81 100644 --- a/include/svx/sidebar/Popup.hxx +++ b/include/svx/sidebar/Popup.hxx @@ -87,7 +87,7 @@ protected: /** A derived specialisation class can override this method to do additional work. */ - virtual void CreateContainerAndControl (void); + void CreateContainerAndControl (void); private: vcl::Window* mpParent; diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 2eb9bb1b9f5c..66bbe0b8f043 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -256,16 +256,16 @@ public: rtl::Reference< sdr::SelectionController > getSelectionController() const { return mxSelectionController; } /** returns true if the shape identified by its inventor and identifier supports format paint brush operation */ - virtual bool SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const; + bool SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const; /** returns a format paint brush set from the current selection */ - virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet ); + bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet ); /** applies a format paint brush set from the current selection. if bNoCharacterFormats is true, no character attributes are changed. if bNoParagraphFormats is true, no paragraph attributes are changed. */ - virtual void ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats ); + void ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats ); /** helper function for selections with multiple SdrText for one SdrTextObj (f.e. tables ) */ void ApplyFormatPaintBrushToText( SfxItemSet& rFormatSet, SdrTextObj& rTextObj, SdrText* pText, bool bNoCharacterFormats, bool bNoParagraphFormats ); diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index a923c78fdc46..d50124a32ae3 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -421,10 +421,10 @@ public: // Masterpages virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); - virtual void DeleteMasterPage(sal_uInt16 nPgNum); + void DeleteMasterPage(sal_uInt16 nPgNum); // Remove means transferring ownership to the caller (opposite of Insert) virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum); - virtual void MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos); + void MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos); const SdrPage* GetMasterPage(sal_uInt16 nPgNum) const; SdrPage* GetMasterPage(sal_uInt16 nPgNum); sal_uInt16 GetMasterPageCount() const; @@ -496,7 +496,7 @@ public: // of the files, i.e. true or false. (Method is called multiple // times, so use one flag only!) virtual bool IsReadOnly() const; - virtual void SetReadOnly(bool bYes); + void SetReadOnly(bool bYes); // Mixing two SdrModels. Mind that rSourceModel is not const. // The pages will not be copied but moved, when inserted. diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 1d7ba2e24c5e..3982175f2f22 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -141,9 +141,9 @@ protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; virtual void ModelHasChanged() SAL_OVERRIDE; // Is called by the PaintView virtual void SetMarkHandles(); // aHdl - fill (List of handles) - virtual void SetMarkRects(); // Rects at the PageViews - virtual void CheckMarked(); // Scan MarkList after Del and Lock Layer ... - virtual void AddDragModeHdl(SdrDragMode eMode); + void SetMarkRects(); // Rects at the PageViews + void CheckMarked(); // Scan MarkList after Del and Lock Layer ... + void AddDragModeHdl(SdrDragMode eMode); virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; // add custom handles (used by other apps, e.g. AnchorPos) @@ -154,8 +154,8 @@ protected: //HMHvoid ImpShowMarkHdl(bool bNoRefHdl); virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay) const; - virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const; - virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const; + SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const; + SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const; bool ImpIsFrameHandles() const; void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal=0, sal_uInt16 nOpt=0) const; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 1113ef88118b..ab94f3150d03 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -209,12 +209,12 @@ public: sal_uInt32 GetInventor() const { return nInventor;} sal_uInt16 GetId() const { return nIdentifier;} - virtual bool HasMacro (const SdrObject* pObj) const; - virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; - virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; - virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; - virtual bool DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj); - virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; + bool HasMacro (const SdrObject* pObj) const; + SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; + Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; + void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; + bool DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj); + OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; }; // all geometrical data of an arbitrary object for use in undo/redo @@ -401,7 +401,7 @@ public: protected: // override if the class inherits from SdrObjPlusData: - virtual SdrObjPlusData* NewPlusData() const; + SdrObjPlusData* NewPlusData() const; protected: /// A derived class must override these 3 methods if it has own geometric @@ -441,8 +441,8 @@ public: void RemoveListener(SfxListener& rListener); const SfxBroadcaster* GetBroadcaster() const; - virtual void AddReference(SdrVirtObj& rVrtObj); - virtual void DelReference(SdrVirtObj& rVrtObj); + void AddReference(SdrVirtObj& rVrtObj); + void DelReference(SdrVirtObj& rVrtObj); virtual sal_uInt32 GetObjInventor() const; virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; @@ -452,7 +452,7 @@ public: virtual void NbcSetLayer(SdrLayerID nLayer); virtual void SetLayer(SdrLayerID nLayer); // renaming GetLayerSet -> getMergedHierarchyLayerSet to make clear what happens here. rSet needs to be empty. - virtual void getMergedHierarchyLayerSet(SetOfByte& rSet) const; + void getMergedHierarchyLayerSet(SetOfByte& rSet) const; // UserCall interface void SetUserCall(SdrObjUserCall* pUser); @@ -745,7 +745,7 @@ public: // keep text in outliner's format // SetOutlinerParaObject: transfer ownership of *pTextObject! - virtual void SetOutlinerParaObject(OutlinerParaObject* pTextObject); + void SetOutlinerParaObject(OutlinerParaObject* pTextObject); virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); virtual OutlinerParaObject* GetOutlinerParaObject() const; virtual void NbcReformatText(); diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index a828d1184b4a..8a329347ddf9 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -76,7 +76,7 @@ public: protected: - virtual void mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState ); + void mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState ); virtual ::sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; private: diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index df738c29a44d..e8e2a4f975fa 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -182,9 +182,9 @@ public: // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. - virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText = false, ::Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; + void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText = false, ::Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const SAL_OVERRIDE; - virtual void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const; + void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const SAL_OVERRIDE; virtual bool IsAutoGrowHeight() const SAL_OVERRIDE; @@ -246,7 +246,7 @@ public: virtual bool BegTextEdit(SdrOutliner& rOutl) SAL_OVERRIDE; virtual void EndTextEdit(SdrOutliner& rOutl) SAL_OVERRIDE; virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const SAL_OVERRIDE; - virtual void TakeTextEditArea(const sdr::table::CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; + void TakeTextEditArea(const sdr::table::CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual sal_uInt16 GetOutlinerViewAnchorMode() const SAL_OVERRIDE; virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) SAL_OVERRIDE; diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index ef8e0f1be513..b1ee25d81f21 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -552,7 +552,7 @@ public: // #103836# iterates over the paragraphs of a given SdrObject and removes all // hard set character attributes with the which ids contained in the // given vector - virtual void RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>& rCharWhichIds ); + void RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>& rCharWhichIds ); // #111096# // Get necessary data for text scroll animation. ATM base it on a Text-Metafile and a diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index 927a0f572938..ce4c31828016 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -56,8 +56,8 @@ public: TYPEINFO_OVERRIDE(); SdrVirtObj(SdrObject& rNewObj); virtual ~SdrVirtObj(); - virtual SdrObject& ReferencedObj(); - virtual const SdrObject& GetReferencedObj() const; + SdrObject& ReferencedObj(); + const SdrObject& GetReferencedObj() const; virtual void NbcSetAnchorPos(const Point& rAnchorPos) SAL_OVERRIDE; virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index e6add4500019..3f2cc06d1190 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -100,7 +100,7 @@ friend class SdrEditView; bool bObjOrdNumsDirty; bool bRectsDirty; protected: - virtual void RecalcRects(); + void RecalcRects(); SdrObjList(); void lateInit(const SdrObjList& rSrcList); @@ -128,9 +128,9 @@ public: void SetUpList(SdrObjList* pNewUpList) { pUpList=pNewUpList; } SdrObject* GetOwnerObj() const { return pOwnerObj; } void SetOwnerObj(SdrObject* pNewOwner) { pOwnerObj=pNewOwner; } - virtual SdrPage* GetPage() const; - virtual void SetPage(SdrPage* pNewPage); - virtual SdrModel* GetModel() const; + SdrPage* GetPage() const; + void SetPage(SdrPage* pNewPage); + SdrModel* GetModel() const; virtual void SetModel(SdrModel* pNewModel); /// recalculate order numbers / ZIndex void RecalcObjOrdNums(); @@ -150,7 +150,7 @@ public: virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, size_t nObjNum); virtual SdrObject* ReplaceObject(SdrObject* pNewObj, size_t nObjNum); /// Modify ZOrder of an SdrObject - virtual SdrObject* NbcSetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum); + SdrObject* NbcSetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum); virtual SdrObject* SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum); void SetRectsDirty(); @@ -184,7 +184,7 @@ public: list, extracts the content, inserts it flat to the list and removes the group object afterwards. */ - virtual void FlattenGroups(); + void FlattenGroups(); /** Ungroup the object at the given index This method ungroups the content of the group object at the @@ -194,7 +194,7 @@ public: operation is performed recursively, such that the content of the given object contains no groups afterwards. */ - virtual void UnGroupObj( size_t nObjNum ); + void UnGroupObj( size_t nObjNum ); /** Return whether there is an explicit, user defined, object navigation order. When there is one this method returns <TRUE/> and the @@ -430,7 +430,7 @@ public: private: sdr::contact::ViewContact* mpViewContact; protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + sdr::contact::ViewContact* CreateObjectSpecificViewContact(); public: sdr::contact::ViewContact& GetViewContact() const; @@ -499,7 +499,7 @@ public: bool IsMasterPage() const { return mbMaster; } void SetInserted(bool bNew = true); bool IsInserted() const { return mbInserted; } - virtual void SetChanged(); + void SetChanged(); // #i68775# React on PageNum changes (from Model in most cases) void SetPageNum(sal_uInt16 nNew); @@ -511,20 +511,20 @@ public: bool getPageBorderOnlyLeftRight() const { return mbPageBorderOnlyLeftRight; } virtual void SetSize(const Size& aSiz); - virtual Size GetSize() const; + Size GetSize() const; virtual void SetOrientation(Orientation eOri); virtual Orientation GetOrientation() const; - virtual sal_Int32 GetWdt() const; - virtual sal_Int32 GetHgt() const; + sal_Int32 GetWdt() const; + sal_Int32 GetHgt() const; virtual void SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 Lwr); virtual void SetLftBorder(sal_Int32 nBorder); virtual void SetUppBorder(sal_Int32 nBorder); virtual void SetRgtBorder(sal_Int32 nBorder); virtual void SetLwrBorder(sal_Int32 nBorder); - virtual sal_Int32 GetLftBorder() const; - virtual sal_Int32 GetUppBorder() const; - virtual sal_Int32 GetRgtBorder() const; - virtual sal_Int32 GetLwrBorder() const; + sal_Int32 GetLftBorder() const; + sal_Int32 GetUppBorder() const; + sal_Int32 GetRgtBorder() const; + sal_Int32 GetLwrBorder() const; virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 25d8e087ebc8..aa734ec28f65 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -376,7 +376,7 @@ public: // EndCompleteRedraw does the necessary refreshes, evtl. paints text edit and overlay and evtl destroys the // SdrPaintWindow again. This means: the SdrPaintWindow is no longer safe after this closing call. virtual SdrPaintWindow* BeginCompleteRedraw(OutputDevice* pOut); - virtual void DoCompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0); + void DoCompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0); virtual void EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer); @@ -532,7 +532,7 @@ public: const svtools::ColorConfig& getColorConfig() const { return maColorConfig;} - virtual void onChangeColorConfig(); + void onChangeColorConfig(); // #103834# Set background color for svx at SdrPageViews void SetApplicationBackgroundColor(Color aBackgroundColor); diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx index a77da32e5470..3aad68fec9cf 100644 --- a/include/svx/svdtext.hxx +++ b/include/svx/svdtext.hxx @@ -47,13 +47,13 @@ public: virtual ~SdrText(); virtual void SetModel(SdrModel* pNewModel); - virtual void ForceOutlinerParaObject( sal_uInt16 nOutlMode ); + void ForceOutlinerParaObject( sal_uInt16 nOutlMode ); virtual void SetOutlinerParaObject( OutlinerParaObject* pTextObject ); - virtual OutlinerParaObject* GetOutlinerParaObject() const; + OutlinerParaObject* GetOutlinerParaObject() const; - virtual void CheckPortionInfo( SdrOutliner& rOutliner ); - virtual void ReformatText(); + void CheckPortionInfo( SdrOutliner& rOutliner ); + void ReformatText(); // default uses GetObjectItemSet, but may be overridden to // return a text-specific ItemSet diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index c3e48615d48c..b99d15e3901f 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -751,7 +751,7 @@ public: virtual SdrUndoAction* CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ); // Implement Title/Description Elements UI for Writer text frames, graphics and embedded objects (#i73249#) - virtual SdrUndoAction* CreateUndoObjectStrAttr( SdrObject& rObject, + SdrUndoAction* CreateUndoObjectStrAttr( SdrObject& rObject, SdrUndoObjStrAttr::ObjStrAttrType eObjStrAttrType, const OUString& sOldStr, const OUString& sNewStr ); diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx index 348f97a4ae33..e7eaab1ca615 100644 --- a/include/svx/unopool.hxx +++ b/include/svx/unopool.hxx @@ -77,7 +77,7 @@ public: protected: void init(); - virtual void getAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException); + void getAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException); virtual void putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, css::uno::RuntimeException); protected: diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index 928c37bdf914..f882b3f707c6 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -100,7 +100,7 @@ namespace toolkit // XAccessibleComponent 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 void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx index 3ed77911102f..18c646023609 100644 --- a/include/toolkit/controls/geometrycontrolmodel.hxx +++ b/include/toolkit/controls/geometrycontrolmodel.hxx @@ -83,9 +83,9 @@ namespace com { namespace sun { namespace star { bool m_bCloneable; protected: - virtual ::com::sun::star::uno::Any ImplGetDefaultValueByHandle(sal_Int32 nHandle) const; - virtual ::com::sun::star::uno::Any ImplGetPropertyValueByHandle(sal_Int32 nHandle) const; - virtual void ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: com::sun::star::uno::Any& aValue); + ::com::sun::star::uno::Any ImplGetDefaultValueByHandle(sal_Int32 nHandle) const; + ::com::sun::star::uno::Any ImplGetPropertyValueByHandle(sal_Int32 nHandle) const; + void ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: com::sun::star::uno::Any& aValue); protected: /** diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx index 0e0269a9dacf..2e1911f86e57 100644 --- a/include/tools/inetmime.hxx +++ b/include/tools/inetmime.hxx @@ -714,7 +714,7 @@ protected: @return The length of pOctets (without the terminating null). */ - virtual sal_Size writeSequence(const sal_Char * pSequence); + sal_Size writeSequence(const sal_Char * pSequence); /** Write a sequence of octets. @@ -726,7 +726,7 @@ protected: @param pEnd Points past the end of the sequence, must be >= pBegin. */ - virtual void writeSequence(const sal_uInt32 * pBegin, + void writeSequence(const sal_uInt32 * pBegin, const sal_uInt32 * pEnd); /** Write a sequence of octets. @@ -739,7 +739,7 @@ protected: @param pEnd Points past the end of the sequence, must be >= pBegin. */ - virtual void writeSequence(const sal_Unicode * pBegin, + void writeSequence(const sal_Unicode * pBegin, const sal_Unicode * pEnd); public: diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx index 062f1bbe926a..912595cab622 100644 --- a/include/tools/inetmsg.hxx +++ b/include/tools/inetmsg.hxx @@ -423,7 +423,7 @@ public: bool HeaderParsed() const { return bHeaderParsed; } - virtual INetMIMEMessage* CreateMessage ( + INetMIMEMessage* CreateMessage ( const INetMIMEMessage& rMsg) const; using INetRFC822Message::SetHeaderField; diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 59561de1d9c2..27854e05c051 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -127,10 +127,10 @@ public: virtual ~SvLockBytes() { close(); } - virtual const SvStream * GetStream() const { return m_pStream; } + const SvStream * GetStream() const { return m_pStream; } virtual void SetSynchronMode(bool bTheSync = true) { m_bSync = bTheSync; } - virtual bool IsSynchronMode() const { return m_bSync; } + bool IsSynchronMode() const { return m_bSync; } virtual ErrCode ReadAt(sal_uInt64 nPos, void * pBuffer, sal_Size nCount, sal_Size * pRead) const; @@ -462,10 +462,10 @@ public: friend SvStream& operator<<( SvStream& rStr, SvStrPtr f ); // for Manips /// end of input seen during previous i/o operation - virtual bool eof() const { return bIsEof; } + bool eof() const { return bIsEof; } /// stream is broken - virtual bool bad() const { return GetError() != 0; } + bool bad() const { return GetError() != 0; } /** Get state @@ -698,7 +698,7 @@ protected: /// AllocateMemory must update pBuf accordingly /// - pBuf: Address of new block - virtual bool AllocateMemory( sal_Size nSize ); + bool AllocateMemory( sal_Size nSize ); /// ReAllocateMemory must update the following variables: /// - pBuf: Address of new block @@ -706,11 +706,11 @@ protected: /// Set to 0 , if new block size is 0 bytes /// - nSize: New block size /// - nPos: Set to 0 if position outside of block - virtual bool ReAllocateMemory( long nDiff ); + bool ReAllocateMemory( long nDiff ); /// Is called when this stream allocated the buffer or the buffer is /// resized. FreeMemory may need to NULLify handles in derived classes. - virtual void FreeMemory(); + void FreeMemory(); SvMemoryStream(void*) { } // for sub-classes diff --git a/include/vbahelper/vbadocumentbase.hxx b/include/vbahelper/vbadocumentbase.hxx index 43306761c7a2..9fd0ed467dca 100644 --- a/include/vbahelper/vbadocumentbase.hxx +++ b/include/vbahelper/vbadocumentbase.hxx @@ -31,7 +31,7 @@ protected: css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::uno::XInterface > mxVBProject; protected: - virtual css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } + css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } public: VbaDocumentBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > xModel ); diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx index 98860eb82d6c..18aa3cc283cb 100644 --- a/include/vbahelper/vbashape.hxx +++ b/include/vbahelper/vbashape.hxx @@ -44,9 +44,9 @@ protected: sal_Int32 m_nType; css::uno::Reference< css::frame::XModel > m_xModel; css::uno::Any m_aRange; - virtual void addListeners(); - virtual void removeShapeListener() throw( css::uno::RuntimeException ); - virtual void removeShapesListener() throw( css::uno::RuntimeException ); + void addListeners(); + void removeShapeListener() throw( css::uno::RuntimeException ); + void removeShapesListener() throw( css::uno::RuntimeException ); virtual OUString getServiceImplName() SAL_OVERRIDE; virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; public: diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx index e67a18d27bc8..f514348f3c62 100644 --- a/include/vbahelper/vbashapes.hxx +++ b/include/vbahelper/vbashapes.hxx @@ -41,7 +41,7 @@ protected: css::uno::Reference< css::frame::XModel > m_xModel; virtual OUString getServiceImplName() SAL_OVERRIDE; virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XIndexAccess > getShapesByArrayIndices( const css::uno::Any& Index ) throw (css::uno::RuntimeException); + css::uno::Reference< css::container::XIndexAccess > getShapesByArrayIndices( const css::uno::Any& Index ) throw (css::uno::RuntimeException); css::uno::Reference< css::drawing::XShape > createShape( const OUString& service ) throw (css::uno::RuntimeException); css::uno::Any AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, css::uno::Any aRange ) throw (css::uno::RuntimeException); css::uno::Any AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, css::uno::Any aRange ) throw (css::uno::RuntimeException); diff --git a/include/vbahelper/vbatextframe.hxx b/include/vbahelper/vbatextframe.hxx index c2ddd8db8b1e..5a175630cac0 100644 --- a/include/vbahelper/vbatextframe.hxx +++ b/include/vbahelper/vbatextframe.hxx @@ -33,7 +33,7 @@ protected: protected: virtual OUString getServiceImplName() SAL_OVERRIDE; virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; - virtual void setAsMSObehavior(); + void setAsMSObehavior(); sal_Int32 getMargin( const OUString& sMarginType ); void setMargin( const OUString& sMarginType, float fMargin ); public: diff --git a/include/vcl/ImageListProvider.hxx b/include/vcl/ImageListProvider.hxx index 924720b17842..1aa35dc238cd 100644 --- a/include/vcl/ImageListProvider.hxx +++ b/include/vcl/ImageListProvider.hxx @@ -39,7 +39,7 @@ namespace vcl /* abstract */ class IImageListProvider { public: - virtual ImageList getImageList(ImageListType) = 0; + ; protected: ~IImageListProvider() {} diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx index 5088dc57ff21..d0394bb94cf5 100644 --- a/include/vcl/accel.hxx +++ b/include/vcl/accel.hxx @@ -68,9 +68,9 @@ public: Accelerator( const ResId& rResId ); virtual ~Accelerator(); - virtual void Activate(); - virtual void Deactivate(); - virtual void Select(); + void Activate(); + void Deactivate(); + void Select(); void InsertItem( sal_uInt16 nItemId, const vcl::KeyCode& rKeyCode ); void InsertItem( const ResId& rResId ); diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index 81df3d1e9090..5601f1ffc93d 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -44,7 +44,7 @@ public: virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void Click(); + void Click(); void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; } const Size& GetPageSizePixel() const { return maPageSize; } diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index ee9ea29d8aff..7e59b06e3ede 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -168,9 +168,9 @@ public: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + void UserDraw( const UserDrawEvent& rUDEvt ); - virtual void Toggle(); + void Toggle(); void SetSymbol( SymbolType eSymbol ); SymbolType GetSymbol() const { return meSymbol; } @@ -358,7 +358,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Toggle(); + void Toggle(); bool IsStateChanged() const { return mbStateChanged; } @@ -474,7 +474,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Toggle(); + void Toggle(); void SetState( TriState eState ); TriState GetState() const { return meState; } diff --git a/include/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx index 116f46ac0797..a4d671214888 100644 --- a/include/vcl/dndhelp.hxx +++ b/include/vcl/dndhelp.hxx @@ -64,16 +64,16 @@ public: virtual void dragDropEnd(const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) + void dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) + void dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) + void dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) + void dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); @@ -90,7 +90,7 @@ public: virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) + void dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 691478164b6c..ca9325a1494f 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -173,7 +173,7 @@ public: void SetFloatStyle( WinBits nWinStyle ); WinBits GetFloatStyle() const { return mnFloatBits;} - virtual void setPosSizePixel( long nX, long nY, + void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); void SetPosSizePixel( const Point& rNewPos, @@ -311,10 +311,10 @@ public: virtual bool PrepareToggleFloatingMode(); virtual void ToggleFloatingMode(); - virtual void TitleButtonClick( sal_uInt16 nButton ); - virtual void Pin(); - virtual void Roll(); - virtual void PopupModeEnd(); + void TitleButtonClick( sal_uInt16 nButton ); + void Pin(); + void Roll(); + void PopupModeEnd(); virtual void Resizing( Size& rSize ); virtual bool Close(); virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index e61d31f56b72..9479fcbdeba8 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -223,8 +223,8 @@ public: virtual void SetText( const OUString& rStr, const Selection& rNewSelection ); virtual OUString GetText() const SAL_OVERRIDE; - virtual void SetPlaceholderText( const OUString& rStr ); - virtual OUString GetPlaceholderText() const; + void SetPlaceholderText( const OUString& rStr ); + OUString GetPlaceholderText() const; void SaveValue() { maSaveValue = GetText(); } const OUString& GetSavedValue() const { return maSaveValue; } @@ -244,7 +244,7 @@ public: virtual Size CalcMinimumSizeForText(const OUString &rString) const; virtual Size GetOptimalSize() const SAL_OVERRIDE; virtual Size CalcSize(sal_Int32 nChars) const; - virtual sal_Int32 GetMaxVisChars() const; + sal_Int32 GetMaxVisChars() const; sal_Int32 GetCharPos( const Point& rWindowPos ) const; diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 4e335516d021..92b0967127f3 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -185,7 +185,7 @@ public: virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + void UserDraw( const UserDrawEvent& rUDEvt ); virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetImage( const Image& rImage ); diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 30c2934888ef..8ff335346d8f 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -118,8 +118,8 @@ private: protected: - virtual void Linker( OutputDevice* pOut, bool bLink ); - virtual long Hook(); + void Linker( OutputDevice* pOut, bool bLink ); + long Hook(); public: GDIMetaFile(); diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 0515e205707e..8ae868fe7fdc 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -188,7 +188,7 @@ public: if bExtendedInfo == true the file header is used to derive as many properties as possible (size, color, etc.) */ - virtual bool Detect( bool bExtendedInfo = false ); + bool Detect( bool bExtendedInfo = false ); /** @return the file format, GFF_NOT if no format was recognized */ sal_uInt16 GetFileFormat() const { return nFormat; } diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 9b7e522b5ab0..a1986ba634f0 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -213,11 +213,11 @@ protected: public: virtual ~Menu(); - virtual void Activate(); - virtual void Deactivate(); + void Activate(); + void Deactivate(); virtual void Highlight(); virtual void Select(); - virtual void RequestHelp( const HelpEvent& rHEvt ); + void RequestHelp( const HelpEvent& rHEvt ); void InsertItem( sal_uInt16 nItemId, const OUString& rStr, MenuItemBits nItemBits = MenuItemBits::NONE, diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index c7a2adec1f0b..c8adafd90137 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -498,8 +498,8 @@ public: sal_uInt16 nFlags = 0 ); // Call before and after a paint operation to reduce flushing - virtual void BeginPaint(); - virtual void EndPaint(); + void BeginPaint(); + void EndPaint(); protected: @@ -1569,9 +1569,9 @@ public: void EnableMapMode( bool bEnable = true ); bool IsMapModeEnabled() const { return mbMap; } - virtual void SetMapMode(); + void SetMapMode(); virtual void SetMapMode( const MapMode& rNewMapMode ); - virtual void SetRelativeMapMode( const MapMode& rNewMapMode ); + void SetRelativeMapMode( const MapMode& rNewMapMode ); const MapMode& GetMapMode() const { return maMapMode; } // #i75163# diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 00c05547bded..bfa9469f5a48 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -304,7 +304,7 @@ public: static const QueueInfo* GetQueueInfo( const OUString& rPrinterName, bool bStatusUpdate ); static OUString GetDefaultPrinterName(); - virtual void Error(); + void Error(); const OUString& GetName() const { return maPrinterName; } const OUString& GetDriverName() const { return maDriver; } diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx index d99afbe1d7c6..c761429ea126 100644 --- a/include/vcl/printerinfomanager.hxx +++ b/include/vcl/printerinfomanager.hxx @@ -178,10 +178,10 @@ public: // primarily used internally // returns the printer queue names - virtual const std::list< SystemPrintQueue >& getSystemPrintQueues(); + const std::list< SystemPrintQueue >& getSystemPrintQueues(); // similar but returnse whole commandlines - virtual void getSystemPrintCommands( std::list< OUString >& rCommands ); + void getSystemPrintCommands( std::list< OUString >& rCommands ); // abstract print command // returns a stdio FILE* that a postscript file may be written to diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index db0a673842d7..0208635477ce 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -105,7 +105,7 @@ public: virtual void LoseFocus() SAL_OVERRIDE; using Window::Scroll; - virtual void Scroll(); + void Scroll(); virtual void EndScroll(); long DoScroll( long nNewPos ); diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index bc30d29d4060..859852e458c1 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -83,8 +83,8 @@ public: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Slide(); - virtual void EndSlide(); + void Slide(); + void EndSlide(); void EnableDrag( bool bEnable = true ) { mbFullDrag = bEnable; } diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index 1900822b1844..243107afd804 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -59,8 +59,8 @@ public: explicit SpinButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~SpinButton(); - virtual void Up(); - virtual void Down(); + void Up(); + void Down(); virtual void Resize() SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index 1ed55f4ab909..81ffe4ffe14f 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -65,9 +65,9 @@ public: explicit Splitter( vcl::Window* pParent, WinBits nStyle = WB_VSCROLL ); virtual ~Splitter(); - virtual void StartSplit(); - virtual void EndSplit(); - virtual void Split(); + void StartSplit(); + void EndSplit(); + void Split(); virtual void Splitting( Point& rSplitPos ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -89,7 +89,7 @@ public: const Rectangle& GetDragRectPixel() const { return maDragRect; } vcl::Window* GetDragWindow() const { return mpRefWin; } - virtual void SetSplitPosPixel( long nPos ); + void SetSplitPosPixel( long nPos ); long GetSplitPosPixel() const { return mnSplitPos; } bool IsHorizontal() const { return mbHorzSplit; } diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index b6433ef89531..124f26c9302e 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -125,8 +125,8 @@ public: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Click(); - virtual void DoubleClick(); + void Click(); + void DoubleClick(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); void InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index 11e8f3fa875d..602bad2b4aea 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -110,7 +110,7 @@ class VCL_DLLPUBLIC Idle : public Timer void Start() { Timer::Start(); } void Stop() { Timer::Stop(); } - virtual void DoIdle(); + void DoIdle(); virtual void Timeout() SAL_OVERRIDE { DoIdle(); } }; diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 2d6961da1286..9b9d2c21f6e9 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -290,13 +290,13 @@ public: virtual ~ToolBox(); virtual void Click(); - virtual void DoubleClick(); + void DoubleClick(); virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; - virtual void Highlight(); + void Highlight(); virtual void Select(); - virtual void Customize( const ToolBoxCustomizeEvent& rCEvt ); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + void Customize( const ToolBoxCustomizeEvent& rCEvt ); + void UserDraw( const UserDrawEvent& rUDEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index fe5280d1ba2d..786764bdf7bf 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -89,7 +89,7 @@ public: virtual void ReplaceSelected( const OUString& rStr ) SAL_OVERRIDE; virtual void DeleteSelected() SAL_OVERRIDE; virtual OUString GetSelected() const SAL_OVERRIDE; - virtual OUString GetSelected( LineEnd aSeparator ) const; + OUString GetSelected( LineEnd aSeparator ) const; virtual void Cut() SAL_OVERRIDE; virtual void Copy() SAL_OVERRIDE; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index c021333ba744..d4827439bfd5 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -704,7 +704,7 @@ public: virtual void Erase() SAL_OVERRIDE; virtual void Erase( const Rectangle& rRect ) SAL_OVERRIDE { ::OutputDevice::Erase( rRect ); } - virtual void PostPaint(); + void PostPaint(); virtual void Draw( ::OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Move(); virtual void Resize(); @@ -797,7 +797,7 @@ public: using ::OutputDevice::SetSettings; virtual void SetSettings( const AllSettings& rSettings ) SAL_OVERRIDE; - virtual void SetSettings( const AllSettings& rSettings, bool bChild ); + void SetSettings( const AllSettings& rSettings, bool bChild ); void UpdateSettings( const AllSettings& rSettings, bool bChild = false ); void NotifyAllChildren( DataChangedEvent& rDCEvt ); @@ -959,10 +959,10 @@ public: // window extents of the client window, coordinates to be used in SetPosPixel Rectangle GetClientWindowExtentsRelative( vcl::Window *pRelativeWindow ) const; - virtual bool IsScrollable() const; + bool IsScrollable() const; virtual void Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags = 0 ); - virtual void Scroll( long nHorzScroll, long nVertScroll, + void Scroll( long nHorzScroll, long nVertScroll, const Rectangle& rRect, sal_uInt16 nFlags = 0 ); virtual void Invalidate( sal_uInt16 nFlags = 0 ); virtual void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 ); @@ -1105,7 +1105,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface( bool bCreate = true ); - virtual void SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ); + void SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ); /** @name Accessibility */ @@ -1224,13 +1224,13 @@ public: void SetCreatedWithToolkit( bool b ); // Drag and Drop interfaces - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > GetDropTarget(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > GetDragSource(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > GetDragGestureRecognizer(); + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > GetDropTarget(); + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > GetDragSource(); + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > GetDragGestureRecognizer(); // Clipboard/Selection interfaces - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetClipboard(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetPrimarySelection(); + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetClipboard(); + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetPrimarySelection(); /* * Widgets call this to inform their owner container that the widget wants diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx index 70ae41dc768e..f2ec924bcfa5 100644 --- a/include/xmloff/XMLPageExport.hxx +++ b/include/xmloff/XMLPageExport.hxx @@ -72,7 +72,7 @@ protected: SvXMLExport& GetExport() { return rExport; } - virtual void collectPageMasterAutoStyle( + void collectPageMasterAutoStyle( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, OUString& rPageMasterName ); diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx index 273248565006..7d9d6eedb61f 100644 --- a/include/xmloff/styleexp.hxx +++ b/include/xmloff/styleexp.hxx @@ -69,7 +69,7 @@ private: protected: - virtual bool exportStyle( + bool exportStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > & rStyle, const OUString& rXMLFamily, @@ -103,7 +103,7 @@ public: // bool bUsed, sal_uInt16 nFamily = 0, // const OUString* pPrefix = 0L); - virtual bool exportDefaultStyle( + bool exportDefaultStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xPropSet, const OUString& rXMLFamily, diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index f6a8c8574c88..75be14a19562 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -597,7 +597,7 @@ public: bool bIsProgress = false ); // This method exports all automatic styles that have been collected. - virtual void exportTextAutoStyles(); + void exportTextAutoStyles(); void exportEvents( const ::com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > & rPropSet ); diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index 111fcae5345f..b8fab9f642da 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -229,10 +229,10 @@ protected: virtual XMLTextParagraphExport* CreateTextParagraphExport(); virtual XMLShapeExport* CreateShapeExport(); virtual SvXMLAutoStylePoolP* CreateAutoStylePool(); - virtual SchXMLExportHelper* CreateChartExport(); + SchXMLExportHelper* CreateChartExport(); virtual XMLPageExport* CreatePageExport(); virtual XMLFontAutoStylePool* CreateFontAutoStylePool(); - virtual xmloff::OFormLayerXMLExport* CreateFormExport(); + xmloff::OFormLayerXMLExport* CreateFormExport(); virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps); virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps); diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index d6b4acbf167c..d4faf1002ec9 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -180,8 +180,8 @@ protected: inline bool HasShapeImport() const { return mxShapeImport.is(); } inline void ClearShapeImport() { mxShapeImport = 0; } - virtual SchXMLImportHelper* CreateChartImport(); - virtual ::xmloff::OFormLayerXMLImport* CreateFormImport(); + SchXMLImportHelper* CreateChartImport(); + ::xmloff::OFormLayerXMLImport* CreateFormImport(); void SetFontDecls( XMLFontStylesContext *pFontDecls ); void SetStyles( SvXMLStylesContext *pStyles ); diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx index 037932dd114d..dda84bde7eec 100644 --- a/include/xmloff/xmlprmap.hxx +++ b/include/xmloff/xmlprmap.hxx @@ -93,11 +93,11 @@ public: /** import/export This methods calls the respective im/export-method of the respective PropertyHandler. */ - virtual bool exportXML( + bool exportXML( OUString& rStrExpValue, const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool importXML( + bool importXML( const OUString& rStrImpValue, XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter ) const; diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx index 7b8a356aa2a1..73bcfc6ecba1 100644 --- a/include/xmloff/xmlstyle.hxx +++ b/include/xmloff/xmlstyle.hxx @@ -249,7 +249,7 @@ public: GetStylesContainer( sal_uInt16 nFamily ) const; virtual OUString GetServiceName( sal_uInt16 nFamily ) const; - virtual ::com::sun::star::uno::Reference < ::com::sun::star::style::XAutoStyleFamily > + ::com::sun::star::uno::Reference < ::com::sun::star::style::XAutoStyleFamily > GetAutoStyles( sal_uInt16 nFamily ) const; void CopyAutoStylesToDoc(); void CopyStylesToDoc( bool bOverwrite, bool bFinish = true ); diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx index 474bee685f95..ab3f0e26e9e1 100644 --- a/l10ntools/inc/xmlparse.hxx +++ b/l10ntools/inc/xmlparse.hxx @@ -155,7 +155,7 @@ public: virtual ~XMLFile(); void Print( XMLNode *pCur = NULL, sal_uInt16 nLevel = 0 ); - virtual void SearchL10NElements( XMLChildNode *pCur, int pos = 0 ); + void SearchL10NElements( XMLChildNode *pCur, int pos = 0 ); void Extract( XMLFile *pCur = NULL ); XMLHashMap* GetStrings(){ return m_pXMLStrings; } @@ -248,7 +248,7 @@ public: void SetPos ( int nPos ) { m_nPos = nPos; } void SetOldRef ( OString const & sOldRef ) { m_sOldRef = sOldRef; } - virtual int GetPos() { return m_nPos; } + int GetPos() { return m_nPos; } OString GetProject() const { return m_sProject; } OString GetFileName() const { return m_sFilename; } OString GetId() const { return m_sId; } diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index a4e60b91e6a6..c2acc2e25e8a 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -52,41 +52,36 @@ public: virtual ~GenPoEntry(); // Default copy constructor and copy operator work well - virtual OString getExtractCom() const { return m_sExtractCom; } - virtual OString getReference() const { return m_sReference; } - virtual OString getMsgCtxt() const { return m_sMsgCtxt; } - virtual OString getMsgId() const { return m_sMsgId; } - virtual OString getMsgStr() const { return m_sMsgStr; } - virtual bool isFuzzy() const { return m_bFuzzy; } - virtual bool isNull() const { return m_bNull; } - - virtual void setExtractCom(const OString& rExtractCom) + OString getReference() const { return m_sReference; } + OString getMsgCtxt() const { return m_sMsgCtxt; } + OString getMsgId() const { return m_sMsgId; } + OString getMsgStr() const { return m_sMsgStr; } + bool isFuzzy() const { return m_bFuzzy; } + bool isNull() const { return m_bNull; } + + void setExtractCom(const OString& rExtractCom) { m_sExtractCom = rExtractCom; } - virtual void setReference(const OString& rReference) + void setReference(const OString& rReference) { m_sReference = rReference; } - virtual void setMsgCtxt(const OString& rMsgCtxt) + void setMsgCtxt(const OString& rMsgCtxt) { m_sMsgCtxt = rMsgCtxt; } - virtual void setMsgId(const OString& rMsgId) + void setMsgId(const OString& rMsgId) { m_sMsgId = rMsgId; } - virtual void setMsgStr(const OString& rMsgStr) + void setMsgStr(const OString& rMsgStr) { m_sMsgStr = rMsgStr; } - virtual void setFuzzy(const bool bFuzzy) - { - m_bFuzzy = bFuzzy; - } - virtual void writeToFile(std::ofstream& rOFStream) const; - virtual void readFromFile(std::ifstream& rIFStream); + void writeToFile(std::ofstream& rOFStream) const; + void readFromFile(std::ifstream& rIFStream); }; namespace diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx index a6123a42f565..d162c209c524 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.hxx +++ b/lotuswordpro/source/filter/lwpcelllayout.hxx @@ -118,7 +118,7 @@ protected: void RegisterDefaultCell(); virtual LwpCellBorderType GetCellBorderType(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout); LwpCellLayout * GetCellByRowCol(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout); - virtual sal_uInt16 GetLeftColID(sal_uInt16 nCol){return nCol - 1; }; + sal_uInt16 GetLeftColID(sal_uInt16 nCol){return nCol - 1; }; virtual sal_uInt16 GetBelowRowID(sal_uInt16 nRow){return nRow + 1; }; sal_uInt16 crowid; diff --git a/lotuswordpro/source/filter/lwpfribtable.hxx b/lotuswordpro/source/filter/lwpfribtable.hxx index f7d0acbef49e..7c24562e838b 100644 --- a/lotuswordpro/source/filter/lwpfribtable.hxx +++ b/lotuswordpro/source/filter/lwpfribtable.hxx @@ -67,7 +67,7 @@ public: void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE; LwpSuperTableLayout* GetSuperTable(); void RegisterNewStyle(); - virtual void XFConvert(XFContentContainer* pCont); + void XFConvert(XFContentContainer* pCont); private: LwpObjectID m_objTable; }; diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index 594a375147b6..69ad38e423d9 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -1644,26 +1644,21 @@ XFColumnSep* LwpLayout::GetColumnSep() return NULL; } - LwpBorderStuff* pBorderStuff = pLayoutGutters->GetBorderStuff(); + LwpBorderStuff& pBorderStuff = pLayoutGutters->GetBorderStuff(); - if(pBorderStuff) - { - LwpBorderStuff::BorderType eType = LwpBorderStuff::LEFT; - LwpColor aColor = pBorderStuff->GetSideColor(eType); - double fWidth = pBorderStuff->GetSideWidth(eType); - //sal_uInt16 nType = pBorderStuff->GetSideType(eType); - - XFColumnSep* pColumnSep = new XFColumnSep(); - XFColor aXFColor(aColor.To24Color()); - pColumnSep->SetColor(aXFColor); - pColumnSep->SetWidth(fWidth); - pColumnSep->SetRelHeight(100); - pColumnSep->SetVerticalAlign(enumXFAlignTop); + LwpBorderStuff::BorderType eType = LwpBorderStuff::LEFT; + LwpColor aColor = pBorderStuff.GetSideColor(eType); + double fWidth = pBorderStuff.GetSideWidth(eType); + //sal_uInt16 nType = pBorderStuff->GetSideType(eType); - return pColumnSep; - } - return NULL; + XFColumnSep* pColumnSep = new XFColumnSep(); + XFColor aXFColor(aColor.To24Color()); + pColumnSep->SetColor(aXFColor); + pColumnSep->SetWidth(fWidth); + pColumnSep->SetRelHeight(100); + pColumnSep->SetVerticalAlign(enumXFAlignTop); + return pColumnSep; } /** diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx index e1ffb4fc8b87..9d6488d09da3 100644 --- a/lotuswordpro/source/filter/lwplayout.hxx +++ b/lotuswordpro/source/filter/lwplayout.hxx @@ -111,43 +111,43 @@ public: virtual bool IsAutoGrowDown(){ return false;} virtual bool IsAutoGrowLeft(){ return false;} virtual bool IsAutoGrowRight(){ return false;} - virtual bool IsFitGraphic(); - virtual bool IsAutoGrowWidth(); - virtual bool IsInlineToMargin(); + bool IsFitGraphic(); + bool IsAutoGrowWidth(); + bool IsInlineToMargin(); virtual sal_uInt8 GetContentOrientation(){ return TEXT_ORIENT_LRTB;} virtual bool HonorProtection(); virtual bool IsProtected(); - virtual bool HasProtection(); - virtual OUString GetStyleName(){ return m_StyleName;} - virtual bool IsComplex(); + bool HasProtection(); + OUString GetStyleName(){ return m_StyleName;} + bool IsComplex(); virtual bool IsAnchorPage(){ return false;} virtual bool IsAnchorFrame(){ return false;} virtual bool IsAnchorCell(){ return false;} - virtual bool IsPage(); - virtual bool IsHeader(); - virtual bool IsFooter(); - virtual bool IsFrame(); - virtual bool IsCell(); - virtual bool IsSuperTable(); - virtual bool IsGroupHead(); + bool IsPage(); + bool IsHeader(); + bool IsFooter(); + bool IsFrame(); + bool IsCell(); + bool IsSuperTable(); + bool IsGroupHead(); virtual sal_uInt8 GetRelativeType(); - virtual bool IsRelativeAnchored(); - virtual LwpUseWhen* GetUseWhen(); + bool IsRelativeAnchored(); + LwpUseWhen* GetUseWhen(); virtual LwpUseWhen* VirtualGetUseWhen(){ return NULL;} virtual bool IsUseOnAllPages(){ return false;} virtual bool IsUseOnAllEvenPages(){ return false;} virtual bool IsUseOnAllOddPages(){ return false;} virtual bool IsUseOnPage(){ return false;} virtual sal_Int32 GetPageNumber(sal_uInt16 /*nLayoutNumber*/ = 0){ return -1;} - virtual bool IsMinimumHeight(); + bool IsMinimumHeight(); virtual bool IsForWaterMark(){ return false;} virtual LwpPara* GetLastParaOfPreviousStory() { return NULL; } - virtual LwpVirtualLayout* GetParentLayout(); + LwpVirtualLayout* GetParentLayout(); virtual LwpVirtualLayout* GetContainerLayout(){ return NULL;} - virtual void RegisterChildStyle(); - virtual bool NoContentReference(); - virtual bool IsStyleLayout(); - virtual enumXFAlignType GetVerticalAlignmentType() + void RegisterChildStyle(); + bool NoContentReference(); + bool IsStyleLayout(); + enumXFAlignType GetVerticalAlignmentType() { if (m_nAttributes & STYLE_CENTEREDVERTICALLY) { @@ -159,7 +159,7 @@ public: } return enumXFAlignTop; }; - virtual void SetStyleName(const OUString & str){ m_StyleName = str;} + void SetStyleName(const OUString & str){ m_StyleName = str;} virtual double GetWidth(){return -1;} //Check whether there are contents in the layout @@ -219,7 +219,7 @@ protected: enum {SHIFT_UP = 0, SHIFT_DOWN = 4, SHIFT_LEFT = 8, SHIFT_RIGHT =12}; public: virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_VIRTUAL_LAYOUT;} - virtual LwpVirtualLayout* FindChildByType(LWP_LAYOUT_TYPE eType); + LwpVirtualLayout* FindChildByType(LWP_LAYOUT_TYPE eType); }; class LwpAssociatedLayouts @@ -298,9 +298,9 @@ public: virtual sal_uInt8 GetContentOrientation() SAL_OVERRIDE; virtual bool HonorProtection() SAL_OVERRIDE; virtual bool IsProtected() SAL_OVERRIDE; - virtual LwpVirtualLayout* GetWaterMarkLayout(); + LwpVirtualLayout* GetWaterMarkLayout(); XFBGImage* GetXFBGImage(); - virtual bool GetUsePrinterSettings(); + bool GetUsePrinterSettings(); LwpLayoutScale* GetLayoutScale(){return dynamic_cast<LwpLayoutScale*>(m_LayScale.obj().get());} sal_uInt16 GetScaleMode(void); @@ -312,12 +312,12 @@ public: bool CanSizeRight(void); virtual double GetWidth() SAL_OVERRIDE; - virtual sal_Int32 GetMinimumWidth(); + sal_Int32 GetMinimumWidth(); bool IsSizeRightToContent(void); bool IsSizeRightToContainer(void); sal_Int32 DetermineWidth(); virtual double GetHeight(); - virtual LwpPoint GetOrigin(); + LwpPoint GetOrigin(); bool IsPatternFill(); XFBGImage* GetFillPattern(); @@ -377,7 +377,7 @@ public: virtual sal_uInt16 GetNumCols() SAL_OVERRIDE; virtual double GetColWidth(sal_uInt16 nIndex) SAL_OVERRIDE; virtual double GetColGap(sal_uInt16 nIndex) SAL_OVERRIDE; - virtual sal_uInt16 GetUsePage(); + sal_uInt16 GetUsePage(); public: enum UseWhenType { @@ -388,7 +388,7 @@ public: StartOnEvenPage }; public: - virtual UseWhenType GetUseWhenType(); + UseWhenType GetUseWhenType(); virtual bool IsUseOnAllPages() SAL_OVERRIDE; virtual bool IsUseOnAllEvenPages() SAL_OVERRIDE; virtual bool IsUseOnAllOddPages() SAL_OVERRIDE; @@ -402,10 +402,10 @@ class LwpPlacableLayout : public LwpLayout public: LwpPlacableLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm ); virtual ~LwpPlacableLayout(); - virtual sal_uInt8 GetWrapType(); - virtual LwpLayoutRelativity* GetRelativityPiece(); + sal_uInt8 GetWrapType(); + LwpLayoutRelativity* GetRelativityPiece(); virtual sal_uInt8 GetRelativeType() SAL_OVERRIDE; - virtual sal_Int32 GetBaseLineOffset(); + sal_Int32 GetBaseLineOffset(); virtual bool IsAnchorPage() SAL_OVERRIDE; virtual bool IsAnchorFrame() SAL_OVERRIDE; virtual bool IsAnchorCell() SAL_OVERRIDE; diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx index 20e3a3d83240..306101aa153c 100644 --- a/lotuswordpro/source/filter/lwplaypiece.hxx +++ b/lotuswordpro/source/filter/lwplaypiece.hxx @@ -248,7 +248,7 @@ class LwpLayoutGutters : public LwpVirtualPiece public: LwpLayoutGutters(LwpObjectHeader& objHdr, LwpSvStream* pStrm); virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE; - inline virtual LwpBorderStuff* GetBorderStuff(){return &m_BorderBuffer;} + inline LwpBorderStuff& GetBorderStuff() { return m_BorderBuffer; } protected: virtual void Read() SAL_OVERRIDE; protected: diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx index c05c9d7e46fa..d6f3c9998149 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx @@ -89,14 +89,14 @@ public: */ virtual void Add(XFContent *pContent); - virtual void InsertAtBegin(XFContent *pContent); - virtual void RemoveAt(sal_uInt32 nPos); - virtual rtl::Reference<XFContent> GetLastContent(); - virtual void RemoveLastContent(); + void InsertAtBegin(XFContent *pContent); + void RemoveAt(sal_uInt32 nPos); + rtl::Reference<XFContent> GetLastContent(); + void RemoveLastContent(); /** * @descr convience function for add text content. */ - virtual void Add(const OUString& text); + void Add(const OUString& text); /** * @descr return the number of contents in the container. diff --git a/lotuswordpro/source/filter/xfilter/xfframe.hxx b/lotuswordpro/source/filter/xfilter/xfframe.hxx index bed0aad8032b..aeb2efb2c06f 100644 --- a/lotuswordpro/source/filter/xfilter/xfframe.hxx +++ b/lotuswordpro/source/filter/xfilter/xfframe.hxx @@ -159,7 +159,7 @@ public: /** * @descr Get the frame type. image, drawing or text-box. */ - virtual enumXFFrameType GetFrameType(); + enumXFFrameType GetFrameType(); /** * @descr Get content type, enumXFContentFrame. diff --git a/lotuswordpro/source/filter/xfilter/xflist.hxx b/lotuswordpro/source/filter/xfilter/xflist.hxx index 1fa175377023..05531cccd858 100644 --- a/lotuswordpro/source/filter/xfilter/xflist.hxx +++ b/lotuswordpro/source/filter/xfilter/xflist.hxx @@ -92,9 +92,9 @@ public: */ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; - virtual void StartList(IXFStream *pStrm, bool bContinueNumber = false); + void StartList(IXFStream *pStrm, bool bContinueNumber = false); - virtual void EndList(IXFStream *pStrm); + void EndList(IXFStream *pStrm); private: bool m_bOrdered; diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx index 985d3f0defa2..2d5a48a1311d 100644 --- a/oox/source/docprop/docprophandler.hxx +++ b/oox/source/docprop/docprophandler.hxx @@ -79,8 +79,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); }; diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 66d8554a21e3..f8610a17fce4 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -353,7 +353,7 @@ class OleFormCtrlExportHelper public: OleFormCtrlExportHelper( const Reference< XComponentContext >& rxCtx, const Reference< XModel >& xDocModel, const Reference< XControlModel >& xModel ); virtual ~OleFormCtrlExportHelper() { } - virtual OUString getGUID() + OUString getGUID() { OUString sResult; if ( maGUID.getLength() > 2 ) diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index c24d9caa9677..68bf784b3923 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -348,7 +348,7 @@ namespace reportdesign virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // document::XEventListener - virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); // XUIConfigurationManagerSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 6235b4e9b268..0729cc1f2047 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -161,7 +161,7 @@ public: virtual ~OCustomShape(); - virtual sal_Int32 GetStep() const; + sal_Int32 GetStep() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape() SAL_OVERRIDE; @@ -208,7 +208,7 @@ public: virtual ~OOle2Obj(); - virtual sal_Int32 GetStep() const; + sal_Int32 GetStep() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape() SAL_OVERRIDE; @@ -254,7 +254,7 @@ protected: public: TYPEINFO_OVERRIDE(); - virtual sal_Int32 GetStep() const; + sal_Int32 GetStep() const; virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /** creates the m_xMediator when it doesn't already exist. diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx index 89f43ceabf35..8ba80c1a58fb 100644 --- a/reportdesign/source/core/inc/Section.hxx +++ b/reportdesign/source/core/inc/Section.hxx @@ -187,8 +187,8 @@ namespace reportdesign virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > SAL_CALL getGroup() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > SAL_CALL getReportDefinition() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > SAL_CALL createReportComponent( const OUString& _sReportComponentSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::lang::IllegalArgumentException,::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableReportComponentNames( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > SAL_CALL createReportComponent( const OUString& _sReportComponentSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::lang::IllegalArgumentException,::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableReportComponentNames( ) throw (::com::sun::star::uno::RuntimeException); // XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 662b01365df1..e21b4983ca1d 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -168,10 +168,10 @@ public: void removeFunction(const OUString& _sFunctionName); inline const TGroupFunctionMap& getFunctions() const { return m_aFunctions; } - virtual SvXMLImport& getGlobalContext(); + SvXMLImport& getGlobalContext(); - virtual void enterEventContext(); - virtual void leaveEventContext(); + void enterEventContext(); + void leaveEventContext(); bool isOldFormat() const; }; diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index 9c6c925cf2b0..25142933680d 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -106,7 +106,7 @@ namespace rptui virtual void GetFocus() SAL_OVERRIDE; // set the view readonly or not - virtual void setReadOnly(bool _bReadOnly); + void setReadOnly(bool _bReadOnly); virtual void initialize() SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx index dc01897f1e74..9941c95479b3 100644 --- a/reportdesign/source/ui/inc/dlgedfunc.hxx +++ b/reportdesign/source/ui/inc/dlgedfunc.hxx @@ -93,7 +93,7 @@ public: @param _rCode the keycode @return <TRUE/> if the keycode is handled otherwise <FALSE/> */ - virtual bool handleKeyEvent(const KeyEvent& _rEvent); + bool handleKeyEvent(const KeyEvent& _rEvent); /** returns <TRUE/> if the mouse event is over an existing object * diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h index 7fb6e794fe8d..1d93491a3b1b 100644 --- a/rsc/inc/rscerror.h +++ b/rsc/inc/rscerror.h @@ -134,14 +134,14 @@ public: void SetListFile( FILE * fList ){ fListing = fList; } FILE * GetListFile(){ return fListing; } RscVerbosity GetVerbosity() const { return m_verbosity; } - virtual void StdOut( const char *, const RscVerbosity _verbosityLevel = RscVerbosityNormal ); - virtual void StdErr( const char * ); - virtual void LstOut( const char * ); - virtual void Error( const ERRTYPE& rError, RscTop* pClass, const RscId &aId, + void StdOut( const char *, const RscVerbosity _verbosityLevel = RscVerbosityNormal ); + void StdErr( const char * ); + void LstOut( const char * ); + void Error( const ERRTYPE& rError, RscTop* pClass, const RscId &aId, const char * pMessage = NULL ); // Dieser Fehler sollte nur im Compilermodus auftreten, // das Programm wird mit exit() verlassen - virtual void FatalError( const ERRTYPE& rError, const RscId &aId, + void FatalError( const ERRTYPE& rError, const RscId &aId, const char * pMessage = NULL ); }; diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 8c86e0ea3e48..5aca8a3ba5b5 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -56,7 +56,7 @@ public: ScMergeAttr( const ScMergeAttr& ); virtual ~ScMergeAttr(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -110,7 +110,7 @@ public: ScProtectionAttr( const ScProtectionAttr& ); virtual ~ScProtectionAttr(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -251,7 +251,7 @@ public: ScPageHFItem( const ScPageHFItem& rItem ); virtual ~ScPageHFItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -284,7 +284,7 @@ public: virtual ~ScViewObjectModeItem(); virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual OUString GetValueText( sal_uInt16 nVal ) const; + OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; @@ -303,7 +303,7 @@ public: ScDoubleItem( const ScDoubleItem& rItem ); virtual ~ScDoubleItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index 12653280f607..d733a932f68a 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -219,7 +219,7 @@ protected: // GetItemPropertyMap for derived classes must contain all entries, including base class virtual const SfxItemPropertyMap& GetItemPropertyMap(); - virtual ::com::sun::star::beans::PropertyState GetOnePropertyState( + ::com::sun::star::beans::PropertyState GetOnePropertyState( sal_uInt16 nItemWhich, const SfxItemPropertySimpleEntry* pEntry ); virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, ::com::sun::star::uno::Any& ) @@ -674,7 +674,7 @@ public: virtual void RefChanged() SAL_OVERRIDE; // via getImplementation() - virtual void SetArrayFormulaWithGrammar( const OUString& rFormula, + void SetArrayFormulaWithGrammar( const OUString& rFormula, const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar ) throw (css::uno::RuntimeException, diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index e87f61697eba..22513598210b 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -51,7 +51,7 @@ public: ScTpDefaultsItem( const ScTpDefaultsItem& rItem ); virtual ~ScTpDefaultsItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 9e06437fb65c..30f3ec1a4523 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -151,7 +151,7 @@ public: ScTpCalcItem( const ScTpCalcItem& rItem ); virtual ~ScTpCalcItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index 9030090939ba..0b284efce4d7 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -114,7 +114,7 @@ public: virtual bool getIsDataLayoutDimension(long nColumn) = 0; virtual bool IsDateDimension(long nDim) = 0; virtual sal_uLong GetNumberFormat(long nDim); - virtual sal_uInt32 GetNumberFormatByIdx( NfIndexTableOffset ); + sal_uInt32 GetNumberFormatByIdx( NfIndexTableOffset ); virtual void DisposeData() = 0; virtual void SetEmptyFlags( bool bIgnoreEmptyRows, bool bRepeatIfEmpty ) = 0; @@ -139,7 +139,7 @@ public: const ScDPItemData& rSecondData, long nSecondIndex ) const; virtual long GetMembersCount( long nDim ); - virtual const ScDPItemData* GetMemberByIndex( long nDim, long nIndex ); + const ScDPItemData* GetMemberByIndex( long nDim, long nIndex ); virtual const ScDPItemData* GetMemberById( long nDim, long nId); virtual long GetSourceDim( long nDim ); virtual long Compare( long nDim, long nDataId1, long nDataId2); diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 5f0b9eb1a6c7..016e7090663d 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -306,8 +306,8 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual long getCount() const; - virtual ScDPDimension* getByIndex(long nIndex) const; + long getCount() const; + ScDPDimension* getByIndex(long nIndex) const; }; class ScDPDimension : boost::noncopyable, public cppu::WeakImplHelper5< @@ -460,8 +460,8 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual long getCount() const; - virtual ScDPHierarchy* getByIndex(long nIndex) const; + long getCount() const; + ScDPHierarchy* getByIndex(long nIndex) const; }; class ScDPHierarchy : public cppu::WeakImplHelper3< @@ -537,8 +537,8 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual long getCount() const; - virtual ScDPLevel* getByIndex(long nIndex) const; + long getCount() const; + ScDPLevel* getByIndex(long nIndex) const; }; class ScDPLevel : public cppu::WeakImplHelper5< diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index 906804efee84..eceddc0d9e5d 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -87,7 +87,7 @@ public: ScTpFormulaItem( const ScTpFormulaItem& rItem ); virtual ~ScTpFormulaItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index b250b818f47f..fa46ca59cd30 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -197,10 +197,10 @@ protected: ScDocShell* pDocShell; /** called from the XActionLockable interface methods on initial locking */ - virtual void lock(); + void lock(); /** called from the XActionLockable interface methods on final unlock */ - virtual void unlock(); + void unlock(); public: ScNamedRangesObj(ScDocShell* pDocSh); diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index f6372e67f403..ed7e14f78b66 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -61,7 +61,7 @@ public: ScTpPrintItem( const ScTpPrintItem& rItem ); virtual ~ScTpPrintItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index ddef65e3bd45..1dc47a1d1f1e 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -120,7 +120,7 @@ public: ScTpViewItem( const ScTpViewItem& rItem ); virtual ~ScTpViewItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index d601b82bf33b..18aed00b6376 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -310,7 +310,6 @@ public: throw OpenCLError(err, __FILE__, __LINE__); return 1; } - virtual cl_mem GetCLBuffer() const { return NULL; } }; class DynamicKernelPiArgument : public DynamicKernelArgument diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx index 2568b14ce447..1af5508a0124 100644 --- a/sc/source/core/opencl/opbase.hxx +++ b/sc/source/core/opencl/opbase.hxx @@ -158,7 +158,7 @@ public: virtual std::string DumpOpName() const SAL_OVERRIDE; virtual void DumpInlineFun( std::set<std::string>&, std::set<std::string>& ) const SAL_OVERRIDE; const std::string& GetName() const; - virtual cl_mem GetCLBuffer() const; + cl_mem GetCLBuffer() const; virtual bool NeedParallelReduction() const SAL_OVERRIDE; protected: @@ -177,7 +177,7 @@ public: virtual std::string GetBottom() { return "";}; virtual std::string Gen2( const std::string&/*lhs*/, const std::string&/*rhs*/ ) const { return "";} - virtual std::string Gen( ArgVector& /*argVector*/ ) { return "";}; + std::string Gen( ArgVector& /*argVector*/ ) { return "";}; virtual std::string BinFuncName() const { return "";}; virtual void BinInlineFun( std::set<std::string>&, std::set<std::string>& ) { } diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index cc1b916ae6d7..72ba7717d759 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -153,12 +153,6 @@ public: return ( IdToOleNameHash.find( aName ) != IdToOleNameHash.end() ); } - // XElementAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) - { - ::osl::MutexGuard aGuard( m_aMutex ); - return IdToOleNameHash.size(); - } // XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 6706e7f8a384..e7538d62b4e9 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -404,7 +404,7 @@ public: // set own index & return new index // could override to use more indexes per action - virtual void SetIndex( sal_uInt32& rIndex ); + void SetIndex( sal_uInt32& rIndex ); virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; virtual sal_Size GetLen() const SAL_OVERRIDE; diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index ebbcd408a305..f05764b00a80 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -198,7 +198,7 @@ protected: const ScTokenArray* ErrorToFormula( bool bErrOrVal, sal_uInt8 nError, double& rVal ); - virtual void AdjustRowHeight(); + void AdjustRowHeight(); virtual void PostDocLoad( void ); public: diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index f2e8ee939dcf..0d0888d00b50 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -108,7 +108,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; - virtual void WriteEmbeddedData( XclExpStream& rStrm ); + void WriteEmbeddedData( XclExpStream& rStrm ); void SetDisplay( bool bDisplay ) { mbSetDisplay = bDisplay; } /** Builds file name from the passed file URL. Tries to convert to relative file name. diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 1703630cf363..6ff6e45aa43c 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -300,7 +300,7 @@ public: /** Writes the OBJ record and the entire chart substream. */ virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; - virtual void WriteChartObj( sax_fastparser::FSHelperPtr pDrawing, XclExpXmlStream& rStrm ); + void WriteChartObj( sax_fastparser::FSHelperPtr pDrawing, XclExpXmlStream& rStrm ); void WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const XShapeRef& rXShape, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0 ); const css::uno::Reference<css::chart::XChartDocument>& GetChartDoc() const; diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 07ce8eee3c38..eadfcc958583 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -187,8 +187,8 @@ public: bool HasEqualDataSource( const ScDPObject& rDPObj ) const; /** Writes related records into Workbook stream and creates the pivot cache storage stream. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + void Save( XclExpStream& rStrm ); + void SaveXml( XclExpXmlStream& rStrm ); private: /** Returns read/write access to a pivot cache field. */ diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 8b2a8c4b035b..5118672aa862 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -56,7 +56,7 @@ public: virtual void SetCellData( ScMyCell& rMyCell ) = 0; virtual void Sort() = 0; - virtual void UpdateAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + void UpdateAddress( ::com::sun::star::table::CellAddress& rCellAddress ); }; struct ScMyShape diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index 09781152d7c2..779d166525d2 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -137,14 +137,14 @@ private: const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); protected: - virtual OUString SAL_CALL GetNote(void) + OUString SAL_CALL GetNote(void) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL GetAllDisplayNote(void) + OUString SAL_CALL GetAllDisplayNote(void) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getShadowAttrs(void) + OUString SAL_CALL getShadowAttrs(void) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getBorderAttrs(void) + OUString SAL_CALL getBorderAttrs(void) throw (::com::sun::star::uno::RuntimeException); public: const ScAddress& GetCellAddress() const { return maCellAddress; } diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 7cad584e7a09..0eecb33385b7 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -79,7 +79,7 @@ protected: virtual ~ScAccessibleContextBase(void); public: - virtual bool SAL_CALL isShowing( ) + bool SAL_CALL isShowing( ) throw (::com::sun::star::uno::RuntimeException); virtual bool SAL_CALL isVisible() @@ -292,7 +292,7 @@ protected: bool IsDefunc() const { return rBHelper.bDisposed; } - virtual void IsObjectValid() const + void IsObjectValid() const throw (::com::sun::star::lang::DisposedException); /// Use this method to set initial Name without notification diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index a26a8739d7be..74753391a62c 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -81,9 +81,9 @@ public: /** Sends a caret changed event to all listeners. */ virtual void SendCaretEvent(); /** Sends a visible area changed event to all listeners. */ - virtual void SendVisibleEvent(); + void SendVisibleEvent(); /** Sends a selection changed event to all listeners. */ - virtual void SendSelectionEvent(); + void SendSelectionEvent(); /** Sends a table model changed event for changed cell contents to all listeners. */ virtual void SendTableUpdateEvent( sal_uInt32 nFirstColumn, sal_uInt32 nLastColumn, bool bAllRows ); /** Sends a table model changed event for an inserted column to all listeners. */ diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 3d470a2fc4c6..b9c2fdf85a4d 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -64,9 +64,9 @@ public: virtual void SAL_CALL disposing() SAL_OVERRIDE; - virtual void LostFocus(); + void LostFocus(); - virtual void GotFocus(); + void GotFocus(); ///===== XInterface ===================================================== virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 55983fcf0be8..9ec6ecb60195 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -89,8 +89,8 @@ public: void CompleteSelectionChanged(bool bNewState); - virtual void LostFocus(); - virtual void GotFocus(); + void LostFocus(); + void GotFocus(); void BoundingBoxChanged(); void VisAreaChanged(); diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index 541450ac06bc..e6d65f7654ea 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -51,7 +51,7 @@ public: virtual SvxTextForwarder* GetTextForwarder() = 0; virtual SvxViewForwarder* GetViewForwarder() = 0; virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) = 0; - virtual SfxBroadcaster& GetBroadcaster() const { return maBroadcaster; } + SfxBroadcaster& GetBroadcaster() const { return maBroadcaster; } virtual void UpdateData() = 0; virtual void SetDoUpdate(bool bValue) = 0; diff --git a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx index eaa1d9cb84c9..7812674a351c 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx @@ -60,7 +60,7 @@ public: void RemoveEntryForItem(ScItemValue* pItemValue); - virtual bool HasEntry(SvTreeListEntry* pEntry); + bool HasEntry(SvTreeListEntry* pEntry); protected: virtual void InsertEntryForSourceTarget(SvTreeListEntry* pSource, SvTreeListEntry* pTarget); diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index ce60a44db005..520ec223a784 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -38,7 +38,7 @@ public: virtual void SetActive() SAL_OVERRIDE; protected: - virtual void CalculateInputAndWriteToOutput(); + void CalculateInputAndWriteToOutput(); virtual ScRange ApplyOutput(ScDocShell* pDocShell) = 0; virtual sal_Int16 GetUndoNameId() = 0; diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index 682197c01e02..db4514ab49f9 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -38,7 +38,7 @@ public: virtual void SetActive() SAL_OVERRIDE; protected: - virtual void CalculateInputAndWriteToOutput(); + void CalculateInputAndWriteToOutput(); virtual ScRange ApplyOutput(ScDocShell* pDocShell) = 0; virtual sal_Int16 GetUndoNameId() = 0; diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx index 8a80bb201bee..6aceb0b8d8c5 100644 --- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx +++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx @@ -103,10 +103,10 @@ public: DataCellIterator(ScRange aInputRange, bool aByColumn); virtual ~DataCellIterator(); - virtual bool hasNext(); - virtual ScAddress get(); - virtual void next(); - virtual ScAddress getRelative(int aDelta); + bool hasNext(); + ScAddress get(); + void next(); + ScAddress getRelative(int aDelta); }; class DataRangeIterator @@ -123,7 +123,7 @@ public: virtual ScRange get() = 0; virtual void next() = 0; virtual void reset() = 0; - virtual sal_Int32 index(); + sal_Int32 index(); virtual DataCellIterator iterateCells() = 0; }; diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 945e36e0a3ac..8f476190b6b5 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -127,7 +127,7 @@ private: DECL_LINK( UpdateFocusHdl, void* ); protected: - virtual bool DoClose( sal_uInt16 nId ); + bool DoClose( sal_uInt16 nId ); void SetDispatcherLock( bool bLock ); diff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxx index 7de20d939880..4900d78309a0 100644 --- a/sc/source/ui/inc/chartsh.hxx +++ b/sc/source/ui/inc/chartsh.hxx @@ -45,7 +45,7 @@ public: void ExecuteExportAsGraphic(SfxRequest& rReq); void GetExportAsGraphicState(SfxItemSet &rSet); - virtual void HandleSelectionChange(void); + void HandleSelectionChange(void); }; #endif diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index ee25532926b3..886528614b21 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -55,7 +55,7 @@ public: bool CondFormatsChanged() { return mbModified;} - virtual bool IsInRefMode() const; + bool IsInRefMode() const; private: PushButton *m_pBtnAdd; diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 1f4793daff18..5e7dd488662d 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -183,8 +183,8 @@ public: #if ENABLE_TELEPATHY SAL_DLLPRIVATE ScCollaboration* GetCollaboration(); #endif - virtual void Activate(); - virtual void Deactivate(); + void Activate(); + void Deactivate(); virtual ::svl::IUndoManager* GetUndoManager() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index d19cb263a746..e948e2d8e67d 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -161,7 +161,7 @@ public: const OUString& rFilter); static void CheckOle( const SdrMarkList& rMarkList, bool& rAnyOle, bool& rOneOle ); - virtual void SyncForGrid( SdrObject* pObj ); + void SyncForGrid( SdrObject* pObj ); }; #endif diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 7ac4181191dc..3798998b9d1c 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -91,7 +91,7 @@ protected: virtual bool Close() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void Resizing( Size& rSize ) SAL_OVERRIDE; - virtual void SetSize(); + void SetSize(); virtual void ToggleFloatingMode() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index bd86eff3efe8..692090ed6aab 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -73,11 +73,11 @@ public: void SetMouseButtonCode(sal_uInt16 nNew) { if(nNew != mnCode) mnCode = nNew; } sal_uInt16 GetMouseButtonCode() const { return mnCode; } - virtual void Paint(const Rectangle&, vcl::Window*) {} + void Paint(const Rectangle&, vcl::Window*) {} - virtual void DoCut(); - virtual void DoCopy(); - virtual void DoPaste(); + void DoCut(); + void DoCopy(); + void DoPaste(); // Mouse- & Key-Events; return value=TRUE: Event was processed virtual bool KeyInput(const KeyEvent& rKEvt); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index fe43cf2d0385..1e61b9591a2c 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -287,7 +287,7 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou protected: using Window::Resize; - virtual void Resize( const Size& rSize ); + void Resize( const Size& rSize ); virtual void PrePaint() SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; @@ -383,7 +383,7 @@ public: void DoInvertRect( const Rectangle& rPixel ); void CheckNeedsRepaint(); - virtual void SwitchView(); + void SwitchView(); void UpdateDPFromFieldPopupMenu(); bool UpdateVisibleRange(); diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 0c04545e1478..a1c9478ff104 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -253,7 +253,7 @@ public: void SetFormulaMode( bool bSet ); - virtual bool IsInputActive(); + bool IsInputActive(); EditView* GetEditView(); void TextGrabFocus(); diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 29da9a69c1ed..6a976e9b7409 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -302,7 +302,7 @@ private: protected: virtual void Resize() SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Resizing( Size& rSize ); + void Resizing( Size& rSize ); public: ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl::Window* pParent, @@ -314,7 +314,7 @@ public: void CursorPosChanged(); - virtual SfxChildAlignment + SfxChildAlignment CheckAlignment(SfxChildAlignment,SfxChildAlignment); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxx index aff49e1f3f6c..b451e730f3cf 100644 --- a/sc/source/ui/inc/oleobjsh.hxx +++ b/sc/source/ui/inc/oleobjsh.hxx @@ -43,7 +43,7 @@ public: ScOleObjectShell(ScViewData* pData); virtual ~ScOleObjectShell(); - virtual void HandleSelectionChange(); + void HandleSelectionChange(); }; #endif diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 2d0f7ea502e6..ca46dcad358a 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -158,7 +158,7 @@ public: FmFormView* GetDrawView() { return pDrawView; } - virtual void SwitchView(); + void SwitchView(); SC_DLLPUBLIC void SetSelectedTabs(const ScMarkData& rMark); const ScMarkData::MarkedTabsType& GetSelectedTabs() const { return maSelectedTabs; } diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 660812fea376..38572d28d0f3 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -68,7 +68,7 @@ protected: virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; - virtual OUString GetDescription() const; + OUString GetDescription() const; virtual void WriteUserData(OUString &, bool bBrowse = false) SAL_OVERRIDE; virtual void ReadUserData(const OUString &, bool bBrowse = false) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx index b1451d5ff54d..fdb8697e41b3 100644 --- a/sc/source/ui/inc/privsplt.hxx +++ b/sc/source/ui/inc/privsplt.hxx @@ -54,10 +54,10 @@ class ScPrivatSplit : public Control ScPrivatSplit( vcl::Window* pWindow, const ResId& rResId, SC_SPLIT_DIRECTION eScSplit); - virtual short GetDeltaX(); - virtual short GetDeltaY(); + short GetDeltaX(); + short GetDeltaY(); - virtual void CtrModified(); + void CtrModified(); void SetYRange(Range cRgeY); diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index 1187db297a40..1388bde13b5b 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -145,7 +145,7 @@ class ScAcceptChgDlgWrapper: public SfxChildWindow SFX_DECL_CHILDWINDOW_WITHID(Class); - virtual void ReInitDlg(); + void ReInitDlg(); }; class ScSimpleRefDlgWrapper: public SfxChildWindow diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx index 4c537106d36f..4e26f31c0165 100644 --- a/sc/source/ui/inc/spelldialog.hxx +++ b/sc/source/ui/inc/spelldialog.hxx @@ -49,7 +49,7 @@ public: /** This method makes the one from the base class public so that it can be called from the view shell when one is created. */ - virtual void InvalidateSpellDialog(); + void InvalidateSpellDialog(); protected: /** Iterate over the sentences in all text shapes and stop at the diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 9020c2184c84..6ef999235f23 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -214,7 +214,7 @@ protected: virtual OUString GetSelectionText( bool bWholeWord ) SAL_OVERRIDE; virtual bool HasSelection( bool bText ) const SAL_OVERRIDE; - virtual OUString GetDescription() const; + OUString GetDescription() const; virtual void WriteUserData(OUString &, bool bBrowse = false) SAL_OVERRIDE; virtual void ReadUserData(const OUString &, bool bBrowse = false) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxx index 01b1d4605d30..d8880ad4716f 100644 --- a/sc/source/ui/inc/tbinsert.hxx +++ b/sc/source/ui/inc/tbinsert.hxx @@ -27,7 +27,7 @@ class ScTbxInsertCtrl : public SfxToolBoxControl sal_uInt16 nLastSlotId; using SfxToolBoxControl::Select; - virtual void Select( bool bMod1 = false ); + void Select( bool bMod1 = false ); public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 500e62d68c73..81947fabeda4 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -114,7 +114,7 @@ protected: virtual void MouseButtonUp( const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Click() SAL_OVERRIDE; - virtual void StartPopup(); + void StartPopup(); public: diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index ae988e6dd84e..baecc2659d29 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -63,7 +63,7 @@ public: ScInputStatusItem( const ScInputStatusItem& rItem ); virtual ~ScInputStatusItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -154,7 +154,7 @@ public: ScSortItem( const ScSortItem& rItem ); virtual ~ScSortItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const SAL_OVERRIDE; @@ -179,7 +179,7 @@ public: ScQueryItem( const ScQueryItem& rItem ); virtual ~ScQueryItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -208,7 +208,7 @@ public: ScSubTotalItem( const ScSubTotalItem& rItem ); virtual ~ScSubTotalItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const SAL_OVERRIDE; @@ -229,7 +229,7 @@ public: ScUserListItem( const ScUserListItem& rItem ); virtual ~ScUserListItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -249,7 +249,7 @@ public: ScConsolidateItem( const ScConsolidateItem& rItem ); virtual ~ScConsolidateItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -268,7 +268,7 @@ public: ScPivotItem( const ScPivotItem& rItem ); virtual ~ScPivotItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -291,7 +291,7 @@ public: ScSolveItem( const ScSolveItem& rItem ); virtual ~ScSolveItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -310,7 +310,7 @@ public: ScTabOpItem( const ScTabOpItem& rItem ); virtual ~ScTabOpItem(); - virtual OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 9fb3b77a6119..ea1d9361714f 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -201,7 +201,7 @@ public: bool SetupRefDlg(); bool RemoveRefDlg( bool bRestoreModal = true ); - virtual void SetModal( bool bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); } + void SetModal( bool bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); } virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE { diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index a9ea9dce95ea..7910209bf709 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -49,7 +49,7 @@ public: /** Returns true, if VBA document events are enabled. */ static bool getDocumentEventsEnabled(); - virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); + SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); // XExactName virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -130,8 +130,8 @@ public: virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) throw (css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL GetOpenFilename( const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText, const css::uno::Any& rMultiSelect ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL GetSaveAsFilename( const css::uno::Any& rInitialFileName, const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText ) throw (css::uno::RuntimeException); + css::uno::Any SAL_CALL GetOpenFilename( const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText, const css::uno::Any& rMultiSelect ) throw (css::uno::RuntimeException); + css::uno::Any SAL_CALL GetSaveAsFilename( const css::uno::Any& rInitialFileName, const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText ) throw (css::uno::RuntimeException); virtual void SAL_CALL Undo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface virtual OUString getServiceImplName() SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx index ae202e42e221..01dd37728d67 100644 --- a/sc/source/ui/vba/vbachartobject.hxx +++ b/sc/source/ui/vba/vbachartobject.hxx @@ -53,7 +53,7 @@ public: virtual void SAL_CALL setName( const OUString& sName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getChart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL Delete() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void Activate() throw ( css::script::BasicErrorException ); + void Activate() throw ( css::script::BasicErrorException ); // XHelperInterface virtual OUString getServiceImplName() SAL_OVERRIDE; virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx index 91c300e069c1..79fd5e001f62 100644 --- a/sc/source/ui/vba/vbadialogs.hxx +++ b/sc/source/ui/vba/vbadialogs.hxx @@ -38,7 +38,7 @@ public: virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDialogs - virtual void SAL_CALL Dummy() throw (css::uno::RuntimeException); + void SAL_CALL Dummy() throw (css::uno::RuntimeException); // XHelperInterface virtual OUString getServiceImplName() SAL_OVERRIDE; virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx index 4e0c433b8469..446453d18a40 100644 --- a/sc/source/ui/vba/vbaformatconditions.hxx +++ b/sc/source/ui/vba/vbaformatconditions.hxx @@ -51,7 +51,7 @@ class ScVbaFormatConditions: public ScVbaFormatConditions_BASE css::uno::Reference< css::beans::XPropertySet > mxParentRangePropertySet; public: void notifyRange() throw ( css::script::BasicErrorException ); - virtual css::uno::Reference< ov::excel::XFormatCondition > Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2, const css::uno::Reference< ov::excel::XStyle >& _xCalcStyle ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + css::uno::Reference< ov::excel::XFormatCondition > Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2, const css::uno::Reference< ov::excel::XStyle >& _xCalcStyle ) throw (css::script::BasicErrorException, css::uno::RuntimeException); OUString getA1Formula(const css::uno::Any& _aFormula) throw ( css::script::BasicErrorException ); OUString getStyleName(); void removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle) throw ( css::script::BasicErrorException ); diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index 3510b90c729c..12b552a8519e 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -37,7 +37,7 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc class ScVbaGlobals : public ScVbaGlobals_BASE { css::uno::Reference< ov::excel::XApplication > mxApplication; - virtual css::uno::Reference< + css::uno::Reference< ov::excel::XApplication > SAL_CALL getApplication() throw (css::uno::RuntimeException); public: diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx index af7b8cc04c6f..11189a26a96d 100644 --- a/sc/source/ui/vba/vbaname.hxx +++ b/sc/source/ui/vba/vbaname.hxx @@ -37,8 +37,8 @@ class ScVbaName : public NameImpl_BASE OUString getContent( const formula::FormulaGrammar::Grammar eGrammar, bool prependEquals = true ); void setContent( const OUString& sContent, const formula::FormulaGrammar::Grammar eGrammar, bool removeEquals = true ); protected: - virtual css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } - virtual css::uno::Reference< ov::excel::XWorksheet > getWorkSheet() throw (css::uno::RuntimeException); + css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } + css::uno::Reference< ov::excel::XWorksheet > getWorkSheet() throw (css::uno::RuntimeException); public: ScVbaName( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XNamedRange >& xName , const css::uno::Reference< css::sheet::XNamedRanges >& xNames , const css::uno::Reference< css::frame::XModel >& xModel ); @@ -62,7 +62,7 @@ public: virtual OUString SAL_CALL getRefersToR1C1Local() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setRefersToR1C1Local( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRefersToRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setRefersToRange( const css::uno::Reference< ov::excel::XRange > xRange ) throw (css::uno::RuntimeException); + void SAL_CALL setRefersToRange( const css::uno::Reference< ov::excel::XRange > xRange ) throw (css::uno::RuntimeException); // Methods virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxx index 5bba9a8d0536..96d9180be56e 100644 --- a/sc/source/ui/vba/vbanames.hxx +++ b/sc/source/ui/vba/vbanames.hxx @@ -36,7 +36,7 @@ class ScVbaNames : public ScVbaNames_BASE css::uno::Reference< css::sheet::XNamedRanges > mxNames; protected: - virtual css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } + css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } public: ScVbaNames( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XNamedRanges >& xNames , const css::uno::Reference< css::frame::XModel >& xModel ); diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 610222625aab..64897586a5e2 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -955,7 +955,7 @@ class Dim2ArrayValueGetter : public ArrayVisitor protected: uno::Any maValue; ValueGetter& mValueGetter; - virtual void processValue( sal_Int32 x, sal_Int32 y, const uno::Any& aValue ) + void processValue( sal_Int32 x, sal_Int32 y, const uno::Any& aValue ) { uno::Sequence< uno::Sequence< uno::Any > >& aMatrix = *( uno::Sequence< uno::Sequence< uno::Any > >* )( maValue.getValue() ); aMatrix[x][y] = aValue; diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 98c9b015c497..254a5bc831ef 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -116,7 +116,7 @@ class ScVbaRange : public ScVbaRange_BASE protected: virtual ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException ) SAL_OVERRIDE; - virtual SfxItemSet* getCurrentDataSet( ) throw ( css::uno::RuntimeException ); + SfxItemSet* getCurrentDataSet( ) throw ( css::uno::RuntimeException ); public: ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange, bool bIsRows = false, bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException ); ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges, bool bIsRows = false, bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); @@ -228,7 +228,7 @@ public: virtual css::uno::Reference< ov::excel::XFont > SAL_CALL Font() throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE ; virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (css::uno::RuntimeException); + css::uno::Reference< ov::excel::XRange > Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getCellRange( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; static css::uno::Any getCellRange( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException); virtual void SAL_CALL PasteSpecial( const css::uno::Any& Paste, const css::uno::Any& Operation, const css::uno::Any& SkipBlanks, const css::uno::Any& Transpose ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index a250cdecdd58..30164e1013e2 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -72,9 +72,9 @@ public: virtual ~ScVbaWorksheet(); - virtual css::uno::Reference< css::frame::XModel > getModel() + css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } - virtual css::uno::Reference< css::sheet::XSpreadsheet > getSheet() + css::uno::Reference< css::sheet::XSpreadsheet > getSheet() { return mxSheet; } static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); css::uno::Reference< ov::excel::XWorksheet > createSheetCopyInNewDoc( const OUString& ); diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx index b66260303c39..45b29c710c60 100644 --- a/scripting/source/dlgprov/dlgevtatt.hxx +++ b/scripting/source/dlgprov/dlgevtatt.hxx @@ -95,7 +95,7 @@ namespace dlgprov OUString m_sScriptType; OUString m_sScriptCode; - virtual void firing_impl( const ::com::sun::star::script::AllEventObject& Event, ::com::sun::star::uno::Any* pRet ); + void firing_impl( const ::com::sun::star::script::AllEventObject& Event, ::com::sun::star::uno::Any* pRet ); public: DialogAllListenerImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& rxListener, diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index 2c690addeb82..1a183b379b8e 100644 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -103,7 +103,7 @@ namespace dlgprov ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > createDialogModelForBasic() throw ( ::com::sun::star::uno::Exception ); // XDialogProvider / XDialogProvider2 impl method - virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XControl > SAL_CALL createDialogImpl( + ::com::sun::star::uno::Reference < ::com::sun::star::awt::XControl > SAL_CALL createDialogImpl( const OUString& URL, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent, diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 9e1545101b44..0685cce9f1e7 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -269,9 +269,9 @@ public: virtual OUString GetLayoutName() const SAL_OVERRIDE { return maLayoutName; } void SetFileName(const OUString& aName) { maFileName = aName; } - virtual OUString GetFileName() const { return maFileName; } + OUString GetFileName() const { return maFileName; } void SetBookmarkName(const OUString& aName) { maBookmarkName = aName; } - virtual OUString GetBookmarkName() const { return maBookmarkName; } + OUString GetBookmarkName() const { return maBookmarkName; } SdPageLink* GetLink() { return mpPageLink; } void ConnectLink(); @@ -327,7 +327,7 @@ public: /** Set the name of the page and broadcast a model change. */ - virtual void SetName (const OUString& rName); + void SetName (const OUString& rName); const sd::HeaderFooterSettings& getHeaderFooterSettings() const; void setHeaderFooterSettings( const sd::HeaderFooterSettings& rNewSettings ); diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index 15958987fe55..08245158bd7d 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -130,7 +130,7 @@ protected: void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix ); virtual SfxStyleSheetBase* Create(const OUString& rName, SfxStyleFamily eFamily, sal_uInt16 nMask) SAL_OVERRIDE; - virtual SfxStyleSheetBase* Create(const SdStyleSheet& rStyle); + SfxStyleSheetBase* Create(const SdStyleSheet& rStyle); using SfxStyleSheetPool::Create; virtual ~SdStyleSheetPool(); diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index 6802c480bd98..cf3243a9f254 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -138,7 +138,7 @@ protected: void throwIfDisposed() throw (::com::sun::star::uno::RuntimeException); - virtual void disposing(); + void disposing(); OUString msApiName; rtl::Reference< SfxStyleSheetBasePool > mxPool; diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx index 384d17105a0f..5844170f397b 100644 --- a/sd/inc/textapi.hxx +++ b/sd/inc/textapi.hxx @@ -42,7 +42,7 @@ public: virtual ~TextApiObject() throw(); - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); OutlinerParaObject* CreateText(); void SetText( OutlinerParaObject& rText ); diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx index 28d9d3f8f9c7..fae879dbcbc7 100644 --- a/sd/source/filter/eppt/epptooxml.hxx +++ b/sd/source/filter/eppt/epptooxml.hxx @@ -74,7 +74,7 @@ public: virtual bool exportDocument() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // only needed for import, leave them empty, refactor later XmlFilterBase to export and import base? - virtual sal_Int32 getSchemeClr( sal_Int32 /* nColorSchemeToken */ ) const { return 0; } + sal_Int32 getSchemeClr( sal_Int32 /* nColorSchemeToken */ ) const { return 0; } virtual oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE { return NULL; } virtual const oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE { return NULL; } virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE { return oox::drawingml::table::TableStyleListPtr(); } diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 1b7014c43593..bd918c151acf 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -248,7 +248,6 @@ public: virtual ~SdPathHdl(); virtual void CreateB2dIAObject() SAL_OVERRIDE; virtual bool IsFocusHdl() const SAL_OVERRIDE; - virtual Pointer GetSdrDragPointer() const; virtual bool isMarkable() const SAL_OVERRIDE; private: @@ -315,27 +314,6 @@ bool SdPathHdl::isMarkable() const return false; } -Pointer SdPathHdl::GetSdrDragPointer() const -{ - PointerStyle eStyle = POINTER_NOTALLOWED; - if( mxTag.is() ) - { - if( mxTag->isSelected() ) - { - if( !mxTag->getView().IsFrameDragSingles() && mxTag->getView().IsInsObjPointMode() ) - eStyle = POINTER_CROSS; - else - eStyle = POINTER_MOVE; - } - else - { - eStyle = POINTER_ARROW; - - } - } - return Pointer( eStyle ); -} - MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, const CustomAnimationEffectPtr& pEffect ) : SmartTag( rView ) , mrPane( rPane ) diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 36aefb829c6a..09480da57de6 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -158,7 +158,6 @@ public: virtual ~AnnotationHdl(); virtual void CreateB2dIAObject() SAL_OVERRIDE; virtual bool IsFocusHdl() const SAL_OVERRIDE; - virtual Pointer GetSdrDragPointer() const; virtual bool isMarkable() const SAL_OVERRIDE; private: @@ -249,24 +248,6 @@ bool AnnotationHdl::isMarkable() const return false; } -Pointer AnnotationHdl::GetSdrDragPointer() const -{ - PointerStyle eStyle = POINTER_NOTALLOWED; - if( mxTag.is() ) - { - if( mxTag->isSelected() ) - { - eStyle = POINTER_MOVE; - } - else - { - eStyle = POINTER_ARROW; - - } - } - return Pointer( eStyle ); -} - AnnotationTag::AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView, const Reference< XAnnotation >& xAnnotation, Color& rColor, int nIndex, const vcl::Font& rFont ) : SmartTag( rView ) , mrManager( rManager ) diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index b44525c493b2..c0e289d1ecfa 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -105,7 +105,7 @@ class AnnotationWindow : public FloatingWindow void StartEdit(); - virtual SvxLanguageItem GetLanguage(void); + SvxLanguageItem GetLanguage(void); void setAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, bool bGrabFocus = false ); const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& getAnnotation() const { return mxAnnotation; } diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index ef4c08b2c11b..16241381f83f 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -360,7 +360,7 @@ protected: If this is an empty reference then the currently active accessible OLE object (if there is one) is removed. */ - virtual void SetAccessibleOLEObject ( + void SetAccessibleOLEObject ( const ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible>& xOLEObject); //===== XAccessibleGetAccFromXShape ============================================ @@ -369,7 +369,7 @@ protected: throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; public: - virtual void SwitchViewActivated (void) { Activated(); } + void SwitchViewActivated (void) { Activated(); } virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index f18101e1bc73..196b4b87a6cc 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -109,7 +109,7 @@ public: protected: // overridden, as we hold the listeners ourselves - virtual void FireEvent (const ::com::sun::star::accessibility::AccessibleEventObject& aEvent); + void FireEvent (const ::com::sun::star::accessibility::AccessibleEventObject& aEvent); // overridden to detect focus changes virtual void Activated (void) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index 5d20cd2b0d50..99affbe53d99 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -285,7 +285,7 @@ public: getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SwitchViewActivated (void); + void SwitchViewActivated (void); private: class Implementation; ::std::unique_ptr<Implementation> mpImpl; diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 5f1a5dc1bb70..68a20852d081 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -239,7 +239,7 @@ protected: */ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; - virtual void FillPropertyTable ( + void FillPropertyTable ( ::std::vector< ::com::sun::star::beans::Property>& rProperties); /** diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 47f6d16be761..7f7cfee5aa4f 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -227,10 +227,10 @@ protected: void Construct(bool bClipboard); virtual void InPlaceActivate( bool bActive ) SAL_OVERRIDE; public: - virtual void setDocAccTitle( const OUString& rTitle ); - virtual const OUString getDocAccTitle() const; - virtual void setDocReadOnly( bool bReadOnly); - virtual bool getDocReadOnly() const; + void setDocAccTitle( const OUString& rTitle ); + const OUString getDocAccTitle() const; + void setDocReadOnly( bool bReadOnly); + bool getDocReadOnly() const; private: void setEditMode(DrawViewShell* pDrawViewShell, bool isMasterPage); }; diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 8a92f42828ce..56dbc5f4b76f 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -140,8 +140,8 @@ public: void ShowMousePosInfo(const Rectangle& rRect, ::sd::Window* pWin); - virtual void AddWindow(::sd::Window* pWin); - virtual void RemoveWindow(::sd::Window* pWin); + void AddWindow(::sd::Window* pWin); + void RemoveWindow(::sd::Window* pWin); virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive); @@ -161,8 +161,8 @@ public: virtual void Deactivate(bool IsMDIActivate) SAL_OVERRIDE; virtual void UIActivating( SfxInPlaceClient* ) SAL_OVERRIDE; virtual void UIDeactivated( SfxInPlaceClient* ) SAL_OVERRIDE; - virtual OUString GetSelectionText( bool bCompleteWords = false ); - virtual bool HasSelection( bool bText = true ) const; + OUString GetSelectionText( bool bCompleteWords = false ); + bool HasSelection( bool bText = true ) const; //If we are editing an PRESOBJ_OUTLINE return the Outliner and fill rSel //with the current selection @@ -325,7 +325,7 @@ public: returned value is independent of whether the layer modus is currently active and the tab control is visible. */ - virtual int GetTabLayerCount (void) const; + int GetTabLayerCount (void) const; /** Return the numerical id of the currently active layer as seen by the layer tab control. @@ -334,7 +334,7 @@ public: number of layers as returned by the <member>GetTabLayerCount</member> method (exclusive). */ - virtual int GetActiveTabLayerIndex (void) const; + int GetActiveTabLayerIndex (void) const; /** Set the active layer at the layer tab control and update the control accordingly to reflect the change on screen. @@ -344,7 +344,7 @@ public: <member>GetTabLayerCount</member> method (exclusive). Note that Invalid values are ignored. No excpetion is thrown in that case. */ - virtual void SetActiveTabLayerIndex (int nId); + void SetActiveTabLayerIndex (int nId); /** Return a pointer to the tab control for pages. */ diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx index b0a1c02d9de2..d24b0d80581e 100644 --- a/sd/source/ui/inc/FrameView.hxx +++ b/sd/source/ui/inc/FrameView.hxx @@ -166,8 +166,8 @@ public: void SetIsNavigatorShowingAllShapes (const bool bIsNavigatorShowingAllShapes); bool IsNavigatorShowingAllShapes (void) const { return mbIsNavigatorShowingAllShapes;} - virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); - virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); + void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); + void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); private: sal_uInt16 mnRefCount; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 91b678fdcd2a..9d67d5c9c39c 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -92,8 +92,8 @@ public: /** selects the paragraph for the given page at the outliner view*/ void SetActualPage( SdPage* pActual ); - virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); - virtual void AdjustPosSizePixel( + void Paint (const Rectangle& rRect, ::sd::Window* pWin); + void AdjustPosSizePixel( const Point &rPos, const Size &rSize, ::sd::Window* pWindow); diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 1a737b5c65e0..951c40f93c4f 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -77,8 +77,8 @@ public: virtual long VirtHScrollHdl(ScrollBar* pHScroll) SAL_OVERRIDE; virtual long VirtVScrollHdl(ScrollBar* pVHScroll) SAL_OVERRIDE; - virtual void AddWindow(::sd::Window* pWin); - virtual void RemoveWindow(::sd::Window* pWin); + void AddWindow(::sd::Window* pWin); + void RemoveWindow(::sd::Window* pWin); virtual void Activate( bool IsMDIActivate ) SAL_OVERRIDE; virtual void Deactivate( bool IsMDIActivate ) SAL_OVERRIDE; @@ -105,8 +105,8 @@ public: virtual void SetZoom(long nZoom) SAL_OVERRIDE; virtual void SetZoomRect(const Rectangle& rZoomRect) SAL_OVERRIDE; - virtual OUString GetSelectionText( bool bCompleteWords = false ); - virtual bool HasSelection( bool bText = true ) const; + OUString GetSelectionText( bool bCompleteWords = false ); + bool HasSelection( bool bText = true ) const; void Execute(SfxRequest& rReq); diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index d72fb3e10652..25750a4c9cde 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -86,7 +86,7 @@ public: css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener - virtual void SAL_CALL + void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index 1af5619f968d..a9167b148763 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -194,25 +194,25 @@ protected: calls the CreateModel(), CreateView(), and CreateController() methods in this order. */ - virtual void CreateModelViewController (void); + void CreateModelViewController (void); /** Create the model for the view shell. When called from the default implementation of CreateModelViewController() then neither view nor controller do exist. Test their pointers when in doubt. */ - virtual model::SlideSorterModel* CreateModel (void); + model::SlideSorterModel* CreateModel (void); /** Create the view for the view shell. When called from the default implementation of CreateModelViewController() then the model but not the controller does exist. Test their pointers when in doubt. */ - virtual view::SlideSorterView* CreateView (void); + view::SlideSorterView* CreateView (void); /** Create the controller for the view shell. When called from the default implementation of CreateModelViewController() then both the view and the controller do exist. Test their pointers when in doubt. */ - virtual controller::SlideSorterController* CreateController (void); + controller::SlideSorterController* CreateController (void); private: bool mbIsValid; diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 4f6e7abd5054..ec1ab1aac49a 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -72,24 +72,24 @@ public: */ static SlideSorterViewShell* GetSlideSorter (ViewShellBase& rBase); - virtual void GetFocus (void); - virtual void LoseFocus (void); + void GetFocus (void); + void LoseFocus (void); virtual SdPage* GetActualPage (void) SAL_OVERRIDE; /// inherited from sd::ViewShell virtual SdPage* getCurrentPage() const SAL_OVERRIDE; void ExecCtrl (SfxRequest& rRequest); - virtual void GetCtrlState (SfxItemSet &rSet); - virtual void FuSupport (SfxRequest& rRequest); - virtual void FuTemporary (SfxRequest& rRequest); - virtual void GetStatusBarState (SfxItemSet& rSet); - virtual void FuPermanent (SfxRequest& rRequest); + void GetCtrlState (SfxItemSet &rSet); + void FuSupport (SfxRequest& rRequest); + void FuTemporary (SfxRequest& rRequest); + void GetStatusBarState (SfxItemSet& rSet); + void FuPermanent (SfxRequest& rRequest); void GetAttrState (SfxItemSet& rSet); void ExecStatusBar (SfxRequest& rRequest); virtual void Command (const CommandEvent& rEvent, ::sd::Window* pWindow) SAL_OVERRIDE; - virtual void GetMenuState (SfxItemSet &rSet); - virtual void GetClipboardState (SfxItemSet &rSet); + void GetMenuState (SfxItemSet &rSet); + void GetClipboardState (SfxItemSet &rSet); virtual void ReadFrameViewData (FrameView* pView) SAL_OVERRIDE; virtual void WriteFrameViewData (void) SAL_OVERRIDE; @@ -119,10 +119,10 @@ public: //===== Drag and Drop ===================================================== - virtual void StartDrag ( + void StartDrag ( const Point& rDragPt, ::vcl::Window* pWindow ); - virtual void DragFinished ( + void DragFinished ( sal_Int8 nDropAction); virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, @@ -186,7 +186,7 @@ public: protected: - virtual SvBorder GetBorder (bool bOuterResize); + SvBorder GetBorder (bool bOuterResize); /** Override this method to handle a missing tool bar correctly. This is the case when the slide sorter is not the main view shell. diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index 313a2560b880..73e3ba0c07a2 100644 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -44,7 +44,7 @@ public: /** This method makes the one from the base class public so that it can be called from the view shell when one is created. */ - virtual void InvalidateSpellDialog (void); + void InvalidateSpellDialog (void); SFX_DECL_CHILDWINDOW_WITHID(SpellDialogChildWindow); diff --git a/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx index 17388f18c3b6..8e2c9e527ff0 100644 --- a/sd/source/ui/inc/TextObjectBar.hxx +++ b/sd/source/ui/inc/TextObjectBar.hxx @@ -53,7 +53,7 @@ public: void GetCharState( SfxItemSet& rSet ); void Execute( SfxRequest &rReq ); - virtual void Command( const CommandEvent& rCEvt ); + void Command( const CommandEvent& rCEvt ); private: ViewShell* mpViewShell; diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index e9630c7a2b21..9f8455622d12 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -98,13 +98,13 @@ public: virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false); virtual void MarkListHasChanged() SAL_OVERRIDE; virtual void ModelHasChanged() SAL_OVERRIDE; - virtual void SelectAll(); - virtual void DoCut(vcl::Window* pWindow=NULL); - virtual void DoCopy(vcl::Window* pWindow=NULL); - virtual void DoPaste(vcl::Window* pWindow=NULL); + void SelectAll(); + void DoCut(vcl::Window* pWindow=NULL); + void DoCopy(vcl::Window* pWindow=NULL); + void DoPaste(vcl::Window* pWindow=NULL); virtual void DoConnect(SdrOle2Obj* pOleObj) SAL_OVERRIDE; virtual bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false); - virtual void StartDrag( const Point& rStartPos, vcl::Window* pWindow ); + void StartDrag( const Point& rStartPos, vcl::Window* pWindow ); virtual void DragFinished( sal_Int8 nDropAction ); virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, diff --git a/sd/source/ui/inc/ViewClipboard.hxx b/sd/source/ui/inc/ViewClipboard.hxx index c61cbef0a637..86f3bbaaf7f6 100644 --- a/sd/source/ui/inc/ViewClipboard.hxx +++ b/sd/source/ui/inc/ViewClipboard.hxx @@ -40,7 +40,7 @@ public: /** Handle the drop of a drag-and-drop action where the transferable contains a set of pages. */ - virtual void HandlePageDrop (const SdTransferable& rTransferable); + void HandlePageDrop (const SdTransferable& rTransferable); protected: ::sd::View& mrView; @@ -54,7 +54,7 @@ protected: /** Assign the (first) master page of the given transferable to the (...) slide. */ - virtual void AssignMasterPage ( + void AssignMasterPage ( const SdTransferable& rTransferable, SdPage* pMasterPage); diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 352b6f9b72e9..589fb3594d04 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -138,7 +138,7 @@ public: view shell is still a valid object and can safely call methods that rely on that. */ - virtual void Exit (void); + void Exit (void); void Cancel(); @@ -183,15 +183,15 @@ public: virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void Command(const CommandEvent& rCEvt, ::sd::Window* pWin); - virtual bool RequestHelp( const HelpEvent& rEvt, ::sd::Window* pWin ); - virtual bool Notify( NotifyEvent& rNEvt, ::sd::Window* pWin ); + bool RequestHelp( const HelpEvent& rEvt, ::sd::Window* pWin ); + bool Notify( NotifyEvent& rNEvt, ::sd::Window* pWin ); - virtual bool HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin); + bool HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin); - virtual void Draw(OutputDevice &rDev, const ::vcl::Region &rReg); + void Draw(OutputDevice &rDev, const ::vcl::Region &rReg); virtual void SetUIUnit(FieldUnit eUnit); - virtual void SetDefTabHRuler( sal_uInt16 nDefTab ); + void SetDefTabHRuler( sal_uInt16 nDefTab ); const SfxPoolItem* GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& nNumItemId); @@ -231,8 +231,8 @@ public: void SetFrameView (FrameView* pFrameView); virtual void ReadFrameViewData(FrameView* pView); virtual void WriteFrameViewData(); - virtual void WriteUserData(OUString& rString); - virtual void ReadUserData(const OUString& rString); + void WriteUserData(OUString& rString); + void ReadUserData(const OUString& rString); virtual bool ActivateObject(SdrOle2Obj* pObj, long nVerb); @@ -301,7 +301,7 @@ public: CreateAccessibleDocumentView (::sd::Window* pWindow); virtual void SwitchViewFireFocus( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc ); - virtual void SwitchActiveViewFireFocus( ); + void SwitchActiveViewFireFocus( ); // Move these two methods from DrawViewShell to enable slide show view void NotifyAccUpdate(); void fireSwitchCurrentPage(sal_Int32 pageIndex); @@ -389,7 +389,7 @@ public: /** Return the type of the shell. */ - virtual ShellType GetShellType (void) const; + ShellType GetShellType (void) const; /** This method is more or less an alias to Deactivate(). It is called before an object of this class is taken from the stack of view diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index af33977a8e33..12bef3f1232a 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -84,7 +84,7 @@ public: /** This method is part of the object construction. It HAS to be called after the constructor has created a new object. */ - virtual void LateInit (const OUString& rsDefaultView); + void LateInit (const OUString& rsDefaultView); ::boost::shared_ptr<ViewShellManager> GetViewShellManager (void) const; @@ -114,7 +114,7 @@ public: slots. This is the companion of Execute() and handles the slots concerned with showing the pane docking windows. */ - virtual void GetState (SfxItemSet& rSet); + void GetState (SfxItemSet& rSet); /* override these from SfxViewShell */ virtual OUString GetSelectionText(bool) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 0a33a937b44b..e88fa1df1c8a 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -134,7 +134,7 @@ public: double GetScrlLineHeight(); double GetScrlPageWidth(); double GetScrlPageHeight(); - virtual void GrabFocus(); + void GrabFocus(); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; // DropTargetHelper @@ -189,7 +189,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE; - virtual void SwitchView(); + void SwitchView(); OUString GetSurroundingText() const SAL_OVERRIDE; Selection GetSurroundingTextSelection() const SAL_OVERRIDE; diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx index 093b550431b7..d46bf2cc64a2 100644 --- a/sd/source/ui/inc/dlgctrls.hxx +++ b/sd/source/ui/inc/dlgctrls.hxx @@ -37,7 +37,7 @@ class SD_DLLPUBLIC FadeEffectLB : public ListBox public: FadeEffectLB(vcl::Window* pParent, WinBits nStyle); virtual ~FadeEffectLB(); - virtual void Fill(); + void Fill(); /* void selectEffectFromPage( SdPage* pPage ); */ void applySelected( SdPage* pSlide ) const; diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 50261d972616..5c66103fb8c3 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -75,7 +75,7 @@ public: virtual bool Command(const CommandEvent& rCEvt); virtual bool RequestHelp(const HelpEvent& rHEvt); - virtual void Paint(const Rectangle&, ::sd::Window* ); + void Paint(const Rectangle&, ::sd::Window* ); virtual void ReceiveRequest(SfxRequest& rReq); virtual void Activate(); ///< activates the function diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index 522deeb59f67..93f5de4563f6 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -70,9 +70,9 @@ public: FrameView* pFrameView); virtual ~ToolPanelViewShell (void); - virtual void GetFocus (void); - virtual void LoseFocus (void); - virtual void KeyInput (const KeyEvent& rEvent); + void GetFocus (void); + void LoseFocus (void); + void KeyInput (const KeyEvent& rEvent); using sd::ViewShell::KeyInput; virtual SdPage* GetActualPage (void) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index bb5d33b0e57a..1ca849a83e3f 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -85,7 +85,7 @@ private: DECL_LINK( CheckFileHdl, void * ); void UpdateTree(); - virtual void OpenFileDialog(); + void OpenFileDialog(); ::com::sun::star::presentation::ClickAction GetActualClickAction(); void SetActualClickAction( ::com::sun::star::presentation::ClickAction eCA ); void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE ); diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index c7bf63bb8394..f62d2f7368ed 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -135,8 +135,8 @@ public: static rtl::Reference< SdXImpressDocument > GetModel( SdDrawDocument* pDoc ); // intern - virtual bool operator==( const SdXImpressDocument& rModel ) const { return mpDoc == rModel.mpDoc; } - virtual bool operator!=( const SdXImpressDocument& rModel ) const { return mpDoc != rModel.mpDoc; } + bool operator==( const SdXImpressDocument& rModel ) const { return mpDoc == rModel.mpDoc; } + bool operator!=( const SdXImpressDocument& rModel ) const { return mpDoc != rModel.mpDoc; } ::sd::DrawDocShell* GetDocShell() const { return mpDocShell; } SdDrawDocument* GetDoc() const { return mpDoc; } diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx index 346411809ba7..ba120ea63ec3 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx @@ -47,7 +47,7 @@ public: */ virtual void Fill (ItemList& rItemList) SAL_OVERRIDE; - virtual void GetState (SfxItemSet& rItemSet); + void GetState (SfxItemSet& rItemSet); protected: virtual void NotifyContainerChangeEvent (const MasterPageContainerChangeEvent& rEvent) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index 16d1ea3f4909..7eb77fc38f46 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -74,7 +74,7 @@ public: const css::uno::Reference<css::ui::XSidebar>& rxSidebar); virtual ~LayoutMenu (void); - virtual void Dispose (void); + void Dispose (void); /** Return a numerical value representing the currently selected layout. diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index d61fdcac9ca3..adec3911ed8a 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -79,12 +79,12 @@ public: SdPage* pMasterPage, sal_uInt16 nInsertionIndex); - virtual Size GetPreferredSize (void); - virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); - virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); - virtual bool IsResizable (void); - virtual vcl::Window* GetWindow (void); - virtual sal_Int32 GetMinimumWidth (void); + Size GetPreferredSize (void); + sal_Int32 GetPreferredWidth (sal_Int32 nHeight); + sal_Int32 GetPreferredHeight (sal_Int32 nWidth); + bool IsResizable (void); + vcl::Window* GetWindow (void); + sal_Int32 GetMinimumWidth (void); /** Update the selection of previews according to whatever influences them apart from mouse and keyboard. If, for @@ -142,7 +142,7 @@ protected: */ ::std::queue<sal_uInt16> maPreviewUpdateQueue; - virtual SdPage* GetSelectedMasterPage (void); + SdPage* GetSelectedMasterPage (void); /** Assign the given master page to all slides of the document. @param pMasterPage @@ -168,7 +168,7 @@ protected: UserData* GetUserData (int nIndex) const; void SetUserData (int nIndex, UserData* pData); - virtual sal_Int32 GetIndexForToken (MasterPageContainer::Token aToken) const; + sal_Int32 GetIndexForToken (MasterPageContainer::Token aToken) const; typedef ::std::vector<MasterPageContainer::Token> ItemList; void UpdateItemList (::std::unique_ptr<ItemList> && pList); void Clear (void); diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx index 797308f83187..77800f8aa59f 100644 --- a/sd/source/ui/sidebar/PanelBase.hxx +++ b/sd/source/ui/sidebar/PanelBase.hxx @@ -57,7 +57,7 @@ public: // ISidebarReceiver virtual void SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSidebar) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessibleObject ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent); diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index b8673460d9e1..35a931a8c206 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -176,15 +176,15 @@ public: virtual void SAL_CALL setUsePen( sal_Bool _usepen ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL getPenColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPenColor( ::sal_Int32 _pencolor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setUseEraser( bool _usepen ) throw (css::uno::RuntimeException); + void SAL_CALL setUseEraser( bool _usepen ) throw (css::uno::RuntimeException); virtual double SAL_CALL getPenWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPenWidth( double dStrokeWidth ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setEraseAllInk( bool bEraseAllInk ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setEraseInk( sal_Int32 nEraseInkSize ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setPenMode( bool bSwitchPenMode) throw (css::uno::RuntimeException); - virtual void SAL_CALL setEraserMode( bool bSwitchEraserMode ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setPointerMode( bool bSwitchPointerMode) throw (css::uno::RuntimeException); - virtual void SAL_CALL setPointerPosition( const ::com::sun::star::geometry::RealPoint2D& pos ) throw (css::uno::RuntimeException); + void SAL_CALL setEraseAllInk( bool bEraseAllInk ) throw (css::uno::RuntimeException); + void SAL_CALL setEraseInk( sal_Int32 nEraseInkSize ) throw (css::uno::RuntimeException); + void SAL_CALL setPenMode( bool bSwitchPenMode) throw (css::uno::RuntimeException); + void SAL_CALL setEraserMode( bool bSwitchEraserMode ) throw (css::uno::RuntimeException); + void SAL_CALL setPointerMode( bool bSwitchPointerMode) throw (css::uno::RuntimeException); + void SAL_CALL setPointerPosition( const ::com::sun::star::geometry::RealPoint2D& pos ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL isRunning( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL getSlideCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getSlideByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index f17f477e34a4..01d3fe77403c 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -187,7 +187,7 @@ public: /// Disposing our broadcaster virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL paint( const ::com::sun::star::awt::PaintEvent& e ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL paint( const ::com::sun::star::awt::PaintEvent& e ) throw (::com::sun::star::uno::RuntimeException); // XSlideShowView methods virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > SAL_CALL getCanvas( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sd/source/ui/slidesorter/controller/SlsCommand.hxx b/sd/source/ui/slidesorter/controller/SlsCommand.hxx index 29238441c0d3..7f6017e1a966 100644 --- a/sd/source/ui/slidesorter/controller/SlsCommand.hxx +++ b/sd/source/ui/slidesorter/controller/SlsCommand.hxx @@ -29,7 +29,7 @@ class Command { public: virtual ~Command (void) {}; - virtual void operator() (void) = 0; + ; }; } } } // end of namespace sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index e8577b918a57..cc2c96894b99 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -263,8 +263,8 @@ private: sal_Int32 mnAnchorIndex; sal_Int32 mnSecondIndex; - virtual void UpdateModelPosition (const Point& rMouseModelPosition); - virtual void UpdateSelection (void); + void UpdateModelPosition (const Point& rMouseModelPosition); + void UpdateSelection (void); /** Update the rectangle selection so that the given position becomes the new second point of the selection rectangle. diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index 7e42b84363c1..eb7f2916747b 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -70,7 +70,7 @@ public: /** Late initialization. Call this method once a new new object has been created. */ - virtual void Init (void); + void Init (void); virtual ~SlideSorterController (void); @@ -170,7 +170,7 @@ public: /** This factory method creates a selection function. */ - virtual rtl::Reference<FuPoor> CreateSelectionFunction (SfxRequest& rRequest); + rtl::Reference<FuPoor> CreateSelectionFunction (SfxRequest& rRequest); /** When the current function of the view shell is the slide sorter selection function then return a reference to it. Otherwise return diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index 0075d3b9071b..2d379006dcac 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -69,7 +69,7 @@ public: const ::std::vector<TransferableData::Representative>& rRepresentatives); virtual ~TransferableData (void); - virtual void DragFinished (sal_Int8 nDropAction); + void DragFinished (sal_Int8 nDropAction); const ::std::vector<Representative>& GetRepresentatives (void) const { return maRepresentatives;} diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 0816c1822f7f..e9ac85896ea0 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -126,7 +126,7 @@ public: void HandleDrawModeChange (void); - virtual void Resize (void); + void Resize (void); virtual void CompleteRedraw ( OutputDevice* pDevice, const ::vcl::Region& rPaintArea, diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 93c65a6eb113..4ac5fac514cb 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -81,7 +81,7 @@ public: virtual void objectChanged( SdrObject* pNewObj ) SAL_OVERRIDE; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx index b3f5653cf377..2fb3891b744e 100644 --- a/sdext/source/pdfimport/inc/pdfparse.hxx +++ b/sdext/source/pdfimport/inc/pdfparse.hxx @@ -162,8 +162,8 @@ struct PDFContainer : public PDFEntry // entries that can contain sub elements besides comments PDFContainer() : PDFEntry(), m_nOffset( 0 ) {} virtual ~PDFContainer(); - virtual bool emitSubElements( EmitContext& rWriteContext ) const; - virtual void cloneSubElements( std::vector<PDFEntry*>& rNewSubElements ) const; + bool emitSubElements( EmitContext& rWriteContext ) const; + void cloneSubElements( std::vector<PDFEntry*>& rNewSubElements ) const; PDFObject* findObject( unsigned int nNumber, unsigned int nGeneration ) const; PDFObject* findObject( PDFObjectRef* pRef ) const diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx index ae8e5f16e8d4..9ceabd68aedb 100644 --- a/sdext/source/pdfimport/tree/genericelements.hxx +++ b/sdext/source/pdfimport/tree/genericelements.hxx @@ -295,29 +295,29 @@ namespace pdfi ElementFactory() {} virtual ~ElementFactory(); - virtual HyperlinkElement* createHyperlinkElement( Element* pParent, const OUString& rURI ) + HyperlinkElement* createHyperlinkElement( Element* pParent, const OUString& rURI ) { return new HyperlinkElement( pParent, rURI ); } - virtual TextElement* createTextElement( Element* pParent, sal_Int32 nGCId, sal_Int32 nFontId ) + TextElement* createTextElement( Element* pParent, sal_Int32 nGCId, sal_Int32 nFontId ) { return new TextElement( pParent, nGCId, nFontId ); } - virtual ParagraphElement* createParagraphElement( Element* pParent ) + ParagraphElement* createParagraphElement( Element* pParent ) { return new ParagraphElement( pParent ); } - virtual FrameElement* createFrameElement( Element* pParent, sal_Int32 nGCId ) + FrameElement* createFrameElement( Element* pParent, sal_Int32 nGCId ) { return new FrameElement( pParent, nGCId ); } - virtual PolyPolyElement* + PolyPolyElement* createPolyPolyElement( Element* pParent, sal_Int32 nGCId, const basegfx::B2DPolyPolygon& rPolyPoly, sal_Int8 nAction) { return new PolyPolyElement( pParent, nGCId, rPolyPoly, nAction ); } - virtual ImageElement* createImageElement( Element* pParent, sal_Int32 nGCId, ImageId nImage ) + ImageElement* createImageElement( Element* pParent, sal_Int32 nGCId, ImageId nImage ) { return new ImageElement( pParent, nGCId, nImage ); } - virtual PageElement* createPageElement( Element* pParent, + PageElement* createPageElement( Element* pParent, sal_Int32 nPageNr ) { return new PageElement( pParent, nPageNr ); } - virtual DocumentElement* createDocumentElement() + DocumentElement* createDocumentElement() { return new DocumentElement(); } }; } diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index 19331e98e89f..76d86e3199b4 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -105,7 +105,7 @@ public: /** On some occasions it is necessary to trigger the painting of a scrollbar from the outside. */ - virtual void Paint ( + void Paint ( const css::awt::Rectangle& rUpdateBox, bool bNoClip = false); @@ -188,7 +188,7 @@ protected: SharedBitmapDescriptor mpThumbEndDescriptor; bool maEnabledState[__AreaCount__]; - virtual css::geometry::RealRectangle2D GetRectangle (const Area eArea) const; + css::geometry::RealRectangle2D GetRectangle (const Area eArea) const; virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const = 0; virtual void UpdateDragAnchor (const double nDragDistance) = 0; virtual css::geometry::RealPoint2D GetPoint (const double nMajor, const double nMinor) const = 0; diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 0b4a2452779a..442c89872b14 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -141,9 +141,9 @@ namespace { const SharedElementMode& rpMouseOverMode, const SharedElementMode& rpSelectedMode, const SharedElementMode& rpDisabledMode); - virtual void CurrentSlideHasChanged (void); - virtual void SetLocation (const awt::Point& rLocation); - virtual void SetSize (const geometry::RealSize2D& rSize); + void CurrentSlideHasChanged (void); + void SetLocation (const awt::Point& rLocation); + void SetSize (const geometry::RealSize2D& rSize); virtual void Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState) = 0; @@ -151,8 +151,8 @@ namespace { const Reference<rendering::XCanvas>& rxCanvas); awt::Rectangle GetBoundingBox (void) const; virtual bool SetState (const bool bIsOver, const bool bIsPressed); - virtual void Invalidate (const bool bSynchronous = true); - virtual bool IsOutside (const awt::Rectangle& rBox); + void Invalidate (const bool bSynchronous = true); + bool IsOutside (const awt::Rectangle& rBox); virtual bool IsFilling (void) const; void UpdateState (void); diff --git a/sfx2/source/bastyp/fltlst.hxx b/sfx2/source/bastyp/fltlst.hxx index f61bb591ce2b..a78c6a72a82b 100644 --- a/sfx2/source/bastyp/fltlst.hxx +++ b/sfx2/source/bastyp/fltlst.hxx @@ -42,9 +42,9 @@ class SfxFilterListener public: // XRefreshListener - virtual void SAL_CALL refreshed( const ::com::sun::star::lang::EventObject& aSource ) throw( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL refreshed( const ::com::sun::star::lang::EventObject& aSource ) throw( ::com::sun::star::uno::RuntimeException ); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aSource ) throw( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aSource ) throw( ::com::sun::star::uno::RuntimeException ); }; diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index ebb14a5231b6..737b0c09c4bc 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -111,7 +111,7 @@ public: 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 void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -226,7 +226,7 @@ public: 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 void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index b290c7373f6f..9c7f3218f82a 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -503,8 +503,7 @@ namespace sfx2 class ModuleTaskPane_Impl : public ::boost::noncopyable { public: - ModuleTaskPane_Impl( ModuleTaskPane& i_rAntiImpl, const Reference< XFrame >& i_rDocumentFrame, - const IToolPanelCompare* i_pPanelCompare ) + ModuleTaskPane_Impl( ModuleTaskPane& i_rAntiImpl, const Reference< XFrame >& i_rDocumentFrame ) :m_rAntiImpl( i_rAntiImpl ) ,m_sModuleIdentifier( lcl_identifyModule( i_rDocumentFrame ) ) ,m_xFrame( i_rDocumentFrame ) @@ -512,7 +511,7 @@ namespace sfx2 { m_aPanelDeck.Show(); OnResize(); - impl_initFromConfiguration( i_pPanelCompare ); + impl_initFromConfiguration(); } ~ModuleTaskPane_Impl() @@ -528,14 +527,12 @@ namespace sfx2 ::boost::optional< size_t > GetPanelPos( const OUString& i_rResourceURL ); - OUString - GetPanelResourceURL( const size_t i_nPanelPos ) const; void SetDrawersLayout(); void SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent ); private: - void impl_initFromConfiguration( const IToolPanelCompare* i_pPanelCompare ); + void impl_initFromConfiguration(); static bool impl_isToolPanelResource( const OUString& i_rResourceURL ); @@ -575,7 +572,7 @@ namespace sfx2 } - void ModuleTaskPane_Impl::impl_initFromConfiguration( const IToolPanelCompare* i_pPanelCompare ) + void ModuleTaskPane_Impl::impl_initFromConfiguration() { const ::utl::OConfigurationTreeRoot aWindowStateConfig( lcl_getModuleUIElementStatesConfig( m_sModuleIdentifier ) ); if ( !aWindowStateConfig.isValid() ) @@ -599,22 +596,6 @@ namespace sfx2 ::svt::PToolPanel pCustomPanel( new CustomToolPanel( aResourceNode, m_xFrame ) ); size_t nPanelPos = m_aPanelDeck.GetPanelCount(); - if ( i_pPanelCompare ) - { - // assuming that nobody will insert hundreths of panels, a simple O(n) search should suffice here ... - while ( nPanelPos > 0 ) - { - const short nCompare = i_pPanelCompare->compareToolPanelsURLs( - *resource, - GetPanelResourceURL( --nPanelPos ) - ); - if ( nCompare >= 0 ) - { - ++nPanelPos; - break; - } - } - } nPanelPos = m_aPanelDeck.InsertPanel( pCustomPanel, nPanelPos ); if ( ::comphelper::getBOOL( aResourceNode.getNodeValue( "Visible" ) ) ) @@ -676,16 +657,6 @@ namespace sfx2 } - OUString ModuleTaskPane_Impl::GetPanelResourceURL( const size_t i_nPanelPos ) const - { - ENSURE_OR_RETURN( i_nPanelPos < m_aPanelDeck.GetPanelCount(), "ModuleTaskPane_Impl::GetPanelResourceURL: illegal panel position!", OUString() ); - const ::svt::PToolPanel pPanel( m_aPanelDeck.GetPanel( i_nPanelPos ) ); - const CustomToolPanel* pCustomPanel = dynamic_cast< const CustomToolPanel* >( pPanel.get() ); - ENSURE_OR_RETURN( pCustomPanel != NULL, "ModuleTaskPane_Impl::GetPanelPos: illegal panel implementation!", OUString() ); - return pCustomPanel->GetResourceURL(); - } - - void ModuleTaskPane_Impl::SetDrawersLayout() { const ::svt::PDeckLayouter pLayouter( m_aPanelDeck.GetLayouter() ); @@ -724,7 +695,7 @@ namespace sfx2 ModuleTaskPane::ModuleTaskPane( vcl::Window& i_rParentWindow, const Reference< XFrame >& i_rDocumentFrame ) :Window( &i_rParentWindow, WB_DIALOGCONTROL ) - ,m_pImpl( new ModuleTaskPane_Impl( *this, i_rDocumentFrame, NULL ) ) + ,m_pImpl( new ModuleTaskPane_Impl( *this, i_rDocumentFrame ) ) { } diff --git a/sfx2/source/doc/printhelper.hxx b/sfx2/source/doc/printhelper.hxx index fdabc092a375..09f15f808bcf 100644 --- a/sfx2/source/doc/printhelper.hxx +++ b/sfx2/source/doc/printhelper.hxx @@ -60,7 +60,7 @@ private: osl::Mutex m_aMutex; IMPL_PrintListener_DataContainer* m_pData ; - virtual void impl_setPrinter(const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rPrinter,SfxPrinter*& pPrinter,sal_uInt16& nChangeFlags,SfxViewShell*& pViewSh); + void impl_setPrinter(const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rPrinter,SfxPrinter*& pPrinter,sal_uInt16& nChangeFlags,SfxViewShell*& pViewSh); } ; #endif diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index fa7a26b90964..b7219a30ccba 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -208,8 +208,8 @@ protected: virtual void CheckItem( sal_uInt16 /*nMesId*/, bool /*bCheck*/ = true ) {} virtual bool IsCheckedItem( sal_uInt16 /*nMesId*/ ) { return true; } virtual void LoadedFamilies() {} - virtual void Update() { UpdateStyles_Impl(UPDATE_FAMILY_LIST); } - virtual void InvalidateBindings(); + void Update() { UpdateStyles_Impl(UPDATE_FAMILY_LIST); } + void InvalidateBindings(); virtual void InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten ) = 0; virtual void EnableFamilyItem( sal_uInt16 nId, bool bEnabled = true ) = 0; virtual void ClearFamilyList() = 0; @@ -267,10 +267,10 @@ public: DECL_LINK( MenuSelectHdl, Menu * ); virtual void EnableEdit( bool b = true ) { bCanEdit = b; } - virtual void EnableDel( bool b = true ) { bCanDel = b; } - virtual void EnableNew( bool b = true ) { bCanNew = b; } - virtual void EnableHide( bool b = true ) { bCanHide = b; } - virtual void EnableShow( bool b = true ) { bCanShow = b; } + void EnableDel( bool b = true ) { bCanDel = b; } + void EnableNew( bool b = true ) { bCanNew = b; } + void EnableHide( bool b = true ) { bCanHide = b; } + void EnableShow( bool b = true ) { bCanShow = b; } vcl::Window* GetWindow() { return pWindow; } @@ -281,7 +281,7 @@ public: OUString GetSelectedEntry() const; SfxObjectShell* GetObjectShell() const { return pCurObjShell; } - virtual void PrepareDeleteAction(); // disable buttons, change button text, etc. when del is going to happen + void PrepareDeleteAction(); // disable buttons, change button text, etc. when del is going to happen inline bool CanEdit( void ) const { return bCanEdit; } inline bool CanDel( void ) const { return bCanDel; } @@ -290,7 +290,7 @@ public: inline bool CanShow( void ) const { return bCanShow; } // normally for derivates from SvTreeListBoxes, but in this case the dialog handles context menus - virtual PopupMenu* CreateContextMenu( void ); + PopupMenu* CreateContextMenu( void ); }; class DropToolBox_Impl : public ToolBox, public DropTargetHelper @@ -323,7 +323,7 @@ private: DECL_LINK( MenuSelectHdl, Menu* ); protected: - virtual void Command( const CommandEvent& rMEvt ); + void Command( const CommandEvent& rMEvt ); virtual void EnableEdit( bool = true ) SAL_OVERRIDE; virtual void EnableItem( sal_uInt16 nMesId, bool bCheck = true ) SAL_OVERRIDE; virtual void CheckItem( sal_uInt16 nMesId, bool bCheck = true ) SAL_OVERRIDE; diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index db58c1a54670..3d20a0e1dc31 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -242,10 +242,10 @@ protected: void RemoveChildWin_Impl(SfxChildWin_Impl*); void Sort_Impl(); SfxChild_Impl* FindChild_Impl( const vcl::Window& rWindow ) const; - virtual bool RequestTopToolSpacePixel_Impl( SvBorder aBorder ); + bool RequestTopToolSpacePixel_Impl( SvBorder aBorder ); virtual Rectangle GetTopRect_Impl(); SvBorder Arrange_Impl(); - virtual void SaveStatus_Impl(SfxChildWindow*, const SfxChildWinInfo&); + void SaveStatus_Impl(SfxChildWindow*, const SfxChildWinInfo&); static bool IsPluginMode( SfxObjectShell* pObjShell ); public: @@ -308,13 +308,13 @@ public: void ShowChildWindow_Impl(sal_uInt16, bool bVisible, bool bSetFocus); void SetChildWindow_Impl(sal_uInt16, bool bOn, bool bSetFocus); SfxChildWindow* GetChildWindow_Impl(sal_uInt16); - virtual void InitializeChild_Impl(SfxChildWin_Impl*); + void InitializeChild_Impl(SfxChildWin_Impl*); SfxSplitWindow* GetSplitWindow_Impl(SfxChildAlignment); bool IsVisible_Impl( sal_uInt16 nMode ) const; bool IsFloating( sal_uInt16 nId ); void SetActiveChild_Impl( vcl::Window *pChild ); - virtual bool ActivateNextChild_Impl( bool bForward = true ); + bool ActivateNextChild_Impl( bool bForward = true ); bool AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const; // Methods for StatusBar diff --git a/sfx2/source/sidebar/TitleBar.hxx b/sfx2/source/sidebar/TitleBar.hxx index a6bdedf0ff79..ea206c99f90a 100644 --- a/sfx2/source/sidebar/TitleBar.hxx +++ b/sfx2/source/sidebar/TitleBar.hxx @@ -58,7 +58,7 @@ protected: virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox) = 0; virtual void PaintDecoration (const Rectangle& rTitleBarBox) = 0; - virtual void PaintFocus (const Rectangle& rFocusBox); + void PaintFocus (const Rectangle& rFocusBox); virtual sidebar::Paint GetBackgroundPaint (void) = 0; virtual Color GetTextColor (void) = 0; virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex); diff --git a/slideshow/source/engine/animationnodes/basecontainernode.hxx b/slideshow/source/engine/animationnodes/basecontainernode.hxx index 0d83d1123309..46b762b45ec6 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.hxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.hxx @@ -51,7 +51,7 @@ protected: private: virtual bool init_st() SAL_OVERRIDE; - virtual bool init_children(); + bool init_children(); virtual void deactivate_st( NodeState eDestState ) SAL_OVERRIDE; virtual bool hasPendingAnimation() const SAL_OVERRIDE; // force to be implemented by derived class: diff --git a/slideshow/source/engine/pointersymbol.hxx b/slideshow/source/engine/pointersymbol.hxx index 8a144aa40732..a1d624a3a6ea 100644 --- a/slideshow/source/engine/pointersymbol.hxx +++ b/slideshow/source/engine/pointersymbol.hxx @@ -55,7 +55,7 @@ public: /** Use this method to update the pointer's position */ void setVisible( const bool bVisible ); - virtual void viewsChanged(const ::com::sun::star::geometry::RealPoint2D pos); + void viewsChanged(const ::com::sun::star::geometry::RealPoint2D pos); private: PointerSymbol( const ::com::sun::star::uno::Reference< diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx index 9a8b9925b093..6de066c42ec2 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.hxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx @@ -163,7 +163,7 @@ private: // ShapeCursorEventHandler interface - virtual bool cursorChanged( const ::com::sun::star::uno::Reference< + bool cursorChanged( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& xShape, sal_Int16 nCursor ); diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 1b60e8eab774..5549e5ebd213 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -110,12 +110,6 @@ public: virtual ~SlideImpl(); - // Disposable interface - - - virtual void dispose(); - - // Slide interface @@ -428,30 +422,6 @@ SlideImpl::~SlideImpl() } } -void SlideImpl::dispose() -{ - maSlideBitmaps.clear(); - mpPaintOverlay.reset(); - maAnimations.dispose(); - maContext.dispose(); - - if( mpShapeManager ) - { - maContext.mrScreenUpdater.removeViewUpdate(mpShapeManager); - mpShapeManager->dispose(); - } - - // TODO(Q3): Make sure LayerManager (and thus Shapes) dies first, - // because SlideShowContext has SubsettableShapeManager as - // reference member. - mpLayerManager.reset(); - mpSubsettableShapeManager.reset(); - mpShapeManager.reset(); - mxRootNode.clear(); - mxDrawPage.clear(); - mxDrawPagesSupplier.clear(); -} - bool SlideImpl::prefetch() { if( !mxRootNode.is() ) diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index 9843d48b22ce..7fa45a298012 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -86,7 +86,7 @@ namespace slideshow drawPolygons(); } - virtual void dispose() + void dispose() { maViews.clear(); } diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index 1d4ce3cf765b..ee73d0451ea0 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -111,11 +111,6 @@ public: maEvents() {} - void clearContainer() - { - maEvents = ImpEventQueue(); - } - void addEvent( const EventSharedPtr& rEvent ) { maEvents.push( rEvent ); @@ -135,11 +130,6 @@ public: maAnimationEventMap() {} - virtual void dispose() - { - maAnimationEventMap.clear(); - } - virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) SAL_OVERRIDE { ENSURE_OR_RETURN_FALSE( @@ -206,10 +196,6 @@ public: } private: - virtual void dispose() - { - clearContainer(); - } // triggered by API calls, e.g. space bar virtual bool handleEvent() SAL_OVERRIDE @@ -308,11 +294,6 @@ public: : EventContainer(), mrEventQueue(rEventQueue) {} private: - virtual void dispose() - { - clearContainer(); - } - virtual bool handleMouseReleased( awt::MouseEvent const& evt ) SAL_OVERRIDE { if(evt.Buttons != awt::MouseButton::RIGHT) @@ -339,13 +320,6 @@ public: maShapeEventMap() {} - virtual void dispose() - { - // TODO(Q1): Check whether plain vector with swap idiom is - // okay here - maShapeEventMap = ImpShapeEventMap(); - } - void addEvent( const EventSharedPtr& rEvent, const ShapeSharedPtr& rShape ) { diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx index 80b73c2d0c3a..f2bed3498fba 100644 --- a/slideshow/source/inc/shapeattributelayer.hxx +++ b/slideshow/source/inc/shapeattributelayer.hxx @@ -64,7 +64,7 @@ namespace slideshow @return an abstract, numerical state ID. */ - virtual StateId getStateId() const = 0; + ; }; typedef ::boost::shared_ptr< State > StateSharedPtr; diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 792bbb68b4f1..5d1479395601 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -124,7 +124,7 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener sal_Int32 nFileFormat, bool bTemplate = false ) const SAL_OVERRIDE; - virtual bool SetData( const OUString& rData ); + bool SetData( const OUString& rData ); virtual sal_uLong GetMiscStatus() const SAL_OVERRIDE; virtual void OnDocumentPrinterChanged( Printer * ) SAL_OVERRIDE; virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) SAL_OVERRIDE; @@ -209,7 +209,7 @@ public: virtual ::svl::IUndoManager *GetUndoManager () SAL_OVERRIDE; - virtual SfxItemPool& GetPool() const; + SfxItemPool& GetPool() const; void Execute( SfxRequest& rReq ); void GetState(SfxItemSet &); diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index a44ed3596c57..9a3516c57837 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -147,7 +147,7 @@ public: void SetSize(const Fraction &rScale); virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell); - virtual void PrepareAttributes(); + void PrepareAttributes(); sal_uInt16 FindIndex() const; @@ -161,7 +161,7 @@ public: const SmRect & GetRect() const { return *this; } SmRect & GetRect() { return *this; } - virtual void Move(const Point &rPosition); + void Move(const Point &rPosition); void MoveTo(const Point &rPosition) { Move(rPosition - GetTopLeft()); } virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat); virtual void CreateTextFromNode(OUString &rText); diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index fa09ba35b791..0d9430e91e95 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -260,7 +260,7 @@ protected: const OUString& rText, sal_uInt16 MaxWidth); - virtual sal_uInt16 Print(SfxProgress &rProgress, bool bIsAPI); + sal_uInt16 Print(SfxProgress &rProgress, bool bIsAPI); virtual SfxPrinter *GetPrinter(bool bCreate = false) SAL_OVERRIDE; virtual sal_uInt16 SetPrinter(SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false) SAL_OVERRIDE; @@ -308,8 +308,8 @@ private: static void InitInterface_Impl(); public: - virtual void Execute( SfxRequest& rReq ); - virtual void GetState(SfxItemSet &); + void Execute( SfxRequest& rReq ); + void GetState(SfxItemSet &); void Impl_Print( OutputDevice &rOutDev, const SmPrintUIOptions &rPrintUIOptions, Rectangle aOutRect, Point aZeroPoint ); diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx index 2b74bf057bc5..ad8249d21ebe 100644 --- a/store/source/storbase.hxx +++ b/store/source/storbase.hxx @@ -814,8 +814,8 @@ protected: PageHolder m_xPage; bool m_bDirty; - virtual storeError guard (sal_uInt32 nAddr) = 0; - virtual storeError verify (sal_uInt32 nAddr) const = 0; + ; + ; }; #endif /* EXP */ diff --git a/svgio/inc/svgio/svgreader/svgcharacternode.hxx b/svgio/inc/svgio/svgreader/svgcharacternode.hxx index 9425a46f23fe..192f24d221ba 100644 --- a/svgio/inc/svgio/svgreader/svgcharacternode.hxx +++ b/svgio/inc/svgio/svgreader/svgcharacternode.hxx @@ -158,7 +158,7 @@ namespace svgio virtual ~SvgCharacterNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const SAL_OVERRIDE; - virtual void decomposeText(drawinglayer::primitive2d::Primitive2DSequence& rTarget, SvgTextPosition& rSvgTextPosition) const; + void decomposeText(drawinglayer::primitive2d::Primitive2DSequence& rTarget, SvgTextPosition& rSvgTextPosition) const; void whiteSpaceHandling(); void addGap(); void concatenate(const OUString& rText); diff --git a/svgio/inc/svgio/svgreader/svgsvgnode.hxx b/svgio/inc/svgio/svgreader/svgsvgnode.hxx index d4fb304f653d..4a36bf864081 100644 --- a/svgio/inc/svgio/svgreader/svgsvgnode.hxx +++ b/svgio/inc/svgio/svgreader/svgsvgnode.hxx @@ -60,8 +60,8 @@ namespace svgio /// Seeks width and height of viewport, which is current before the new viewport is set. // needed for percentage unit in x, y, width or height - virtual void seekReferenceWidth(double& fWidth, bool& bHasFound) const; - virtual void seekReferenceHeight(double& fHeight, bool& bHasFound) const; + void seekReferenceWidth(double& fWidth, bool& bHasFound) const; + void seekReferenceHeight(double& fHeight, bool& bHasFound) const; /// InfoProvider support for % values in children // The returned 'CurrentViewPort' is the viewport as it is set by this svg element diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx index 362f797e5a09..c12e7449a725 100644 --- a/svtools/inc/roadmap.hxx +++ b/svtools/inc/roadmap.hxx @@ -93,7 +93,7 @@ namespace svt protected: /// called when an item has been selected by any means - virtual void Select(); + void Select(); private: DECL_LINK(ImplClickHdl, HyperLabel*); diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx index 7b0e01bf0b8d..cde9465ed222 100644 --- a/svtools/inc/table/tablecontrol.hxx +++ b/svtools/inc/table/tablecontrol.hxx @@ -135,7 +135,7 @@ namespace svt { namespace table } SVT_DLLPRIVATE virtual void Resize() SAL_OVERRIDE; - virtual void Select(); + void Select(); /**after removing a row, updates the vector which contains the selected rows if the row, which should be removed, is selected, it will be erased from the vector diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx b/svtools/inc/vclxaccessibleheaderbaritem.hxx index 144364f9f495..3274c7e72b36 100644 --- a/svtools/inc/vclxaccessibleheaderbaritem.hxx +++ b/svtools/inc/vclxaccessibleheaderbaritem.hxx @@ -58,8 +58,8 @@ private: protected: - 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/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index bff17665e392..d6d69910425d 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -88,7 +88,7 @@ public: bool IsFrozen() const { return _bFrozen; } void Freeze( bool bFreeze = true ) { _bFrozen = bFreeze; } - virtual void Draw( BrowseBox& rBox, OutputDevice& rDev, + void Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos, bool bCurs ); void SetWidth(sal_uLong nNewWidthPixel, const Fraction& rCurrentZoom); diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index 9a32d694fff4..55aca40b9cf4 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -162,7 +162,7 @@ public: 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 void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -250,7 +250,7 @@ public: 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 void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 4b2cf9f54ebf..9773363eb213 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -138,7 +138,7 @@ public: 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 void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -258,7 +258,7 @@ public: 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 void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index f94ec3041bd2..7b07a9d3186a 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -283,7 +283,7 @@ public: virtual void Commit() SAL_OVERRIDE; private: - virtual void clearFieldAssignment(const OUString& _rLogicalName); + void clearFieldAssignment(const OUString& _rLogicalName); }; diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index fc52b5441e68..a9a7607a5c93 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -136,10 +136,6 @@ namespace svt { namespace table { return 5 * 100; } - virtual void setRowHeight(TableMetrics _nRowHeight) - { - (void)_nRowHeight; - } virtual TableMetrics getColumnHeaderHeight() const SAL_OVERRIDE { return 0; diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index 0c2da1f191ab..f905504d111e 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -276,8 +276,8 @@ namespace svt { namespace table virtual long pixelWidthToAppFont( long const i_pixels ) const SAL_OVERRIDE; virtual void hideTracking() SAL_OVERRIDE; virtual void showTracking( Rectangle const & i_location, sal_uInt16 const i_flags ) SAL_OVERRIDE; - virtual RowPos getRowAtPoint( const Point& rPoint ) const; - virtual ColPos getColAtPoint( const Point& rPoint ) const; + RowPos getRowAtPoint( const Point& rPoint ) const; + ColPos getColAtPoint( const Point& rPoint ) const; virtual TableCell hitTest( const Point& rPoint ) const SAL_OVERRIDE; virtual ColumnMetrics getColumnMetrics( ColPos const i_column ) const SAL_OVERRIDE; virtual bool isRowSelected( RowPos i_row ) const SAL_OVERRIDE; diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx index c606d6a4b205..2b9b7c6c9507 100644 --- a/svtools/source/table/tabledatawindow.hxx +++ b/svtools/source/table/tabledatawindow.hxx @@ -59,8 +59,8 @@ namespace svt { namespace table virtual void MouseButtonDown( const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt) SAL_OVERRIDE; virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; - virtual void SetControlBackground(const Color& rColor); - virtual void SetControlBackground(); + void SetControlBackground(const Color& rColor); + void SetControlBackground(); virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; void SetBackground(const Wallpaper& rColor); diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index c2a032c9d5ab..3c1fde170513 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -62,7 +62,7 @@ protected: virtual void DoubleClick(const BrowserMouseEvent&) SAL_OVERRIDE; virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE; virtual void Select() SAL_OVERRIDE; - virtual void SetDirty(); // is called for example in mode switches + void SetDirty(); // is called for example in mode switches virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) SAL_OVERRIDE; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) SAL_OVERRIDE; public: @@ -72,9 +72,9 @@ public: void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL); sal_uIntPtr GetCurrentPos() const; sal_uInt16 GetCurrentWhich() const; - virtual bool BegChangeEntry(sal_uIntPtr nPos); - virtual bool EndChangeEntry(); - virtual void BrkChangeEntry(); + bool BegChangeEntry(sal_uIntPtr nPos); + bool EndChangeEntry(); + void BrkChangeEntry(); /** GetCellText returns the text at the given position @param _nRow diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index fda7a3cb375a..9a0a02514aa1 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -87,9 +87,9 @@ css::uno::Reference< css::uno::XComponentContext > RecoveryCore::getComponentCon } -TURLList* RecoveryCore::getURLListAccess() +TURLList& RecoveryCore::getURLListAccess() { - return &m_lURLs; + return m_lURLs; } @@ -648,11 +648,11 @@ SaveDialog::SaveDialog(vcl::Window* pParent, RecoveryCore* pCore) // fill listbox with current open documents m_pFileListLB->Clear(); - TURLList* pURLs = m_pCore->getURLListAccess(); + TURLList& pURLs = m_pCore->getURLListAccess(); TURLList::const_iterator pIt; - for ( pIt = pURLs->begin(); - pIt != pURLs->end() ; + for ( pIt = pURLs.begin(); + pIt != pURLs.end() ; ++pIt ) { const TURLInfo& rInfo = *pIt; @@ -878,10 +878,10 @@ RecoveryDialog::RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore) m_pCancelBtn->SetClickHdl( LINK( this, RecoveryDialog, CancelButtonHdl ) ); // fill list box first time - TURLList* pURLList = m_pCore->getURLListAccess(); + TURLList& pURLList = m_pCore->getURLListAccess(); TURLList::const_iterator pIt; - for ( pIt = pURLList->begin(); - pIt != pURLList->end() ; + for ( pIt = pURLList.begin(); + pIt != pURLList.end() ; ++pIt ) { const TURLInfo& rInfo = *pIt; @@ -1240,10 +1240,10 @@ BrokenRecoveryDialog::~BrokenRecoveryDialog() void BrokenRecoveryDialog::impl_refresh() { m_bExecutionNeeded = false; - TURLList* pURLList = m_pCore->getURLListAccess(); + TURLList& pURLList = m_pCore->getURLListAccess(); TURLList::const_iterator pIt; - for ( pIt = pURLList->begin(); - pIt != pURLList->end() ; + for ( pIt = pURLList.begin(); + pIt != pURLList.end() ; ++pIt ) { const TURLInfo& rInfo = *pIt; diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index c829f3a7aa93..fc998adf7a0c 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -75,8 +75,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); //XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -85,13 +85,13 @@ public: 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); - virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) 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); + void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -111,7 +111,7 @@ public: protected: DECL_LINK( WindowEventListener, VclSimpleEvent* ); - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); + void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); private: void IsValid() throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index b2c665048fee..ca861db77a21 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -108,10 +108,10 @@ public: 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 void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -186,10 +186,10 @@ protected: When the object is already disposed then a <type>DisposedException</type> is thrown. */ - virtual Rectangle GetBoundingBoxOnScreen(void) throw (::com::sun::star::uno::RuntimeException); + Rectangle GetBoundingBoxOnScreen(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current bounding box relative to the parent object. - virtual Rectangle GetBoundingBox(void) throw (::com::sun::star::uno::RuntimeException); + Rectangle GetBoundingBox(void) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index c2f5cfaebef7..a85d343b3d32 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -58,7 +58,7 @@ namespace svx // XAccessibleComponent virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) 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; //OAccessibleContextHelper // XAccessibleContext - still waiting to be overwritten @@ -138,7 +138,7 @@ namespace svx // XAccessibleComponent virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) 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; //OAccessibleContextHelper @@ -236,7 +236,7 @@ namespace svx // XAccessibleComponent virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) 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; //OAccessibleContextHelper diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 5d41f28ac598..4241576df3ad 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -233,34 +233,34 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener /** @short TODO */ - virtual css::uno::Reference< css::uno::XComponentContext > getComponentContext(); + css::uno::Reference< css::uno::XComponentContext > getComponentContext(); /** @short TODO */ - virtual TURLList* getURLListAccess(); + TURLList& getURLListAccess(); /** @short TODO */ static bool isBrokenTempEntry(const TURLInfo& rInfo); - virtual void saveBrokenTempEntries(const OUString& sSaveDir); - virtual void saveAllTempEntries(const OUString& sSaveDir); - virtual void forgetBrokenTempEntries(); - virtual void forgetAllRecoveryEntries(); + void saveBrokenTempEntries(const OUString& sSaveDir); + void saveAllTempEntries(const OUString& sSaveDir); + void forgetBrokenTempEntries(); + void forgetAllRecoveryEntries(); void forgetBrokenRecoveryEntries(); /** @short TODO */ - virtual void setProgressHandler(const css::uno::Reference< css::task::XStatusIndicator >& xProgress); + void setProgressHandler(const css::uno::Reference< css::task::XStatusIndicator >& xProgress); /** @short TODO */ - virtual void setUpdateListener(IRecoveryUpdateListener* pListener); + void setUpdateListener(IRecoveryUpdateListener* pListener); /** @short TODO */ - virtual void doEmergencySavePrepare(); - virtual void doEmergencySave(); - virtual void doRecovery(); + void doEmergencySavePrepare(); + void doEmergencySave(); + void doRecovery(); /** @short TODO */ @@ -583,11 +583,11 @@ class BrokenRecoveryDialog : public ModalDialog /** @short TODO */ - virtual bool isExecutionNeeded(); + bool isExecutionNeeded(); /** @short TODO */ - virtual OUString getSaveDirURL(); + OUString getSaveDirURL(); // helper diff --git a/svx/source/inc/eventhandler.hxx b/svx/source/inc/eventhandler.hxx index f3a31de5ec50..ea9da53634d0 100644 --- a/svx/source/inc/eventhandler.hxx +++ b/svx/source/inc/eventhandler.hxx @@ -81,7 +81,7 @@ namespace sdr virtual ~EventHandler(); // Trigger and consume the events - virtual void ExecuteEvents(); + void ExecuteEvents(); bool IsEmpty() const; }; diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 295067326353..2f68067994da 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -108,7 +108,7 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/svx/source/inc/svdobjplusdata.hxx b/svx/source/inc/svdobjplusdata.hxx index 289f64b2560f..7920df322a52 100644 --- a/svx/source/inc/svdobjplusdata.hxx +++ b/svx/source/inc/svdobjplusdata.hxx @@ -37,7 +37,7 @@ public: TYPEINFO(); SdrObjPlusData(); virtual ~SdrObjPlusData(); - virtual SdrObjPlusData* Clone(SdrObject* pObj1) const; + SdrObjPlusData* Clone(SdrObject* pObj1) const; void SetGluePoints(const SdrGluePointList& rPts); }; diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index b4fa3c008e2e..089904adbe95 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -138,9 +138,9 @@ public: void FireAccessibleEvent (short nEventId, const ::com::sun::star::uno::Any& rOld, const ::com::sun::star::uno::Any& rNew); virtual void SAL_CALL disposing() SAL_OVERRIDE; - virtual Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); - virtual Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); /// @returns true if it's disposed or in disposing inline bool IsAlive( void ) const; @@ -238,7 +238,7 @@ public: /// select child void SelectChild( Point pos ); void SelectChild( long nIndex); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateChild (long nIndex, Point mPoint); diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 84f1aad9dc01..04dec2226891 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -104,21 +104,21 @@ public: virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual bool SAL_CALL + bool SAL_CALL isShowing() throw( ::com::sun::star::uno::RuntimeException ); - virtual bool SAL_CALL + bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException ); - virtual bool SAL_CALL + bool SAL_CALL isFocusTraversable() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL + void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL + void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); @@ -126,7 +126,7 @@ public: virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL + ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -250,10 +250,10 @@ public: protected: /// @Return the object's current bounding box relative to the desktop. - virtual Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); /// @Return the object's current bounding box relative to the parent object. - virtual Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); /// Calls all Listener to tell they the change. void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent ); @@ -354,27 +354,27 @@ public: virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual bool SAL_CALL + bool SAL_CALL isShowing() throw( ::com::sun::star::uno::RuntimeException ); - virtual bool SAL_CALL + bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException ); - virtual bool SAL_CALL + bool SAL_CALL isFocusTraversable() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL + void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL + void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL + ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -463,9 +463,9 @@ public: void FireFocusEvent(); protected: - virtual Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); - virtual Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent ); diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx index e1d79e5a7559..e9290a08ac49 100644 --- a/svx/source/inc/tbxform.hxx +++ b/svx/source/inc/tbxform.hxx @@ -38,7 +38,7 @@ public: virtual void LoseFocus() SAL_OVERRIDE; protected: - virtual void FirePosition( bool _bForce ); + void FirePosition( bool _bForce ); }; diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index dba2e091f508..fd07cf5925f0 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -54,9 +54,9 @@ public: AccessibleCell( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, const sdr::table::CellRef& rCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo); virtual ~AccessibleCell (void); - virtual void Init (void); + void Init (void); - virtual bool operator== (const AccessibleCell& rAccessibleCell); + bool operator== (const AccessibleCell& rAccessibleCell); virtual bool SetState (sal_Int16 aState) SAL_OVERRIDE; virtual bool ResetState (sal_Int16 aState) SAL_OVERRIDE; diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index c96fe65f0529..74515045415c 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -105,20 +105,6 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // css.frame.XDispatch - - virtual void SAL_CALL dispatch(const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments) - throw(css::uno::RuntimeException); - - virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, - const css::util::URL& aURL ) - throw(css::uno::RuntimeException); - virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, - const css::util::URL& aURL ) - throw(css::uno::RuntimeException); - - // helper private: @@ -196,28 +182,6 @@ css::uno::Any SAL_CALL RecoveryUI::dispatchWithReturnValue(const css::util::URL& } -void SAL_CALL RecoveryUI::dispatch(const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments) - throw(css::uno::RuntimeException) -{ - // recycle this method :-) - dispatchWithReturnValue(aURL, lArguments); -} - - -void SAL_CALL RecoveryUI::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL& ) throw(css::uno::RuntimeException) -{ - // TODO - OSL_FAIL("RecoveryUI::addStatusListener()\nNot implemented yet!"); -} - - -void SAL_CALL RecoveryUI::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL& ) - throw(css::uno::RuntimeException) -{ - // TODO - OSL_FAIL("RecoveryUI::removeStatusListener()\nNot implemented yet!"); -} static OUString GetCrashConfigDir() { diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 6fa01cc9924c..0d16ad299a5f 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -50,7 +50,7 @@ private: cppu::OBroadcastHelper mrBHelper; - virtual void disposing() throw(); + void disposing() throw(); public: SvxShapeCollection() throw(); diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk index 47b51b6e4417..d948b892c761 100644 --- a/sw/CppunitTest_sw_mailmerge.mk +++ b/sw/CppunitTest_sw_mailmerge.mk @@ -18,6 +18,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_mailmerge, \ cppu \ cppuhelper \ sal \ + sfx \ sw \ test \ unotest \ diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 290f8bbc42f9..0ac7a5107cc6 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -76,7 +76,7 @@ class SwSidebarWin : public vcl::Window const long PageBorder); void SetPosAndSize(); void TranslateTopPosition(const long aAmount); - virtual void CheckMetaText(); + void CheckMetaText(); inline Point GetAnchorPos() { return mAnchorRect.Pos(); } SwEditWin* EditWin(); @@ -92,7 +92,7 @@ class SwSidebarWin : public vcl::Window long GetPostItTextHeight(); void SwitchToPostIt(sal_uInt16 aDirection); - virtual void SwitchToFieldPos(); + void SwitchToFieldPos(); virtual sal_uInt32 MoveCaret() = 0; @@ -155,8 +155,8 @@ class SwSidebarWin : public vcl::Window void ToggleInsMode(); - virtual void ActivatePostIt(); - virtual void DeactivatePostIt(); + void ActivatePostIt(); + void DeactivatePostIt(); void SetChangeTracking( const SwPostItHelper::SwLayoutStatus aStatus, const Color& aColor); diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx index f9fe9b57c299..cbfa62829a4b 100644 --- a/sw/inc/SwNumberTree.hxx +++ b/sw/inc/SwNumberTree.hxx @@ -207,7 +207,7 @@ public: @retval true pNode is first child of this node @retval false else */ - virtual bool IsFirst(const SwNumberTreeNode * pNode) const; + bool IsFirst(const SwNumberTreeNode * pNode) const; /** Return if this node if the first non-phantom node in the tree. @@ -215,7 +215,7 @@ public: @retval true this node is the first non-phantom node in the tree @retval false else */ - virtual bool IsFirst() const; + bool IsFirst() const; /** Return if this node is a phantom. diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index fedf84454b19..e2230dc10c60 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -277,7 +277,7 @@ class SwDrawVirtObj : public SdrVirtObj virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; virtual ::basegfx::B2DPolyPolygon TakeContour() const SAL_OVERRIDE; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE; - virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt16 nPlNum) const; + SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt16 nPlNum) const; virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE; diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx index 19c6f7aeb89e..167a61d44c76 100644 --- a/sw/inc/dlelstnr.hxx +++ b/sw/inc/dlelstnr.hxx @@ -69,7 +69,7 @@ public: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XDictionaryListEventListener - virtual void SAL_CALL processDictionaryListEvent( const ::com::sun::star::linguistic2::DictionaryListEvent& rDicListEvent) throw( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL processDictionaryListEvent( const ::com::sun::star::linguistic2::DictionaryListEvent& rDicListEvent) throw( ::com::sun::star::uno::RuntimeException ); /// XLinguServiceEventListener virtual void SAL_CALL processLinguServiceEvent( const ::com::sun::star::linguistic2::LinguServiceEvent& rLngSvcEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index f2fe7abbf447..46eb057f6e9e 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -492,10 +492,10 @@ public: IDocumentSettingAccess & getIDocumentSettingAccess(); ::sw::DocumentSettingManager & GetDocumentSettingManager(); //The implementation of the interface with some additional methods ::sw::DocumentSettingManager const& GetDocumentSettingManager() const; - virtual sal_uInt32 getRsid() const; - virtual void setRsid( sal_uInt32 nVal ); - virtual sal_uInt32 getRsidRoot() const; - virtual void setRsidRoot( sal_uInt32 nVal ); + sal_uInt32 getRsid() const; + void setRsid( sal_uInt32 nVal ); + sal_uInt32 getRsidRoot() const; + void setRsidRoot( sal_uInt32 nVal ); // IDocumentDeviceAccess IDocumentDeviceAccess const & getIDocumentDeviceAccess() const; @@ -535,17 +535,17 @@ public: ::sw::DocumentContentOperationsManager const & GetDocumentContentOperationsManager() const; ::sw::DocumentContentOperationsManager & GetDocumentContentOperationsManager(); - virtual void SetModified(SwPaM &rPaM); - virtual bool UpdateParRsid( SwTxtNode *pTxtNode, sal_uInt32 nVal = 0 ); - virtual bool UpdateRsid( const SwPaM &rRg, sal_Int32 nLen ); + void SetModified(SwPaM &rPaM); + bool UpdateParRsid( SwTxtNode *pTxtNode, sal_uInt32 nVal = 0 ); + bool UpdateRsid( const SwPaM &rRg, sal_Int32 nLen ); // IDocumentStylePoolAccess IDocumentStylePoolAccess const & getIDocumentStylePoolAccess() const; IDocumentStylePoolAccess & getIDocumentStylePoolAccess(); // SwLineNumberInfo - virtual const SwLineNumberInfo& GetLineNumberInfo() const; - virtual void SetLineNumberInfo(const SwLineNumberInfo& rInfo); + const SwLineNumberInfo& GetLineNumberInfo() const; + void SetLineNumberInfo(const SwLineNumberInfo& rInfo); // IDocumentStatistics IDocumentStatistics const & getIDocumentStatistics() const; @@ -600,10 +600,10 @@ public: //End of Interfaces - virtual void setDocReadOnly( bool b) { mbReadOnly = b; } - virtual bool getDocReadOnly() const { return mbReadOnly; } - virtual void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; } - virtual const OUString getDocAccTitle() const { return msDocAccTitle; } + void setDocReadOnly( bool b) { mbReadOnly = b; } + bool getDocReadOnly() const { return mbReadOnly; } + void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; } + const OUString getDocAccTitle() const { return msDocAccTitle; } // INextInterface here DECL_STATIC_LINK( SwDoc, BackgroundDone, SvxBrushItem *); diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 3b3e0bec921a..913a8c5378ea 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -293,8 +293,8 @@ public: read by the binary filter: */ virtual void UpdateLinks() SAL_OVERRIDE; - virtual void setDocAccTitle( const OUString& rTitle ); - virtual const OUString getDocAccTitle() const; + void setDocAccTitle( const OUString& rTitle ); + const OUString getDocAccTitle() const; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > GetController(); diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 5a3222313d16..93525810ca4f 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -341,11 +341,11 @@ public: virtual OUString GetPar2() const SAL_OVERRIDE; virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; - virtual OUString GetHelp() const; - virtual void SetHelp(const OUString & rStr); + OUString GetHelp() const; + void SetHelp(const OUString & rStr); - virtual OUString GetToolTip() const; - virtual void SetToolTip(const OUString & rStr); + OUString GetToolTip() const; + void SetToolTip(const OUString & rStr); virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE; diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 70bbe3f0e3bc..821323a9dd47 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -770,7 +770,7 @@ public: bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode, const Point& _rDocPos ) const; - virtual void ToggleHeaderFooterEdit( ); + void ToggleHeaderFooterEdit( ); }; void ClearFEShellTabCols(); diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 57780e9671e4..993abd1fca10 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -350,7 +350,7 @@ public: virtual OUString GetFormula() const; - virtual void ChangeFormat(sal_uInt32 n); + void ChangeFormat(sal_uInt32 n); virtual void SetPar1(const OUString& rStr); virtual void SetPar2(const OUString& rStr); diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 6fe3f0a76c11..c54fb05f8c13 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -330,7 +330,7 @@ public: @return false, default implementation */ - virtual bool IsShadowTransparent() const; + bool IsShadowTransparent() const; //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const; diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 771b727f5534..20422e6feb27 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -76,7 +76,7 @@ public: SwCharFmt* GetCharFmt() const { return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(GetRegisteredIn())); } void SetCharFmt( SwCharFmt* ); - virtual void SetCharFmtName(const OUString& rSet); + void SetCharFmtName(const OUString& rSet); virtual OUString GetCharFmtName()const SAL_OVERRIDE; //For i120928,access the cp info of graphic within bullet diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 0767fb096265..2c7e45ae1052 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -45,7 +45,7 @@ public: virtual ~SwRedlineExtraData(); virtual SwRedlineExtraData* CreateNew() const = 0; - virtual void Accept( SwPaM& rPam ) const; + void Accept( SwPaM& rPam ) const; virtual void Reject( SwPaM& rPam ) const; virtual bool operator == ( const SwRedlineExtraData& ) const; }; diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index b7b33e258f11..d992909534b0 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -420,7 +420,7 @@ public: virtual void SetupFilterOptions(SfxMedium& rMedium); - virtual void SetVersion( const OUString&, long ); + void SetVersion( const OUString&, long ); virtual bool IsStgWriter() const; void SetShowProgress( bool bFlag = false ) { bShowProgress = bFlag; } diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index c39e67242c74..839face2af66 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -70,7 +70,7 @@ class SW_DLLPUBLIC SwCursor : public SwPaM using SwPaM::Find; protected: - virtual _SwCursor_SavePos* CreateNewSavePos() const; + _SwCursor_SavePos* CreateNewSavePos() const; void SaveState(); void RestoreState(); @@ -189,7 +189,7 @@ public: ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); - virtual bool IsInProtectTable( bool bMove = false, + bool IsInProtectTable( bool bMove = false, bool bChgCrsr = true ); bool IsNoCntnt() const; diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx index f483342ade5d..9cc34ad1038c 100644 --- a/sw/inc/swserv.hxx +++ b/sw/inc/swserv.hxx @@ -67,8 +67,8 @@ public: bool SetData( const OUString & rMimeType, const ::com::sun::star::uno::Any& rData ); - virtual void SendDataChanged( const SwPosition& rPos ); - virtual void SendDataChanged( const SwPaM& rRange ); + void SendDataChanged( const SwPosition& rPos ); + void SendDataChanged( const SwPaM& rRange ); bool IsLinkInServer( const SwBaseLink* ) const; diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx index 8ac157297abc..f62ab1e9fa51 100644 --- a/sw/inc/txatbase.hxx +++ b/sw/inc/txatbase.hxx @@ -106,7 +106,7 @@ public: inline SfxPoolItem& GetAttr(); inline sal_uInt16 Which() const { return GetAttr().Which(); } - virtual bool operator==( const SwTxtAttr& ) const; + bool operator==( const SwTxtAttr& ) const; inline const SwFmtCharFmt &GetCharFmt() const; inline const SwFmtAutoFmt &GetAutoFmt() const; diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index f2685ff35f0d..a27ce713d389 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -77,7 +77,7 @@ protected: // the 4 methods that derived classes have to override // base implementation does nothing virtual void RepeatImpl( ::sw::RepeatContext & ); - virtual bool CanRepeatImpl( ::sw::RepeatContext & ) const; + bool CanRepeatImpl( ::sw::RepeatContext & ) const; public: // should not be public, but ran into trouble in untbl.cxx virtual void UndoImpl( ::sw::UndoRedoContext & ) = 0; virtual void RedoImpl( ::sw::UndoRedoContext & ) = 0; diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index 0d9565c249ae..d4183af7c1a6 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -71,7 +71,7 @@ class SwSelPaintRects : public SwRects const SwCrsrShell* pCShell; - virtual void Paint( const Rectangle& rRect ); + void Paint( const Rectangle& rRect ); #if HAVE_FEATURE_DESKTOP sdr::overlay::OverlayObject* mpCursorOverlay; diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index dcc8c4c23689..8d7ae18633b2 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -183,7 +183,7 @@ protected: bool IsEditableState(); - virtual ::com::sun::star::awt::Rectangle SAL_CALL + ::com::sun::star::awt::Rectangle SAL_CALL getBoundsImpl(bool bRelative) throw (css::uno::RuntimeException, std::exception); @@ -297,7 +297,7 @@ public: virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() + ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index 8333c559be3d..7f630af8355e 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -48,8 +48,8 @@ public: void SetVisArea(); - virtual void AddChild( vcl::Window *pWin, bool bFireEvent = true ); - virtual void RemoveChild( vcl::Window *pWin ); + void AddChild( vcl::Window *pWin, bool bFireEvent = true ); + void RemoveChild( vcl::Window *pWin ); // XAccessibleContext diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index 87a4c5031d67..636389da14f3 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -68,7 +68,7 @@ namespace sw { virtual const_iterator_t getAllMarksEnd() const SAL_OVERRIDE; virtual sal_Int32 getAllMarksCount() const SAL_OVERRIDE; virtual const_iterator_t findMark(const OUString& rName) const SAL_OVERRIDE; - virtual bool hasMark(const OUString& rName) const; + bool hasMark(const OUString& rName) const; // bookmarks virtual const_iterator_t getBookmarksBegin() const SAL_OVERRIDE; diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index 4c0e16c6cfcc..b6f21ee293be 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -77,9 +77,9 @@ public: sal_uLong GetText( const OUString& rShort, OUString& ); virtual bool IsOnlyTextBlock( const OUString& rShort ) const SAL_OVERRIDE; - virtual bool IsOnlyTextBlock( sal_uInt16 nIdx ) const; - virtual void SetIsTextOnly( const OUString& rShort, bool bNewValue ); - virtual void SetIsTextOnly( sal_uInt16 nIdx, bool bNewValue ); + bool IsOnlyTextBlock( sal_uInt16 nIdx ) const; + void SetIsTextOnly( const OUString& rShort, bool bNewValue ); + void SetIsTextOnly( sal_uInt16 nIdx, bool bNewValue ); virtual sal_uLong GetMacroTable( sal_uInt16, SvxMacroTableDtor& rMacroTbl, bool bFileAlreadyOpen = false ) SAL_OVERRIDE; diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx index d5bc95c9af24..f2891f4defab 100644 --- a/sw/source/core/inc/bookmrk.hxx +++ b/sw/source/core/inc/bookmrk.hxx @@ -80,7 +80,7 @@ namespace sw { virtual bool IsExpanded() const SAL_OVERRIDE { return static_cast< bool >(m_pPos2); } - virtual void SetName(const OUString& rName) + void SetName(const OUString& rName) { m_aName = rName; } virtual void SetMarkPos(const SwPosition& rNewPos); virtual void SetOtherMarkPos(const SwPosition& rNewPos); @@ -89,7 +89,7 @@ namespace sw { virtual OUString ToString( ) const SAL_OVERRIDE; - virtual void Swap() + void Swap() { if(m_pPos2) m_pPos1.swap(m_pPos2); @@ -252,7 +252,7 @@ namespace sw { bool IsChecked() const SAL_OVERRIDE; void SetChecked(bool checked) SAL_OVERRIDE; - virtual OUString toString( ) const; + OUString toString( ) const; }; } } diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 0df443475a72..f103eca4db66 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -862,7 +862,7 @@ public: public: // if writer is NULL, dumps the layout structure as XML in layout.xml virtual void dumpAsXml(xmlTextWriterPtr writer = NULL) const; - virtual void dumpInfosAsXml(xmlTextWriterPtr writer) const; + void dumpInfosAsXml(xmlTextWriterPtr writer) const; virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const; void dumpChildrenAsXml(xmlTextWriterPtr writer) const; bool IsCollapse() const; diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx index 13b4527f5d74..aa589ff1ac94 100644 --- a/sw/source/core/inc/observablethread.hxx +++ b/sw/source/core/inc/observablethread.hxx @@ -78,7 +78,7 @@ class ObservableThread : public osl::Thread, */ virtual void SAL_CALL onTerminated() SAL_OVERRIDE; - virtual void threadFinished(); + void threadFinished(); private: diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx index 6d041dcbb4ca..e292b3bb0e0e 100644 --- a/sw/source/core/inc/unometa.hxx +++ b/sw/source/core/inc/unometa.hxx @@ -71,7 +71,7 @@ protected: ::sw::UnoImplPtr<Impl> m_pImpl; - virtual void SAL_CALL AttachImpl( + void SAL_CALL AttachImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange, const sal_uInt16 nWhich) diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index d48156f3cc02..6b32e2dd0e7c 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -198,13 +198,13 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTextContent - virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) throw(::com::sun::star::uno::RuntimeException); //XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); //XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index 4025583d9a61..51d540fb34d8 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -501,8 +501,8 @@ public: { } - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + void UndoImpl( ::sw::UndoRedoContext & ); + void RedoImpl( ::sw::UndoRedoContext & ); void SetEnd(SwPaM const& rPam); diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx index 3916eb32fa6e..1b3d5556663b 100644 --- a/sw/source/filter/ww8/attributeoutputbase.hxx +++ b/sw/source/filter/ww8/attributeoutputbase.hxx @@ -214,7 +214,7 @@ public: virtual void OnTOXEnding() {} - virtual void TOXMark( const SwTxtNode& rNode, const SwTOXMark& rAttr ); + void TOXMark( const SwTxtNode& rNode, const SwTOXMark& rAttr ); /// Output redlining. virtual void Redline( const SwRedlineData* pRedline ) = 0; @@ -487,7 +487,7 @@ protected: void TextField( const SwFmtFld& ); /// Sfx item RES_TXTATR_FLYCNT - virtual void TextFlyContent( const SwFmtFlyCnt& ); + void TextFlyContent( const SwFmtFlyCnt& ); /// Sfx item RES_TXTATR_FTN /// @@ -653,7 +653,7 @@ public: virtual void BulletDefinition(int /*nId*/, const Graphic& /*rGraphic*/, Size /*aSize*/) {} // Returns whether or not the 'SwTxtNode' has a paragraph marker inserted \ deleted (using 'track changes') - virtual const SwRedlineData* GetParagraphMarkerRedline( const SwTxtNode& rNode, RedlineType_t aRedlineType ); + const SwRedlineData* GetParagraphMarkerRedline( const SwTxtNode& rNode, RedlineType_t aRedlineType ); }; #endif // INCLUDED_SW_SOURCE_FILTER_WW8_ATTRIBUTEOUTPUTBASE_HXX diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index a5e13d9d07f5..d0ddd2f36d22 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -231,7 +231,7 @@ public: virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; - virtual void TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); + void TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index f2a320e04eee..0f1c655c0bd8 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -111,7 +111,7 @@ public: virtual AttributeOutputBase& AttrOutput() const SAL_OVERRIDE; /// Access to the derived attribute output class. - virtual DocxAttributeOutput& DocxAttrOutput() const; + DocxAttributeOutput& DocxAttrOutput() const; /// Access to the sections/headers/footres. virtual MSWordSections& Sections() const SAL_OVERRIDE; @@ -186,13 +186,13 @@ protected: virtual void ExportDocument_Impl() SAL_OVERRIDE; /// Output page/section breaks - virtual void OutputPageSectionBreaks( const SwTxtNode& ); + void OutputPageSectionBreaks( const SwTxtNode& ); /// Output SwEndNode virtual void OutputEndNode( const SwEndNode& ) SAL_OVERRIDE; /// Output SwTableNode - virtual void OutputTableNode( const SwTableNode& ); + void OutputTableNode( const SwTableNode& ); /// Output SwGrfNode virtual void OutputGrfNode( const SwGrfNode& ) SAL_OVERRIDE; diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx index 582903a60412..1653cd62e5ca 100644 --- a/sw/source/filter/ww8/docxexportfilter.hxx +++ b/sw/source/filter/ww8/docxexportfilter.hxx @@ -36,7 +36,7 @@ public: // For now, let's just do empty implementations of those. virtual bool importDocument() SAL_OVERRIDE { return false; } virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE { return NULL; } - virtual sal_Int32 getSchemeClr( sal_Int32 ) const { return 0; } + sal_Int32 getSchemeClr( sal_Int32 ) const { return 0; } virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE { return NULL; } virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE { return NULL; } virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE { return ::oox::drawingml::table::TableStyleListPtr(); } diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index 44c5c37260ec..0ee6485cdf86 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -58,7 +58,7 @@ public: virtual MSWordSections& Sections() const SAL_OVERRIDE; /// Access to the Rtf Sdr exporter. - virtual RtfSdrExport& SdrExporter() const; + RtfSdrExport& SdrExporter() const; /// Determines if the format is expected to support unicode. virtual bool SupportsUnicode() const SAL_OVERRIDE @@ -105,7 +105,7 @@ public: virtual void WriteNumbering() SAL_OVERRIDE; /// Write the revision table. - virtual void WriteRevTab(); + void WriteRevTab(); /// Output the actual headers and footers. virtual void WriteHeadersFooters(sal_uInt8 nHeadFootFlags, diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 2e405b083486..12d22fb14fca 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -787,10 +787,10 @@ protected: virtual void ExportDocument_Impl() = 0; /// Get the next position in the text node to output - virtual sal_Int32 GetNextPos( SwWW8AttrIter* pAttrIter, const SwTxtNode& rNode, sal_Int32 nAktPos ); + sal_Int32 GetNextPos( SwWW8AttrIter* pAttrIter, const SwTxtNode& rNode, sal_Int32 nAktPos ); /// Update the information for GetNextPos(). - virtual void UpdatePosition( SwWW8AttrIter* pAttrIter, sal_Int32 nAktPos, sal_Int32 nEnd ); + void UpdatePosition( SwWW8AttrIter* pAttrIter, sal_Int32 nAktPos, sal_Int32 nEnd ); /// Output SwTxtNode virtual void OutputTextNode( const SwTxtNode& ); @@ -819,7 +819,7 @@ protected: virtual bool DisallowInheritingOutlineNumbering(const SwFmt &rFmt) = 0; /// Output SwStartNode - virtual void OutputStartNode( const SwStartNode& ); + void OutputStartNode( const SwStartNode& ); /// Output SwEndNode virtual void OutputEndNode( const SwEndNode& ); @@ -833,7 +833,7 @@ protected: virtual void OutputLinkedOLE( const OUString& ) = 0; /// Output SwSectionNode - virtual void OutputSectionNode( const SwSectionNode& ); + void OutputSectionNode( const SwSectionNode& ); virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ) = 0; diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index d6954ac02be6..da3610bb6e37 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -743,14 +743,14 @@ class SwMSConvertControls: public oox::ole::MSConvertOCXControls { public: SwMSConvertControls( SfxObjectShell *pDSh,SwPaM *pP ); - virtual bool InsertFormula( WW8FormulaControl &rFormula); + bool InsertFormula( WW8FormulaControl &rFormula); virtual bool InsertControl(const com::sun::star::uno::Reference< com::sun::star::form::XFormComponent >& rFComp, const ::com::sun::star::awt::Size& rSize, com::sun::star::uno::Reference < com::sun::star::drawing::XShape > *pShape, bool bFloatingCtrl) SAL_OVERRIDE; bool ExportControl(WW8Export &rWrt, const SdrObject *pObj); - virtual bool ReadOCXStream( SotStorageRef& rSrc1, + bool ReadOCXStream( SotStorageRef& rSrc1, com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShapeRef=0, bool bFloatingCtrl=false ); diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 642a56a00ce0..b114e92e838f 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -452,7 +452,7 @@ public: WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd, WW8_CP nStartCp, bool bVer67P); virtual ~WW8PLCFx_PCD(); - virtual sal_uLong GetIMax() const; + sal_uLong GetIMax() const; virtual sal_uInt32 GetIdx() const SAL_OVERRIDE; virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE; virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx index 82e1ab2db060..4e7a4fc88af0 100644 --- a/sw/source/filter/ww8/ww8toolbar.hxx +++ b/sw/source/filter/ww8/ww8toolbar.hxx @@ -112,7 +112,7 @@ protected: public: Tcg255SubStruct( bool bReadId ); virtual ~Tcg255SubStruct(){} - virtual sal_uInt8 id() const { return ch; } + sal_uInt8 id() const { return ch; } bool Read(SvStream &rS) SAL_OVERRIDE; }; diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx index d3c37d4d5a13..93492c6f7dcb 100644 --- a/sw/source/filter/xml/xmlexpit.hxx +++ b/sw/source/filter/xml/xmlexpit.hxx @@ -86,7 +86,7 @@ public: /** this method is called for every item that has the MID_SW_FLAG_NO_ITEM_EXPORT flag set */ - virtual void handleNoItem( SvXMLAttributeList& rAttrList, + void handleNoItem( SvXMLAttributeList& rAttrList, const SvXMLItemMapEntry& rEntry, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index f1b4407b58ac..b68938cb3709 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -566,12 +566,8 @@ class SwNewUserIdxDlg : public ModalDialog m_pNameED->GrabFocus(); } - virtual void Apply(); OUString GetName(){return m_pNameED->GetText();} }; -void SwNewUserIdxDlg::Apply() -{ -} IMPL_LINK( SwNewUserIdxDlg, ModifyHdl, Edit*, pEdit) { diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index 6e0abdf74c22..a0a25380860c 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -39,7 +39,7 @@ public: SwVbaApplication( css::uno::Reference< css::uno::XComponentContext >& m_xContext ); virtual ~SwVbaApplication(); - virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); + SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); // XApplication virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index 2a904386782b..860d8393d4d0 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -75,7 +75,7 @@ public: virtual ~PropertGetSetHelper() {} virtual uno::Any getPropertyValue( const OUString& rPropName ) = 0; virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) = 0; - virtual uno::Reference< beans::XPropertySet > getUserDefinedProperties() { + uno::Reference< beans::XPropertySet > getUserDefinedProperties() { return uno::Reference<beans::XPropertySet>( m_xDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW); } diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index f8c4fdb29329..0272508913dd 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -38,7 +38,7 @@ class SwVbaGlobals : public SwVbaGlobals_BASE private: css::uno::Reference< ooo::vba::word::XApplication > mxApplication; - virtual css::uno::Reference< ooo::vba::word::XApplication > getApplication() throw (css::uno::RuntimeException); + css::uno::Reference< ooo::vba::word::XApplication > getApplication() throw (css::uno::RuntimeException); public: diff --git a/sw/source/ui/vba/vbatable.hxx b/sw/source/ui/vba/vbatable.hxx index 58714a38b53b..e80e362925f2 100644 --- a/sw/source/ui/vba/vbatable.hxx +++ b/sw/source/ui/vba/vbatable.hxx @@ -37,7 +37,7 @@ public: virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL Range( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL Select( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL ConvertToText( const css::uno::Any& Separator, const css::uno::Any& NestedTables ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL ConvertToText( const css::uno::Any& Separator, const css::uno::Any& NestedTables ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/actctrl.hxx b/sw/source/uibase/inc/actctrl.hxx index 790bc0009768..6be1c310a92a 100644 --- a/sw/source/uibase/inc/actctrl.hxx +++ b/sw/source/uibase/inc/actctrl.hxx @@ -28,7 +28,7 @@ class SW_DLLPUBLIC NumEditAction: public NumericField Link aActionLink; protected: - virtual void Action(); + void Action(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: NumEditAction( vcl::Window* pParent, const ResId& rResId ) : diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 2c603fef01b9..79273b06054b 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -198,7 +198,7 @@ public: virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) SAL_OVERRIDE; - virtual sal_Int32 GetEntryRealChildrenNum( SvTreeListEntry* pEntry ) const; + sal_Int32 GetEntryRealChildrenNum( SvTreeListEntry* pEntry ) const; using Control::Notify; // FIXME why do we have 2 of these virtual void Notify(SfxBroadcaster& rBC, SfxHint const& rHint) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index ff049097c950..3866dbf723ef 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -295,7 +295,7 @@ public: SwEditWin(vcl::Window *pParent, SwView &); virtual ~SwEditWin(); - virtual void SwitchView(); + void SwitchView(); /** * Notification about some region of the output device got invalidated. * diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 386213b74285..02c47361374f 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -115,7 +115,7 @@ class SwNavigationPI : public vcl::Window, void MakeVisible(); void InitImageList(); - virtual SfxChildAlignment + SfxChildAlignment CheckAlignment(SfxChildAlignment,SfxChildAlignment); void SetPopupWindow( SfxPopupWindow* ); @@ -124,7 +124,7 @@ class SwNavigationPI : public vcl::Window, protected: - virtual bool Close(); + bool Close(); virtual void Resize() SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/popbox.hxx b/sw/source/uibase/inc/popbox.hxx index 57f2eaeef7a1..fd90c912c6c5 100644 --- a/sw/source/uibase/inc/popbox.hxx +++ b/sw/source/uibase/inc/popbox.hxx @@ -33,7 +33,7 @@ class SwHelpToolBox: public ToolBox, public DropTargetHelper protected: virtual void MouseButtonDown(const MouseEvent &rEvt) SAL_OVERRIDE; - virtual long DoubleClick(ToolBox *); + long DoubleClick(ToolBox *); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index c5ccce1c80f4..2b2fa240a25c 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -141,7 +141,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; - virtual void SwitchView(); + void SwitchView(); }; /** @@ -236,7 +236,7 @@ public: void DocSzChgd(const Size& rNewSize); const Size& GetDocSz() const { return aDocSz; } - virtual void SetVisArea( const Rectangle&, bool bUpdateScrollbar = true); + void SetVisArea( const Rectangle&, bool bUpdateScrollbar = true); inline void AdjustEditWin(); diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 97cffe688fc2..7cffc0bb366a 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -129,7 +129,7 @@ public: void Initialize(const OUString &rExtraData); void FillInfo(OUString &rExtraData) const; - virtual void Activate(); + void Activate(); }; class SwModelessRedlineAcceptDlg : public SfxModelessDialog diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx index 5b2226ff68ed..5fc129de1104 100644 --- a/sw/source/uibase/inc/uinums.hxx +++ b/sw/source/uibase/inc/uinums.hxx @@ -79,7 +79,7 @@ public: void GetNumFmt(size_t, SwNumFmt const*&, OUString const*&) const; }; -class SwChapterNumRules +class SW_DLLPUBLIC SwChapterNumRules { public: enum { nMaxRules = MAX_NUM_RULES }; // currently 9 defined forms @@ -95,7 +95,7 @@ public: inline const SwNumRulesWithName* GetRules(sal_uInt16 nIdx) const; void CreateEmptyNumRule(sal_uInt16 nIdx); // for import - virtual void ApplyNumRules( + void ApplyNumRules( const SwNumRulesWithName &rCopy, sal_uInt16 nIdx); diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx index fd27dba2c106..20cf95ffcd57 100644 --- a/sw/source/uibase/inc/view.hxx +++ b/sw/source/uibase/inc/view.hxx @@ -475,7 +475,7 @@ public: void DocSzChgd( const Size& rNewSize ); const Size& GetDocSz() const { return m_aDocSz; } - virtual void SetVisArea( const Rectangle&, bool bUpdateScrollbar = true); + void SetVisArea( const Rectangle&, bool bUpdateScrollbar = true); void SetVisArea( const Point&, bool bUpdateScrollbar = true); void CheckVisArea(); diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx index c12ca2b781d6..dfc2f4eec8e5 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.hxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx @@ -168,7 +168,7 @@ public: impl_disposing( const com::sun::star::lang::EventObject& Source ) throw( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL + void SAL_CALL impl_notify( const ::com::sun::star::ucb::ListEvent& Changes ) throw( com::sun::star::uno::RuntimeException ); }; diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx index 37141dd94a31..58d818b3e6cc 100644 --- a/ucb/source/ucp/cmis/cmis_content.hxx +++ b/ucb/source/ucp/cmis/cmis_content.hxx @@ -147,7 +147,7 @@ public: getProperties( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; - virtual libcmis::ObjectPtr updateProperties( + libcmis::ObjectPtr updateProperties( const com::sun::star::uno::Any& iCmisProps, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv); diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx index 824827ce08ed..f1e698728527 100644 --- a/ucb/source/ucp/file/bc.hxx +++ b/ucb/source/ucp/file/bc.hxx @@ -294,12 +294,12 @@ namespace fileaccess { getCommandInfo() throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL + com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( sal_Int32 nMyCommandIdentifier ) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > SAL_CALL + com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > SAL_CALL getPropertyValues( sal_Int32 nMyCommandIdentifier, const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& PropertySet ) diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index fa6a7668ba21..271b80c63059 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -843,8 +843,7 @@ static bool _UCBOpenContentSync( const Command& rArg, Reference < XInterface > xSink, Reference < XInteractionHandler > xInteract, - Reference < XProgressHandler > xProgress, - UcbLockBytesHandlerRef xHandler ); + Reference < XProgressHandler > xProgress ); static bool UCBOpenContentSync( UcbLockBytesRef xLockBytes, @@ -852,8 +851,7 @@ static bool UCBOpenContentSync( const Command& rArg, Reference < XInterface > xSink, Reference < XInteractionHandler > xInteract, - Reference < XProgressHandler > xProgress, - UcbLockBytesHandlerRef xHandler ) + Reference < XProgressHandler > xProgress ) { // http protocol must be handled in a special way: // during the opening process the input stream may change @@ -873,7 +871,7 @@ static bool UCBOpenContentSync( ! aScheme.equalsIgnoreAsciiCase("vnd.sun.star.webdav") && ! aScheme.equalsIgnoreAsciiCase("ftp")) return _UCBOpenContentSync( - xLockBytes,xContent,rArg,xSink,xInteract,xProgress,xHandler); + xLockBytes,xContent,rArg,xSink,xInteract,xProgress); if ( !aScheme.equalsIgnoreAsciiCase( "http" ) && !aScheme.equalsIgnoreAsciiCase( "https" ) ) @@ -1067,9 +1065,6 @@ static bool UCBOpenContentSync( if ( bAborted || bException ) { - if( xHandler.Is() ) - xHandler->Handle( UcbLockBytesHandler::CANCEL, xLockBytes ); - Reference < XActiveDataSink > xActiveSink( xSink, UNO_QUERY ); if ( xActiveSink.is() ) xActiveSink->setInputStream( Reference < XInputStream >() ); @@ -1100,8 +1095,7 @@ static bool _UCBOpenContentSync( const Command& rArg, Reference < XInterface > xSink, Reference < XInteractionHandler > xInteract, - Reference < XProgressHandler > xProgress, - UcbLockBytesHandlerRef xHandler ) + Reference < XProgressHandler > xProgress ) { ::ucbhelper::Content aContent( xContent, new UcbTaskEnvironment( xInteract, xProgress ), @@ -1162,9 +1156,6 @@ static bool _UCBOpenContentSync( if ( bAborted || bException ) { - if( xHandler.Is() ) - xHandler->Handle( UcbLockBytesHandler::CANCEL, xLockBytes ); - Reference < XActiveDataSink > xActiveSink( xSink, UNO_QUERY ); if ( xActiveSink.is() ) xActiveSink->setInputStream( Reference < XInputStream >() ); @@ -1313,9 +1304,6 @@ void UcbLockBytes::terminate_Impl() OSL_FAIL("No InputStream, but no error set!" ); SetError( ERRCODE_IO_NOTEXISTS ); } - - if ( m_xHandler.Is() ) - m_xHandler->Handle( UcbLockBytesHandler::DONE, this ); } void UcbLockBytes::SetSynchronMode (bool bSynchron) @@ -1519,9 +1507,6 @@ ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const IMPL_LINK_NOARG(UcbLockBytes, DataAvailHdl) { - if ( hasInputStream_Impl() && m_xHandler.Is() ) - m_xHandler->Handle( UcbLockBytesHandler::DATA_AVAILABLE, this ); - return 0; } @@ -1588,8 +1573,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo aCommand, xSink, xInteractionHandler, - xProgressHdl, - pHandler ); + xProgressHdl ); if ( xLockBytes->GetError() == ERRCODE_NONE && ( bError || !xLockBytes->getInputStream().is() ) ) { diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx index abf8c5b0b77e..7126dfc371cc 100644 --- a/unotools/source/ucbhelper/ucblockbytes.hxx +++ b/unotools/source/ucbhelper/ucblockbytes.hxx @@ -82,7 +82,7 @@ public: : m_bActive( true ) {} - virtual void Handle( LoadHandlerItem nWhich, UcbLockBytesRef xLockBytes ) = 0; + ; void Activate( bool bActivate = true ) { m_bActive = bActivate; } bool IsActive() const { return m_bActive; } }; diff --git a/unoxml/source/dom/documentbuilder.hxx b/unoxml/source/dom/documentbuilder.hxx index a4b3bdc1b759..e6c4ddb4aaa0 100644 --- a/unoxml/source/dom/documentbuilder.hxx +++ b/unoxml/source/dom/documentbuilder.hxx @@ -133,7 +133,7 @@ namespace DOM virtual void SAL_CALL setEntityResolver(const css::uno::Reference< css::xml::sax::XEntityResolver >& er) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::xml::sax::XEntityResolver > SAL_CALL getEntityResolver() + css::uno::Reference< css::xml::sax::XEntityResolver > SAL_CALL getEntityResolver() throw (css::uno::RuntimeException); diff --git a/unoxml/source/dom/element.hxx b/unoxml/source/dom/element.hxx index ff27d3d9dcc5..59f105646c10 100644 --- a/unoxml/source/dom/element.hxx +++ b/unoxml/source/dom/element.hxx @@ -162,7 +162,7 @@ namespace DOM /** sets the element name */ - virtual void SAL_CALL setElementName(const OUString& elementName) + void SAL_CALL setElementName(const OUString& elementName) throw (css::uno::RuntimeException, css::xml::dom::DOMException); // overrides for XNode base diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx index 7a6e6e19e134..efd9304eb47c 100644 --- a/vbahelper/source/msforms/vbacontrol.hxx +++ b/vbahelper/source/msforms/vbacontrol.hxx @@ -54,7 +54,7 @@ protected: css::uno::Reference< css::uno::XInterface > m_xControl; css::uno::Reference< css::frame::XModel > m_xModel; - virtual css::uno::Reference< css::awt::XWindowPeer > getWindowPeer() throw (css::uno::RuntimeException); + css::uno::Reference< css::awt::XWindowPeer > getWindowPeer() throw (css::uno::RuntimeException); void fireChangeEvent(); void fireClickEvent(); public: @@ -101,7 +101,7 @@ public: virtual ::sal_Int32 SAL_CALL getMousePointer() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setMousePointer( ::sal_Int32 _mousepointer ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //remove resource because ooo.vba.excel.XControl is a wrapper of com.sun.star.drawing.XControlShape - virtual void removeResource() throw( css::uno::RuntimeException ); + void removeResource() throw( css::uno::RuntimeException ); virtual ::sal_Int32 SAL_CALL getForeColor() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setForeColor( ::sal_Int32 _forecolor ) throw (::com::sun::star::uno::RuntimeException); //XHelperInterface diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.hxx b/vbahelper/source/msforms/vbalistcontrolhelper.hxx index 15a19e489760..3c895bd6d840 100644 --- a/vbahelper/source/msforms/vbalistcontrolhelper.hxx +++ b/vbahelper/source/msforms/vbalistcontrolhelper.hxx @@ -29,12 +29,12 @@ class ListControlHelper public: ListControlHelper( const css::uno::Reference< css::beans::XPropertySet >& rxControl ) : m_xProps( rxControl ){} virtual ~ListControlHelper() {} - virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setRowSource( const OUString& _rowsource ) throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException); - virtual void SAL_CALL Clear( ) throw (css::uno::RuntimeException); + void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException); + void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException); + void SAL_CALL setRowSource( const OUString& _rowsource ) throw (css::uno::RuntimeException); + ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException); + css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException); + void SAL_CALL Clear( ) throw (css::uno::RuntimeException); }; #endif diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx index f36b6a76f67f..6932bac8facb 100644 --- a/vcl/inc/PhysicalFontFace.hxx +++ b/vcl/inc/PhysicalFontFace.hxx @@ -54,8 +54,8 @@ public: // font instance specific data virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const = 0; - virtual int GetHeight() const { return mnHeight; } - virtual int GetWidth() const { return mnWidth; } + int GetHeight() const { return mnHeight; } + int GetWidth() const { return mnWidth; } virtual sal_IntPtr GetFontId() const = 0; int GetFontMagic() const { return mnMagic; } bool IsScalable() const { return (mnHeight == 0); } diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx index e28e51169af7..1a6300cbba04 100644 --- a/vcl/inc/canvasbitmap.hxx +++ b/vcl/inc/canvasbitmap.hxx @@ -70,7 +70,7 @@ namespace unotools // XIntegerReadOnlyBitmap virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapPalette > SAL_CALL getPalette( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapPalette > SAL_CALL getPalette( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XBitmapPalette diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index d5378594264d..a47b25feea37 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -195,7 +195,7 @@ public: { return GetGlyphData( aGlyphId ).GetMetric(); } #if ENABLE_GRAPHITE - virtual GraphiteFaceWrapper* GetGraphiteFace() const; + GraphiteFaceWrapper* GetGraphiteFace() const; #endif sal_GlyphId GetGlyphIndex( sal_UCS4 ) const; diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx index 7356bd52827a..f8abb791c4ae 100644 --- a/vcl/inc/graphite_layout.hxx +++ b/vcl/inc/graphite_layout.hxx @@ -119,7 +119,7 @@ public: // methods using string indexing virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra=0, int nFactor=1) const SAL_OVERRIDE; virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const SAL_OVERRIDE; - virtual void ApplyDXArray(ImplLayoutArgs &rArgs, std::vector<int> & rDeltaWidth); + void ApplyDXArray(ImplLayoutArgs &rArgs, std::vector<int> & rDeltaWidth); virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const SAL_OVERRIDE; diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 85e5f6bb4c97..b3819e27093f 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -128,8 +128,8 @@ public: #ifndef IOS // If enabled we can get damage notifications for regions immediately rendered to ... - virtual void enableDamageTracker( bool bOn = true ); - virtual void damaged( const basegfx::B2IBox& /* rDamageRect */) {} + void enableDamageTracker( bool bOn = true ); + void damaged( const basegfx::B2IBox& /* rDamageRect */) {} #endif /*TODO: functional implementation */ diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 0f142a5e524e..a49962ee127b 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -583,7 +583,7 @@ public: const Image& GetImage() const { return maImage; } void SetImage( const Image& rImg ) { maImage = rImg; } - virtual void MBDown(); + void MBDown(); boost::signals2::signal< void ( ImplWin* ) > buttonDownSignal; boost::signals2::signal< void ( UserDrawEvent* ) > userDrawSignal; @@ -610,7 +610,7 @@ public: virtual ~ImplBtn() {}; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MBDown(); + void MBDown(); boost::signals2::signal< void ( ImplBtn* ) > buttonDownSignal; }; diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx index 7bb4532a3205..5ae6ab8668b3 100644 --- a/vcl/inc/openglgdiimpl.hxx +++ b/vcl/inc/openglgdiimpl.hxx @@ -118,17 +118,17 @@ public: bool IsOffscreen() const { return mpProvider ? mpProvider->IsOffScreen() : true; } // operations to do before painting - virtual void PreDraw(); + void PreDraw(); // operations to do after painting - virtual void PostDraw(); + void PostDraw(); protected: bool AcquireContext(); bool ReleaseContext(); // retrieve the default context for offscreen rendering - virtual OpenGLContext* GetDefaultContext(); + OpenGLContext* GetDefaultContext(); // create a new context for window rendering virtual OpenGLContext* CreateWinContext() = 0; @@ -146,7 +146,7 @@ public: virtual void freeResources() SAL_OVERRIDE; - virtual const vcl::Region& getClipRegion() const; + const vcl::Region& getClipRegion() const; virtual bool setClipRegion( const vcl::Region& ) SAL_OVERRIDE; // diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index ff6271c8d88c..d5ec8272ab4a 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -87,7 +87,7 @@ public: virtual SalGraphicsImpl* GetImpl() const = 0; /// Check that our mpImpl is OpenGL and return the context, otherwise NULL. - virtual OpenGLContext* GetOpenGLContext() const; + OpenGLContext* GetOpenGLContext() const; void setAntiAliasB2DDraw(bool bNew) { m_bAntiAliasB2DDraw = bNew; } bool getAntiAliasB2DDraw() const { return m_bAntiAliasB2DDraw; } diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 3a2061b6391c..ae1fe9dda55c 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -175,7 +175,7 @@ public: virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const = 0; virtual DeviceCoordinate GetTextWidth() const { return FillDXArray( NULL ); } virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const = 0; - virtual bool IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594 + bool IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594 // methods using glyph indexing virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdAry, Point& rPos, int&, @@ -184,7 +184,7 @@ public: virtual bool GetOutline( SalGraphics&, ::basegfx::B2DPolyPolygonVector& ) const; virtual bool GetBoundRect( SalGraphics&, Rectangle& ) const; - virtual bool IsSpacingGlyph( sal_GlyphId ) const; + bool IsSpacingGlyph( sal_GlyphId ) const; // reference counting void Release() const; @@ -193,7 +193,7 @@ public: virtual void MoveGlyph( int nStart, long nNewXPos ) = 0; virtual void DropGlyph( int nStart ) = 0; virtual void Simplify( bool bIsBase ) = 0; - virtual void DisableGlyphInjection( bool /*bDisable*/ ) {} + void DisableGlyphInjection( bool /*bDisable*/ ) {} protected: // used by layout engines @@ -240,7 +240,7 @@ public: // used only by OutputDevice::ImplLayout, TODO: make friend explicit MultiSalLayout( SalLayout& rBaseLayout, const PhysicalFontFace* pBaseFont = NULL ); - virtual bool AddFallback( SalLayout& rFallbackLayout, + bool AddFallback( SalLayout& rFallbackLayout, ImplLayoutRuns&, const PhysicalFontFace* pFallbackFont ); virtual bool LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE; virtual void AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE; @@ -322,8 +322,8 @@ public: void AppendGlyph( const GlyphItem& ); void Reserve(int size) { m_GlyphItems.reserve(size + 1); } virtual void AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE; - virtual void ApplyDXArray( ImplLayoutArgs& ); - virtual void Justify( DeviceCoordinate nNewWidth ); + void ApplyDXArray( ImplLayoutArgs& ); + void Justify( DeviceCoordinate nNewWidth ); void KashidaJustify( long nIndex, int nWidth ); void ApplyAsianKerning( const sal_Unicode*, int nLength ); void SortGlyphItems(); diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index 915502deedf1..f09c19fe1a5a 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -51,11 +51,11 @@ public: virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) = 0; virtual void Show( bool bVisible ) = 0; - virtual void Enable( bool /* nEnable */ ) {} + void Enable( bool /* nEnable */ ) {} virtual void GrabFocus() {} - virtual void SetBackground() {} - virtual void SetBackground( SalColor /* nSalColor */ ) {} + void SetBackground() {} + void SetBackground( SalColor /* nSalColor */ ) {} virtual void SetForwardKey( bool /* bEnable */ ) {} diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index e890580b6544..9c2c76eaa4d3 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -104,15 +104,15 @@ public: GtkData( SalInstance *pInstance ); virtual ~GtkData(); - virtual void Init(); + void Init(); virtual void Dispose() SAL_OVERRIDE; - virtual void initNWF(); - virtual void deInitNWF(); + void initNWF(); + void deInitNWF(); static gboolean userEventFn( gpointer data ); - virtual void PostUserEvent(); + void PostUserEvent(); void Yield( bool bWait, bool bHandleAllCurrentEvents ); inline GdkDisplay *GetGdkDisplay(); diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index ad4a5f0c7e85..af530f867e0b 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -360,7 +360,7 @@ public: virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE; virtual void SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE; virtual void SetMenu( SalMenu *pSalMenu ) SAL_OVERRIDE; - virtual SalMenu* GetMenu( void ); + SalMenu* GetMenu( void ); virtual void DrawMenuBar() SAL_OVERRIDE; void EnsureAppMenuWatch(); @@ -445,7 +445,7 @@ public: static GtkSalFrame *getFromWindow( GtkWindow *pWindow ); - virtual void damaged (const basegfx::B2IBox& rDamageRect); + void damaged (const basegfx::B2IBox& rDamageRect); virtual Window GetX11Window() SAL_OVERRIDE; }; diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 8a3d77e963af..7659321f38b3 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -65,7 +65,7 @@ public: virtual void RemoveItem( unsigned nPos ) SAL_OVERRIDE; virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) SAL_OVERRIDE; virtual void SetFrame( const SalFrame* pFrame ) SAL_OVERRIDE; - virtual const GtkSalFrame* GetFrame() const; + const GtkSalFrame* GetFrame() const; virtual void CheckItem( unsigned nPos, bool bCheck ) SAL_OVERRIDE; virtual void EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE; virtual void ShowItem( unsigned nPos, bool bShow ) SAL_OVERRIDE; @@ -74,16 +74,16 @@ public: virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE; virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE; - virtual void SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; } - virtual Menu* GetMenu() { return mpVCLMenu; } - virtual GtkSalMenu* GetParentSalMenu() { return mpParentSalMenu; } - virtual void SetMenuModel( GMenuModel* pMenuModel ) { mpMenuModel = pMenuModel; } - virtual GMenuModel* GetMenuModel() { return mpMenuModel; } - virtual unsigned GetItemCount() { return maItems.size(); } - virtual GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; } - virtual void SetActionGroup( GActionGroup* pActionGroup ) { mpActionGroup = pActionGroup; } - virtual GActionGroup* GetActionGroup() { return mpActionGroup; } - virtual bool IsItemVisible( unsigned nPos ); + void SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; } + Menu* GetMenu() { return mpVCLMenu; } + GtkSalMenu* GetParentSalMenu() { return mpParentSalMenu; } + void SetMenuModel( GMenuModel* pMenuModel ) { mpMenuModel = pMenuModel; } + GMenuModel* GetMenuModel() { return mpMenuModel; } + unsigned GetItemCount() { return maItems.size(); } + GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; } + void SetActionGroup( GActionGroup* pActionGroup ) { mpActionGroup = pActionGroup; } + GActionGroup* GetActionGroup() { return mpActionGroup; } + bool IsItemVisible( unsigned nPos ); void NativeSetItemText( unsigned nSection, unsigned nItemPos, const OUString& rText ); void NativeSetItemCommand( unsigned nSection, diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 358a77946e9a..26bb5e9ec63e 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -395,7 +395,7 @@ public: virtual ~SalX11Display(); virtual bool Dispatch( XEvent *pEvent ) SAL_OVERRIDE; - virtual void Yield(); + void Yield(); virtual void PostUserEvent() SAL_OVERRIDE; bool IsEvent(); diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 69ec2da6dfeb..af894caef2c4 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -250,7 +250,7 @@ public: const SalBitmap& rSourceBitmap, const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE; - virtual bool drawAlphaBitmap( + bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rBitmap ); diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx index 091f4c196446..35fb4590b508 100644 --- a/vcl/inc/unx/wmadaptor.hxx +++ b/vcl/inc/unx/wmadaptor.hxx @@ -219,14 +219,14 @@ public: /* * set NET_WM_PID */ - virtual void setPID( X11SalFrame* pFrame ) const; + void setPID( X11SalFrame* pFrame ) const; /* * set WM_CLIENT_MACHINE */ - virtual void setClientMachine( X11SalFrame* pFrame ) const; + void setClientMachine( X11SalFrame* pFrame ) const; - virtual void answerPing( X11SalFrame*, XClientMessageEvent* ) const; + void answerPing( X11SalFrame*, XClientMessageEvent* ) const; /* * maximizes frame diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index 10118a7a42e4..d15508f9994c 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -309,7 +309,7 @@ private: return uno::Sequence< sal_Int8 >(); } - virtual uno::Reference< rendering::XBitmapPalette > SAL_CALL getPalette( ) throw (uno::RuntimeException) + uno::Reference< rendering::XBitmapPalette > SAL_CALL getPalette( ) throw (uno::RuntimeException) { uno::Reference< XBitmapPalette > aRet; if( mnBitsPerPixel == 8 ) diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 28bf171a3421..402757ab18dd 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -2061,8 +2061,6 @@ void ToolBox::ImplUpdateImageList() ImageListType eType = vcl::HIGHCONTRAST_NO; if (eType != mpData->meImageListType) { - vcl::IImageListProvider* pImageListProvider = mpData->mpImageListProvider; - SetImageList( pImageListProvider->getImageList(eType) ); mpData->meImageListType = eType; } } diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index 586dff1ab86e..3a0379c285b5 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -167,7 +167,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base // XEventListener using cppu::WeakComponentImplHelperBase::disposing; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); // FilePicker Event functions diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx index 1acdd66c4abf..24017a2493e2 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx @@ -66,7 +66,7 @@ class SalGtkFolderPicker : // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); private: diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx index 8f4552c03818..eb8e814b804b 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx @@ -49,13 +49,13 @@ class SalGtkPicker osl::Mutex m_rbHelperMtx; GtkWidget *m_pDialog; protected: - virtual void SAL_CALL implsetTitle( const OUString& aTitle ) + void SAL_CALL implsetTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL implsetDisplayDirectory( const OUString& rDirectory ) + void SAL_CALL implsetDisplayDirectory( const OUString& rDirectory ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ); - virtual OUString SAL_CALL implgetDisplayDirectory( ) + OUString SAL_CALL implgetDisplayDirectory( ) throw( com::sun::star::uno::RuntimeException ); OUString uritounicode(const gchar *pIn); OString unicodetouri(const OUString &rURL); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 0a36eb8cff6b..888c7b18678f 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1276,7 +1276,7 @@ public: TestAndQuit(); } - virtual void TestAndQuit() + void TestAndQuit() { if (underTesting) return; underTesting=true; diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx index eee27fcd1b3e..8ed1b1412d1f 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx @@ -102,10 +102,7 @@ public: virtual void startCell(const Handle_t & start, TablePropertyMapPtr pProps) SAL_OVERRIDE; virtual void endCell(const Handle_t & end) SAL_OVERRIDE; - virtual Handle_t* getTable( ) - { - return &m_xTableRange; - }; + Handle_t& getTable() { return m_xTableRange; }; }; }} diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx index 0bb98a4b3a2b..5c7011550d89 100644 --- a/writerfilter/source/dmapper/OLEHandler.hxx +++ b/writerfilter/source/dmapper/OLEHandler.hxx @@ -77,7 +77,7 @@ class OLEHandler : public LoggedProperties virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; // Interoperability - virtual void saveInteropProperties( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument > const& xTextDocument, + void saveInteropProperties( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument > const& xTextDocument, const OUString& sObjectName, const OUString& sOldObjectName = OUString() ); public: diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index f411a8bd3e4e..2aefbeed6aa1 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -172,7 +172,7 @@ public: void printProperties(); #ifdef DEBUG_WRITERFILTER - virtual void dumpXml( const TagLogger::Pointer_t pLogger ) const; + void dumpXml( const TagLogger::Pointer_t pLogger ) const; #endif static com::sun::star::table::ShadowFormat getShadowFromBorder(com::sun::star::table::BorderLine2 aBorder); diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx index 0644a879e9ee..2f1c32d5df8d 100644 --- a/writerfilter/source/dmapper/TableManager.hxx +++ b/writerfilter/source/dmapper/TableManager.hxx @@ -504,7 +504,7 @@ public: @param rHandle the handle */ - virtual void handle(const css::uno::Reference<css::text::XTextRange>& rHandle); + void handle(const css::uno::Reference<css::text::XTextRange>& rHandle); /** Start a new table level. @@ -537,12 +537,12 @@ public: /** Handle the start of a paragraph group. */ - virtual void startParagraphGroup(); + void startParagraphGroup(); /** Handle the end of a paragraph group. */ - virtual void endParagraphGroup(); + void endParagraphGroup(); /** Handle an SPRM at curent handle. @@ -556,12 +556,12 @@ public: @param pProps the properites */ - virtual void props(TablePropertyMapPtr pProps); + void props(TablePropertyMapPtr pProps); /** Handle occurrence of character 0x7. */ - virtual void handle0x7(); + void handle0x7(); /** Handle 8 bit text at current handle. @@ -569,7 +569,7 @@ public: @param data array of characters @param len number of characters to handle */ - virtual void text(const sal_uInt8 * data, size_t len); + void text(const sal_uInt8 * data, size_t len); /** Handle 16 bit text at current handle. @@ -577,7 +577,7 @@ public: @param data array of characters @param len number of characters to handle */ - virtual void utext(const sal_uInt8 * data, size_t len); + void utext(const sal_uInt8 * data, size_t len); /** Handle properties of the current cell. @@ -614,7 +614,7 @@ public: If this function returns true the current paragraph contains only control information, e.g. end of row. */ - virtual bool isIgnore() const; + bool isIgnore() const; #ifdef DEBUG_WRITERFILTER diff --git a/writerfilter/source/dmapper/TagLogger.hxx b/writerfilter/source/dmapper/TagLogger.hxx index 9282f5b16c9e..f3ce41f0d76b 100644 --- a/writerfilter/source/dmapper/TagLogger.hxx +++ b/writerfilter/source/dmapper/TagLogger.hxx @@ -34,7 +34,7 @@ namespace writerfilter { public: typedef std::shared_ptr<IdToString> Pointer_t; - virtual std::string toString(const Id & id) const = 0; + ; protected: ~IdToString() {} diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx index b074b54bfe9c..a4b4d61514aa 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx @@ -65,10 +65,10 @@ class OOXMLDocumentImpl : public OOXMLDocument sal_Int32 mnProgressEndPos; protected: - virtual void resolveFastSubStream(Stream & rStream, + void resolveFastSubStream(Stream & rStream, OOXMLStream::StreamType_t nType); - virtual void resolveFastSubStreamWithId(Stream & rStream, + void resolveFastSubStreamWithId(Stream & rStream, writerfilter::Reference<Stream>::Pointer_t pStream, sal_uInt32 nId); @@ -110,7 +110,7 @@ public: virtual void resolveComment(Stream & rStream, const sal_Int32 nId) SAL_OVERRIDE; - virtual OOXMLPropertySet * getPicturePropSet + OOXMLPropertySet * getPicturePropSet (const OUString & rId); virtual void resolvePicture(Stream & rStream, const OUString & rId) SAL_OVERRIDE; diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 73a0d3bdb192..a21221af2f23 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -84,7 +84,7 @@ public: throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8> & rId) throw (css::uno::RuntimeException); + sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8> & rId) throw (css::uno::RuntimeException); // local @@ -183,12 +183,12 @@ public: void positivePercentage(const OUString& rText); void startTxbxContent(); void endTxbxContent(); - virtual void propagateCharacterProperties(); - virtual void propagateCharacterPropertiesAsSet(const Id & rId); - virtual void propagateTableProperties(); - virtual void propagateRowProperties(); - virtual void propagateCellProperties(); - virtual bool propagatesProperties() const; + void propagateCharacterProperties(); + void propagateCharacterPropertiesAsSet(const Id & rId); + void propagateTableProperties(); + void propagateRowProperties(); + void propagateCellProperties(); + bool propagatesProperties() const; void sendPropertiesWithId(const Id & rId); void sendPropertiesToParent(); void sendCellProperties(); @@ -235,7 +235,7 @@ protected: void startAction(Token_t Element); void endAction(Token_t Element); - virtual OOXMLPropertySet * getPicturePropSet + OOXMLPropertySet * getPicturePropSet (const OUString & rId); virtual void resolvePropertySetAttrs(); @@ -269,7 +269,7 @@ public: OOXMLPropertySet::Pointer_t getPropertySetAttrs() const { return mpPropertySetAttrs;} virtual void newProperty(const Id & rId, OOXMLValue::Pointer_t pVal) SAL_OVERRIDE; - virtual void sendProperty(Id nId); + void sendProperty(Id nId); virtual OOXMLPropertySet::Pointer_t getPropertySet() const SAL_OVERRIDE; void handleHyperlink(); @@ -338,7 +338,7 @@ public: (OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerValue(); - virtual void setValue(OOXMLValue::Pointer_t pValue); + void setValue(OOXMLValue::Pointer_t pValue); virtual OOXMLValue::Pointer_t getValue() const SAL_OVERRIDE; virtual void lcl_endFastElement(Token_t Element) @@ -365,7 +365,7 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; - virtual void newPropertySet(OOXMLPropertySet::Pointer_t pPropertySet); + void newPropertySet(OOXMLPropertySet::Pointer_t pPropertySet); protected: OOXMLTableImpl mTable; diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx index 00ca3c278ebf..79308ab41fd7 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx @@ -291,7 +291,7 @@ public: virtual ~OOXMLTableImpl(); virtual void resolve(Table & rTable) SAL_OVERRIDE; - virtual void add(ValuePointer_t pPropertySet); + void add(ValuePointer_t pPropertySet); virtual OOXMLTable * clone() const SAL_OVERRIDE; }; diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx index 5ea046d35f6e..dcd5bbaf81e0 100644 --- a/writerfilter/source/rtftok/rtfvalue.hxx +++ b/writerfilter/source/rtftok/rtfvalue.hxx @@ -51,8 +51,8 @@ public: #ifdef DEBUG_WRITERFILTER virtual std::string toString() const SAL_OVERRIDE; #endif - virtual RTFValue* Clone(); - virtual RTFValue* CloneWithSprms(RTFSprms const& rAttributes, RTFSprms const& rSprms); + RTFValue* Clone(); + RTFValue* CloneWithSprms(RTFSprms const& rAttributes, RTFSprms const& rSprms); RTFSprms& getAttributes(); RTFSprms& getSprms(); RTFShape& getShape() const; diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx index 6acfafd749b5..820ff70f3ae1 100644 --- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx +++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx @@ -38,8 +38,8 @@ namespace xmlsearch { static const sal_Int32 END; virtual ~NonnegativeIntegerGenerator() { }; - virtual sal_Int32 first() throw( xmlsearch::excep::XmlSearchException ) = 0; - virtual sal_Int32 next() throw( xmlsearch::excep::XmlSearchException ) = 0; + ; + ; }; diff --git a/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx b/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx index bc24283ededa..f37884068f3d 100644 --- a/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx +++ b/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx @@ -27,7 +27,7 @@ namespace xmlsearch { class CompressorIterator { public: - virtual void value( sal_Int32 ) = 0; + ; protected: ~CompressorIterator() {} diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx index f2c148c788e3..6ca159e8a709 100644 --- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx +++ b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx @@ -41,7 +41,7 @@ namespace xmlsearch { virtual sal_Int32 getNextByte() = 0; - virtual void initReading() + void initReading() { toRead_ = 0; } @@ -62,8 +62,7 @@ namespace xmlsearch { { public: - StreamDecompressor( RandomAccessStream* in ) - : in_( in ) + StreamDecompressor( RandomAccessStream* ) { } @@ -71,11 +70,6 @@ namespace xmlsearch { virtual sal_Int32 getNextByte() SAL_OVERRIDE; - - private: - - RandomAccessStream* in_; - }; diff --git a/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx b/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx index f536a017ba81..efcebc85a830 100644 --- a/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx +++ b/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx @@ -33,11 +33,11 @@ namespace xmlsearch { virtual ~RandomAccessStream() { }; // The calle is responsible for allocating the buffer - virtual void seek( sal_Int32 ) = 0; - virtual sal_Int32 readBytes( sal_Int8*,sal_Int32 ) = 0; - virtual void writeBytes( sal_Int8*, sal_Int32 ) = 0; - virtual sal_Int32 length() = 0; - virtual void close() = 0; + ; + ; + ; + ; + ; protected: diff --git a/xmlhelp/source/cxxhelp/util/Decompressor.cxx b/xmlhelp/source/cxxhelp/util/Decompressor.cxx index 12981610e838..a52fb75bcf15 100644 --- a/xmlhelp/source/cxxhelp/util/Decompressor.cxx +++ b/xmlhelp/source/cxxhelp/util/Decompressor.cxx @@ -26,22 +26,11 @@ using namespace xmlsearch::util; const sal_Int32 Decompressor::BitsInByte = 8; const sal_Int32 Decompressor::NBits = 32; -inline sal_Int32 getInteger_( const sal_Int8* v ) -{ - return (((((( (v[0]&0xFF) ) << 8 ) - | (v[1]&0xFF) ) << 8 ) - | (v[2]&0xFF) ) << 8 ) - | (v[3]&0xFF); -} - sal_Int32 StreamDecompressor::getNextByte() { sal_Int8 a[4]; a[0] = a[1] = a[2] = 0; - if( in_->readBytes( &a[3],1 ) != -1 ) - return getInteger_( a ); - else - return -1; + return -1; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx index 276dc9b303f6..3bd5b92e7d4a 100644 --- a/xmloff/inc/txtvfldi.hxx +++ b/xmloff/inc/txtvfldi.hxx @@ -87,11 +87,11 @@ public: virtual ~XMLValueImportHelper(); /// process attribute values - virtual void ProcessAttribute( sal_uInt16 nAttrToken, + void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); /// prepare XTextField for insertion into document - virtual void PrepareField( + void PrepareField( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xPropertySet); diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index 5e3fc42739e2..15e94ec5b4cb 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -162,7 +162,7 @@ public: virtual void EndElement() SAL_OVERRIDE; - virtual void ManipulateConfigItem(); + void ManipulateConfigItem(); }; class XMLConfigItemSetContext : public XMLConfigBaseContext diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx index 87cc9393952e..f25e7c9fae76 100644 --- a/xmloff/source/core/DomExport.cxx +++ b/xmloff/source/core/DomExport.cxx @@ -63,16 +63,16 @@ public: virtual ~DomVisitor() {} virtual void element( const Reference<XElement>& ) {} virtual void character( const Reference<XCharacterData>& ) {} - virtual void attribute( const Reference<XAttr>& ) {} - virtual void cdata( const Reference<XCDATASection>& ) {} - virtual void comment( const Reference<XComment>& ) {} - virtual void documentFragment( const Reference<XDocumentFragment>& ) {} - virtual void document( const Reference<XDocument>& ) {} - virtual void documentType( const Reference<XDocumentType>& ) {} - virtual void entity( const Reference<XEntity>& ) {} - virtual void entityReference( const Reference<XEntityReference>& ) {} - virtual void notation( const Reference<XNotation>& ) {} - virtual void processingInstruction( const Reference<XProcessingInstruction>& ) {} + void attribute( const Reference<XAttr>& ) {} + void cdata( const Reference<XCDATASection>& ) {} + void comment( const Reference<XComment>& ) {} + void documentFragment( const Reference<XDocumentFragment>& ) {} + void document( const Reference<XDocument>& ) {} + void documentType( const Reference<XDocumentType>& ) {} + void entity( const Reference<XEntity>& ) {} + void entityReference( const Reference<XEntityReference>& ) {} + void notation( const Reference<XNotation>& ) {} + void processingInstruction( const Reference<XProcessingInstruction>& ) {} virtual void endElement( const Reference<XElement>& ) {} }; diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index b9f0c5466353..4d2592aadd8c 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -257,13 +257,13 @@ namespace xmloff virtual void doRegisterCellValueBinding( const OUString& _rBoundCellAddress ); /** register the given XForms binding */ - virtual void doRegisterXFormsValueBinding( const OUString& ); + void doRegisterXFormsValueBinding( const OUString& ); /** register the given XForms list binding */ - virtual void doRegisterXFormsListBinding( const OUString& ); + void doRegisterXFormsListBinding( const OUString& ); /** register the given XForms submission */ - virtual void doRegisterXFormsSubmission( const OUString& ); + void doRegisterXFormsSubmission( const OUString& ); protected: diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx index 32ab15b51f9a..0bf4058f39d2 100644 --- a/xmlsecurity/source/component/certificatecontainer.hxx +++ b/xmlsecurity/source/component/certificatecontainer.hxx @@ -40,8 +40,8 @@ class CertificateContainer : public ::cppu::WeakImplHelper2< css::lang::XService Map certTrustMap; bool SAL_CALL searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap ); - virtual bool SAL_CALL isTemporaryCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException); - virtual bool SAL_CALL isCertificateTrust( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException); + bool SAL_CALL isTemporaryCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException); + bool SAL_CALL isCertificateTrust( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException); public: diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index 32478f4046fe..18ae0b2ecd75 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -107,26 +107,26 @@ private : static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ; //Native methods - virtual CERTCertDBHandle* getCertDb() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; + CERTCertDBHandle* getCertDb() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual void setCertDb( CERTCertDBHandle* aCertDb ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; + void setCertDb( CERTCertDBHandle* aCertDb ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual void adoptSymKey( PK11SymKey* aSymKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual void rejectSymKey( PK11SymKey* aSymKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual PK11SymKey* getSymKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; + void adoptSymKey( PK11SymKey* aSymKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; + void rejectSymKey( PK11SymKey* aSymKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; + PK11SymKey* getSymKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual void adoptPubKey( SECKEYPublicKey* aPubKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual void rejectPubKey( SECKEYPublicKey* aPubKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual SECKEYPublicKey* getPubKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; + void adoptPubKey( SECKEYPublicKey* aPubKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; + void rejectPubKey( SECKEYPublicKey* aPubKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; + SECKEYPublicKey* getPubKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual void adoptPriKey( SECKEYPrivateKey* aPriKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual void rejectPriKey( SECKEYPrivateKey* aPriKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual SECKEYPrivateKey* getPriKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; + void adoptPriKey( SECKEYPrivateKey* aPriKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; + void rejectPriKey( SECKEYPrivateKey* aPriKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; + SECKEYPrivateKey* getPriKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL getPersonalCertificates() throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const ::com::sun::star::uno::Sequence< sal_Int8 >& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const OUString& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; + ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const OUString& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL buildCertificatePath( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& beginCert ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; @@ -135,13 +135,13 @@ private : //Native methods - virtual xmlSecKeysMngrPtr createKeysManager() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; + xmlSecKeysMngrPtr createKeysManager() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; + void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; private: void updateSlots(); - virtual void addCryptoSlot( PK11SlotInfo* aSlot ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; + void addCryptoSlot( PK11SlotInfo* aSlot ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; } ; #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_SECURITYENVIRONMENT_NSSIMPL_HXX |