diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /forms/source/richtext | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'forms/source/richtext')
-rw-r--r-- | forms/source/richtext/attributedispatcher.hxx | 8 | ||||
-rw-r--r-- | forms/source/richtext/clipboarddispatcher.hxx | 10 | ||||
-rw-r--r-- | forms/source/richtext/featuredispatcher.hxx | 4 | ||||
-rw-r--r-- | forms/source/richtext/parametrizedattributedispatcher.hxx | 4 | ||||
-rw-r--r-- | forms/source/richtext/richtextcontrol.hxx | 26 | ||||
-rw-r--r-- | forms/source/richtext/richtextimplcontrol.hxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/richtextmodel.hxx | 30 | ||||
-rw-r--r-- | forms/source/richtext/richtextunowrapper.hxx | 6 | ||||
-rw-r--r-- | forms/source/richtext/richtextvclcontrol.hxx | 18 | ||||
-rw-r--r-- | forms/source/richtext/richtextviewport.hxx | 14 | ||||
-rw-r--r-- | forms/source/richtext/rtattributehandler.hxx | 28 | ||||
-rw-r--r-- | forms/source/richtext/specialdispatchers.hxx | 12 |
12 files changed, 81 insertions, 81 deletions
diff --git a/forms/source/richtext/attributedispatcher.hxx b/forms/source/richtext/attributedispatcher.hxx index b4e971f9cbb2..358a2df57513 100644 --- a/forms/source/richtext/attributedispatcher.hxx +++ b/forms/source/richtext/attributedispatcher.hxx @@ -58,16 +58,16 @@ namespace frm virtual ~OAttributeDispatcher( ); // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override; // ITextAttributeListener - virtual void onAttributeStateChanged( AttributeId _nAttributeId, const AttributeState& _rState ) SAL_OVERRIDE; + virtual void onAttributeStateChanged( AttributeId _nAttributeId, const AttributeState& _rState ) override; // ORichTextFeatureDispatcher - virtual void disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify ) SAL_OVERRIDE; + virtual void disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify ) override; // ORichTextFeatureDispatcher - virtual css::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; + virtual css::frame::FeatureStateEvent buildStatusEvent() const override; // own overridables virtual void fillFeatureEventFromAttributeState( css::frame::FeatureStateEvent& _rEvent, const AttributeState& _rState ) const; diff --git a/forms/source/richtext/clipboarddispatcher.hxx b/forms/source/richtext/clipboarddispatcher.hxx index b0d0569654eb..2384cc07a889 100644 --- a/forms/source/richtext/clipboarddispatcher.hxx +++ b/forms/source/richtext/clipboarddispatcher.hxx @@ -48,12 +48,12 @@ namespace frm protected: // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override; // ORichTextFeatureDispatcher - virtual void invalidateFeatureState_Broadcast() SAL_OVERRIDE; + virtual void invalidateFeatureState_Broadcast() override; virtual css::frame::FeatureStateEvent - buildStatusEvent() const SAL_OVERRIDE; + buildStatusEvent() const override; protected: /** determines whether our functionality is currently available @@ -75,10 +75,10 @@ namespace frm virtual ~OPasteClipboardDispatcher(); // OClipboardDispatcher - virtual bool implIsEnabled( ) const SAL_OVERRIDE; + virtual bool implIsEnabled( ) const override; // ORichTextFeatureDispatcher - virtual void disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify ) SAL_OVERRIDE; + virtual void disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify ) override; private: DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void ); diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx index 23c94ddfc52c..794947ff0764 100644 --- a/forms/source/richtext/featuredispatcher.hxx +++ b/forms/source/richtext/featuredispatcher.hxx @@ -81,8 +81,8 @@ namespace frm protected: // XDispatch - virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/forms/source/richtext/parametrizedattributedispatcher.hxx b/forms/source/richtext/parametrizedattributedispatcher.hxx index fbb26d415e8d..0b531f78cf4b 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.hxx +++ b/forms/source/richtext/parametrizedattributedispatcher.hxx @@ -41,10 +41,10 @@ namespace frm virtual ~OParametrizedAttributeDispatcher(); // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override; // OAttributeDispatcher - virtual void fillFeatureEventFromAttributeState( css::frame::FeatureStateEvent& _rEvent, const AttributeState& _rState ) const SAL_OVERRIDE; + virtual void fillFeatureEventFromAttributeState( css::frame::FeatureStateEvent& _rEvent, const AttributeState& _rState ) const override; protected: // own overridables diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx index 67514179c9a8..5bda91b38949 100644 --- a/forms/source/richtext/richtextcontrol.hxx +++ b/forms/source/richtext/richtextcontrol.hxx @@ -59,24 +59,24 @@ namespace frm protected: // UNO DECLARE_UNO3_AGG_DEFAULTS( ORichTextControl, UnoEditControl ) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw ( css::uno::RuntimeException, std::exception ) override; // XControl - virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rParent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rParent ) throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider DECLARE_XTYPEPROVIDER() // XDispatchProvider - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) throw (css::uno::RuntimeException, std::exception) override; // UnoControl - virtual bool requiresNewPeer( const OUString& _rPropertyName ) const SAL_OVERRIDE; + virtual bool requiresNewPeer( const OUString& _rPropertyName ) const override; }; typedef ::cppu::ImplHelper1 < css::frame::XDispatchProvider @@ -109,25 +109,25 @@ namespace frm virtual ~ORichTextPeer(); // XView - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override; // XVclWindowPeer virtual void SAL_CALL setProperty( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XTypeProvider DECLARE_XTYPEPROVIDER( ) // XComponent - virtual void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; // XDispatchProvider - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) throw (css::uno::RuntimeException, std::exception) override; // ITextSelectionListener - virtual void onSelectionChanged( const ESelection& _rSelection ) SAL_OVERRIDE; + virtual void onSelectionChanged( const ESelection& _rSelection ) override; private: SingleAttributeDispatcher implCreateDispatcher( SfxSlotId _nSlotId, const css::util::URL& _rURL ); diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx index 7f8652449482..7a3194642b23 100644 --- a/forms/source/richtext/richtextimplcontrol.hxx +++ b/forms/source/richtext/richtextimplcontrol.hxx @@ -170,7 +170,7 @@ namespace frm inline bool hasHScrollBar( ) const { return m_pHScroll != nullptr; } // IEngineStatusListener overridables - virtual void EditEngineStatusChanged( const EditStatus& _rStatus ) SAL_OVERRIDE; + virtual void EditEngineStatusChanged( const EditStatus& _rStatus ) override; private: DECL_LINK_TYPED( OnInvalidateAllAttributes, LinkParamNone*, void ); diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx index 0b15405238f6..a08a89d3f8d9 100644 --- a/forms/source/richtext/richtextmodel.hxx +++ b/forms/source/richtext/richtextmodel.hxx @@ -105,11 +105,11 @@ namespace frm // UNO DECLARE_UNO3_AGG_DEFAULTS( ORichTextModel, OControlModel ) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (::css::uno::RuntimeException, std::exception) override; + virtual ::css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::css::uno::RuntimeException, std::exception) override; // XPersistObject DECLARE_XPERSISTOBJECT() @@ -118,40 +118,40 @@ namespace frm DECLARE_XTYPEPROVIDER() // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XPropertySet and friends - virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override; virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) - throw(css::lang::IllegalArgumentException) SAL_OVERRIDE; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) SAL_OVERRIDE; - virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; + throw(css::lang::IllegalArgumentException) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override; + virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override; // OControlModel's property handling virtual void describeFixedProperties( css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps - ) const SAL_OVERRIDE; + ) const override; virtual void describeAggregateProperties( css::uno::Sequence< css::beans::Property >& /* [out] */ _rAggregateProps - ) const SAL_OVERRIDE; + ) const override; // prevent method hiding using OControlModel::disposing; using OControlModel::getFastPropertyValue; // OComponentHelper - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // IEngineTextChangeListener - virtual void potentialTextChange( ) SAL_OVERRIDE; + virtual void potentialTextChange( ) override; private: void implInit(); diff --git a/forms/source/richtext/richtextunowrapper.hxx b/forms/source/richtext/richtextunowrapper.hxx index bc135a5313fa..4de0d6ffb2d5 100644 --- a/forms/source/richtext/richtextunowrapper.hxx +++ b/forms/source/richtext/richtextunowrapper.hxx @@ -61,9 +61,9 @@ namespace frm RichTextEditSource( EditEngine& _rEngine, IEngineTextChangeListener* _pTextChangeListener ); // SvxEditSource - virtual SvxEditSource* Clone() const SAL_OVERRIDE; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; - virtual void UpdateData() SAL_OVERRIDE; + virtual SvxEditSource* Clone() const override; + virtual SvxTextForwarder* GetTextForwarder() override; + virtual void UpdateData() override; protected: virtual ~RichTextEditSource(); diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx index 7abdcf5ea049..c7d9f896f0c1 100644 --- a/forms/source/richtext/richtextvclcontrol.hxx +++ b/forms/source/richtext/richtextvclcontrol.hxx @@ -52,7 +52,7 @@ namespace frm ); virtual ~RichTextControl( ); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /* enables the change notifications for a particular attribute @@ -84,8 +84,8 @@ namespace frm static bool isMappableSlot( SfxSlotId _nSlotId ); // IMultiAttributeDispatcher - virtual AttributeState getState( AttributeId _nAttributeId ) const SAL_OVERRIDE; - virtual void executeAttribute( AttributeId _nAttributeId, const SfxPoolItem* _pArgument ) SAL_OVERRIDE; + virtual AttributeState getState( AttributeId _nAttributeId ) const override; + virtual void executeAttribute( AttributeId _nAttributeId, const SfxPoolItem* _pArgument ) override; void SetBackgroundColor( ); void SetBackgroundColor( const Color& _rColor ); @@ -100,15 +100,15 @@ namespace frm EditView& getView(); // Window overridables - virtual void Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, DrawFlags _nFlags ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, DrawFlags _nFlags ) override; protected: // Window overridables - virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; + virtual void Resize() override; + virtual void GetFocus() override; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual bool PreNotify( NotifyEvent& _rNEvt ) override; + virtual bool Notify( NotifyEvent& _rNEvt ) override; private: void applyAttributes( const SfxItemSet& _rAttributesToApply ); diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx index 59d670449fa1..a9a7a46a29ee 100644 --- a/forms/source/richtext/richtextviewport.hxx +++ b/forms/source/richtext/richtextviewport.hxx @@ -43,13 +43,13 @@ namespace frm bool GetHideInactiveSelection() const { return m_bHideInactiveSelection; } protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& _rKEvt ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& _rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& _rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& _rMEvt ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void KeyInput( const KeyEvent& _rKEvt ) override; + virtual void MouseMove( const MouseEvent& _rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& _rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& _rMEvt ) override; private: inline void implInvalidateAttributes() const diff --git a/forms/source/richtext/rtattributehandler.hxx b/forms/source/richtext/rtattributehandler.hxx index 3d27321c2cea..70118a8bbca4 100644 --- a/forms/source/richtext/rtattributehandler.hxx +++ b/forms/source/richtext/rtattributehandler.hxx @@ -79,8 +79,8 @@ namespace frm explicit ParaAlignmentHandler( AttributeId _nAttributeId ); public: - virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const SAL_OVERRIDE; - virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const SAL_OVERRIDE; + virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const override; + virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const override; }; class LineSpacingHandler : public AttributeHandler @@ -92,8 +92,8 @@ namespace frm explicit LineSpacingHandler( AttributeId _nAttributeId ); public: - virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const SAL_OVERRIDE; - virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const SAL_OVERRIDE; + virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const override; + virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const override; }; class EscapementHandler : public AttributeHandler @@ -105,8 +105,8 @@ namespace frm explicit EscapementHandler( AttributeId _nAttributeId ); public: - virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const SAL_OVERRIDE; - virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const SAL_OVERRIDE; + virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const override; + virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const override; }; class SlotHandler : public AttributeHandler @@ -118,8 +118,8 @@ namespace frm SlotHandler( AttributeId _nAttributeId, WhichId _nWhichId ); public: - virtual AttributeState getState( const SfxItemSet& _rAttribs ) const SAL_OVERRIDE; - virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const SAL_OVERRIDE; + virtual AttributeState getState( const SfxItemSet& _rAttribs ) const override; + virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const override; }; class BooleanHandler : public AttributeHandler @@ -128,8 +128,8 @@ namespace frm BooleanHandler( AttributeId _nAttributeId, WhichId _nWhichId ); public: - virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const SAL_OVERRIDE; - virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const SAL_OVERRIDE; + virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const override; + virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const override; }; class FontSizeHandler : public AttributeHandler @@ -138,8 +138,8 @@ namespace frm FontSizeHandler( AttributeId _nAttributeId, WhichId _nWhichId ); public: - virtual AttributeState getState( const SfxItemSet& _rAttribs ) const SAL_OVERRIDE; - virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const SAL_OVERRIDE; + virtual AttributeState getState( const SfxItemSet& _rAttribs ) const override; + virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const override; }; class ParagraphDirectionHandler : public AttributeHandler @@ -153,8 +153,8 @@ namespace frm explicit ParagraphDirectionHandler( AttributeId _nAttributeId ); public: - virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const SAL_OVERRIDE; - virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const SAL_OVERRIDE; + virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const override; + virtual void executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, SvtScriptType _nForScriptType ) const override; }; diff --git a/forms/source/richtext/specialdispatchers.hxx b/forms/source/richtext/specialdispatchers.hxx index 199a74e24983..df56daffa464 100644 --- a/forms/source/richtext/specialdispatchers.hxx +++ b/forms/source/richtext/specialdispatchers.hxx @@ -37,10 +37,10 @@ namespace frm // XDispatch virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // ORichTextFeatureDispatcher - virtual css::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; + virtual css::frame::FeatureStateEvent buildStatusEvent() const override; }; class OParagraphDirectionDispatcher : public OAttributeDispatcher @@ -55,7 +55,7 @@ namespace frm protected: // ORichTextFeatureDispatcher - virtual css::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; + virtual css::frame::FeatureStateEvent buildStatusEvent() const override; }; class OTextDirectionDispatcher : public ORichTextFeatureDispatcher @@ -65,10 +65,10 @@ namespace frm protected: // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override; // ORichTextFeatureDispatcher - virtual css::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; + virtual css::frame::FeatureStateEvent buildStatusEvent() const override; }; class OAsianFontLayoutDispatcher : public OParametrizedAttributeDispatcher @@ -84,7 +84,7 @@ namespace frm protected: // OParametrizedAttributeDispatcher virtual const SfxPoolItem* convertDispatchArgsToItem( - const css::uno::Sequence< css::beans::PropertyValue >& _rArguments ) SAL_OVERRIDE; + const css::uno::Sequence< css::beans::PropertyValue >& _rArguments ) override; }; |