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 /include | |
| parent | 26ad60aec69310fecd918f1c2e09056aa4782320 (diff) | |
new loplugin: change virtual methods to non-virtual
Where we can prove that the virtual method is never overriden.
In the case of pure-virtual methods, we remove the method entirely.
Sometimes this leads to entire methods and fields being
eliminated.
Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae
Diffstat (limited to 'include')
188 files changed, 617 insertions, 656 deletions
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 ); |