diff options
Diffstat (limited to 'svx/inc/sdr/properties/e3dcompoundproperties.hxx')
| -rw-r--r-- | svx/inc/sdr/properties/e3dcompoundproperties.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/inc/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/sdr/properties/e3dcompoundproperties.hxx index c73e0814d35d..788ce8323ab6 100644 --- a/svx/inc/sdr/properties/e3dcompoundproperties.hxx +++ b/svx/inc/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) SAL_OVERRIDE; + virtual void PostItemChange(const sal_uInt16 nWhich) 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 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; }; } // end of namespace properties } // end of namespace sdr |