diff options
Diffstat (limited to 'svx/inc/sdr/properties/groupproperties.hxx')
-rw-r--r-- | svx/inc/sdr/properties/groupproperties.hxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/svx/inc/sdr/properties/groupproperties.hxx b/svx/inc/sdr/properties/groupproperties.hxx index b4aef60f0ff0..73ff23ec2b1f 100644 --- a/svx/inc/sdr/properties/groupproperties.hxx +++ b/svx/inc/sdr/properties/groupproperties.hxx @@ -32,19 +32,19 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; + virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // test changeability for a single item - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const SAL_OVERRIDE; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const override; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) override; // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; + virtual void PostItemChange(const sal_uInt16 nWhich) override; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void ItemSetChanged(const SfxItemSet& rSet) 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 SAL_OVERRIDE; + virtual BaseProperties& Clone(SdrObject& rObj) const override; // get itemset - virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; + virtual const SfxItemSet& GetObjectItemSet() const override; // get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may // be overridden 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 // SfxItemState::DONTCARE which means there were several such items with different // values. - virtual const SfxItemSet& GetMergedItemSet() const SAL_OVERRIDE; + virtual const SfxItemSet& GetMergedItemSet() const override; // Set merged ItemSet. Normally, this maps to SetObjectItemSet(). - virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) SAL_OVERRIDE; + virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) override; // set single item - virtual void SetObjectItem(const SfxPoolItem& rItem) SAL_OVERRIDE; + virtual void SetObjectItem(const SfxPoolItem& rItem) override; // set single item direct, do not do any notifies or things like that - virtual void SetObjectItemDirect(const SfxPoolItem& rItem) SAL_OVERRIDE; + virtual void SetObjectItemDirect(const SfxPoolItem& rItem) override; // clear single item - virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; + virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) 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) SAL_OVERRIDE; + virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) override; // Set a single item, iterate over hierarchies if necessary. - virtual void SetMergedItem(const SfxPoolItem& rItem) SAL_OVERRIDE; + virtual void SetMergedItem(const SfxPoolItem& rItem) override; // Clear a single item, iterate over hierarchies if necessary. - virtual void ClearMergedItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; + virtual void ClearMergedItem(const sal_uInt16 nWhich = 0) override; // set complete item set - virtual void SetObjectItemSet(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void SetObjectItemSet(const SfxItemSet& rSet) override; // set a new StyleSheet - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; // get the local StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; + virtual SfxStyleSheet* GetStyleSheet() const override; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes() SAL_OVERRIDE; + virtual void ForceDefaultAttributes() override; // Move properties to a new ItemPool. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) SAL_OVERRIDE; + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) override; // force all attributes which come from styles to hard attributes // to be able to live without the style. - virtual void ForceStyleToHardAttributes() SAL_OVERRIDE; + virtual void ForceStyleToHardAttributes() override; }; } // end of namespace properties } // end of namespace sdr |