diff options
Diffstat (limited to 'include/svx/sdr/properties')
20 files changed, 142 insertions, 142 deletions
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 |