diff options
Diffstat (limited to 'include/svx/sdr/contact')
37 files changed, 139 insertions, 139 deletions
diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx index 39ac83044e53..7489cfffe131 100644 --- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -73,8 +73,8 @@ namespace sdr const SdrPage* mpProcessedPage; // Hierarchy access methods - virtual sal_uInt32 GetPaintObjectCount() const; - virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const; + virtual sal_uInt32 GetPaintObjectCount() const SAL_OVERRIDE; + virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; public: // basic constructor/destructor @@ -85,19 +85,19 @@ namespace sdr virtual ~ObjectContactOfObjListPainter(); // Process the whole displaying - virtual void ProcessDisplay(DisplayInfo& rDisplayInfo); + virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) SAL_OVERRIDE; // VirtualDevice? Default is false - virtual bool isOutputToVirtualDevice() const; + virtual bool isOutputToVirtualDevice() const SAL_OVERRIDE; // recording MetaFile? Default is false - virtual bool isOutputToRecordingMetaFile() const; + virtual bool isOutputToRecordingMetaFile() const SAL_OVERRIDE; // pdf export? Default is false - virtual bool isOutputToPDFFile() const; + virtual bool isOutputToPDFFile() const SAL_OVERRIDE; // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed. - virtual OutputDevice* TryToGetOutputDevice() const; + virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -118,8 +118,8 @@ namespace sdr SdrPageWeakRef mxStartPage; // Hierarchy access methods - virtual sal_uInt32 GetPaintObjectCount() const; - virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const; + virtual sal_uInt32 GetPaintObjectCount() const SAL_OVERRIDE; + virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; public: // basic constructor @@ -133,7 +133,7 @@ namespace sdr const SdrPage* GetStartPage() const { return mxStartPage.get(); } // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed. - virtual OutputDevice* TryToGetOutputDevice() const; + virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/objectcontactofpageview.hxx b/include/svx/sdr/contact/objectcontactofpageview.hxx index a11770d7d74b..0b1bf34a384d 100644 --- a/include/svx/sdr/contact/objectcontactofpageview.hxx +++ b/include/svx/sdr/contact/objectcontactofpageview.hxx @@ -59,75 +59,75 @@ 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); + virtual void setLazyInvalidate(ViewObjectContact& rVOC) SAL_OVERRIDE; // call this to support evtl. preparations for repaint - virtual void PrepareProcessDisplay(); + virtual void PrepareProcessDisplay() SAL_OVERRIDE; // From baseclass Timer, the timeout call triggered by te LazyInvalidate mechanism - virtual void Timeout(); + virtual void Timeout() SAL_OVERRIDE; // Process the whole displaying - virtual void ProcessDisplay(DisplayInfo& rDisplayInfo); + virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) SAL_OVERRIDE; // test if visualizing of entered groups is switched on at all - virtual bool DoVisualizeEnteredGroup() const; + virtual bool DoVisualizeEnteredGroup() const SAL_OVERRIDE; // get active group's (the entered group) ViewContact - virtual const ViewContact* getActiveViewContact() const; + virtual const ViewContact* getActiveViewContact() const SAL_OVERRIDE; // Invalidate given rectangle at the window/output which is represented by // this ObjectContact. - virtual void InvalidatePartOfView(const basegfx::B2DRange& rRange) const; + virtual void InvalidatePartOfView(const basegfx::B2DRange& rRange) const SAL_OVERRIDE; // Get info if given Rectangle is visible in this view - virtual bool IsAreaVisible(const basegfx::B2DRange& rRange) const; + virtual bool IsAreaVisible(const basegfx::B2DRange& rRange) const SAL_OVERRIDE; // Get info about the need to visualize GluePoints. The default // is that it is not necessary. - virtual bool AreGluePointsVisible() const; + virtual bool AreGluePointsVisible() const SAL_OVERRIDE; // check if text animation is allowed. - virtual bool IsTextAnimationAllowed() const; + virtual bool IsTextAnimationAllowed() const SAL_OVERRIDE; // check if graphic animation is allowed. - virtual bool IsGraphicAnimationAllowed() const; + virtual bool IsGraphicAnimationAllowed() const SAL_OVERRIDE; // check if asynchronious graphis loading is allowed. Default is sal_False. - virtual bool IsAsynchronGraphicsLoadingAllowed() const; + virtual bool IsAsynchronGraphicsLoadingAllowed() const SAL_OVERRIDE; // check if buffering of MasterPages is allowed. Default is sal_False. - virtual bool IsMasterPageBufferingAllowed() const; + virtual bool IsMasterPageBufferingAllowed() const SAL_OVERRIDE; // print? Default is false - virtual bool isOutputToPrinter() const; + virtual bool isOutputToPrinter() const SAL_OVERRIDE; // window? Default is true - virtual bool isOutputToWindow() const; + virtual bool isOutputToWindow() const SAL_OVERRIDE; // VirtualDevice? Default is false - virtual bool isOutputToVirtualDevice() const; + virtual bool isOutputToVirtualDevice() const SAL_OVERRIDE; // recording MetaFile? Default is false - virtual bool isOutputToRecordingMetaFile() const; + virtual bool isOutputToRecordingMetaFile() const SAL_OVERRIDE; // pdf export? Default is false - virtual bool isOutputToPDFFile() const; + virtual bool isOutputToPDFFile() const SAL_OVERRIDE; // gray display mode - virtual bool isDrawModeGray() const; + virtual bool isDrawModeGray() const SAL_OVERRIDE; // gray display mode - virtual bool isDrawModeBlackWhite() const; + virtual bool isDrawModeBlackWhite() const SAL_OVERRIDE; // high contrast display mode - virtual bool isDrawModeHighContrast() const; + virtual bool isDrawModeHighContrast() const SAL_OVERRIDE; // overloaded access to SdrPageView - virtual SdrPageView* TryToGetSdrPageView() const; + virtual SdrPageView* TryToGetSdrPageView() const SAL_OVERRIDE; // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed. - virtual OutputDevice* TryToGetOutputDevice() const; + virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE; /** sets all UNO controls which are associated with this ObjectContact to design or alive mode. diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx index 9a0610b1debe..d46a8e5f44fe 100644 --- a/include/svx/sdr/contact/viewcontactofe3d.hxx +++ b/include/svx/sdr/contact/viewcontactofe3d.hxx @@ -52,7 +52,7 @@ namespace sdr protected: // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; public: // basic constructor, used from E3dObject. @@ -86,7 +86,7 @@ namespace sdr // 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; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_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/viewcontactofe3dcube.hxx b/include/svx/sdr/contact/viewcontactofe3dcube.hxx index 4aa9b34013cc..323df6d10a00 100644 --- a/include/svx/sdr/contact/viewcontactofe3dcube.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dcube.hxx @@ -49,7 +49,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; + virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofe3dextrude.hxx b/include/svx/sdr/contact/viewcontactofe3dextrude.hxx index 8ae3a8cebe09..4e7647167a92 100644 --- a/include/svx/sdr/contact/viewcontactofe3dextrude.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dextrude.hxx @@ -49,7 +49,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; + virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofe3dlathe.hxx b/include/svx/sdr/contact/viewcontactofe3dlathe.hxx index cfcb59e02369..572837f069e0 100644 --- a/include/svx/sdr/contact/viewcontactofe3dlathe.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dlathe.hxx @@ -49,7 +49,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; + virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx index 49c750e332a5..e0ee21118602 100644 --- a/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx @@ -49,7 +49,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; + virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofe3dscene.hxx b/include/svx/sdr/contact/viewcontactofe3dscene.hxx index db21a6c8c849..bd48cbdaf227 100644 --- a/include/svx/sdr/contact/viewcontactofe3dscene.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dscene.hxx @@ -48,7 +48,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); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; public: // basic constructor, used from SdrObject. @@ -61,7 +61,7 @@ namespace sdr } // React on changes of the object of this ViewContact - virtual void ActionChanged(); + virtual void ActionChanged() SAL_OVERRIDE; // access to ViewInformation3D and ObjectTransformation const drawinglayer::geometry::ViewInformation3D& getViewInformation3D(const ::basegfx::B3DRange& rContentRange) const; @@ -102,7 +102,7 @@ namespace sdr // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofe3dsphere.hxx b/include/svx/sdr/contact/viewcontactofe3dsphere.hxx index 3059bea07b24..01e0d4204948 100644 --- a/include/svx/sdr/contact/viewcontactofe3dsphere.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dsphere.hxx @@ -49,7 +49,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; + virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofgraphic.hxx b/include/svx/sdr/contact/viewcontactofgraphic.hxx index 519dede43d8a..b6f25e0650b3 100644 --- a/include/svx/sdr/contact/viewcontactofgraphic.hxx +++ b/include/svx/sdr/contact/viewcontactofgraphic.hxx @@ -50,7 +50,7 @@ namespace sdr protected: // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; public: // access to SdrObject @@ -73,7 +73,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; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofgroup.hxx b/include/svx/sdr/contact/viewcontactofgroup.hxx index da388004f837..4ed308ca4eb0 100644 --- a/include/svx/sdr/contact/viewcontactofgroup.hxx +++ b/include/svx/sdr/contact/viewcontactofgroup.hxx @@ -39,7 +39,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); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; // internal access to SdrObject SdrObjGroup& GetSdrObjGroup() const @@ -55,7 +55,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; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx index b52926738b99..e2f62c4b50e3 100644 --- a/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx +++ b/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx @@ -44,10 +44,10 @@ namespace sdr sdr::MasterPageDescriptor& mrMasterPageDescriptor; // Create a Object-Specific ViewObjectContact - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; // This method is responsible for creating the graphical visualisation data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: // basic constructor @@ -63,9 +63,9 @@ namespace sdr } // Access to possible sub-hierarchy and parent - virtual sal_uInt32 GetObjectCount() const; - virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const; - virtual ViewContact* GetParentContact() const; + virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE; + virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; + virtual ViewContact* GetParentContact() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofopenglobj.hxx b/include/svx/sdr/contact/viewcontactofopenglobj.hxx index 6b48e665f884..550813857422 100644 --- a/include/svx/sdr/contact/viewcontactofopenglobj.hxx +++ b/include/svx/sdr/contact/viewcontactofopenglobj.hxx @@ -24,9 +24,9 @@ public: virtual ~ViewContactOfOpenGLObj(); protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // namespace contact diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx index d2d1505060ca..60fc63d505d3 100644 --- a/include/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx @@ -40,17 +40,17 @@ namespace sdr protected: // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; // create graphical visualisation data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_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(); + virtual void ActionChanged() SAL_OVERRIDE; // access to SdrObject SdrPageObj& GetPageObj() const diff --git a/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx index 2100d827d7dd..d201b8957fb5 100644 --- a/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx @@ -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; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx index 5e5c68d3caaf..919b438436e6 100644 --- a/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx @@ -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; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx index a83b48257e49..496f34a99450 100644 --- a/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx @@ -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; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx index 7fc3e8f532a4..4981e1970945 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx @@ -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; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index a51edca45ad1..67e5294aa973 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -63,7 +63,7 @@ namespace sdr // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; // get notified if some properties have changed virtual void mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState ); @@ -71,7 +71,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; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx index 9b1d2b0c5e49..bbf2c99df40d 100644 --- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx @@ -51,7 +51,7 @@ namespace sdr // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; public: // access to SdrObject @@ -65,26 +65,26 @@ namespace sdr virtual ~ViewContactOfSdrObj(); // Access to possible sub-hierarchy - virtual sal_uInt32 GetObjectCount() const; - virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const; - virtual ViewContact* GetParentContact() const; + virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE; + virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; + virtual ViewContact* GetParentContact() const SAL_OVERRIDE; // React on changes of the object of this ViewContact - virtual void ActionChanged(); + virtual void ActionChanged() SAL_OVERRIDE; // overload for acessing the SdrObject - virtual SdrObject* TryToGetSdrObject() const; + virtual SdrObject* TryToGetSdrObject() const SAL_OVERRIDE; // primitive stuff // add Gluepoints (if available) - virtual drawinglayer::primitive2d::Primitive2DSequence createGluePointPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createGluePointPrimitive2DSequence() const SAL_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; + virtual drawinglayer::primitive2d::Primitive2DSequence embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx index f4845e8411f9..60142ff65db7 100644 --- a/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx @@ -53,7 +53,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; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx index 56b5d4007abf..cd8e2903dec8 100644 --- a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx @@ -44,7 +44,7 @@ namespace sdr protected: // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; public: // access to SdrOle2Obj @@ -67,12 +67,12 @@ namespace sdr drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceWithParameters() const; // #i123539# get rid of buffered chart content (if there) on change - virtual void ActionChanged(); + virtual void ActionChanged() SAL_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; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrpage.hxx b/include/svx/sdr/contact/viewcontactofsdrpage.hxx index 29a86a31c826..3be8aec6952b 100644 --- a/include/svx/sdr/contact/viewcontactofsdrpage.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrpage.hxx @@ -46,7 +46,7 @@ namespace sdr explicit ViewContactOfPageSubObject(ViewContactOfSdrPage& rParentViewContactOfSdrPage); virtual ~ViewContactOfPageSubObject(); - virtual ViewContact* GetParentContact() const; + virtual ViewContact* GetParentContact() const SAL_OVERRIDE; const SdrPage& getPage() const; }; } // end of namespace contact @@ -61,8 +61,8 @@ namespace sdr class ViewContactOfPageBackground : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: explicit ViewContactOfPageBackground(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -80,8 +80,8 @@ namespace sdr class ViewContactOfPageShadow : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: explicit ViewContactOfPageShadow(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -99,8 +99,8 @@ namespace sdr class ViewContactOfPageFill : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: explicit ViewContactOfPageFill(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -118,8 +118,8 @@ namespace sdr class ViewContactOfMasterPage : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: explicit ViewContactOfMasterPage(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -137,8 +137,8 @@ namespace sdr class ViewContactOfOuterPageBorder : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: explicit ViewContactOfOuterPageBorder(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -156,8 +156,8 @@ namespace sdr class ViewContactOfInnerPageBorder : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: explicit ViewContactOfInnerPageBorder(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -175,15 +175,15 @@ namespace sdr class ViewContactOfPageHierarchy : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: explicit ViewContactOfPageHierarchy(ViewContactOfSdrPage& rParentViewContactOfSdrPage); virtual ~ViewContactOfPageHierarchy(); - virtual sal_uInt32 GetObjectCount() const; - virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const; + virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE; + virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -200,8 +200,8 @@ namespace sdr // bitfield bool mbFront : 1; - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: ViewContactOfGrid(ViewContactOfSdrPage& rParentViewContactOfSdrPage, bool bFront); @@ -224,8 +224,8 @@ namespace sdr // bitfield bool mbFront : 1; - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: ViewContactOfHelplines(ViewContactOfSdrPage& rParentViewContactOfSdrPage, bool bFront); @@ -265,7 +265,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); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; public: // access to SdrObject @@ -279,19 +279,19 @@ namespace sdr virtual ~ViewContactOfSdrPage(); // Access to possible sub-hierarchy - virtual sal_uInt32 GetObjectCount() const; - virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const; + virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE; + virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; // React on changes of the object of this ViewContact - virtual void ActionChanged(); + virtual void ActionChanged() SAL_OVERRIDE; // overload for acessing the SdrPage - virtual SdrPage* TryToGetSdrPage() const; + virtual SdrPage* TryToGetSdrPage() const SAL_OVERRIDE; protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx index 0a7b75ad5f74..daa37db432ee 100644 --- a/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx @@ -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; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx index 51fae3e1b1dc..88ddf4615d6b 100644 --- a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx @@ -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; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofunocontrol.hxx b/include/svx/sdr/contact/viewcontactofunocontrol.hxx index 7c180cfa81a3..84378f2ce8cc 100644 --- a/include/svx/sdr/contact/viewcontactofunocontrol.hxx +++ b/include/svx/sdr/contact/viewcontactofunocontrol.hxx @@ -70,7 +70,7 @@ namespace sdr { namespace contact { getTemporaryControlForWindow( const Window& _rWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer ) const; protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ) SAL_OVERRIDE; private: ViewContactOfUnoControl(); // never implemented @@ -80,7 +80,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; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; diff --git a/include/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx index 8ec989e9f8e9..dd8eb218e5a6 100644 --- a/include/svx/sdr/contact/viewcontactofvirtobj.hxx +++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx @@ -45,12 +45,12 @@ namespace sdr virtual ~ViewContactOfVirtObj(); // Access to possible sub-hierarchy - virtual sal_uInt32 GetObjectCount() const; + virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE; protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewobjectcontactofe3d.hxx b/include/svx/sdr/contact/viewobjectcontactofe3d.hxx index 49997367aee6..306798bcc416 100644 --- a/include/svx/sdr/contact/viewobjectcontactofe3d.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofe3d.hxx @@ -53,7 +53,7 @@ namespace sdr // also overload 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; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: ViewObjectContactOfE3d(ObjectContact& rObjectContact, ViewContact& rViewContact); diff --git a/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx index be505f326b57..b25e161dd613 100644 --- a/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx @@ -33,7 +33,7 @@ namespace sdr { protected: // 2d primitive creator - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_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; + virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx index 7072b9bbaab5..7c1a6709f9c8 100644 --- a/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx @@ -57,7 +57,7 @@ namespace sdr SdrGrafObj& getSdrGrafObj(); // This method is responsible for creating the graphical visualisation data - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: ViewObjectContactOfGraphic(ObjectContact& rObjectContact, ViewContact& rViewContact); diff --git a/include/svx/sdr/contact/viewobjectcontactofgroup.hxx b/include/svx/sdr/contact/viewobjectcontactofgroup.hxx index 2419c4c3b9f8..556aa37e12cc 100644 --- a/include/svx/sdr/contact/viewobjectcontactofgroup.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofgroup.hxx @@ -39,10 +39,10 @@ namespace sdr virtual ~ViewObjectContactOfGroup(); // This method recursively paints the draw hierarchy. - virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; private: - virtual bool isPrimitiveVisibleOnAnyLayer(const SetOfByte& aLayers) const; + virtual bool isPrimitiveVisibleOnAnyLayer(const SetOfByte& aLayers) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx index 7d7bab75110f..2cae0aa7833a 100644 --- a/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx @@ -44,8 +44,8 @@ namespace sdr // access to MasterPageDescriptor sdr::MasterPageDescriptor& GetMasterPageDescriptor() const; - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; - virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx index 2e489e758edf..1074ce651f03 100644 --- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx @@ -47,7 +47,7 @@ namespace sdr // 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; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: ViewObjectContactOfPageObj(ObjectContact& rObjectContact, ViewContact& rViewContact); diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx index fdf64e887dc1..45cd0d993036 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx @@ -50,7 +50,7 @@ namespace sdr ViewObjectContactOfSdrObj(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfSdrObj(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; /** retrieves the device which a PageView belongs to, starting from its ObjectContactOfPageView diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx index 5b03e267c5c6..01acfabbb507 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx @@ -38,7 +38,7 @@ namespace sdr const SdrOle2Obj& getSdrOle2Object() const; // This method is responsible for creating the graphical visualisation data - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: ViewObjectContactOfSdrOle2Obj(ObjectContact& rObjectContact, ViewContact& rViewContact); diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx index 3a81301bb2b3..59ffc2b513d0 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx @@ -42,8 +42,8 @@ namespace sdr ViewObjectContactOfPageSubObject(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageSubObject(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; - virtual bool isPrimitiveGhosted(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual bool isPrimitiveGhosted(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -57,13 +57,13 @@ namespace sdr class SVX_DLLPUBLIC ViewObjectContactOfPageBackground : public ViewObjectContactOfPageSubObject { protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: ViewObjectContactOfPageBackground(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageBackground(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -81,7 +81,7 @@ namespace sdr ViewObjectContactOfMasterPage(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfMasterPage(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -95,13 +95,13 @@ namespace sdr class SVX_DLLPUBLIC ViewObjectContactOfPageFill : public ViewObjectContactOfPageSubObject { protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: ViewObjectContactOfPageFill(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageFill(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -118,7 +118,7 @@ namespace sdr ViewObjectContactOfPageShadow(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageShadow(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -135,7 +135,7 @@ namespace sdr ViewObjectContactOfOuterPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfOuterPageBorder(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -152,7 +152,7 @@ namespace sdr ViewObjectContactOfInnerPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfInnerPageBorder(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -169,7 +169,7 @@ namespace sdr ViewObjectContactOfPageHierarchy(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageHierarchy(); - virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -183,13 +183,13 @@ namespace sdr class SVX_DLLPUBLIC ViewObjectContactOfPageGrid : public ViewObjectContactOfPageSubObject { protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: ViewObjectContactOfPageGrid(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageGrid(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -203,13 +203,13 @@ namespace sdr class SVX_DLLPUBLIC ViewObjectContactOfPageHelplines : public ViewObjectContactOfPageSubObject { protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: ViewObjectContactOfPageHelplines(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageHelplines(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -226,7 +226,7 @@ namespace sdr ViewObjectContactOfSdrPage(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfSdrPage(); - virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx index 8194d1c91c73..23f9daa1adaf 100644 --- a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -81,7 +81,7 @@ namespace sdr { namespace contact { /** React on changes of the object of this ViewContact */ - virtual void ActionChanged(); + virtual void ActionChanged() SAL_OVERRIDE; /** to be called when any aspect of the control which requires view updates changed */ @@ -92,10 +92,10 @@ namespace sdr { namespace contact { ~ViewObjectContactOfUnoControl(); // support for Primitive2D - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; // visibility check - virtual bool isPrimitiveVisible( const DisplayInfo& _rDisplayInfo ) const; + virtual bool isPrimitiveVisible( const DisplayInfo& _rDisplayInfo ) const SAL_OVERRIDE; /// to be called when any aspect of the control which requires view updates changed void impl_onControlChangedOrModified(); @@ -119,7 +119,7 @@ namespace sdr { namespace contact { UnoControlPrintOrPreviewContact( const UnoControlPrintOrPreviewContact& ); // never implemented UnoControlPrintOrPreviewContact& operator=( const UnoControlPrintOrPreviewContact& ); // never implemented - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const SAL_OVERRIDE; }; |