diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /include/svx/svdpage.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/svx/svdpage.hxx')
-rw-r--r-- | include/svx/svdpage.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 470c11a1fbaa..84ccb3e3acd6 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -350,9 +350,9 @@ public: virtual ~SdrPageProperties(); // Notify(...) from baseclass SfxListener - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; - virtual bool isUsedByModel() const SAL_OVERRIDE; + virtual bool isUsedByModel() const override; // data read/write const SfxItemSet& GetItemSet() const { return *mpProperties;} @@ -460,7 +460,7 @@ public: TYPEINFO_OVERRIDE(); explicit SdrPage(SdrModel& rNewModel, bool bMasterPage=false); virtual ~SdrPage(); - virtual SdrPage* Clone() const SAL_OVERRIDE; + virtual SdrPage* Clone() const override; virtual SdrPage* Clone(SdrModel* pNewModel) const; bool IsMasterPage() const { return mbMaster; } void SetInserted(bool bNew = true); @@ -492,7 +492,7 @@ public: sal_Int32 GetRgtBorder() const; sal_Int32 GetLwrBorder() const; - virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; + virtual void SetModel(SdrModel* pNewModel) override; // New MasterPage interface bool TRG_HasMasterPage() const { return (0L != mpMasterPageDescriptor); } @@ -559,7 +559,7 @@ public: // different, override the method and at least do what the method does. virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, - const sdr::contact::DisplayInfo& rDisplayInfo) SAL_OVERRIDE; + const sdr::contact::DisplayInfo& rDisplayInfo) override; }; |