diff options
Diffstat (limited to 'cui/source/dialogs')
-rw-r--r-- | cui/source/dialogs/SpellAttrib.hxx | 18 | ||||
-rw-r--r-- | cui/source/dialogs/SpellDialog.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 54 | ||||
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/splitcelldlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/thesdlg_impl.hxx | 2 |
6 files changed, 42 insertions, 42 deletions
diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index 52af93d1f8b2..015b8641194d 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -112,9 +112,9 @@ public: const SpellErrorDescription& GetErrorDescription() const { return m_aSpellErrorDescription; } - virtual void SetFont( vcl::Font& rFont ) const SAL_OVERRIDE; - virtual TextAttrib* Clone() const SAL_OVERRIDE; - virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; + virtual void SetFont( vcl::Font& rFont ) const override; + virtual TextAttrib* Clone() const override; + virtual bool operator==( const TextAttrib& rAttr ) const override; }; @@ -132,9 +132,9 @@ public: LanguageType GetLanguage() const {return m_eLanguage;} - virtual void SetFont( vcl::Font& rFont ) const SAL_OVERRIDE; - virtual TextAttrib* Clone() const SAL_OVERRIDE; - virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; + virtual void SetFont( vcl::Font& rFont ) const override; + virtual TextAttrib* Clone() const override; + virtual bool operator==( const TextAttrib& rAttr ) const override; }; @@ -150,9 +150,9 @@ public: SpellBackgroundAttrib( const SpellBackgroundAttrib& rAttr ); virtual ~SpellBackgroundAttrib(); - virtual void SetFont( vcl::Font& rFont ) const SAL_OVERRIDE; - virtual TextAttrib* Clone() const SAL_OVERRIDE; - virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; + virtual void SetFont( vcl::Font& rFont ) const override; + virtual TextAttrib* Clone() const override; + virtual bool operator==( const TextAttrib& rAttr ) const override; }; }//namespace svx #endif diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index a64911f25e7a..54de68e7197f 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -122,8 +122,8 @@ public: virtual ~SpellUndoAction_Impl(); - virtual void Undo() SAL_OVERRIDE; - virtual sal_uInt16 GetId() const SAL_OVERRIDE; + virtual void Undo() override; + virtual sal_uInt16 GetId() const override; void SetEnableChangePB(){m_bEnableChangePB = true;} bool IsEnableChangePB(){return m_bEnableChangePB;} diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 50210b2ed32b..d783e887405b 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -136,8 +136,8 @@ class HexColorControl : public Edit public: HexColorControl( vcl::Window* pParent, const WinBits& nStyle ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Paste() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual void Paste() override; void SetColor( sal_Int32 nColor ); sal_Int32 GetColor(); @@ -258,7 +258,7 @@ class ColorPreviewControl : public Control public: ColorPreviewControl( vcl::Window* pParent, const WinBits& nStyle ); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; void SetColor(const Color& rColor); @@ -307,16 +307,16 @@ public: ColorFieldControl(vcl::Window* pParent, const WinBits& nStyle); virtual ~ColorFieldControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() 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 KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Resize() override; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; void UpdateBitmap(); void ShowPosition( const Point& rPos, bool bUpdate ); @@ -714,14 +714,14 @@ class ColorSliderControl : public Control public: ColorSliderControl( vcl::Window* pParent, const WinBits& nStyle ); virtual ~ColorSliderControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() 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 KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Resize() override; void UpdateBitmap(); void ChangePosition( long nY ); @@ -985,7 +985,7 @@ public: { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void update_color(sal_uInt16 n = UPDATE_ALL); @@ -1515,20 +1515,20 @@ public: explicit ColorPicker( Reference< XComponentContext > const & xContext ); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override; // XInitialization - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) override; // XPropertyAccess - virtual Sequence< PropertyValue > SAL_CALL getPropertyValues( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< PropertyValue > SAL_CALL getPropertyValues( ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) override; // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL execute( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL execute( ) throw (RuntimeException, std::exception) override; private: Reference< XComponentContext > mxContext; diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 92281b85932c..df88b8429eb1 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -213,10 +213,10 @@ namespace svx public: RubyRadioButton( vcl::Window* _pParent, WinBits nBits ); void init( const OUString& rPrimaryText, const OUString& rSecondaryText, const PseudoRubyText::RubyPosition& rPosition ); - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; protected: - virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) override; private: PseudoRubyText m_aRubyText; diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index c6bf6b04d47d..7335f21a04de 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -31,7 +31,7 @@ namespace { NoApplyDialog(vcl::Window *pParent, const OUString &rId, const OUString &rXML) : SvxStandardDialog(pParent, rId, rXML) { } protected: - virtual void Apply() SAL_OVERRIDE {} + virtual void Apply() override {} }; } diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index f302947b9fb3..2546ecc5844b 100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -54,7 +54,7 @@ public: SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rStr ); virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext, - const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) SAL_OVERRIDE; + const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; }; #endif |