diff options
Diffstat (limited to 'svx/inc/sdr/contact')
27 files changed, 105 insertions, 105 deletions
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; }; |