diff options
Diffstat (limited to 'include/svx/sdr')
88 files changed, 378 insertions, 378 deletions
diff --git a/include/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx index 847f855069ca..636315f1446f 100644 --- a/include/svx/sdr/animation/animationstate.hxx +++ b/include/svx/sdr/animation/animationstate.hxx @@ -63,7 +63,7 @@ namespace sdr virtual ~PrimitiveAnimation(); // execute event, from base class Event - virtual void Trigger(sal_uInt32 nTime); + virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE; }; } // end of namespace animation } // end of namespace sdr diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx index 90f13245ba31..4a7b177e1cd0 100644 --- a/include/svx/sdr/animation/scheduler.hxx +++ b/include/svx/sdr/animation/scheduler.hxx @@ -116,7 +116,7 @@ namespace sdr SVX_DLLPUBLIC virtual ~Scheduler(); // From baseclass Timer, the timeout call - SVX_DLLPUBLIC virtual void Timeout(); + SVX_DLLPUBLIC virtual void Timeout() SAL_OVERRIDE; // get time sal_uInt32 GetTime(); 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; }; diff --git a/include/svx/sdr/event/eventhandler.hxx b/include/svx/sdr/event/eventhandler.hxx index 3ab923e9ee94..36b27a1a3d1e 100644 --- a/include/svx/sdr/event/eventhandler.hxx +++ b/include/svx/sdr/event/eventhandler.hxx @@ -117,7 +117,7 @@ namespace sdr virtual ~TimerEventHandler(); // The timer when it is triggered; from class Timer - virtual void Timeout(); + virtual void Timeout() SAL_OVERRIDE; // reset the timer void Restart(); diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx index 57605a4e165e..539f074c6b64 100644 --- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx @@ -54,7 +54,7 @@ namespace sdr bool mbOverlayState : 1; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlayAnimatedBitmapEx( @@ -83,7 +83,7 @@ namespace sdr // execute event from base class ::sdr::animation::Event. Default // implementation does nothing and does not create a new event. - virtual void Trigger(sal_uInt32 nTime); + virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE; // get shearX and rotation double getShearX() const { return mfShearX; } diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx index 13feeec1eb1b..bd8a779183da 100644 --- a/include/svx/sdr/overlay/overlaybitmapex.hxx +++ b/include/svx/sdr/overlay/overlaybitmapex.hxx @@ -44,7 +44,7 @@ namespace sdr double mfShearX; double mfRotation; - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlayBitmapEx( diff --git a/include/svx/sdr/overlay/overlaycrosshair.hxx b/include/svx/sdr/overlay/overlaycrosshair.hxx index 10625aa8c198..e9a70a7e234d 100644 --- a/include/svx/sdr/overlay/overlaycrosshair.hxx +++ b/include/svx/sdr/overlay/overlaycrosshair.hxx @@ -32,14 +32,14 @@ namespace sdr { protected: // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: explicit OverlayCrosshairStriped(const basegfx::B2DPoint& rBasePos); virtual ~OverlayCrosshairStriped(); // react on stripe definition change - virtual void stripeDefinitionHasChanged(); + virtual void stripeDefinitionHasChanged() SAL_OVERRIDE; }; } // end of namespace overlay } // end of namespace sdr diff --git a/include/svx/sdr/overlay/overlayhelpline.hxx b/include/svx/sdr/overlay/overlayhelpline.hxx index 3eff8fee6aa9..2e3bc1640ae7 100644 --- a/include/svx/sdr/overlay/overlayhelpline.hxx +++ b/include/svx/sdr/overlay/overlayhelpline.hxx @@ -36,7 +36,7 @@ namespace sdr SdrHelpLineKind meKind; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: explicit OverlayHelplineStriped( @@ -48,7 +48,7 @@ namespace sdr SdrHelpLineKind getKind() const { return meKind; } // react on stripe definition change - virtual void stripeDefinitionHasChanged(); + virtual void stripeDefinitionHasChanged() SAL_OVERRIDE; }; } // end of namespace overlay } // end of namespace sdr diff --git a/include/svx/sdr/overlay/overlayline.hxx b/include/svx/sdr/overlay/overlayline.hxx index 4561a2bafe75..65b7bb58fc54 100644 --- a/include/svx/sdr/overlay/overlayline.hxx +++ b/include/svx/sdr/overlay/overlayline.hxx @@ -35,7 +35,7 @@ namespace sdr basegfx::B2DPoint maSecondPosition; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlayLineStriped( @@ -47,7 +47,7 @@ namespace sdr const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; } // react on stripe definition change - virtual void stripeDefinitionHasChanged(); + virtual void stripeDefinitionHasChanged() SAL_OVERRIDE; }; } // end of namespace overlay } // end of namespace sdr diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx index a2ab50d79122..b5c7c7bbe585 100644 --- a/include/svx/sdr/overlay/overlaymanager.hxx +++ b/include/svx/sdr/overlay/overlaymanager.hxx @@ -138,8 +138,8 @@ namespace sdr void InsertEvent(sdr::animation::Event* pNew) { Scheduler::InsertEvent(pNew); } - virtual oslInterlockedCount SAL_CALL acquire(); - virtual oslInterlockedCount SAL_CALL release(); + virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; + virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; }; } // end of namespace overlay } // end of namespace sdr diff --git a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx index 6e219193f62c..2db2cf1da96f 100644 --- a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx +++ b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx @@ -71,19 +71,19 @@ namespace sdr bool bRefreshWithPreRendering = false); // complete redraw - virtual void completeRedraw(const Region& rRegion, OutputDevice* pPreRenderDevice = 0L) const; + virtual void completeRedraw(const Region& rRegion, OutputDevice* pPreRenderDevice = 0L) const SAL_OVERRIDE; // flush. Do buffered updates. - virtual void flush(); + virtual void flush() SAL_OVERRIDE; // #i68597# part of content gets copied, react on it - virtual void copyArea(const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize); + virtual void copyArea(const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize) SAL_OVERRIDE; // restore part of background. Implemented form buffered versions only. - virtual void restoreBackground(const Region& rRegion) const; + virtual void restoreBackground(const Region& rRegion) const SAL_OVERRIDE; // invalidate the given range at local OutputDevice - virtual void invalidateRange(const basegfx::B2DRange& rRange); + virtual void invalidateRange(const basegfx::B2DRange& rRange) SAL_OVERRIDE; // access to RefreshWithPreRendering Flag bool DoRefreshWithPreRendering() const { return mbRefreshWithPreRendering; } diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx index e4effa946efa..130c3406d50d 100644 --- a/include/svx/sdr/overlay/overlayobject.hxx +++ b/include/svx/sdr/overlay/overlayobject.hxx @@ -151,7 +151,7 @@ namespace sdr // execute event from base class ::sdr::animation::Event. Default // implementation does nothing and does not create a new event. - virtual void Trigger(sal_uInt32 nTime); + virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE; // acces to AllowsAnimation flag bool allowsAnimation() const { return mbAllowsAnimation; } diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx index 75c334b974c5..baf5ced3b878 100644 --- a/include/svx/sdr/overlay/overlayobjectcell.hxx +++ b/include/svx/sdr/overlay/overlayobjectcell.hxx @@ -45,7 +45,7 @@ namespace sdr RangeVector maRectangles; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlayObjectCell( CellOverlayType eType, const Color& rColor, const RangeVector& rRects); diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx index c5f3d08376de..b51477b2969c 100644 --- a/include/svx/sdr/overlay/overlaypolypolygon.hxx +++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx @@ -37,7 +37,7 @@ namespace sdr basegfx::B2DPolyPolygon maLinePolyPolygon; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: explicit OverlayPolyPolygonStripedAndFilled( @@ -49,7 +49,7 @@ namespace sdr void setLinePolyPolygon(const basegfx::B2DPolyPolygon& rNew); // react on stripe definition change - virtual void stripeDefinitionHasChanged(); + virtual void stripeDefinitionHasChanged() SAL_OVERRIDE; }; } // end of namespace overlay } // end of namespace sdr diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx index f888e480a0cf..e500bf89ca8e 100644 --- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx +++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx @@ -37,7 +37,7 @@ namespace sdr const drawinglayer::primitive2d::Primitive2DSequence maSequence; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; private: // internal helper to create a drawinglayer::geometry::ViewInformation2D diff --git a/include/svx/sdr/overlay/overlayrectangle.hxx b/include/svx/sdr/overlay/overlayrectangle.hxx index cdb49c174274..7279a11bea0e 100644 --- a/include/svx/sdr/overlay/overlayrectangle.hxx +++ b/include/svx/sdr/overlay/overlayrectangle.hxx @@ -47,7 +47,7 @@ namespace sdr bool mbOverlayState : 1; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlayRectangle( @@ -72,7 +72,7 @@ namespace sdr // execute event from base class ::sdr::animation::Event. Default // implementation does nothing and does not create a new event. - virtual void Trigger(sal_uInt32 nTime); + virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE; }; } // end of namespace overlay } // end of namespace sdr diff --git a/include/svx/sdr/overlay/overlayrollingrectangle.hxx b/include/svx/sdr/overlay/overlayrollingrectangle.hxx index 0f7399a84762..2d7748e8d013 100644 --- a/include/svx/sdr/overlay/overlayrollingrectangle.hxx +++ b/include/svx/sdr/overlay/overlayrollingrectangle.hxx @@ -42,7 +42,7 @@ namespace sdr bool mbShowBounds : 1; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlayRollingRectangleStriped( @@ -63,7 +63,7 @@ namespace sdr bool getShowBounds() const { return mbShowBounds; } // react on stripe definition change - virtual void stripeDefinitionHasChanged(); + virtual void stripeDefinitionHasChanged() SAL_OVERRIDE; }; } // end of namespace overlay } // end of namespace sdr diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx index c4ab9a345ff5..1e4c136d7c00 100644 --- a/include/svx/sdr/overlay/overlayselection.hxx +++ b/include/svx/sdr/overlay/overlayselection.hxx @@ -56,7 +56,7 @@ namespace sdr bool mbBorder : 1; // geometry creation for OverlayObject, can use local *Last* values - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlaySelection( @@ -72,7 +72,7 @@ namespace sdr bool getBorder() const { return mbBorder; } // overloaded to check conditions for last createOverlayObjectPrimitive2DSequence - virtual drawinglayer::primitive2d::Primitive2DSequence getOverlayObjectPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence getOverlayObjectPrimitive2DSequence() const SAL_OVERRIDE; // data write access void setRanges(const std::vector< basegfx::B2DRange >& rNew); diff --git a/include/svx/sdr/overlay/overlaytools.hxx b/include/svx/sdr/overlay/overlaytools.hxx index 85b0c0b1732e..3dab6a607f75 100644 --- a/include/svx/sdr/overlay/overlaytools.hxx +++ b/include/svx/sdr/overlay/overlaytools.hxx @@ -51,7 +51,7 @@ namespace drawinglayer double mfRotation; protected: - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: OverlayBitmapExPrimitive( @@ -71,7 +71,7 @@ namespace drawinglayer double getRotation() const { return mfRotation; } // compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; DeclPrimitive2DIDBlock() }; @@ -96,7 +96,7 @@ namespace drawinglayer double mfDiscreteDashLength; protected: - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: OverlayCrosshairPrimitive( @@ -112,7 +112,7 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } // compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; DeclPrimitive2DIDBlock() }; @@ -144,7 +144,7 @@ namespace drawinglayer double mfRotation; protected: - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: OverlayRectanglePrimitive( @@ -164,7 +164,7 @@ namespace drawinglayer double getRotation() const { return mfRotation; } // compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; DeclPrimitive2DIDBlock() }; @@ -200,7 +200,7 @@ namespace drawinglayer double mfDiscreteDashLength; protected: - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: OverlayHelplineStripedPrimitive( @@ -218,7 +218,7 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } // compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; DeclPrimitive2DIDBlock() }; @@ -245,7 +245,7 @@ namespace drawinglayer double mfDiscreteDashLength; protected: - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: OverlayRollingRectanglePrimitive( @@ -261,7 +261,7 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } // compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; DeclPrimitive2DIDBlock() }; diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx index 4f7b29b95c31..30b7dd02b4e7 100644 --- a/include/svx/sdr/overlay/overlaytriangle.hxx +++ b/include/svx/sdr/overlay/overlaytriangle.hxx @@ -36,7 +36,7 @@ namespace sdr basegfx::B2DPoint maThirdPosition; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlayTriangle( diff --git a/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx index dc2840109bec..02d11c4ebf72 100644 --- a/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx @@ -45,7 +45,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrCaptionPrimitive2D( @@ -56,7 +56,7 @@ namespace drawinglayer double fCornerRadiusY = 0.0); // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // data access const ::basegfx::B2DHomMatrix& getTransform() const { return maTransform; } diff --git a/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx index 45c382517711..36591ed8bde7 100644 --- a/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx @@ -41,7 +41,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrConnectorPrimitive2D( @@ -53,7 +53,7 @@ namespace drawinglayer const ::basegfx::B2DPolygon& getUnitPolygon() const { return maUnitPolygon; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx index 4ef0090978a2..ccdc4a2c9265 100644 --- a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx @@ -54,7 +54,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrCustomShapePrimitive2D( @@ -74,7 +74,7 @@ namespace drawinglayer bool isForceTextClipToTextRange() const { return mbForceTextClipToTextRange; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx index 4d133cb57931..39f7c16bfd58 100644 --- a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx @@ -41,7 +41,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrEllipsePrimitive2D( @@ -53,7 +53,7 @@ namespace drawinglayer const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() @@ -79,7 +79,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrEllipseSegmentPrimitive2D( @@ -97,7 +97,7 @@ namespace drawinglayer bool getCloseUsingCenter() const { return mbCloseUsingCenter; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx index fafa633a843f..b1a9bd564236 100644 --- a/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx @@ -44,7 +44,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrGrafPrimitive2D( @@ -61,7 +61,7 @@ namespace drawinglayer bool isTransparent() const; // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx index 39783b1e487e..67177c7c814d 100644 --- a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx @@ -76,7 +76,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrMeasurePrimitive2D( @@ -110,7 +110,7 @@ namespace drawinglayer bool getTextAutoAngle() const { return mbTextAutoAngle; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx index cbab4e6b7534..888d1c770d80 100644 --- a/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx @@ -52,10 +52,10 @@ namespace drawinglayer const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // local decomposition. - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx index 3215c6f375d7..c2394e827e83 100644 --- a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx @@ -48,7 +48,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrOleContentPrimitive2D( @@ -58,10 +58,10 @@ namespace drawinglayer ); // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // The default implementation will use getDecomposition results to create the range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; // data access const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; } diff --git a/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx index d5bf6d35769a..ce8bd26de582 100644 --- a/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx @@ -43,7 +43,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrPathPrimitive2D( @@ -57,7 +57,7 @@ namespace drawinglayer const basegfx::B2DPolyPolygon& getUnitPolyPolygon() const { return maUnitPolyPolygon; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx index 4082b446ab51..0c7453377d81 100644 --- a/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx @@ -47,7 +47,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrRectanglePrimitive2D( @@ -66,7 +66,7 @@ namespace drawinglayer bool getForceFillForHitTest() const { return mbForceFillForHitTest; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx index 45a48d771d58..650002181201 100644 --- a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -90,11 +90,11 @@ namespace drawinglayer const OutlinerParaObject& getOutlinerParaObject() const { return maOutlinerParaObject; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // own get2DDecomposition to take aspect of decomposition with or without spell checker // into account - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; // transformed clone operator virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const = 0; @@ -119,7 +119,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrContourTextPrimitive2D( @@ -133,10 +133,10 @@ namespace drawinglayer const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // transformed clone operator - virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const; + virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() @@ -161,7 +161,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrPathTextPrimitive2D( @@ -175,10 +175,10 @@ namespace drawinglayer const attribute::SdrFormTextAttribute& getSdrFormTextAttribute() const { return maSdrFormTextAttribute; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // transformed clone operator - virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const; + virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() @@ -211,7 +211,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrBlockTextPrimitive2D( @@ -237,10 +237,10 @@ namespace drawinglayer bool getClipOnBounds() const { return mbClipOnBounds; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // transformed clone operator - virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const; + virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() @@ -265,7 +265,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrStretchTextPrimitive2D( @@ -279,10 +279,10 @@ namespace drawinglayer bool isFixedCellHeight() const { return mbFixedCellHeight; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // transformed clone operator - virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const; + virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() @@ -306,7 +306,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrAutoFitTextPrimitive2D( @@ -320,10 +320,10 @@ namespace drawinglayer bool getWordWrap() const { return mbWordWrap; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // transformed clone operator - virtual SdrTextPrimitive2D* createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const; + virtual SdrTextPrimitive2D* createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/properties/attributeproperties.hxx b/include/svx/sdr/properties/attributeproperties.hxx index 00957837b3ca..a14b63407ebc 100644 --- a/include/svx/sdr/properties/attributeproperties.hxx +++ b/include/svx/sdr/properties/attributeproperties.hxx @@ -44,13 +44,13 @@ namespace sdr SfxStyleSheet* mpStyleSheet; // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& pPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& pPool) SAL_OVERRIDE; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0); + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -60,31 +60,31 @@ namespace sdr AttributeProperties(const AttributeProperties& rProps, SdrObject& rObj); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // destructor virtual ~AttributeProperties(); // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // get the installed StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const; + virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; // Move properties to a new ItemPool. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L); + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) SAL_OVERRIDE; // Set new model. - virtual void SetModel(SdrModel* pOldModel, SdrModel* pNewModel); + virtual void SetModel(SdrModel* pOldModel, SdrModel* pNewModel) SAL_OVERRIDE; // force all attributes which come from styles to hard attributes // to be able to live without the style. - virtual void ForceStyleToHardAttributes(); + virtual void ForceStyleToHardAttributes() SAL_OVERRIDE; // This is the Notify(...) from 2nd base class SfxListener - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; - virtual bool isUsedByModel() const; + virtual bool isUsedByModel() const SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/captionproperties.hxx b/include/svx/sdr/properties/captionproperties.hxx index 609546741c79..b93653b36cf7 100644 --- a/include/svx/sdr/properties/captionproperties.hxx +++ b/include/svx/sdr/properties/captionproperties.hxx @@ -32,10 +32,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -48,14 +48,14 @@ namespace sdr virtual ~CaptionProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes(); + virtual void ForceDefaultAttributes() SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/circleproperties.hxx b/include/svx/sdr/properties/circleproperties.hxx index 63b95089a073..4a8087d81d55 100644 --- a/include/svx/sdr/properties/circleproperties.hxx +++ b/include/svx/sdr/properties/circleproperties.hxx @@ -32,10 +32,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -48,14 +48,14 @@ namespace sdr virtual ~CircleProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes(); + virtual void ForceDefaultAttributes() SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/connectorproperties.hxx b/include/svx/sdr/properties/connectorproperties.hxx index 3b86c026d161..d05391aebb7b 100644 --- a/include/svx/sdr/properties/connectorproperties.hxx +++ b/include/svx/sdr/properties/connectorproperties.hxx @@ -32,10 +32,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -48,10 +48,10 @@ namespace sdr virtual ~ConnectorProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/customshapeproperties.hxx b/include/svx/sdr/properties/customshapeproperties.hxx index f28c90f9a893..95d725ec647e 100644 --- a/include/svx/sdr/properties/customshapeproperties.hxx +++ b/include/svx/sdr/properties/customshapeproperties.hxx @@ -35,36 +35,36 @@ namespace sdr protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // test changeability for a single item - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; // react on Item change - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem); + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem) SAL_OVERRIDE; // Called after ItemChange() is done for all items. Allows local reactions on // specific item changes - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; // clear single item - virtual void ClearObjectItem(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // clear single item direct, do not do any notifies or things like that. // Also supports complete deleteion of items when default parameter 0 is used. - virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; public: // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes(); + virtual void ForceDefaultAttributes() SAL_OVERRIDE; // basic constructor explicit CustomShapeProperties(SdrObject& rObj); @@ -76,10 +76,10 @@ namespace sdr virtual ~CustomShapeProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // This is the notifyer from SfxListener - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx index 0ed222cea03e..97fca16cb310 100644 --- a/include/svx/sdr/properties/defaultproperties.hxx +++ b/include/svx/sdr/properties/defaultproperties.hxx @@ -36,19 +36,19 @@ namespace sdr SfxItemSet* mpItemSet; // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // test changeability for a single item - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const SAL_OVERRIDE; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0); + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -61,32 +61,32 @@ namespace sdr virtual ~DefaultProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // get itemset - virtual const SfxItemSet& GetObjectItemSet() const; + virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; // set single item - virtual void SetObjectItem(const SfxPoolItem& rItem); + virtual void SetObjectItem(const SfxPoolItem& rItem) SAL_OVERRIDE; // set single item direct, do not do any notifies or things like that - virtual void SetObjectItemDirect(const SfxPoolItem& rItem); + virtual void SetObjectItemDirect(const SfxPoolItem& rItem) SAL_OVERRIDE; // clear single item - virtual void ClearObjectItem(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // clear single item direct, do not do any notifies or things like that. // Also supports complete deleteion of items when default parameter 0 is used. - virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // set complete item set - virtual void SetObjectItemSet(const SfxItemSet& rSet); + virtual void SetObjectItemSet(const SfxItemSet& rSet) SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // get the installed StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const; + virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created. @@ -94,7 +94,7 @@ namespace sdr virtual void ForceDefaultAttributes(); // Scale the included ItemSet. - virtual void Scale(const Fraction& rScale); + virtual void Scale(const Fraction& rScale) SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/e3dcompoundproperties.hxx b/include/svx/sdr/properties/e3dcompoundproperties.hxx index 8480e75791bf..aac77ad6a970 100644 --- a/include/svx/sdr/properties/e3dcompoundproperties.hxx +++ b/include/svx/sdr/properties/e3dcompoundproperties.hxx @@ -33,7 +33,7 @@ namespace sdr { protected: // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; public: // basic constructor @@ -46,20 +46,20 @@ namespace sdr virtual ~E3dCompoundProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // get itemset - virtual const SfxItemSet& GetObjectItemSet() const; + virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; // Get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may // be overloaded e.g for group objects to return a merged ItemSet of the object. // When using this method the returned ItemSet may contain items in the state // SFX_ITEM_DONTCARE which means there were several such items with different // values. - virtual const SfxItemSet& GetMergedItemSet() const; + virtual const SfxItemSet& GetMergedItemSet() const SAL_OVERRIDE; // Set merged ItemSet. Normally, this maps to SetObjectItemSet(). - virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false); + virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/e3dextrudeproperties.hxx b/include/svx/sdr/properties/e3dextrudeproperties.hxx index b5d64068a9f5..dac3f8e173ea 100644 --- a/include/svx/sdr/properties/e3dextrudeproperties.hxx +++ b/include/svx/sdr/properties/e3dextrudeproperties.hxx @@ -33,7 +33,7 @@ namespace sdr { protected: // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; public: // basic constructor @@ -46,7 +46,7 @@ namespace sdr virtual ~E3dExtrudeProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/e3dlatheproperties.hxx b/include/svx/sdr/properties/e3dlatheproperties.hxx index e88c4964f217..4a5b56559cbc 100644 --- a/include/svx/sdr/properties/e3dlatheproperties.hxx +++ b/include/svx/sdr/properties/e3dlatheproperties.hxx @@ -33,7 +33,7 @@ namespace sdr { protected: // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; public: // basic constructor @@ -46,7 +46,7 @@ namespace sdr virtual ~E3dLatheProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/e3dproperties.hxx b/include/svx/sdr/properties/e3dproperties.hxx index c55f40b53421..39e10235cb26 100644 --- a/include/svx/sdr/properties/e3dproperties.hxx +++ b/include/svx/sdr/properties/e3dproperties.hxx @@ -33,10 +33,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -49,10 +49,10 @@ namespace sdr virtual ~E3dProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/e3dsceneproperties.hxx b/include/svx/sdr/properties/e3dsceneproperties.hxx index 2767dd2b135e..a92296d23bba 100644 --- a/include/svx/sdr/properties/e3dsceneproperties.hxx +++ b/include/svx/sdr/properties/e3dsceneproperties.hxx @@ -32,7 +32,7 @@ namespace sdr { protected: // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; public: // basic constructor @@ -45,35 +45,35 @@ namespace sdr virtual ~E3dSceneProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // get itemset - virtual const SfxItemSet& GetObjectItemSet() const; + virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; // get merged ItemSet. Normappl, this maps directly to GetObjectItemSet(), but may // be overloaded e.g for group objects to return a merged ItemSet of the object. // When using this method the returned ItemSet may contain items in the state // SFX_ITEM_DONTCARE which means there were several such items with different // values. - virtual const SfxItemSet& GetMergedItemSet() const; + virtual const SfxItemSet& GetMergedItemSet() const SAL_OVERRIDE; // Set merged ItemSet. Normally, this maps to SetObjectItemSet(). - virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false); + virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) SAL_OVERRIDE; // Set a single item, iterate over hierarchies if necessary. - virtual void SetMergedItem(const SfxPoolItem& rItem); + virtual void SetMergedItem(const SfxPoolItem& rItem) SAL_OVERRIDE; // Clear a single item, iterate over hierarchies if necessary. - virtual void ClearMergedItem(const sal_uInt16 nWhich = 0); + virtual void ClearMergedItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // get the installed StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const; + virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; // Move properties to a new ItemPool. Default implementation does nothing. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L); + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) SAL_OVERRIDE; // Special for scene: void SetSceneItemsFromCamera(); diff --git a/include/svx/sdr/properties/e3dsphereproperties.hxx b/include/svx/sdr/properties/e3dsphereproperties.hxx index 2481af6a6007..a92596b6661f 100644 --- a/include/svx/sdr/properties/e3dsphereproperties.hxx +++ b/include/svx/sdr/properties/e3dsphereproperties.hxx @@ -32,7 +32,7 @@ namespace sdr { protected: // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; public: // basic constructor @@ -45,7 +45,7 @@ namespace sdr virtual ~E3dSphereProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/emptyproperties.hxx b/include/svx/sdr/properties/emptyproperties.hxx index ce13b8307f8c..1c7f0250046a 100644 --- a/include/svx/sdr/properties/emptyproperties.hxx +++ b/include/svx/sdr/properties/emptyproperties.hxx @@ -36,19 +36,19 @@ namespace sdr SfxItemSet* mpEmptyItemSet; // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // test changeability for a single item - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const SAL_OVERRIDE; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0); + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -61,32 +61,32 @@ namespace sdr virtual ~EmptyProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // get itemset - virtual const SfxItemSet& GetObjectItemSet() const; + virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; // set single item - virtual void SetObjectItem(const SfxPoolItem& rItem); + virtual void SetObjectItem(const SfxPoolItem& rItem) SAL_OVERRIDE; // set single item direct, do not do any notifies or things like that - virtual void SetObjectItemDirect(const SfxPoolItem& rItem); + virtual void SetObjectItemDirect(const SfxPoolItem& rItem) SAL_OVERRIDE; // clear single item - virtual void ClearObjectItem(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // clear single item direct, do not do any notifies or things like that. // Also supports complete deleteion of items when default parameter 0 is used. - virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // set complete item set - virtual void SetObjectItemSet(const SfxItemSet& rSet); + virtual void SetObjectItemSet(const SfxItemSet& rSet) SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // get the installed StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const; + virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/graphicproperties.hxx b/include/svx/sdr/properties/graphicproperties.hxx index b380fbeb8f0e..8299f5a2955d 100644 --- a/include/svx/sdr/properties/graphicproperties.hxx +++ b/include/svx/sdr/properties/graphicproperties.hxx @@ -32,10 +32,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -48,14 +48,14 @@ namespace sdr virtual ~GraphicProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes(); + virtual void ForceDefaultAttributes() SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/groupproperties.hxx b/include/svx/sdr/properties/groupproperties.hxx index da0e15493ff3..41a08c45168b 100644 --- a/include/svx/sdr/properties/groupproperties.hxx +++ b/include/svx/sdr/properties/groupproperties.hxx @@ -32,19 +32,19 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // test changeability for a single item - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const SAL_OVERRIDE; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0); + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -57,59 +57,59 @@ namespace sdr virtual ~GroupProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // get itemset - virtual const SfxItemSet& GetObjectItemSet() const; + virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; // get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may // be overloaded e.g for group objects to return a merged ItemSet of the object. // When using this method the returned ItemSet may contain items in the state // SFX_ITEM_DONTCARE which means there were several such items with different // values. - virtual const SfxItemSet& GetMergedItemSet() const; + virtual const SfxItemSet& GetMergedItemSet() const SAL_OVERRIDE; // Set merged ItemSet. Normally, this maps to SetObjectItemSet(). - virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false); + virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) SAL_OVERRIDE; // set single item - virtual void SetObjectItem(const SfxPoolItem& rItem); + virtual void SetObjectItem(const SfxPoolItem& rItem) SAL_OVERRIDE; // set single item direct, do not do any notifies or things like that - virtual void SetObjectItemDirect(const SfxPoolItem& rItem); + virtual void SetObjectItemDirect(const SfxPoolItem& rItem) SAL_OVERRIDE; // clear single item - virtual void ClearObjectItem(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // clear single item direct, do not do any notifies or things like that. // Also supports complete deleteion of items when default parameter 0 is used. - virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // Set a single item, iterate over hierarchies if necessary. - virtual void SetMergedItem(const SfxPoolItem& rItem); + virtual void SetMergedItem(const SfxPoolItem& rItem) SAL_OVERRIDE; // Clear a single item, iterate over hierarchies if necessary. - virtual void ClearMergedItem(const sal_uInt16 nWhich = 0); + virtual void ClearMergedItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // set complete item set - virtual void SetObjectItemSet(const SfxItemSet& rSet); + virtual void SetObjectItemSet(const SfxItemSet& rSet) SAL_OVERRIDE; // set a new StyleSheet - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // get the local StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const; + virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes(); + virtual void ForceDefaultAttributes() SAL_OVERRIDE; // Move properties to a new ItemPool. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L); + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) SAL_OVERRIDE; // force all attributes which come from styles to hard attributes // to be able to live without the style. - virtual void ForceStyleToHardAttributes(); + virtual void ForceStyleToHardAttributes() SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/measureproperties.hxx b/include/svx/sdr/properties/measureproperties.hxx index 038c99f63d69..0d4c0f1343e9 100644 --- a/include/svx/sdr/properties/measureproperties.hxx +++ b/include/svx/sdr/properties/measureproperties.hxx @@ -32,10 +32,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -48,14 +48,14 @@ namespace sdr virtual ~MeasureProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes(); + virtual void ForceDefaultAttributes() SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/oleproperties.hxx b/include/svx/sdr/properties/oleproperties.hxx index 5a10f87bd771..9a78025acd77 100644 --- a/include/svx/sdr/properties/oleproperties.hxx +++ b/include/svx/sdr/properties/oleproperties.hxx @@ -42,11 +42,11 @@ namespace sdr virtual ~OleProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes(); + virtual void ForceDefaultAttributes() SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/pageproperties.hxx b/include/svx/sdr/properties/pageproperties.hxx index 08f583b5842b..6af7debda17a 100644 --- a/include/svx/sdr/properties/pageproperties.hxx +++ b/include/svx/sdr/properties/pageproperties.hxx @@ -32,13 +32,13 @@ namespace sdr { protected: // create a new object specific itemset with object specific ranges. - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& pPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& pPool) SAL_OVERRIDE; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0); + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; public: // basic constructor @@ -51,17 +51,17 @@ namespace sdr virtual ~PageProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // get itemset. Overloaded here to allow creating the empty itemset // without asserting - virtual const SfxItemSet& GetObjectItemSet() const; + virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; // get the installed StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const; + virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; // clear single item - virtual void ClearObjectItem(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/rectangleproperties.hxx b/include/svx/sdr/properties/rectangleproperties.hxx index f53b34c5dc65..c78becdb6dec 100644 --- a/include/svx/sdr/properties/rectangleproperties.hxx +++ b/include/svx/sdr/properties/rectangleproperties.hxx @@ -33,7 +33,7 @@ namespace sdr { protected: // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -46,10 +46,10 @@ namespace sdr virtual ~RectangleProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/textproperties.hxx b/include/svx/sdr/properties/textproperties.hxx index 78de4949642a..3a6a5c6991af 100644 --- a/include/svx/sdr/properties/textproperties.hxx +++ b/include/svx/sdr/properties/textproperties.hxx @@ -38,13 +38,13 @@ namespace sdr protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0); + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; /// Get the TextProvider related to our SdrObject virtual const svx::ITextProvider& getTextProvider() const; @@ -60,28 +60,28 @@ namespace sdr virtual ~TextProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes(); + virtual void ForceDefaultAttributes() SAL_OVERRIDE; // force all attributes which come from styles to hard attributes // to be able to live without the style. - virtual void ForceStyleToHardAttributes(); + virtual void ForceStyleToHardAttributes() SAL_OVERRIDE; // This is the notifyer from SfxListener - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; // Set single item at the local ItemSet. *Does not use* AllowItemChange(), // ItemChange(), PostItemChange() and ItemSetChanged() calls. void SetObjectItemNoBroadcast(const SfxPoolItem& rItem); // #i101556# versioning support - virtual sal_uInt32 getVersion() const; + virtual sal_uInt32 getVersion() const SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 1a011ecea434..0ffe6c2b2afa 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -46,23 +46,23 @@ public: SVX_DLLPRIVATE virtual ~SvxTableController(); // from sdr::SelectionController - SVX_DLLPRIVATE virtual bool onKeyInput(const KeyEvent& rKEvt, Window* pWin); - SVX_DLLPRIVATE virtual bool onMouseButtonDown(const MouseEvent& rMEvt, Window* pWin); - SVX_DLLPRIVATE virtual bool onMouseButtonUp(const MouseEvent& rMEvt, Window* pWin); - SVX_DLLPRIVATE virtual bool onMouseMove(const MouseEvent& rMEvt, Window* pWin); + SVX_DLLPRIVATE virtual bool onKeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool onMouseButtonDown(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool onMouseButtonUp(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool onMouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - SVX_DLLPRIVATE virtual bool DeleteMarked(); + SVX_DLLPRIVATE virtual bool DeleteMarked() SAL_OVERRIDE; - SVX_DLLPRIVATE virtual void onSelectionHasChanged(); + SVX_DLLPRIVATE virtual void onSelectionHasChanged() SAL_OVERRIDE; - SVX_DLLPRIVATE virtual void GetState( SfxItemSet& rSet ); - SVX_DLLPRIVATE virtual void Execute( SfxRequest& rReq ); + SVX_DLLPRIVATE virtual void GetState( SfxItemSet& rSet ) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual void Execute( SfxRequest& rReq ) SAL_OVERRIDE; - SVX_DLLPRIVATE virtual bool GetStyleSheet( SfxStyleSheet* &rpStyleSheet ) const; - SVX_DLLPRIVATE virtual bool SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr ); + SVX_DLLPRIVATE virtual bool GetStyleSheet( SfxStyleSheet* &rpStyleSheet ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr ) SAL_OVERRIDE; - SVX_DLLPRIVATE virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet ); - SVX_DLLPRIVATE virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats ); + SVX_DLLPRIVATE virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet ) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats ) SAL_OVERRIDE; // slots SVX_DLLPRIVATE void onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs = 0 ); @@ -86,11 +86,11 @@ public: */ SVX_DLLPRIVATE void FillCommonBorderAttrFromSelectedCells(SvxBoxItem& rBox, SvxBoxInfoItem& rBoxInfo) const; - SVX_DLLPRIVATE virtual bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const; - SVX_DLLPRIVATE virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll); + SVX_DLLPRIVATE virtual bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) SAL_OVERRIDE; - SVX_DLLPRIVATE virtual bool GetMarkedObjModel( SdrPage* pNewPage ); - SVX_DLLPRIVATE virtual bool PasteObjModel( const SdrModel& rModel ); + SVX_DLLPRIVATE virtual bool GetMarkedObjModel( SdrPage* pNewPage ) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool PasteObjModel( const SdrModel& rModel ) SAL_OVERRIDE; SVX_DLLPRIVATE bool hasSelectedCells() const { return mbCellSelectionMode || mpView->IsTextEdit(); } |