diff options
Diffstat (limited to 'include/svx/sdr/contact')
10 files changed, 33 insertions, 33 deletions
diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx index c3f55b884fc2..d9ee440f0272 100644 --- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -58,8 +58,8 @@ protected: const SdrPage* mpProcessedPage; // Hierarchy access methods - virtual sal_uInt32 GetPaintObjectCount() const SAL_OVERRIDE; - virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; + virtual sal_uInt32 GetPaintObjectCount() const override; + virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const override; public: // basic constructor/destructor @@ -70,18 +70,18 @@ public: virtual ~ObjectContactOfObjListPainter(); // Process the whole displaying - virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) SAL_OVERRIDE; + virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) 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; - virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE; + virtual OutputDevice* TryToGetOutputDevice() const override; }; class ObjectContactOfPagePainter : public ObjectContactPainter @@ -94,8 +94,8 @@ protected: SdrPageWeakRef mxStartPage; // Hierarchy access methods - virtual sal_uInt32 GetPaintObjectCount() const SAL_OVERRIDE; - virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; + virtual sal_uInt32 GetPaintObjectCount() const override; + virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const override; public: // basic constructor @@ -108,7 +108,7 @@ public: void SetStartPage(const SdrPage* pPage); const SdrPage* GetStartPage() const { return mxStartPage.get(); } - virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE; + virtual OutputDevice* TryToGetOutputDevice() const override; }; }} diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx index e59e1576dfaa..1b0aee383c5a 100644 --- a/include/svx/sdr/contact/viewcontactofe3d.hxx +++ b/include/svx/sdr/contact/viewcontactofe3d.hxx @@ -42,7 +42,7 @@ class ViewContactOfE3d : public ViewContactOfSdrObj 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: // basic constructor, used from E3dObject. @@ -76,7 +76,7 @@ protected: // This method is responsible for creating the graphical visualisation data derived ONLY from // the model data. The default implementation will try to create a 3D to 2D embedding (will work // when scene is known) which can then be used for 2D processing concerning ranges - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; public: // access to the local primitive without the object's local 3D transform. This is e.g. needed diff --git a/include/svx/sdr/contact/viewcontactofe3dscene.hxx b/include/svx/sdr/contact/viewcontactofe3dscene.hxx index ac47997c4a4e..b860417bedd4 100644 --- a/include/svx/sdr/contact/viewcontactofe3dscene.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dscene.hxx @@ -40,7 +40,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: // basic constructor, used from SdrObject. @@ -53,7 +53,7 @@ public: } // React on changes of the object of this ViewContact - virtual void ActionChanged() SAL_OVERRIDE; + virtual void ActionChanged() override; // access to ViewInformation3D and ObjectTransformation const drawinglayer::geometry::ViewInformation3D& getViewInformation3D(const ::basegfx::B3DRange& rContentRange) const; @@ -94,7 +94,7 @@ 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/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx index d4a5d5177d62..874b2140d4f8 100644 --- a/include/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx @@ -33,17 +33,17 @@ class SVX_DLLPUBLIC ViewContactOfPageObj : public ViewContactOfSdrObj 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; // create graphical visualisation data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; public: // basic constructor, used from SdrObject. explicit ViewContactOfPageObj(SdrPageObj& rPageObj); virtual ~ViewContactOfPageObj(); // #WIP# React on changes of the object of this ViewContact - virtual void ActionChanged() SAL_OVERRIDE; + virtual void ActionChanged() override; // access to SdrObject const SdrPageObj& GetPageObj() const diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index d3490a7eb90f..e440ee67a4af 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -56,7 +56,7 @@ 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; // get notified if some properties have changed void mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState ); @@ -64,7 +64,7 @@ protected: 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/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx index 6d21e48b0e42..724865ed8905 100644 --- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx @@ -44,7 +44,7 @@ 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 @@ -58,26 +58,26 @@ public: virtual ~ViewContactOfSdrObj(); // Access to possible sub-hierarchy - 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; // React on changes of the object of this ViewContact - virtual void ActionChanged() SAL_OVERRIDE; + virtual void ActionChanged() override; /// override for accessing the SdrObject - virtual SdrObject* TryToGetSdrObject() const SAL_OVERRIDE; + virtual SdrObject* TryToGetSdrObject() const override; // primitive stuff // add Gluepoints (if available) - virtual drawinglayer::primitive2d::Primitive2DSequence createGluePointPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createGluePointPrimitive2DSequence() const override; // allow embedding if needed (e.g. for SdrObjects, evtl. Name, Title and description get added). This // is a helper normally used from getViewIndependentPrimitive2DSequence(), but there is one exception // for 3D scenes - virtual drawinglayer::primitive2d::Primitive2DSequence embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const override; }; }} diff --git a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx index 2b6e02e848e8..c5fad1af395e 100644 --- a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx @@ -42,7 +42,7 @@ public: 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/include/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx index b9cef1c2736b..96b0da316d8a 100644 --- a/include/svx/sdr/contact/viewcontactofvirtobj.hxx +++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx @@ -39,12 +39,12 @@ public: virtual ~ViewContactOfVirtObj(); // Access to possible sub-hierarchy - virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE; + virtual sal_uInt32 GetObjectCount() const 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/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx index 129d4355e68a..a4d3ff3e616f 100644 --- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx @@ -38,7 +38,7 @@ protected: // This method is responsible for creating the graphical visualisation data which is // stored/cached in the local primitive. // This method will not handle included hierarchies and not check geometric visibility. - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; public: ViewObjectContactOfPageObj(ObjectContact& rObjectContact, ViewContact& rViewContact); diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx index 4d9d7049e88d..9bd6e5ee516d 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx @@ -46,7 +46,7 @@ public: ViewObjectContactOfSdrObj(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfSdrObj(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; /** retrieves the device which a PageView belongs to, starting from its ObjectContactOfPageView |