From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 16:04:04 +0200 Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 --- svx/inc/AccessibleSvxFindReplaceDialog.hxx | 8 +- svx/inc/AccessibleTableShape.hxx | 178 ++++++++++----------- svx/inc/GalleryControl.hxx | 6 +- svx/inc/dragmt3d.hxx | 20 +-- svx/inc/extrusiondepthdialog.hxx | 2 +- svx/inc/galbrws2.hxx | 10 +- svx/inc/galobj.hxx | 30 ++-- svx/inc/sdr/contact/objectcontactofpageview.hxx | 44 ++--- svx/inc/sdr/contact/viewcontactofe3dcube.hxx | 2 +- svx/inc/sdr/contact/viewcontactofe3dextrude.hxx | 2 +- svx/inc/sdr/contact/viewcontactofe3dlathe.hxx | 2 +- svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx | 2 +- svx/inc/sdr/contact/viewcontactofe3dsphere.hxx | 2 +- svx/inc/sdr/contact/viewcontactofgraphic.hxx | 4 +- svx/inc/sdr/contact/viewcontactofgroup.hxx | 4 +- .../contact/viewcontactofmasterpagedescriptor.hxx | 10 +- svx/inc/sdr/contact/viewcontactofopenglobj.hxx | 4 +- svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx | 2 +- svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx | 2 +- svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx | 2 +- svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx | 2 +- .../sdr/contact/viewcontactofsdrobjcustomshape.hxx | 2 +- svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx | 8 +- svx/inc/sdr/contact/viewcontactofsdrpage.hxx | 52 +++--- svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx | 2 +- svx/inc/sdr/contact/viewcontactofunocontrol.hxx | 4 +- svx/inc/sdr/contact/viewobjectcontactofe3d.hxx | 2 +- .../sdr/contact/viewobjectcontactofe3dscene.hxx | 4 +- svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx | 2 +- svx/inc/sdr/contact/viewobjectcontactofgroup.hxx | 4 +- .../viewobjectcontactofmasterpagedescriptor.hxx | 4 +- .../sdr/contact/viewobjectcontactofsdrole2obj.hxx | 2 +- svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx | 32 ++-- .../sdr/contact/viewobjectcontactofunocontrol.hxx | 8 +- svx/inc/sdr/overlay/overlaycrosshair.hxx | 4 +- svx/inc/sdr/overlay/overlayhandle.hxx | 2 +- svx/inc/sdr/overlay/overlayhelpline.hxx | 4 +- svx/inc/sdr/overlay/overlayline.hxx | 4 +- svx/inc/sdr/overlay/overlaymanagerbuffered.hxx | 8 +- svx/inc/sdr/overlay/overlayrectangle.hxx | 4 +- svx/inc/sdr/overlay/overlayrollingrectangle.hxx | 4 +- svx/inc/sdr/overlay/overlaytools.hxx | 24 +-- svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx | 4 +- .../sdr/primitive2d/sdrconnectorprimitive2d.hxx | 4 +- .../sdr/primitive2d/sdrcustomshapeprimitive2d.hxx | 4 +- svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx | 8 +- svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx | 4 +- svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx | 4 +- svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx | 4 +- .../sdr/primitive2d/sdrolecontentprimitive2d.hxx | 6 +- svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx | 4 +- .../sdr/primitive2d/sdrrectangleprimitive2d.hxx | 4 +- svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx | 40 ++--- svx/inc/sdr/properties/attributeproperties.hxx | 22 +-- svx/inc/sdr/properties/captionproperties.hxx | 10 +- svx/inc/sdr/properties/circleproperties.hxx | 10 +- svx/inc/sdr/properties/connectorproperties.hxx | 8 +- svx/inc/sdr/properties/customshapeproperties.hxx | 22 +-- svx/inc/sdr/properties/e3dcompoundproperties.hxx | 10 +- svx/inc/sdr/properties/e3dextrudeproperties.hxx | 4 +- svx/inc/sdr/properties/e3dlatheproperties.hxx | 4 +- svx/inc/sdr/properties/e3dproperties.hxx | 8 +- svx/inc/sdr/properties/e3dsceneproperties.hxx | 20 +-- svx/inc/sdr/properties/e3dsphereproperties.hxx | 4 +- svx/inc/sdr/properties/emptyproperties.hxx | 28 ++-- svx/inc/sdr/properties/graphicproperties.hxx | 10 +- svx/inc/sdr/properties/groupproperties.hxx | 42 ++--- svx/inc/sdr/properties/measureproperties.hxx | 10 +- svx/inc/sdr/properties/oleproperties.hxx | 4 +- svx/inc/sdr/properties/pageproperties.hxx | 14 +- svx/inc/sdr/properties/rectangleproperties.hxx | 6 +- svx/inc/sdr/properties/textproperties.hxx | 18 +-- svx/inc/svdibrow.hxx | 26 +-- svx/inc/sxcikitm.hxx | 14 +- svx/inc/sxmkitm.hxx | 14 +- svx/inc/tbunosearchcontrollers.hxx | 146 ++++++++--------- svx/inc/unomlstr.hxx | 4 +- 77 files changed, 531 insertions(+), 531 deletions(-) (limited to 'svx/inc') diff --git a/svx/inc/AccessibleSvxFindReplaceDialog.hxx b/svx/inc/AccessibleSvxFindReplaceDialog.hxx index 0e066db27ab3..a69480e9f564 100644 --- a/svx/inc/AccessibleSvxFindReplaceDialog.hxx +++ b/svx/inc/AccessibleSvxFindReplaceDialog.hxx @@ -29,10 +29,10 @@ class VCLXAccessibleSvxFindReplaceDialog : public VCLXAccessibleComponent public: VCLXAccessibleSvxFindReplaceDialog(VCLXWindow* pVCLXindow); virtual ~VCLXAccessibleSvxFindReplaceDialog(); - virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) SAL_OVERRIDE; + virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; @@ -48,7 +48,7 @@ public: {}; private: virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE + ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() override { return new VCLXAccessibleSvxFindReplaceDialog(this); } diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx index 444053409c37..4215c54d54f9 100644 --- a/svx/inc/AccessibleTableShape.hxx +++ b/svx/inc/AccessibleTableShape.hxx @@ -57,82 +57,82 @@ public: AccessibleTableShape( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo ); virtual ~AccessibleTableShape( ); - virtual void Init() SAL_OVERRIDE; + virtual void Init() override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) 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; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire( ) throw () override; + virtual void SAL_CALL release( ) throw () override; // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleTable - virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL clearAccessibleSelection( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL selectAllAccessibleChildren( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL clearAccessibleSelection( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL selectAllAccessibleChildren( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; // XAccessibleTableSelection virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL disposing( ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( ) override; // XSelectionChangeListener virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& Source) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL selectionChanged (const ::com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; sal_Int32 mnPreviousSelectionCount; using AccessibleShape::disposing; friend class AccessibleTableHeaderShape; void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException ); // overwrite the SetState & ResetState to do special operation for table cell's internal text - virtual bool SetState (sal_Int16 aState) SAL_OVERRIDE; - virtual bool ResetState (sal_Int16 aState) SAL_OVERRIDE; + virtual bool SetState (sal_Int16 aState) override; + virtual bool ResetState (sal_Int16 aState) override; // The following two methods are used to set state directly on table object, instead of the internal cell or paragraph. bool SetStateDirectly (sal_Int16 aState); bool ResetStateDirectly (sal_Int16 aState); @@ -140,7 +140,7 @@ public: AccessibleCell* GetActiveAccessibleCell(); protected: - virtual OUString CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual OUString CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) override; sdr::table::SvxTableController* getTableController(); @@ -169,61 +169,61 @@ public: virtual ~AccessibleTableHeaderShape(); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override; //XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual 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; - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + 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) override; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleTable - virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleTableSelection virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; private: SVX_DLLPRIVATE explicit AccessibleTableHeaderShape( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent ); diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx index 3238db11aec8..db467e547a2d 100644 --- a/svx/inc/GalleryControl.hxx +++ b/svx/inc/GalleryControl.hxx @@ -55,15 +55,15 @@ private: void InitSettings(); - virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; + virtual void Resize() override; + virtual void GetFocus() override; DECL_LINK_TYPED(SplitHdl, Splitter*, void); protected: void ThemeSelectionHasChanged(); virtual ~GalleryControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; } } // end of namespace svx::sidebar diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx index 26e6d3cf4b7c..ce75e7fde5a6 100644 --- a/svx/inc/dragmt3d.hxx +++ b/svx/inc/dragmt3d.hxx @@ -70,14 +70,14 @@ public: E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ, bool bFull = false); - virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE; - virtual bool BeginSdrDrag() SAL_OVERRIDE; - virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE; - virtual void CancelSdrDrag() SAL_OVERRIDE; - virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE; + virtual void TakeSdrDragComment(OUString& rStr) const override; + virtual bool BeginSdrDrag() override; + virtual void MoveSdrDrag(const Point& rPnt) override; + virtual void CancelSdrDrag() override; + virtual bool EndSdrDrag(bool bCopy) override; // for migration from XOR to overlay - virtual void CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlayManager) SAL_OVERRIDE; + virtual void CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlayManager) override; }; // Derivative of SdrDragMethod for spinning 3D objects @@ -93,8 +93,8 @@ public: E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ, bool bFull = false); - virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE; - virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE; + virtual void MoveSdrDrag(const Point& rPnt) override; + virtual Pointer GetSdrDragPointer() const override; }; // Derivative of SdrDragMethod for moving 3D sub-objects @@ -112,8 +112,8 @@ public: E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ, bool bFull = false); - virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE; - virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE; + virtual void MoveSdrDrag(const Point& rPnt) override; + virtual Pointer GetSdrDragPointer() const override; }; diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx index 48b932e44e18..b09b63d091e2 100644 --- a/svx/inc/extrusiondepthdialog.hxx +++ b/svx/inc/extrusiondepthdialog.hxx @@ -36,7 +36,7 @@ class ExtrusionDepthDialog : public ModalDialog public: ExtrusionDepthDialog( vcl::Window* pParent, double fDepth, FieldUnit eDefaultUnit ); virtual ~ExtrusionDepthDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; double getDepth() const; }; diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index a2f13805415d..7e31440c7478 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -75,7 +75,7 @@ class GalleryToolBox : public ToolBox { private: - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; public: @@ -131,11 +131,11 @@ private: void ImplSelectItemId( sal_uIntPtr nItemId ); // Control - virtual void Resize() SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Resize() override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; DECL_LINK_TYPED( SelectObjectHdl, GalleryListView*, void ); DECL_LINK_TYPED( SelectObjectValueSetHdl, ValueSet*, void ); @@ -154,7 +154,7 @@ public: GalleryBrowser2(vcl::Window* pParent, Gallery* pGallery); virtual ~GalleryBrowser2(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SelectTheme( const OUString& rThemeName ); diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx index 24c923c01a75..77cfb6e60659 100644 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -91,10 +91,10 @@ private: GalSoundType eSoundType; - virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const SAL_OVERRIDE; - virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SAL_OVERRIDE; + virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const override; + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) override; - virtual sal_uInt16 GetVersion() const SAL_OVERRIDE { return 6; } + virtual sal_uInt16 GetVersion() const override { return 6; } public: @@ -102,8 +102,8 @@ public: SgaObjectSound( const INetURLObject& rURL ); virtual ~SgaObjectSound(); - virtual SgaObjKind GetObjKind() const SAL_OVERRIDE { return SGA_OBJ_SOUND; } - virtual BitmapEx GetThumbBmp() const SAL_OVERRIDE; + virtual SgaObjKind GetObjKind() const override { return SGA_OBJ_SOUND; } + virtual BitmapEx GetThumbBmp() const override; }; class FmFormModel; @@ -116,10 +116,10 @@ private: bool CreateThumb( const FmFormModel& rModel ); - virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const SAL_OVERRIDE; - virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SAL_OVERRIDE; + virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const override; + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) override; - virtual sal_uInt16 GetVersion() const SAL_OVERRIDE { return 5; } + virtual sal_uInt16 GetVersion() const override { return 5; } public: @@ -128,7 +128,7 @@ public: SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL ); virtual ~SgaObjectSvDraw() {}; - virtual SgaObjKind GetObjKind() const SAL_OVERRIDE { return SGA_OBJ_SVDRAW; } + virtual SgaObjKind GetObjKind() const override { return SGA_OBJ_SVDRAW; } }; class SgaObjectBmp: public SgaObject @@ -137,10 +137,10 @@ private: void Init( const Graphic& rGraphic, const INetURLObject& rURL ); - virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const SAL_OVERRIDE; - virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SAL_OVERRIDE; + virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const override; + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) override; - virtual sal_uInt16 GetVersion() const SAL_OVERRIDE { return 5; } + virtual sal_uInt16 GetVersion() const override { return 5; } public: @@ -149,7 +149,7 @@ public: SgaObjectBmp( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& rFormat ); virtual ~SgaObjectBmp() {}; - virtual SgaObjKind GetObjKind() const SAL_OVERRIDE { return SGA_OBJ_BMP; } + virtual SgaObjKind GetObjKind() const override { return SGA_OBJ_BMP; } }; class SgaObjectAnim : public SgaObjectBmp @@ -165,7 +165,7 @@ public: virtual ~SgaObjectAnim() {}; - virtual SgaObjKind GetObjKind() const SAL_OVERRIDE { return SGA_OBJ_ANIM; } + virtual SgaObjKind GetObjKind() const override { return SGA_OBJ_ANIM; } }; class SgaObjectINet : public SgaObjectAnim @@ -181,7 +181,7 @@ public: virtual ~SgaObjectINet() {}; - virtual SgaObjKind GetObjKind() const SAL_OVERRIDE { return SGA_OBJ_INET; } + virtual SgaObjKind GetObjKind() const override { return SGA_OBJ_INET; } }; #endif diff --git a/svx/inc/sdr/contact/objectcontactofpageview.hxx b/svx/inc/sdr/contact/objectcontactofpageview.hxx index 111f38615299..83f189e2ec11 100644 --- a/svx/inc/sdr/contact/objectcontactofpageview.hxx +++ b/svx/inc/sdr/contact/objectcontactofpageview.hxx @@ -55,72 +55,72 @@ namespace sdr // got invalidated by an ActionCanged() call. An active view needs to remember // this and take action on it. Default implementation directly calls back // triggerLazyInvalidate() which promptly handles the request - virtual void setLazyInvalidate(ViewObjectContact& rVOC) SAL_OVERRIDE; + virtual void setLazyInvalidate(ViewObjectContact& rVOC) override; // call this to support evtl. preparations for repaint - virtual void PrepareProcessDisplay() SAL_OVERRIDE; + virtual void PrepareProcessDisplay() override; // From baseclass Timer, the timeout call triggered by te LazyInvalidate mechanism - virtual void Invoke() SAL_OVERRIDE; + virtual void Invoke() override; // Process the whole displaying - virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) SAL_OVERRIDE; + virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) override; // test if visualizing of entered groups is switched on at all - virtual bool DoVisualizeEnteredGroup() const SAL_OVERRIDE; + virtual bool DoVisualizeEnteredGroup() const override; // get active group's (the entered group) ViewContact - virtual const ViewContact* getActiveViewContact() const SAL_OVERRIDE; + virtual const ViewContact* getActiveViewContact() const override; // Invalidate given rectangle at the window/output which is represented by // this ObjectContact. - virtual void InvalidatePartOfView(const basegfx::B2DRange& rRange) const SAL_OVERRIDE; + virtual void InvalidatePartOfView(const basegfx::B2DRange& rRange) const override; // Get info if given Rectangle is visible in this view - virtual bool IsAreaVisible(const basegfx::B2DRange& rRange) const SAL_OVERRIDE; + virtual bool IsAreaVisible(const basegfx::B2DRange& rRange) const override; // Get info about the need to visualize GluePoints. The default // is that it is not necessary. - virtual bool AreGluePointsVisible() const SAL_OVERRIDE; + virtual bool AreGluePointsVisible() const override; // check if text animation is allowed. - virtual bool IsTextAnimationAllowed() const SAL_OVERRIDE; + virtual bool IsTextAnimationAllowed() const override; // check if graphic animation is allowed. - virtual bool IsGraphicAnimationAllowed() const SAL_OVERRIDE; + virtual bool IsGraphicAnimationAllowed() const override; // check if asynchronious graphis loading is allowed. Default is sal_False. - virtual bool IsAsynchronGraphicsLoadingAllowed() const SAL_OVERRIDE; + virtual bool IsAsynchronGraphicsLoadingAllowed() const override; // print? Default is false - virtual bool isOutputToPrinter() const SAL_OVERRIDE; + virtual bool isOutputToPrinter() const override; // window? Default is true - virtual bool isOutputToWindow() const SAL_OVERRIDE; + virtual bool isOutputToWindow() const override; // VirtualDevice? Default is false - virtual bool isOutputToVirtualDevice() const SAL_OVERRIDE; + virtual bool isOutputToVirtualDevice() const override; // recording MetaFile? Default is false - virtual bool isOutputToRecordingMetaFile() const SAL_OVERRIDE; + virtual bool isOutputToRecordingMetaFile() const override; // pdf export? Default is false - virtual bool isOutputToPDFFile() const SAL_OVERRIDE; + virtual bool isOutputToPDFFile() const override; // gray display mode - virtual bool isDrawModeGray() const SAL_OVERRIDE; + virtual bool isDrawModeGray() const override; // gray display mode - virtual bool isDrawModeBlackWhite() const SAL_OVERRIDE; + virtual bool isDrawModeBlackWhite() const override; // high contrast display mode - virtual bool isDrawModeHighContrast() const SAL_OVERRIDE; + virtual bool isDrawModeHighContrast() const override; // override access to SdrPageView - virtual SdrPageView* TryToGetSdrPageView() const SAL_OVERRIDE; + virtual SdrPageView* TryToGetSdrPageView() const override; // access to OutputDevice. May return 0L like the default implementations do. Override as needed. - virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE; + virtual OutputDevice* TryToGetOutputDevice() const override; /** sets all UNO controls which are associated with this ObjectContact to design or alive mode. diff --git a/svx/inc/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx index 531b926939b6..ab97e4896914 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dcube.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx @@ -43,7 +43,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data which is // stored in the local primitive list. Default creates a yellow replacement rectangle. - virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx index e91b46994ee7..20a73ae946fa 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx @@ -44,7 +44,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data which is // stored in the local primitive list. Default creates a yellow replacement rectangle. - virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx index cf13907d313d..cedaa2563d00 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx @@ -44,7 +44,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data which is // stored in the local primitive list. Default creates a yellow replacement rectangle. - virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx index 77043792f52b..2544414ab665 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx @@ -43,7 +43,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data which is // stored in the local primitive list. Default creates a yellow replacement rectangle. - virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx index eadc02b3fd94..1ea99d3f461e 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx @@ -44,7 +44,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data which is // stored in the local primitive list. Default creates a yellow replacement rectangle. - virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/sdr/contact/viewcontactofgraphic.hxx index d3657e5e4b37..e9e590cf7c3a 100644 --- a/svx/inc/sdr/contact/viewcontactofgraphic.hxx +++ b/svx/inc/sdr/contact/viewcontactofgraphic.hxx @@ -45,7 +45,7 @@ namespace sdr protected: // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; public: // access to SdrObject @@ -72,7 +72,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewcontactofgroup.hxx b/svx/inc/sdr/contact/viewcontactofgroup.hxx index b21b31ac8cca..db910e40d090 100644 --- a/svx/inc/sdr/contact/viewcontactofgroup.hxx +++ b/svx/inc/sdr/contact/viewcontactofgroup.hxx @@ -34,7 +34,7 @@ namespace sdr // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. Default is to create // a standard ViewObjectContact containing the given ObjectContact and *this - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; // internal access to SdrObject const SdrObjGroup& GetSdrObjGroup() const @@ -50,7 +50,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx index 296d12710d0b..5c6671f932bf 100644 --- a/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx +++ b/svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx @@ -40,10 +40,10 @@ namespace sdr sdr::MasterPageDescriptor& mrMasterPageDescriptor; // Create a Object-Specific ViewObjectContact - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; // This method is responsible for creating the graphical visualisation data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; public: // basic constructor @@ -59,9 +59,9 @@ namespace sdr } // Access to possible sub-hierarchy and parent - virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE; - virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; - virtual ViewContact* GetParentContact() const SAL_OVERRIDE; + virtual sal_uInt32 GetObjectCount() const override; + virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const override; + virtual ViewContact* GetParentContact() const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewcontactofopenglobj.hxx b/svx/inc/sdr/contact/viewcontactofopenglobj.hxx index 05a80b1565d2..cebef7a3b362 100644 --- a/svx/inc/sdr/contact/viewcontactofopenglobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofopenglobj.hxx @@ -24,9 +24,9 @@ public: virtual ~ViewContactOfOpenGLObj(); protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; }; } // namespace contact diff --git a/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx index df6ea2fa78d4..7dfea4e176d2 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx @@ -45,7 +45,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx index a95e9294a4c9..d64615a36d00 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx @@ -45,7 +45,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx index b687acbb8235..87b432ebf889 100644 --- a/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx @@ -45,7 +45,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx index 2e505e36ec0f..6d2ab6645231 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx @@ -45,7 +45,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx index af8cb3b01840..df30d0f9f2fb 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx @@ -48,7 +48,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx index 1e1c8959fb85..13ab44e81c38 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx @@ -37,7 +37,7 @@ private: protected: // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; public: // access to SdrOle2Obj @@ -60,14 +60,14 @@ public: drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceWithParameters() const; // #i123539# get rid of buffered chart content (if there) on change - virtual void ActionChanged() SAL_OVERRIDE; + virtual void ActionChanged() override; - virtual basegfx::B2DRange getRange( const drawinglayer::geometry::ViewInformation2D& rViewInfo2D ) const SAL_OVERRIDE; + virtual basegfx::B2DRange getRange( const drawinglayer::geometry::ViewInformation2D& rViewInfo2D ) const override; protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data, just wraps to call createPrimitive2DSequenceWithParameters(false) - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; }; }} diff --git a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx index 90d9401b0cd8..240595707cf8 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx @@ -38,15 +38,15 @@ public: explicit ViewContactOfPageSubObject(ViewContactOfSdrPage& rParentViewContactOfSdrPage); virtual ~ViewContactOfPageSubObject(); - virtual ViewContact* GetParentContact() const SAL_OVERRIDE; + virtual ViewContact* GetParentContact() const override; const SdrPage& getPage() const; }; class ViewContactOfPageBackground : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; public: explicit ViewContactOfPageBackground(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -56,8 +56,8 @@ public: class ViewContactOfPageShadow : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; public: explicit ViewContactOfPageShadow(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -67,8 +67,8 @@ public: class ViewContactOfPageFill : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; public: explicit ViewContactOfPageFill(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -78,8 +78,8 @@ public: class ViewContactOfMasterPage : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; public: explicit ViewContactOfMasterPage(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -89,8 +89,8 @@ public: class ViewContactOfOuterPageBorder : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; public: explicit ViewContactOfOuterPageBorder(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -100,8 +100,8 @@ public: class ViewContactOfInnerPageBorder : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; public: explicit ViewContactOfInnerPageBorder(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -118,15 +118,15 @@ public: class ViewContactOfPageHierarchy : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; public: explicit ViewContactOfPageHierarchy(ViewContactOfSdrPage& rParentViewContactOfSdrPage); virtual ~ViewContactOfPageHierarchy(); - virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE; - virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; + virtual sal_uInt32 GetObjectCount() const override; + virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const override; }; class ViewContactOfGrid : public ViewContactOfPageSubObject @@ -135,8 +135,8 @@ protected: // bitfield bool mbFront : 1; - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; public: ViewContactOfGrid(ViewContactOfSdrPage& rParentViewContactOfSdrPage, bool bFront); @@ -151,8 +151,8 @@ protected: // bitfield bool mbFront : 1; - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; public: ViewContactOfHelplines(ViewContactOfSdrPage& rParentViewContactOfSdrPage, bool bFront); @@ -184,7 +184,7 @@ protected: // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. Default is to create // a standard ViewObjectContact containing the given ObjectContact and *this - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; public: // access to SdrObject @@ -198,16 +198,16 @@ public: virtual ~ViewContactOfSdrPage(); // Access to possible sub-hierarchy - virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE; - virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; + virtual sal_uInt32 GetObjectCount() const override; + virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const override; // React on changes of the object of this ViewContact - virtual void ActionChanged() SAL_OVERRIDE; + virtual void ActionChanged() override; protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; }; }} diff --git a/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx index c9d03d285913..b45444507598 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx @@ -45,7 +45,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx index 3e271d1bde79..bc11faf8a35b 100644 --- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx @@ -70,7 +70,7 @@ namespace sdr { namespace contact { getTemporaryControlForWindow( const vcl::Window& _rWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer ) const; protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ) SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ) override; private: ViewContactOfUnoControl( const ViewContactOfUnoControl& ) = delete; @@ -79,7 +79,7 @@ namespace sdr { namespace contact { protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; }; diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx index 0781313ec44b..800638914d64 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx @@ -48,7 +48,7 @@ namespace sdr // also override the 2d method to deliver a 2d object with embedd3d 3d and the 3d transformation which is able to // answer the get2DRange question accordingly - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; public: ViewObjectContactOfE3d(ObjectContact& rObjectContact, ViewContact& rViewContact); diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx index 013bec8af903..1745ff987a0c 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx @@ -33,7 +33,7 @@ namespace sdr { protected: // 2d primitive creator - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; public: // basic constructor. @@ -42,7 +42,7 @@ namespace sdr // process this primitive: Eventually also recursively travel an existing hierarchy, // e.g. for group objects, scenes or pages. This method will test geometrical visibility. - virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx index 14e472ace2d0..17d7cbd190a5 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx @@ -54,7 +54,7 @@ namespace sdr SdrGrafObj& getSdrGrafObj(); // This method is responsible for creating the graphical visualisation data - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; public: ViewObjectContactOfGraphic(ObjectContact& rObjectContact, ViewContact& rViewContact); diff --git a/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx index ba37beee7f94..95380d3faab3 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofgroup.hxx @@ -34,10 +34,10 @@ namespace sdr virtual ~ViewObjectContactOfGroup(); // This method recursively paints the draw hierarchy. - virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const override; private: - virtual bool isPrimitiveVisibleOnAnyLayer(const SetOfByte& aLayers) const SAL_OVERRIDE; + virtual bool isPrimitiveVisibleOnAnyLayer(const SetOfByte& aLayers) const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx index 2a6e179f0684..4a434551b082 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx @@ -39,8 +39,8 @@ namespace sdr // access to MasterPageDescriptor sdr::MasterPageDescriptor& GetMasterPageDescriptor() const; - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; - virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; + virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx index 25b66a5e2a6c..8b9a3217012c 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx @@ -32,7 +32,7 @@ protected: const SdrOle2Obj& getSdrOle2Object() const; // This method is responsible for creating the graphical visualisation data - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; public: ViewObjectContactOfSdrOle2Obj(ObjectContact& rObjectContact, ViewContact& rViewContact); diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx index d0dd9abdec30..2c664c7b4545 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx @@ -37,8 +37,8 @@ namespace sdr ViewObjectContactOfPageSubObject(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageSubObject(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; - virtual bool isPrimitiveGhosted(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; + virtual bool isPrimitiveGhosted(const DisplayInfo& rDisplayInfo) const override; }; } // end of namespace contact } // end of namespace sdr @@ -50,13 +50,13 @@ namespace sdr class SVX_DLLPUBLIC ViewObjectContactOfPageBackground : public ViewObjectContactOfPageSubObject { protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; public: ViewObjectContactOfPageBackground(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageBackground(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; }; } // end of namespace contact } // end of namespace sdr @@ -72,7 +72,7 @@ namespace sdr ViewObjectContactOfMasterPage(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfMasterPage(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; }; } // end of namespace contact } // end of namespace sdr @@ -84,13 +84,13 @@ namespace sdr class SVX_DLLPUBLIC ViewObjectContactOfPageFill : public ViewObjectContactOfPageSubObject { protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; public: ViewObjectContactOfPageFill(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageFill(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; }; } // end of namespace contact } // end of namespace sdr @@ -105,7 +105,7 @@ namespace sdr ViewObjectContactOfPageShadow(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageShadow(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; }; } // end of namespace contact } // end of namespace sdr @@ -120,7 +120,7 @@ namespace sdr ViewObjectContactOfOuterPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfOuterPageBorder(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; }; } // end of namespace contact } // end of namespace sdr @@ -135,7 +135,7 @@ namespace sdr ViewObjectContactOfInnerPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfInnerPageBorder(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; }; } // end of namespace contact } // end of namespace sdr @@ -150,7 +150,7 @@ namespace sdr ViewObjectContactOfPageHierarchy(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageHierarchy(); - virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const override; }; } // end of namespace contact } // end of namespace sdr @@ -162,13 +162,13 @@ namespace sdr class SVX_DLLPUBLIC ViewObjectContactOfPageGrid : public ViewObjectContactOfPageSubObject { protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; public: ViewObjectContactOfPageGrid(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageGrid(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; }; } // end of namespace contact } // end of namespace sdr @@ -180,13 +180,13 @@ namespace sdr class SVX_DLLPUBLIC ViewObjectContactOfPageHelplines : public ViewObjectContactOfPageSubObject { protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; public: ViewObjectContactOfPageHelplines(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageHelplines(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; }; } // end of namespace contact } // end of namespace sdr @@ -201,7 +201,7 @@ namespace sdr ViewObjectContactOfSdrPage(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfSdrPage(); - virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const override; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx index 25a7229c5200..395baf04ce79 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -81,7 +81,7 @@ namespace sdr { namespace contact { /** React on changes of the object of this ViewContact */ - virtual void ActionChanged() SAL_OVERRIDE; + virtual void ActionChanged() override; /** to be called when any aspect of the control which requires view updates changed */ @@ -92,10 +92,10 @@ namespace sdr { namespace contact { virtual ~ViewObjectContactOfUnoControl(); // support for Primitive2D - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; // visibility check - virtual bool isPrimitiveVisible( const DisplayInfo& _rDisplayInfo ) const SAL_OVERRIDE; + virtual bool isPrimitiveVisible( const DisplayInfo& _rDisplayInfo ) const override; /// to be called when any aspect of the control which requires view updates changed void impl_onControlChangedOrModified(); @@ -114,7 +114,7 @@ namespace sdr { namespace contact { UnoControlPrintOrPreviewContact( const UnoControlPrintOrPreviewContact& ) = delete; UnoControlPrintOrPreviewContact& operator=( const UnoControlPrintOrPreviewContact& ) = delete; - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const override; }; diff --git a/svx/inc/sdr/overlay/overlaycrosshair.hxx b/svx/inc/sdr/overlay/overlaycrosshair.hxx index 12e9a2ae3e3b..afe49f76849a 100644 --- a/svx/inc/sdr/overlay/overlaycrosshair.hxx +++ b/svx/inc/sdr/overlay/overlaycrosshair.hxx @@ -32,14 +32,14 @@ namespace sdr { protected: // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; public: explicit OverlayCrosshairStriped(const basegfx::B2DPoint& rBasePos); virtual ~OverlayCrosshairStriped(); // react on stripe definition change - virtual void stripeDefinitionHasChanged() SAL_OVERRIDE; + virtual void stripeDefinitionHasChanged() override; }; } // end of namespace overlay } // end of namespace sdr diff --git a/svx/inc/sdr/overlay/overlayhandle.hxx b/svx/inc/sdr/overlay/overlayhandle.hxx index 60d7e54418f4..6bde7350cf82 100644 --- a/svx/inc/sdr/overlay/overlayhandle.hxx +++ b/svx/inc/sdr/overlay/overlayhandle.hxx @@ -24,7 +24,7 @@ protected: Color maStrokeColor; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; public: OverlayHandle(const basegfx::B2DPoint& rBasePos, diff --git a/svx/inc/sdr/overlay/overlayhelpline.hxx b/svx/inc/sdr/overlay/overlayhelpline.hxx index 287d0336a836..054d348b24cd 100644 --- a/svx/inc/sdr/overlay/overlayhelpline.hxx +++ b/svx/inc/sdr/overlay/overlayhelpline.hxx @@ -36,7 +36,7 @@ namespace sdr SdrHelpLineKind meKind; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; public: explicit OverlayHelplineStriped( @@ -48,7 +48,7 @@ namespace sdr SdrHelpLineKind getKind() const { return meKind; } // react on stripe definition change - virtual void stripeDefinitionHasChanged() SAL_OVERRIDE; + virtual void stripeDefinitionHasChanged() override; }; } // end of namespace overlay } // end of namespace sdr diff --git a/svx/inc/sdr/overlay/overlayline.hxx b/svx/inc/sdr/overlay/overlayline.hxx index 71f7aa38c8f2..9738a8d0a936 100644 --- a/svx/inc/sdr/overlay/overlayline.hxx +++ b/svx/inc/sdr/overlay/overlayline.hxx @@ -35,7 +35,7 @@ namespace sdr basegfx::B2DPoint maSecondPosition; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; public: OverlayLineStriped( @@ -47,7 +47,7 @@ namespace sdr const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; } // react on stripe definition change - virtual void stripeDefinitionHasChanged() SAL_OVERRIDE; + virtual void stripeDefinitionHasChanged() override; }; } // end of namespace overlay } // end of namespace sdr diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx index 5fd9096e87f1..43b39c80f0d3 100644 --- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx +++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx @@ -74,16 +74,16 @@ namespace sdr bool bRefreshWithPreRendering = false); // complete redraw - virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = 0L) const SAL_OVERRIDE; + virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = 0L) const override; // flush. Do buffered updates. - virtual void flush() SAL_OVERRIDE; + virtual void flush() override; // restore part of background. Implemented form buffered versions only. - virtual void restoreBackground(const vcl::Region& rRegion) const SAL_OVERRIDE; + virtual void restoreBackground(const vcl::Region& rRegion) const override; // invalidate the given range at local OutputDevice - virtual void invalidateRange(const basegfx::B2DRange& rRange) SAL_OVERRIDE; + virtual void invalidateRange(const basegfx::B2DRange& rRange) override; // access to RefreshWithPreRendering Flag bool DoRefreshWithPreRendering() const { return mbRefreshWithPreRendering; } diff --git a/svx/inc/sdr/overlay/overlayrectangle.hxx b/svx/inc/sdr/overlay/overlayrectangle.hxx index 2a72b61755c4..1fcb805bde59 100644 --- a/svx/inc/sdr/overlay/overlayrectangle.hxx +++ b/svx/inc/sdr/overlay/overlayrectangle.hxx @@ -45,7 +45,7 @@ namespace sdr bool mbOverlayState : 1; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; public: OverlayRectangle( @@ -67,7 +67,7 @@ namespace sdr // execute event from base class sdr::animation::Event. Default // implementation does nothing and does not create a new event. - virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE; + virtual void Trigger(sal_uInt32 nTime) override; }; } // end of namespace overlay } // end of namespace sdr diff --git a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx index 2d43be42f1c1..ffc3eeceb195 100644 --- a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx +++ b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx @@ -42,7 +42,7 @@ namespace sdr bool mbShowBounds : 1; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; public: OverlayRollingRectangleStriped( @@ -63,7 +63,7 @@ namespace sdr bool getShowBounds() const { return mbShowBounds; } // react on stripe definition change - virtual void stripeDefinitionHasChanged() SAL_OVERRIDE; + virtual void stripeDefinitionHasChanged() override; }; } // end of namespace overlay } // end of namespace sdr diff --git a/svx/inc/sdr/overlay/overlaytools.hxx b/svx/inc/sdr/overlay/overlaytools.hxx index 9e74d689b722..f5b8c96de422 100644 --- a/svx/inc/sdr/overlay/overlaytools.hxx +++ b/svx/inc/sdr/overlay/overlaytools.hxx @@ -41,7 +41,7 @@ private: double mfRotation; protected: - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: OverlayStaticRectanglePrimitive( @@ -53,7 +53,7 @@ public: double fRotation); // compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; DeclPrimitive2DIDBlock() }; @@ -87,7 +87,7 @@ namespace drawinglayer double mfRotation; protected: - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: OverlayBitmapExPrimitive( @@ -107,7 +107,7 @@ namespace drawinglayer double getRotation() const { return mfRotation; } // compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; DeclPrimitive2DIDBlock() }; @@ -132,7 +132,7 @@ namespace drawinglayer double mfDiscreteDashLength; protected: - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: OverlayCrosshairPrimitive( @@ -148,7 +148,7 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } // compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; DeclPrimitive2DIDBlock() }; @@ -180,7 +180,7 @@ namespace drawinglayer double mfRotation; protected: - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: OverlayRectanglePrimitive( @@ -200,7 +200,7 @@ namespace drawinglayer double getRotation() const { return mfRotation; } // compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; DeclPrimitive2DIDBlock() }; @@ -236,7 +236,7 @@ namespace drawinglayer double mfDiscreteDashLength; protected: - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: OverlayHelplineStripedPrimitive( @@ -254,7 +254,7 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } // compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; DeclPrimitive2DIDBlock() }; @@ -281,7 +281,7 @@ namespace drawinglayer double mfDiscreteDashLength; protected: - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: OverlayRollingRectanglePrimitive( @@ -297,7 +297,7 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } // compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; DeclPrimitive2DIDBlock() }; diff --git a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx index f3c9c3b13314..2fd8ac5e9839 100644 --- a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx @@ -45,7 +45,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrCaptionPrimitive2D( @@ -56,7 +56,7 @@ namespace drawinglayer double fCornerRadiusY = 0.0); // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // data access const ::basegfx::B2DHomMatrix& getTransform() const { return maTransform; } diff --git a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx index 39b490382be3..6a3ef322b0bf 100644 --- a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx @@ -41,7 +41,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrConnectorPrimitive2D( @@ -53,7 +53,7 @@ namespace drawinglayer const ::basegfx::B2DPolygon& getUnitPolygon() const { return maUnitPolygon; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx index b1d5cd634246..f1780e817141 100644 --- a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx @@ -54,7 +54,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrCustomShapePrimitive2D( @@ -74,7 +74,7 @@ namespace drawinglayer bool isForceTextClipToTextRange() const { return mbForceTextClipToTextRange; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx index be6140d2c0cf..bc17ca962768 100644 --- a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx @@ -41,7 +41,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrEllipsePrimitive2D( @@ -53,7 +53,7 @@ namespace drawinglayer const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID DeclPrimitive2DIDBlock() @@ -79,7 +79,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrEllipseSegmentPrimitive2D( @@ -91,7 +91,7 @@ namespace drawinglayer bool bCloseUsingCenter); // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx index b7b22f6bcdbe..4275261ce202 100644 --- a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx @@ -44,7 +44,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrGrafPrimitive2D( @@ -61,7 +61,7 @@ namespace drawinglayer bool isTransparent() const; // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx index 480e6d82eab1..483a623d2d39 100644 --- a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx @@ -76,7 +76,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrMeasurePrimitive2D( @@ -110,7 +110,7 @@ namespace drawinglayer bool getTextAutoAngle() const { return mbTextAutoAngle; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx index 2fcf28e09f3c..14a42031ed3e 100644 --- a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx @@ -52,10 +52,10 @@ namespace drawinglayer const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // local decomposition. - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx index 6cbaa2878817..c8e6e54fb844 100644 --- a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx @@ -48,7 +48,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrOleContentPrimitive2D( @@ -58,10 +58,10 @@ namespace drawinglayer ); // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // The default implementation will use getDecomposition results to create the range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; // data access const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; } diff --git a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx index a8179fb53d3e..b997cace727b 100644 --- a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx @@ -43,7 +43,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrPathPrimitive2D( @@ -57,7 +57,7 @@ namespace drawinglayer const basegfx::B2DPolyPolygon& getUnitPolyPolygon() const { return maUnitPolyPolygon; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx index 729b680c160f..eb4bd91c14c4 100644 --- a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx @@ -47,7 +47,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrRectanglePrimitive2D( @@ -65,7 +65,7 @@ namespace drawinglayer bool getForceFillForHitTest() const { return mbForceFillForHitTest; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx index db10e0833ff4..1cb5edf1ab6e 100644 --- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -90,11 +90,11 @@ namespace drawinglayer const OutlinerParaObject& getOutlinerParaObject() const { return maOutlinerParaObject; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // own get2DDecomposition to take aspect of decomposition with or without spell checker // into account - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; // transformed clone operator virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const = 0; @@ -119,7 +119,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrContourTextPrimitive2D( @@ -133,10 +133,10 @@ namespace drawinglayer const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // transformed clone operator - virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE; + virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override; // provide unique ID DeclPrimitive2DIDBlock() @@ -161,7 +161,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrPathTextPrimitive2D( @@ -175,10 +175,10 @@ namespace drawinglayer const attribute::SdrFormTextAttribute& getSdrFormTextAttribute() const { return maSdrFormTextAttribute; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // transformed clone operator - virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE; + virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override; // provide unique ID DeclPrimitive2DIDBlock() @@ -211,7 +211,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrBlockTextPrimitive2D( @@ -237,10 +237,10 @@ namespace drawinglayer bool getClipOnBounds() const { return mbClipOnBounds; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // transformed clone operator - virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE; + virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override; // provide unique ID DeclPrimitive2DIDBlock() @@ -265,7 +265,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrStretchTextPrimitive2D( @@ -279,10 +279,10 @@ namespace drawinglayer bool isFixedCellHeight() const { return mbFixedCellHeight; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // transformed clone operator - virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE; + virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override; // provide unique ID DeclPrimitive2DIDBlock() @@ -306,7 +306,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrAutoFitTextPrimitive2D( @@ -320,10 +320,10 @@ namespace drawinglayer bool getWordWrap() const { return mbWordWrap; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // transformed clone operator - virtual SdrTextPrimitive2D* createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE; + virtual SdrTextPrimitive2D* createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const override; // provide unique ID DeclPrimitive2DIDBlock() @@ -343,7 +343,7 @@ namespace drawinglayer ::basegfx::B2DHomMatrix maTextRangeTransform; // text range transformation from unit range ([0.0 .. 1.0]) to text range protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrChainedTextPrimitive2D( @@ -356,10 +356,10 @@ namespace drawinglayer //bool getWordWrap() const { return true; } // XXX: Hack! Should have a proper implementation// // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // transformed clone operator - virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE; + virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/svx/inc/sdr/properties/attributeproperties.hxx b/svx/inc/sdr/properties/attributeproperties.hxx index 43073ff4d152..1eee80bcb6d5 100644 --- a/svx/inc/sdr/properties/attributeproperties.hxx +++ b/svx/inc/sdr/properties/attributeproperties.hxx @@ -43,13 +43,13 @@ namespace sdr SfxStyleSheet* mpStyleSheet; // create a new itemset - virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& pPool) SAL_OVERRIDE; + virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& pPool) override; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) override; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void ItemSetChanged(const SfxItemSet& rSet) override; public: // basic constructor @@ -59,31 +59,31 @@ namespace sdr AttributeProperties(const AttributeProperties& rProps, SdrObject& rObj); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // destructor virtual ~AttributeProperties(); // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; // get the installed StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; + virtual SfxStyleSheet* GetStyleSheet() const override; // Move properties to a new ItemPool. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) SAL_OVERRIDE; + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) override; // Set new model. - virtual void SetModel(SdrModel* pOldModel, SdrModel* pNewModel) SAL_OVERRIDE; + virtual void SetModel(SdrModel* pOldModel, SdrModel* pNewModel) override; // force all attributes which come from styles to hard attributes // to be able to live without the style. - virtual void ForceStyleToHardAttributes() SAL_OVERRIDE; + virtual void ForceStyleToHardAttributes() override; // This is the Notify(...) from 2nd base class SfxListener - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; - virtual bool isUsedByModel() const SAL_OVERRIDE; + virtual bool isUsedByModel() const override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/captionproperties.hxx b/svx/inc/sdr/properties/captionproperties.hxx index 7c2aea848820..a9b26f266c6f 100644 --- a/svx/inc/sdr/properties/captionproperties.hxx +++ b/svx/inc/sdr/properties/captionproperties.hxx @@ -32,10 +32,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; + virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void ItemSetChanged(const SfxItemSet& rSet) override; public: // basic constructor @@ -48,14 +48,14 @@ namespace sdr virtual ~CaptionProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes() SAL_OVERRIDE; + virtual void ForceDefaultAttributes() override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/circleproperties.hxx b/svx/inc/sdr/properties/circleproperties.hxx index 283b2851c584..50d315cc9168 100644 --- a/svx/inc/sdr/properties/circleproperties.hxx +++ b/svx/inc/sdr/properties/circleproperties.hxx @@ -32,10 +32,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; + virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void ItemSetChanged(const SfxItemSet& rSet) override; public: // basic constructor @@ -48,14 +48,14 @@ namespace sdr virtual ~CircleProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes() SAL_OVERRIDE; + virtual void ForceDefaultAttributes() override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/connectorproperties.hxx b/svx/inc/sdr/properties/connectorproperties.hxx index 5f7fb21798cd..d5ff377e6179 100644 --- a/svx/inc/sdr/properties/connectorproperties.hxx +++ b/svx/inc/sdr/properties/connectorproperties.hxx @@ -32,10 +32,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; + virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void ItemSetChanged(const SfxItemSet& rSet) override; public: // basic constructor @@ -48,10 +48,10 @@ namespace sdr virtual ~ConnectorProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/customshapeproperties.hxx b/svx/inc/sdr/properties/customshapeproperties.hxx index f2617cff1a86..184ecdae20e1 100644 --- a/svx/inc/sdr/properties/customshapeproperties.hxx +++ b/svx/inc/sdr/properties/customshapeproperties.hxx @@ -35,36 +35,36 @@ namespace sdr protected: // create a new itemset - virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; + virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // test changeability for a single item - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const SAL_OVERRIDE; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const override; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void ItemSetChanged(const SfxItemSet& rSet) override; // react on Item change - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem) SAL_OVERRIDE; + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem) override; // Called after ItemChange() is done for all items. Allows local reactions on // specific item changes - virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; + virtual void PostItemChange(const sal_uInt16 nWhich) override; // clear single item - virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; + virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) override; // clear single item direct, do not do any notifies or things like that. // Also supports complete deleteion of items when default parameter 0 is used. - virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; + virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) override; public: // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes() SAL_OVERRIDE; + virtual void ForceDefaultAttributes() override; // basic constructor explicit CustomShapeProperties(SdrObject& rObj); @@ -76,10 +76,10 @@ namespace sdr virtual ~CustomShapeProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // This is the notifyer from SfxListener - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/sdr/properties/e3dcompoundproperties.hxx index c73e0814d35d..788ce8323ab6 100644 --- a/svx/inc/sdr/properties/e3dcompoundproperties.hxx +++ b/svx/inc/sdr/properties/e3dcompoundproperties.hxx @@ -33,7 +33,7 @@ namespace sdr { protected: // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; + virtual void PostItemChange(const sal_uInt16 nWhich) override; public: // basic constructor @@ -46,20 +46,20 @@ namespace sdr virtual ~E3dCompoundProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // get itemset - virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; + virtual const SfxItemSet& GetObjectItemSet() const override; // Get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may // be overridden e.g for group objects to return a merged ItemSet of the object. // When using this method the returned ItemSet may contain items in the state // SfxItemState::DONTCARE which means there were several such items with different // values. - virtual const SfxItemSet& GetMergedItemSet() const SAL_OVERRIDE; + virtual const SfxItemSet& GetMergedItemSet() const override; // Set merged ItemSet. Normally, this maps to SetObjectItemSet(). - virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) SAL_OVERRIDE; + virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/e3dextrudeproperties.hxx b/svx/inc/sdr/properties/e3dextrudeproperties.hxx index 5b2f76bab22c..1f3d9bf2ab1c 100644 --- a/svx/inc/sdr/properties/e3dextrudeproperties.hxx +++ b/svx/inc/sdr/properties/e3dextrudeproperties.hxx @@ -32,7 +32,7 @@ namespace sdr { protected: // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; + virtual void PostItemChange(const sal_uInt16 nWhich) override; public: // basic constructor @@ -45,7 +45,7 @@ namespace sdr virtual ~E3dExtrudeProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/e3dlatheproperties.hxx b/svx/inc/sdr/properties/e3dlatheproperties.hxx index 381246477b40..9221816a10df 100644 --- a/svx/inc/sdr/properties/e3dlatheproperties.hxx +++ b/svx/inc/sdr/properties/e3dlatheproperties.hxx @@ -32,7 +32,7 @@ namespace sdr { protected: // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; + virtual void PostItemChange(const sal_uInt16 nWhich) override; public: // basic constructor @@ -45,7 +45,7 @@ namespace sdr virtual ~E3dLatheProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/e3dproperties.hxx b/svx/inc/sdr/properties/e3dproperties.hxx index c281eed8cd58..aee3be1e784e 100644 --- a/svx/inc/sdr/properties/e3dproperties.hxx +++ b/svx/inc/sdr/properties/e3dproperties.hxx @@ -32,10 +32,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; + virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void ItemSetChanged(const SfxItemSet& rSet) override; public: // basic constructor @@ -48,10 +48,10 @@ namespace sdr virtual ~E3dProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/e3dsceneproperties.hxx b/svx/inc/sdr/properties/e3dsceneproperties.hxx index 6d20504eb861..3aaf29ca6a05 100644 --- a/svx/inc/sdr/properties/e3dsceneproperties.hxx +++ b/svx/inc/sdr/properties/e3dsceneproperties.hxx @@ -32,7 +32,7 @@ namespace sdr { protected: // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; + virtual void PostItemChange(const sal_uInt16 nWhich) override; public: // basic constructor @@ -45,35 +45,35 @@ namespace sdr virtual ~E3dSceneProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // get itemset - virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; + virtual const SfxItemSet& GetObjectItemSet() const override; // get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may // be overridden e.g for group objects to return a merged ItemSet of the object. // When using this method the returned ItemSet may contain items in the state // SfxItemState::DONTCARE which means there were several such items with different // values. - virtual const SfxItemSet& GetMergedItemSet() const SAL_OVERRIDE; + virtual const SfxItemSet& GetMergedItemSet() const override; // Set merged ItemSet. Normally, this maps to SetObjectItemSet(). - virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) SAL_OVERRIDE; + virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) override; // Set a single item, iterate over hierarchies if necessary. - virtual void SetMergedItem(const SfxPoolItem& rItem) SAL_OVERRIDE; + virtual void SetMergedItem(const SfxPoolItem& rItem) override; // Clear a single item, iterate over hierarchies if necessary. - virtual void ClearMergedItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; + virtual void ClearMergedItem(const sal_uInt16 nWhich = 0) override; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; // get the installed StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; + virtual SfxStyleSheet* GetStyleSheet() const override; // Move properties to a new ItemPool. Default implementation does nothing. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) SAL_OVERRIDE; + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) override; // Special for scene: void SetSceneItemsFromCamera(); diff --git a/svx/inc/sdr/properties/e3dsphereproperties.hxx b/svx/inc/sdr/properties/e3dsphereproperties.hxx index 29eba7922a55..7fecf0cb42cd 100644 --- a/svx/inc/sdr/properties/e3dsphereproperties.hxx +++ b/svx/inc/sdr/properties/e3dsphereproperties.hxx @@ -32,7 +32,7 @@ namespace sdr { protected: // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; + virtual void PostItemChange(const sal_uInt16 nWhich) override; public: // basic constructor @@ -45,7 +45,7 @@ namespace sdr virtual ~E3dSphereProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/emptyproperties.hxx b/svx/inc/sdr/properties/emptyproperties.hxx index 4eb67a35711f..ae9e31e227ee 100644 --- a/svx/inc/sdr/properties/emptyproperties.hxx +++ b/svx/inc/sdr/properties/emptyproperties.hxx @@ -35,19 +35,19 @@ namespace sdr SfxItemSet* mpEmptyItemSet; // create a new itemset - virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; + virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // test changeability for a single item - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const SAL_OVERRIDE; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const override; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) override; // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; + virtual void PostItemChange(const sal_uInt16 nWhich) override; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void ItemSetChanged(const SfxItemSet& rSet) override; public: // basic constructor @@ -60,32 +60,32 @@ namespace sdr virtual ~EmptyProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // get itemset - virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; + virtual const SfxItemSet& GetObjectItemSet() const override; // set single item - virtual void SetObjectItem(const SfxPoolItem& rItem) SAL_OVERRIDE; + virtual void SetObjectItem(const SfxPoolItem& rItem) override; // set single item direct, do not do any notifies or things like that - virtual void SetObjectItemDirect(const SfxPoolItem& rItem) SAL_OVERRIDE; + virtual void SetObjectItemDirect(const SfxPoolItem& rItem) override; // clear single item - virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; + virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) override; // clear single item direct, do not do any notifies or things like that. // Also supports complete deleteion of items when default parameter 0 is used. - virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; + virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) override; // set complete item set - virtual void SetObjectItemSet(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void SetObjectItemSet(const SfxItemSet& rSet) override; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; // get the installed StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; + virtual SfxStyleSheet* GetStyleSheet() const override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/graphicproperties.hxx b/svx/inc/sdr/properties/graphicproperties.hxx index 0a09658e6a10..c8d7b1fa3603 100644 --- a/svx/inc/sdr/properties/graphicproperties.hxx +++ b/svx/inc/sdr/properties/graphicproperties.hxx @@ -32,10 +32,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; + virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void ItemSetChanged(const SfxItemSet& rSet) override; public: // basic constructor @@ -48,14 +48,14 @@ namespace sdr virtual ~GraphicProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes() SAL_OVERRIDE; + virtual void ForceDefaultAttributes() override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/groupproperties.hxx b/svx/inc/sdr/properties/groupproperties.hxx index b4aef60f0ff0..73ff23ec2b1f 100644 --- a/svx/inc/sdr/properties/groupproperties.hxx +++ b/svx/inc/sdr/properties/groupproperties.hxx @@ -32,19 +32,19 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; + virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // test changeability for a single item - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const SAL_OVERRIDE; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const override; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) override; // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; + virtual void PostItemChange(const sal_uInt16 nWhich) override; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void ItemSetChanged(const SfxItemSet& rSet) override; public: // basic constructor @@ -57,59 +57,59 @@ namespace sdr virtual ~GroupProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // get itemset - virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; + virtual const SfxItemSet& GetObjectItemSet() const override; // get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may // be overridden e.g for group objects to return a merged ItemSet of the object. // When using this method the returned ItemSet may contain items in the state // SfxItemState::DONTCARE which means there were several such items with different // values. - virtual const SfxItemSet& GetMergedItemSet() const SAL_OVERRIDE; + virtual const SfxItemSet& GetMergedItemSet() const override; // Set merged ItemSet. Normally, this maps to SetObjectItemSet(). - virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) SAL_OVERRIDE; + virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) override; // set single item - virtual void SetObjectItem(const SfxPoolItem& rItem) SAL_OVERRIDE; + virtual void SetObjectItem(const SfxPoolItem& rItem) override; // set single item direct, do not do any notifies or things like that - virtual void SetObjectItemDirect(const SfxPoolItem& rItem) SAL_OVERRIDE; + virtual void SetObjectItemDirect(const SfxPoolItem& rItem) override; // clear single item - virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; + virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) override; // clear single item direct, do not do any notifies or things like that. // Also supports complete deleteion of items when default parameter 0 is used. - virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; + virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) override; // Set a single item, iterate over hierarchies if necessary. - virtual void SetMergedItem(const SfxPoolItem& rItem) SAL_OVERRIDE; + virtual void SetMergedItem(const SfxPoolItem& rItem) override; // Clear a single item, iterate over hierarchies if necessary. - virtual void ClearMergedItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; + virtual void ClearMergedItem(const sal_uInt16 nWhich = 0) override; // set complete item set - virtual void SetObjectItemSet(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void SetObjectItemSet(const SfxItemSet& rSet) override; // set a new StyleSheet - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; // get the local StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; + virtual SfxStyleSheet* GetStyleSheet() const override; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes() SAL_OVERRIDE; + virtual void ForceDefaultAttributes() override; // Move properties to a new ItemPool. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) SAL_OVERRIDE; + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) override; // force all attributes which come from styles to hard attributes // to be able to live without the style. - virtual void ForceStyleToHardAttributes() SAL_OVERRIDE; + virtual void ForceStyleToHardAttributes() override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/measureproperties.hxx b/svx/inc/sdr/properties/measureproperties.hxx index 9fade1b40955..4fce2bb48beb 100644 --- a/svx/inc/sdr/properties/measureproperties.hxx +++ b/svx/inc/sdr/properties/measureproperties.hxx @@ -32,10 +32,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; + virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void ItemSetChanged(const SfxItemSet& rSet) override; public: // basic constructor @@ -48,14 +48,14 @@ namespace sdr virtual ~MeasureProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes() SAL_OVERRIDE; + virtual void ForceDefaultAttributes() override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/oleproperties.hxx b/svx/inc/sdr/properties/oleproperties.hxx index 8f608bc3e50f..d6791cc3f11d 100644 --- a/svx/inc/sdr/properties/oleproperties.hxx +++ b/svx/inc/sdr/properties/oleproperties.hxx @@ -42,11 +42,11 @@ namespace sdr virtual ~OleProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes() SAL_OVERRIDE; + virtual void ForceDefaultAttributes() override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/pageproperties.hxx b/svx/inc/sdr/properties/pageproperties.hxx index 7de1a930abea..67cd908f1d7d 100644 --- a/svx/inc/sdr/properties/pageproperties.hxx +++ b/svx/inc/sdr/properties/pageproperties.hxx @@ -32,13 +32,13 @@ namespace sdr { protected: // create a new object specific itemset with object specific ranges. - virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& pPool) SAL_OVERRIDE; + virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& pPool) override; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) override; // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; + virtual void PostItemChange(const sal_uInt16 nWhich) override; public: // basic constructor @@ -51,17 +51,17 @@ namespace sdr virtual ~PageProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // get itemset. Override here to allow creating the empty itemset // without asserting - virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; + virtual const SfxItemSet& GetObjectItemSet() const override; // get the installed StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; + virtual SfxStyleSheet* GetStyleSheet() const override; // clear single item - virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; + virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/rectangleproperties.hxx b/svx/inc/sdr/properties/rectangleproperties.hxx index caf56beac2ff..925c5c4b53e7 100644 --- a/svx/inc/sdr/properties/rectangleproperties.hxx +++ b/svx/inc/sdr/properties/rectangleproperties.hxx @@ -32,7 +32,7 @@ namespace sdr { protected: // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void ItemSetChanged(const SfxItemSet& rSet) override; public: // basic constructor @@ -45,10 +45,10 @@ namespace sdr virtual ~RectangleProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/sdr/properties/textproperties.hxx b/svx/inc/sdr/properties/textproperties.hxx index 6a04900f6bb8..16875d46db6a 100644 --- a/svx/inc/sdr/properties/textproperties.hxx +++ b/svx/inc/sdr/properties/textproperties.hxx @@ -37,13 +37,13 @@ namespace sdr protected: // create a new itemset - virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; + virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) override; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void ItemSetChanged(const SfxItemSet& rSet) override; /// Get the TextProvider related to our SdrObject virtual const svx::ITextProvider& getTextProvider() const; @@ -59,28 +59,28 @@ namespace sdr virtual ~TextProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes() SAL_OVERRIDE; + virtual void ForceDefaultAttributes() override; // force all attributes which come from styles to hard attributes // to be able to live without the style. - virtual void ForceStyleToHardAttributes() SAL_OVERRIDE; + virtual void ForceStyleToHardAttributes() override; // This is the notifyer from SfxListener - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; // Set single item at the local ItemSet. *Does not use* AllowItemChange(), // ItemChange(), PostItemChange() and ItemSetChanged() calls. void SetObjectItemNoBroadcast(const SfxPoolItem& rItem); // #i101556# versioning support - virtual sal_uInt32 getVersion() const SAL_OVERRIDE; + virtual sal_uInt32 getVersion() const override; }; } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index 2280d3183f13..b59a85fd4d1c 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -57,19 +57,19 @@ private: void ImpRestoreWhich(); protected: - virtual long GetRowCount() const SAL_OVERRIDE; - virtual bool SeekRow(long nRow) SAL_OVERRIDE; - virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const SAL_OVERRIDE; - virtual void DoubleClick(const BrowserMouseEvent&) SAL_OVERRIDE; - virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE; - virtual void Select() SAL_OVERRIDE; + virtual long GetRowCount() const override; + virtual bool SeekRow(long nRow) override; + virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const override; + virtual void DoubleClick(const BrowserMouseEvent&) override; + virtual void KeyInput(const KeyEvent& rEvt) override; + virtual void Select() override; void SetDirty(); // is called for example in mode switches - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) SAL_OVERRIDE; - virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) SAL_OVERRIDE; + virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override; + virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override; public: _SdrItemBrowserControl(vcl::Window* pParent, WinBits nBits=WB_3DLOOK|WB_BORDER|WB_TABSTOP); virtual ~_SdrItemBrowserControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void Clear(); void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL); sal_uIntPtr GetCurrentPos() const; @@ -86,7 +86,7 @@ public: @return the text out of the cell */ - virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const SAL_OVERRIDE; + virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const override; const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; } OUString GetNewEntryValue() const { return pEditControl->GetText(); } @@ -102,9 +102,9 @@ class _SdrItemBrowserWindow: public FloatingWindow { public: _SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits=WB_STDSIZEABLEDOCKWIN); virtual ~_SdrItemBrowserWindow(); - virtual void dispose() SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; + virtual void dispose() override; + virtual void Resize() override; + virtual void GetFocus() override; void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL) { aBrowse->SetAttributes(pAttr,p2ndSet); } _SdrItemBrowserControl *GetBrowserControl() { return aBrowse.get(); } }; diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx index be018c7fe65f..de2e65c3e274 100644 --- a/svx/inc/sxcikitm.hxx +++ b/svx/inc/sxcikitm.hxx @@ -32,16 +32,16 @@ public: TYPEINFO_OVERRIDE(); SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {} SdrCircKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CIRCKIND,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // { return 4; } + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; + virtual sal_uInt16 GetValueCount() const override; // { return 4; } SdrCircKind GetValue() const { return (SdrCircKind)SfxEnumItem::GetValue(); } - 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 ) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; }; #endif diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx index 2c6b5261d828..1ee199428733 100644 --- a/svx/inc/sxmkitm.hxx +++ b/svx/inc/sxmkitm.hxx @@ -32,16 +32,16 @@ public: TYPEINFO_OVERRIDE(); SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {} SdrMeasureKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREKIND,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // { return 2; } + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; + virtual sal_uInt16 GetValueCount() const override; // { return 2; } SdrMeasureKind GetValue() const { return (SdrMeasureKind)SfxEnumItem::GetValue(); } - 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 ) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; }; #endif diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx index 64c4718057b0..4a22a96ac409 100644 --- a/svx/inc/tbunosearchcontrollers.hxx +++ b/svx/inc/tbunosearchcontrollers.hxx @@ -47,7 +47,7 @@ public: css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::uno::XComponentContext >& xContext ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; void Remember_Impl(const OUString& rStr); void SetTextToSelected_Impl(); @@ -92,26 +92,26 @@ public: virtual ~FindTextToolbarController(); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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 sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // 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; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; // XToolbarController - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; DECL_LINK(EditModifyHdl, void*); @@ -132,26 +132,26 @@ public: virtual ~ExitSearchToolboxController(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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 sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // 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; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException, std::exception ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override; }; class UpDownSearchToolboxController : public svt::ToolboxController, @@ -164,26 +164,26 @@ public: virtual ~UpDownSearchToolboxController(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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 sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // 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; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException, std::exception ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override; private: Type meType; @@ -197,26 +197,26 @@ public: virtual ~MatchCaseToolboxController(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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 sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // 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; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XToolbarController - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override; private: VclPtr m_pMatchCaseControl; @@ -230,26 +230,26 @@ public: virtual ~FindAllToolboxController(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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 sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // 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; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException, std::exception ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override; }; class SearchLabelToolboxController : public svt::ToolboxController, @@ -260,26 +260,26 @@ public: virtual ~SearchLabelToolboxController(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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 sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // 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; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XToolbarController - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override; }; // protocol handler for "vnd.sun.star.findbar:*" URLs @@ -296,26 +296,26 @@ public: virtual ~FindbarDispatcher(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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 sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; // XDispatchProvider - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) 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 >& lDescriptions ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) 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 >& lDescriptions ) throw( css::uno::RuntimeException, std::exception ) override; // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) override; private: diff --git a/svx/inc/unomlstr.hxx b/svx/inc/unomlstr.hxx index 103f311e3a60..f722f136a710 100644 --- a/svx/inc/unomlstr.hxx +++ b/svx/inc/unomlstr.hxx @@ -34,10 +34,10 @@ public: virtual ~SvxUnoShapeModifyListener() throw(); // ::com::sun::star::util::XModifyListener - virtual void SAL_CALL modified(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL modified(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception) override; // ::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; + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception) override; // internal void invalidate() throw(); -- cgit